From patchwork Tue Nov 16 12:25:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 12622291 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AF33C433F5 for ; Tue, 16 Nov 2021 12:26:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3DA5961882 for ; Tue, 16 Nov 2021 12:26:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236144AbhKPM3E (ORCPT ); Tue, 16 Nov 2021 07:29:04 -0500 Received: from mail-lf1-f41.google.com ([209.85.167.41]:46990 "EHLO mail-lf1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236140AbhKPM3B (ORCPT ); Tue, 16 Nov 2021 07:29:01 -0500 Received: by mail-lf1-f41.google.com with SMTP id b1so46840558lfs.13; Tue, 16 Nov 2021 04:26:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=cAXGZZ6nd6Kr3NLJSibWSA76ESUyMzTBbvb3SIYaImo=; b=TNOSPIT/o0WF2kMhCfxh9WlCzxF3PUchXP+4g+2HzgNLze5l+31z42b10I1iI1q5Hm Dz8bDBOKB/mupLXFrD84WZA9Zjac+WD1ipiuQok5e2DK8kjCV/rfJA8H2FG9fcA0HaT1 UN+AQP4lLdcDx4MLEKhHJSZF/TRhfUBzP6i/MLXHHl1hO2FASRznNqiuCcjEgldcDl0Y qc7Ws7DSNS3NhT0kxJZc40EiL7662Q0tfyUwQTw1nF6My3mZOql0Jc0GNEgdlBAduUdq jQis/TveZGn1acuIQbEwCmiiyecZ1Y5gyZSVIYm613DNZ4VHP7RJG2ec62TuKBOTBPJc n28Q== X-Gm-Message-State: AOAM533qVvTz7k+6eBH9ZGGf7NVxYhmfumuzIJn/4UcSVbDI2eDoDJq7 vwlV/I71ONZcXzhIFoiSTaI= X-Google-Smtp-Source: ABdhPJyMSv1GDEU5VDePN/B7WoOYnoIAsywv3Qg7QWaujWOdhjXMNHWtaDTFfMfRbTYMjrDi1MYYwA== X-Received: by 2002:a05:6512:20d4:: with SMTP id u20mr6321919lfr.339.1637065562990; Tue, 16 Nov 2021 04:26:02 -0800 (PST) Received: from fedora (dc73szyyyyyyyyyyyyycy-3.rev.dnainternet.fi. [2001:14ba:16ee:fa00::4]) by smtp.gmail.com with ESMTPSA id n4sm1938734lfu.70.2021.11.16.04.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 04:26:02 -0800 (PST) Date: Tue, 16 Nov 2021 14:25:53 +0200 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Sebastian Reichel , Rob Herring , Matti Vaittinen , Lee Jones , Linus Walleij , rostokus@gmail.com, fan.chen@mediatek.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-power@fi.rohmeurope.com Subject: [RFC PATCH v3 3/9] power: supply: Support DT originated temperature-capacity tables Message-ID: <6123f62ac44e6513a498d15034a4b6b22abe5f5b.1637061794.git.matti.vaittinen@fi.rohmeurope.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Support obtaining the "capacity degradation by temperature" - tables from device-tree to batinfo. Signed-off-by: Matti Vaittinen --- RFCv3: - rename simple_gauge_temp_degr to power_supply_temp_degr --- drivers/power/supply/power_supply_core.c | 53 ++++++++++++++++++++++++ include/linux/power_supply.h | 26 ++++++++++++ 2 files changed, 79 insertions(+) diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 295672165836..1a21f692ab81 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -562,10 +562,12 @@ struct power_supply *devm_power_supply_get_by_phandle(struct device *dev, EXPORT_SYMBOL_GPL(devm_power_supply_get_by_phandle); #endif /* CONFIG_OF */ +#define POWER_SUPPLY_TEMP_DGRD_MAX_VALUES 100 int power_supply_get_battery_info(struct power_supply *psy, struct power_supply_battery_info *info) { struct power_supply_resistance_temp_table *resist_table; + u32 *dgrd_table; struct device_node *battery_np; const char *value; int err, len, index; @@ -588,6 +590,8 @@ int power_supply_get_battery_info(struct power_supply *psy, info->temp_max = INT_MAX; info->factory_internal_resistance_uohm = -EINVAL; info->resist_table = NULL; + info->temp_dgrd_values = 0; + info->temp_dgrd = NULL; for (index = 0; index < POWER_SUPPLY_OCV_TEMP_MAX; index++) { info->ocv_table[index] = NULL; @@ -677,6 +681,55 @@ int power_supply_get_battery_info(struct power_supply *psy, of_property_read_u32_index(battery_np, "operating-range-celsius", 1, &info->temp_max); + len = of_property_count_u32_elems(battery_np, "temp-degrade-table"); + if (len == -EINVAL) + len = 0; + if (len < 0) { + err = len; + goto out_put_node; + } + /* table should consist of value pairs - maximum of 100 pairs */ + if (len % 3 || len / 3 > POWER_SUPPLY_TEMP_DGRD_MAX_VALUES) { + dev_warn(&psy->dev, + "bad amount of temperature-capacity degrade values\n"); + err = -EINVAL; + goto out_put_node; + } + info->temp_dgrd_values = len / 3; + if (info->temp_dgrd_values) { + info->temp_dgrd = devm_kcalloc(&psy->dev, + info->temp_dgrd_values, + sizeof(*info->temp_dgrd), + GFP_KERNEL); + if (!info->temp_dgrd) { + err = -ENOMEM; + goto out_put_node; + } + dgrd_table = kcalloc(len, sizeof(*dgrd_table), GFP_KERNEL); + if (!dgrd_table) { + err = -ENOMEM; + goto out_put_node; + } + err = of_property_read_u32_array(battery_np, + "temp-degrade-table", + dgrd_table, len); + if (err) { + dev_warn(&psy->dev, + "bad temperature - capacity degrade values %d\n", err); + kfree(dgrd_table); + info->temp_dgrd_values = 0; + goto out_put_node; + } + for (index = 0; index < info->temp_dgrd_values; index++) { + struct power_supply_temp_degr *d = &info->temp_dgrd[index]; + + d->temp_degrade_1C = dgrd_table[index * 3]; + d->degrade_at_set = dgrd_table[index * 3 + 1]; + d->temp_set_point = dgrd_table[index * 3 + 2]; + } + kfree(dgrd_table); + } + len = of_property_count_u32_elems(battery_np, "ocv-capacity-celsius"); if (len < 0 && len != -EINVAL) { err = len; diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index fa8cf434f7e3..fbc07d403f41 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -214,6 +214,30 @@ union power_supply_propval { struct device_node; struct power_supply; +/** + * struct power_supply_temp_degr - impact of temperature to battery capacity + * + * Usually temperature impacts on battery capacity. For systems where it is + * sufficient to describe capacity change as a series of temperature ranges + * where the change is linear (Eg delta cap = temperature_change * constant + + * offset) can be described by this structure. + * + * Please note - in order to avoid unnecessary rounding errors the change + * of capacity (uAh) is per change of temperature degree C while the temperature + * range floor is in tenths of degree C + * + * @temp_set_point: Temperature where cap change is as given in + * degrade_at_set. Units are 0.1 degree C + * @degrade_at_set: Capacity difference (from ideal) at temp_set_point + * temperature + * @temp_degrade_1C: Capacity change / temperature change (uAh / degree C) + */ +struct power_supply_temp_degr { + int temp_set_point; + int degrade_at_set; + int temp_degrade_1C; +}; + /* Run-time specific power supply configuration */ struct power_supply_config { struct device_node *of_node; @@ -377,6 +401,8 @@ struct power_supply_battery_info { int ocv_table_size[POWER_SUPPLY_OCV_TEMP_MAX]; struct power_supply_resistance_temp_table *resist_table; int resist_table_size; + int temp_dgrd_values; + struct power_supply_temp_degr *temp_dgrd; }; extern struct atomic_notifier_head power_supply_notifier;