linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sebastian Reichel <sre@kernel.org>
To: Dev Null <devnull@uvos.xyz>
Cc: linux-omap@vger.kernel.org, linux-pm@vger.kernel.org,
	Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH 1/1] power: supply: cpcap-battery: improve handling of 3rd party and XT875 batteries.
Date: Tue, 20 Oct 2020 23:41:26 +0200	[thread overview]
Message-ID: <20201020214126.tkf37xpehnpxli4a@earth.universe> (raw)
In-Reply-To: <20201020225312.b4ea29c9dc3ae00f23e39280@uvos.xyz>

[-- Attachment #1: Type: text/plain, Size: 4872 bytes --]

Hi,

Please do one change per patch:

On Tue, Oct 20, 2020 at 10:53:12PM +0200, Dev Null wrote:
> Adds a module option to ignore a missing temerature sensor.

first patch

> Invalidates empty->counter_uah and charge_full when charge_now indicates that they are grossly wrong

second patch

> Makes charge_full_design writeable, so that different/custom batteries can be used.

third patch

> This is especially usfull on XTT875 where both HW4X and BW8X exsist.

missing Signed-off-by.

> diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
> index 3be76cd7584a..ffa70c31c1cb 100644
> --- a/drivers/power/supply/cpcap-battery.c
> +++ b/drivers/power/supply/cpcap-battery.c
> @@ -28,6 +28,7 @@
>  #include <linux/power_supply.h>
>  #include <linux/reboot.h>
>  #include <linux/regmap.h>
> +#include <linux/moduleparam.h>
>  
>  #include <linux/iio/consumer.h>
>  #include <linux/iio/types.h>
> @@ -162,6 +163,9 @@ static const struct cpcap_battery_capacity cpcap_battery_cap[] = {
>  
>  #define CPCAP_NO_BATTERY	-400
>  
> +static bool ignore_temperature_probe;
> +module_param(ignore_temperature_probe, bool, 0660);

Can this be deferred from DT (i.e. always disable temperature probe
on XT875)? Having to specify a module parameter to get a working
system is not very user friendly.

>  static struct cpcap_battery_state_data *
>  cpcap_battery_get_state(struct cpcap_battery_ddata *ddata,
>  			enum cpcap_battery_state state)
> @@ -205,7 +209,8 @@ static int cpcap_charger_battery_temperature(struct cpcap_battery_ddata *ddata,
>  	channel = ddata->channels[CPCAP_BATTERY_IIO_BATTDET];
>  	error = iio_read_channel_processed(channel, value);
>  	if (error < 0) {
> -		dev_warn(ddata->dev, "%s failed: %i\n", __func__, error);
> +		if (!ignore_temperature_probe)
> +			dev_warn(ddata->dev, "%s failed: %i\n", __func__, error);
>  		*value = CPCAP_NO_BATTERY;
>  
>  		return error;
> @@ -558,7 +563,7 @@ static int cpcap_battery_get_property(struct power_supply *psy,
>  
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_PRESENT:
> -		if (latest->temperature > CPCAP_NO_BATTERY)
> +		if (latest->temperature > CPCAP_NO_BATTERY || ignore_temperature_probe)
>  			val->intval = 1;
>  		else
>  			val->intval = 0;
> @@ -641,10 +646,22 @@ static int cpcap_battery_get_property(struct power_supply *psy,
>  		if (!empty->voltage)
>  			return -ENODATA;
>  		val->intval = empty->counter_uah - latest->counter_uah;
> -		if (val->intval < 0)
> +		if (val->intval < 0) {
> +			if (ddata->charge_full && abs(val->intval) > ddata->charge_full/5) {
> +				empty->voltage = 0;
> +				ddata->charge_full = 0;
> +				return -ENODATA;
> +			}
>  			val->intval = 0;
> -		else if (ddata->charge_full && ddata->charge_full < val->intval)
> +		}
> +		else if (ddata->charge_full && ddata->charge_full < val->intval) {
> +			if (val->intval > (6*ddata->charge_full)/5) {
> +				empty->voltage = 0;
> +				ddata->charge_full = 0;
> +				return -ENODATA;
> +			}
>  			val->intval = ddata->charge_full;
> +		}

The context of this patch is not available in cpcap-battery driver
from mainline. So this has dependencies on other patches, which
need to be submitted first. I currently do not have any pending
cpcap patches, but IIRC there was a big patchset which had to be
resubmitted.

>  		break;
>  	case POWER_SUPPLY_PROP_CHARGE_FULL:
>  		if (!ddata->charge_full)
> @@ -658,6 +675,8 @@ static int cpcap_battery_get_property(struct power_supply *psy,
>  		val->intval = POWER_SUPPLY_SCOPE_SYSTEM;
>  		break;
>  	case POWER_SUPPLY_PROP_TEMP:
> +		if (ignore_temperature_probe)
> +			return -ENODATA;
>  		val->intval = latest->temperature;
>  		break;
>  	default:
> @@ -715,11 +734,18 @@ static int cpcap_battery_set_property(struct power_supply *psy,
>  	case POWER_SUPPLY_PROP_CHARGE_FULL:
>  		if (val->intval < 0)
>  			return -EINVAL;
> -		if (val->intval > ddata->config.info.charge_full_design)
> +		if (val->intval > (6*ddata->config.info.charge_full_design)/5)

This deserves a comment. Why do we allow to set charge full to be
above full design capacity?

>  			return -EINVAL;
>  
>  		ddata->charge_full = val->intval;
>  
> +		return 0;
> +	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
> +		if (val->intval < 0)
> +			return -EINVAL;
> +
> +		ddata->config.info.charge_full_design = val->intval;
> +
>  		return 0;
>  	default:
>  		return -EINVAL;
> @@ -734,6 +760,7 @@ static int cpcap_battery_property_is_writeable(struct power_supply *psy,
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE:
>  	case POWER_SUPPLY_PROP_CHARGE_FULL:
> +	case POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN:
>  		return 1;
>  	default:
>  		return 0;
> 
> -- 
> Dev Null <devnull@uvos.xyz>

-- Sebastian

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2020-10-20 21:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20 20:53 Dev Null
2020-10-20 21:41 ` Sebastian Reichel [this message]
2020-10-21  4:51   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201020214126.tkf37xpehnpxli4a@earth.universe \
    --to=sre@kernel.org \
    --cc=devnull@uvos.xyz \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=tony@atomide.com \
    --subject='Re: [PATCH 1/1] power: supply: cpcap-battery: improve handling of 3rd party and XT875 batteries.' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).