From patchwork Mon Oct 15 08:09:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 148811 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3507428lji; Mon, 15 Oct 2018 01:10:52 -0700 (PDT) X-Google-Smtp-Source: ACcGV604ltxlrg6H4sOT++ctJp3IzjDNqlZpKjX5mE4d4HTZ4AmMkszNtXCSvbgMzNi0o1tK4sTn X-Received: by 2002:a63:a612:: with SMTP id t18-v6mr14861086pge.338.1539591052063; Mon, 15 Oct 2018 01:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539591052; cv=none; d=google.com; s=arc-20160816; b=xCjQWMvjtrNhb2kz/t0W4NQPOZEsuNKmFZYAAO1FbtXZ9oYGHEU35e0/uKZkXfedVu 6jTjNTxgxcBv/otUq3Vh+LMDR1ujgmghrupqw+f467tmT4zcuaInefvcIf9bAnL3D9lj SGT4YRmyUc2Z/Wy7l7w+mYz8OpVL8VsSx7cHpBEYTcFrkNDq0PePPsyraVDlHHJkTxSB A1cqWslwMEjiOAMlKBqDXq+lh3YYNd8kGelhv/4x6r3ClmnMP1Wup8aai74HKA9BtyQs 4wYsOQYbT4qxKfGn5nEyu8/NUMZbu41brzJGIsfrbu3RIPs+cs8eX3q6ktqcMwFDgUZV ESuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=cDuzUAuMsnhE9gCbGkSwe4MnMbrTeR2cKrHQa5XyMOI=; b=LTuV2LYQphz7KnC0nN8I5nMBFJ99Uy0AbOqXw33DHa/V5DxENTWhwa6SgRONY4VeCQ Er2a+qJTipOyykf/pazbVaqIdJF2Yg+uPPNxuY4N7vblLR0BCesSIB1XmK+TV3SmjxIZ sGpns2j/llq9v9APcftzWIr8BuKvbNCrFWspDXfF1Yq6YD3oe0ZfMeD0EPxTA3TGc6BJ Yyh2qyajYvWloE4nsLvDlKqwVCKKOVRf3YGV4/bGT7PI3Rxuljr9lnXU9OIq73hlWB5l /OakEdYu/9zTsMr7kWP4+lF5Aq7qEv8TCPj5+N/JrcGjyD8SsJCIBsFAGoPADs35jPhK WEJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N0MeuAnx; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v1-v6si10815326pfb.144.2018.10.15.01.10.51; Mon, 15 Oct 2018 01:10:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N0MeuAnx; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726960AbeJOPzB (ORCPT + 10 others); Mon, 15 Oct 2018 11:55:01 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:33461 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726932AbeJOPzA (ORCPT ); Mon, 15 Oct 2018 11:55:00 -0400 Received: by mail-pf1-f193.google.com with SMTP id 78-v6so6898412pfq.0 for ; Mon, 15 Oct 2018 01:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=cDuzUAuMsnhE9gCbGkSwe4MnMbrTeR2cKrHQa5XyMOI=; b=N0MeuAnx2m8YE+SUShgCQ2aP9S1Dl9t5jVcilGu0qW4NV7W/JP924mFF5i5eDNSDct YsPwMjPYJL3pIgVkCh7cKQ15nkFlX9hyvdNhwLCq9IzA2ui6sxVKKBDPx3e4gNQCKM2x /1whyC8aovWWYIk+LFSZk/pMNYQToKoRRTYSE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=cDuzUAuMsnhE9gCbGkSwe4MnMbrTeR2cKrHQa5XyMOI=; b=C57VAyxVoSk/hGpmjtYFae/tB1wwb2GMk+7pxM79KfNwGBw2Wu4QF5OJ1j3mo/wv4N OHNl2wlkp6juy6e3PeQ81a30+HQPXhbsOMaz82Nn8o87p6MkLcTU80vocHO0Z42UGBJR K+W8Y6Yzzk2I5oMlYkCj/Fb6Mq9MVglZ+uYKuZzTFgcvtU2DQMkJgMmaPbtonrmqVJrJ m5nb5URejoJd035+ihWak4rdKJ0OwWXtEeNmXoQsYLptZPGaILsVFAYlxdcqtTQXgyaF N/Bu71CEDMrguOxexInk+DvQVEiuz5X5i2BwaAdpnNNgWPm0MvdfWnda/3si1HtEyET8 9QXQ== X-Gm-Message-State: ABuFfohdsmeYdTvcUBHBMR/cK4leT9GYBATbNFVwYK0CgMX+v9MsQ/8r IdBZ8trDN1GPs4/FizkdskXNaw== X-Received: by 2002:a63:9855:: with SMTP id l21-v6mr15158714pgo.162.1539591049721; Mon, 15 Oct 2018 01:10:49 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.102]) by smtp.gmail.com with ESMTPSA id m27-v6sm16375855pff.187.2018.10.15.01.10.45 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Oct 2018 01:10:48 -0700 (PDT) From: Baolin Wang To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, yuanjiang.yu@unisoc.com, baolin.wang@linaro.org, broonie@kernel.org, ctatlor97@gmail.com, linus.walleij@linaro.org Subject: [PATCH v4 4/6] power: supply: core: Add some helpers to use the battery OCV capacity table Date: Mon, 15 Oct 2018 16:09:23 +0800 Message-Id: <3bbd08505c0bdbbdfaee6143376044cdf38d0a8e.1539587217.git.baolin.wang@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org We have introduced some battery properties to present the OCV table temperatures and OCV capacity table values. Thus this patch add OCV temperature and OCV table for battery information, as well as providing some helper functions to use the OCV capacity table for users. Signed-off-by: Baolin Wang Reviewed-by: Linus Walleij --- Changes from v3: - Split core modification into one separate patch. - Rename ocv-capacity-table-temperatures to ocv-capacity-celsius. Changes from v2: - Use type __be32 to calculate the table length. - Update error messages. - Add some helper functions. Changes from v1: - New patch in v2. --- drivers/power/supply/power_supply_core.c | 123 +++++++++++++++++++++++++++++- include/linux/power_supply.h | 19 +++++ 2 files changed, 141 insertions(+), 1 deletion(-) -- 1.7.9.5 diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 307e0995..58c4309 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -570,7 +570,7 @@ int power_supply_get_battery_info(struct power_supply *psy, { struct device_node *battery_np; const char *value; - int err; + int err, len, index; info->energy_full_design_uwh = -EINVAL; info->charge_full_design_uah = -EINVAL; @@ -581,6 +581,12 @@ int power_supply_get_battery_info(struct power_supply *psy, info->constant_charge_voltage_max_uv = -EINVAL; info->factory_internal_resistance_uohm = -EINVAL; + for (index = 0; index < POWER_SUPPLY_OCV_TEMP_MAX; index++) { + info->ocv_table[index] = NULL; + info->ocv_temp[index] = -EINVAL; + info->ocv_table_size[index] = -EINVAL; + } + if (!psy->of_node) { dev_warn(&psy->dev, "%s currently only supports devicetree\n", __func__); @@ -620,10 +626,125 @@ int power_supply_get_battery_info(struct power_supply *psy, of_property_read_u32(battery_np, "factory-internal-resistance-micro-ohms", &info->factory_internal_resistance_uohm); + len = of_property_count_u32_elems(battery_np, "ocv-capacity-celsius"); + if (len < 0 && len != -EINVAL) { + return len; + } else if (len > POWER_SUPPLY_OCV_TEMP_MAX) { + dev_err(&psy->dev, "Too many temperature values\n"); + return -EINVAL; + } else if (len > 0) { + of_property_read_u32_array(battery_np, "ocv-capacity-celsius", + info->ocv_temp, len); + } + + for (index = 0; index < len; index++) { + struct power_supply_battery_ocv_table *table; + char *propname; + const __be32 *list; + int i, tab_len, size; + + propname = kasprintf(GFP_KERNEL, "ocv-capacity-table-%d", index); + list = of_get_property(battery_np, propname, &size); + if (!list || !size) { + dev_err(&psy->dev, "failed to get %s\n", propname); + kfree(propname); + power_supply_put_battery_info(psy, info); + return -EINVAL; + } + + kfree(propname); + tab_len = size / (2 * sizeof(__be32)); + info->ocv_table_size[index] = tab_len; + + table = info->ocv_table[index] = + devm_kzalloc(&psy->dev, tab_len * sizeof(*table), + GFP_KERNEL); + if (!info->ocv_table[index]) { + power_supply_put_battery_info(psy, info); + return -ENOMEM; + } + + for (i = 0; i < tab_len; i++) { + table[i].ocv = be32_to_cpu(*list++); + table[i].capacity = be32_to_cpu(*list++); + } + } + return 0; } EXPORT_SYMBOL_GPL(power_supply_get_battery_info); +void power_supply_put_battery_info(struct power_supply *psy, + struct power_supply_battery_info *info) +{ + int i; + + for (i = 0; i < POWER_SUPPLY_OCV_TEMP_MAX; i++) + kfree(info->ocv_table[i]); +} +EXPORT_SYMBOL_GPL(power_supply_put_battery_info); + +int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table, + int table_len, int ocv) +{ + int i, cap, tmp; + + for (i = 0; i < table_len; i++) + if (ocv > table[i].ocv) + break; + + if (i > 0 && i < table_len) { + tmp = (table[i - 1].capacity - table[i].capacity) * + (ocv - table[i].ocv); + tmp /= table[i - 1].ocv - table[i].ocv; + cap = tmp + table[i].capacity; + } else if (i == 0) { + cap = table[0].capacity; + } else { + cap = table[table_len - 1].capacity; + } + + return cap; +} +EXPORT_SYMBOL_GPL(power_supply_ocv2cap_simple); + +struct power_supply_battery_ocv_table * +power_supply_find_ocv2cap_table(struct power_supply_battery_info *info, + int temp, int *table_len) +{ + int best_temp_diff = INT_MAX, best_index = 0, temp_diff, i; + + if (!info->ocv_table[0]) + return NULL; + + for (i = 0; i < POWER_SUPPLY_OCV_TEMP_MAX; i++) { + temp_diff = abs(info->ocv_temp[i] - temp); + + if (temp_diff < best_temp_diff) { + best_temp_diff = temp_diff; + best_index = i; + } + } + + *table_len = info->ocv_table_size[best_index]; + return info->ocv_table[best_index]; +} +EXPORT_SYMBOL_GPL(power_supply_find_ocv2cap_table); + +int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info, + int ocv, int temp) +{ + struct power_supply_battery_ocv_table *table; + int table_len; + + table = power_supply_find_ocv2cap_table(info, temp, &table_len); + if (!table) + return -EINVAL; + + return power_supply_ocv2cap_simple(table, table_len, ocv); +} +EXPORT_SYMBOL_GPL(power_supply_batinfo_ocv2cap); + int power_supply_get_property(struct power_supply *psy, enum power_supply_property psp, union power_supply_propval *val) diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index d089566..84fe93f 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -309,6 +309,13 @@ struct power_supply_info { int use_for_apm; }; +struct power_supply_battery_ocv_table { + int ocv; /* microVolts */ + int capacity; /* percent */ +}; + +#define POWER_SUPPLY_OCV_TEMP_MAX 20 + /* * This is the recommended struct to manage static battery parameters, * populated by power_supply_get_battery_info(). Most platform drivers should @@ -327,6 +334,9 @@ struct power_supply_battery_info { int constant_charge_current_max_ua; /* microAmps */ int constant_charge_voltage_max_uv; /* microVolts */ int factory_internal_resistance_uohm; /* microOhms */ + int ocv_temp[POWER_SUPPLY_OCV_TEMP_MAX];/* celsius */ + struct power_supply_battery_ocv_table *ocv_table[POWER_SUPPLY_OCV_TEMP_MAX]; + int ocv_table_size[POWER_SUPPLY_OCV_TEMP_MAX]; }; extern struct atomic_notifier_head power_supply_notifier; @@ -350,6 +360,15 @@ extern struct power_supply *devm_power_supply_get_by_phandle( extern int power_supply_get_battery_info(struct power_supply *psy, struct power_supply_battery_info *info); +extern void power_supply_put_battery_info(struct power_supply *psy, + struct power_supply_battery_info *info); +extern int power_supply_ocv2cap_simple(struct power_supply_battery_ocv_table *table, + int table_len, int ocv); +extern struct power_supply_battery_ocv_table * +power_supply_find_ocv2cap_table(struct power_supply_battery_info *info, + int temp, int *table_len); +extern int power_supply_batinfo_ocv2cap(struct power_supply_battery_info *info, + int ocv, int temp); extern void power_supply_changed(struct power_supply *psy); extern int power_supply_am_i_supplied(struct power_supply *psy); extern int power_supply_set_input_current_limit_from_supplier(