diff mbox series

[v4,04/10] power: supply: max77693: Set charge current limits during init

Message ID 20240816-max77693-charger-extcon-v4-4-050a0a9bfea0@gmail.com (mailing list archive)
State New
Headers show
Series power: supply: max77693: Toggle charging/OTG based on extcon status | expand

Commit Message

Artur Weber Aug. 16, 2024, 8:19 a.m. UTC 
There are two charger current limit registers:

- Fast charge current limit (which controls current going from the
  charger to the battery);
- CHGIN input current limit (which controls current going into the
  charger through the cable).

Add functions for setting both of the values, and set them to a
safe default value of 500mA at initialization.

The value for the fast charge current limit can be modified by setting
the constant-charge-current-max-ua DT property of the battery node
specified in the monitored-battery charger DT property; the CHGIN input
current limit will be set up later in the charger detection mechanism
(in the future, the INPUT_CURRENT_LIMIT property could also be made
writeable for userspace control of the current limit, while keeping
the actual current limit from the charger to the battery intact
so that users don't accidentally blow up their batteries with a bad
value).

Acked-by: Lee Jones <lee@kernel.org>
Tested-by: Henrik Grimler <henrik@grimler.se>
Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
---
Changes in v3:
- Dropped CHARGER reg in favor of managing the registers directly

Changes in v2:
- Squashed mfd include register additions into this commit
- Changed from custom fast charge current property to monitored-battery
  (devm_power_supply_register call has been moved up as it is needed by
  the DT init function now)
- Changed to adapt to both current limit values being managed by the
  CHARGER regulator
---
 drivers/power/supply/max77693_charger.c | 82 ++++++++++++++++++++++++++++-----
 include/linux/mfd/max77693-private.h    |  2 +
 2 files changed, 73 insertions(+), 11 deletions(-)

Comments

Krzysztof Kozlowski Aug. 16, 2024, 9:54 a.m. UTC | #1 
On 16/08/2024 10:19, Artur Weber wrote:
> There are two charger current limit registers:
> 
> - Fast charge current limit (which controls current going from the
>   charger to the battery);
> - CHGIN input current limit (which controls current going into the
>   charger through the cable).
> 
> Add functions for setting both of the values, and set them to a
> safe default value of 500mA at initialization.
> 
> The value for the fast charge current limit can be modified by setting
> the constant-charge-current-max-ua DT property of the battery node
> specified in the monitored-battery charger DT property; the CHGIN input
> current limit will be set up later in the charger detection mechanism
> (in the future, the INPUT_CURRENT_LIMIT property could also be made
> writeable for userspace control of the current limit, while keeping
> the actual current limit from the charger to the battery intact
> so that users don't accidentally blow up their batteries with a bad
> value).
> 
> Acked-by: Lee Jones <lee@kernel.org>
> Tested-by: Henrik Grimler <henrik@grimler.se>
> Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
> ---
> Changes in v3:
> - Dropped CHARGER reg in favor of managing the registers directly
> 
> Changes in v2:
> - Squashed mfd include register additions into this commit
> - Changed from custom fast charge current property to monitored-battery
>   (devm_power_supply_register call has been moved up as it is needed by
>   the DT init function now)
> - Changed to adapt to both current limit values being managed by the
>   CHARGER regulator
> ---
>  drivers/power/supply/max77693_charger.c | 82 ++++++++++++++++++++++++++++-----
>  include/linux/mfd/max77693-private.h    |  2 +
>  2 files changed, 73 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
> index 4caac142c428..17975ec69a6a 100644
> --- a/drivers/power/supply/max77693_charger.c
> +++ b/drivers/power/supply/max77693_charger.c
> @@ -26,6 +26,7 @@ struct max77693_charger {
>  	u32 min_system_volt;
>  	u32 thermal_regulation_temp;
>  	u32 batttery_overcurrent;
> +	u32 fast_charge_current;
>  	u32 charge_input_threshold_volt;
>  };
>  
> @@ -596,6 +597,48 @@ static int max77693_set_batttery_overcurrent(struct max77693_charger *chg,
>  			CHG_CNFG_12_B2SOVRC_MASK, data);
>  }
>  
> +static int max77693_set_input_current_limit(struct max77693_charger *chg,
> +		unsigned int uamp)
> +{
> +	unsigned int data;
> +
> +	if (uamp < 60000 || uamp > 2540000) {
> +		dev_err(chg->dev, "Wrong value for input current limit");
> +		return -EINVAL;
> +	};
> +
> +	data = uamp / 20000; /* 20mA steps */
> +
> +	data <<= CHG_CNFG_09_CHGIN_ILIM_SHIFT;
> +
> +	dev_dbg(chg->dev, "Input current limit: %u (0x%x)\n", uamp, data);
> +
> +	return regmap_update_bits(chg->max77693->regmap,
> +			MAX77693_CHG_REG_CHG_CNFG_09,
> +			CHG_CNFG_09_CHGIN_ILIM_MASK, data);
> +}
> +
> +static int max77693_set_fast_charge_current(struct max77693_charger *chg,
> +		unsigned int uamp)
> +{
> +	unsigned int data;
> +
> +	if (uamp > 2100000) {
> +		dev_err(chg->dev, "Wrong value for fast charge current\n");
> +		return -EINVAL;
> +	}
> +
> +	data = uamp / 33300; /* 0.1A/3 steps */
> +
> +	data <<= CHG_CNFG_02_CC_SHIFT;
> +
> +	dev_dbg(chg->dev, "Fast charge current: %u (0x%x)\n", uamp, data);
> +
> +	return regmap_update_bits(chg->max77693->regmap,
> +			MAX77693_CHG_REG_CHG_CNFG_02,
> +			CHG_CNFG_02_CC_MASK, data);
> +}
> +
>  static int max77693_set_charge_input_threshold_volt(struct max77693_charger *chg,
>  		unsigned int uvolt)
>  {
> @@ -673,6 +716,15 @@ static int max77693_reg_init(struct max77693_charger *chg)
>  	if (ret)
>  		return ret;
>  
> +	ret = max77693_set_fast_charge_current(chg, chg->fast_charge_current);
> +	if (ret)
> +		return ret;
> +
> +	ret = max77693_set_input_current_limit(chg,
> +				DEFAULT_FAST_CHARGE_CURRENT);
> +	if (ret)
> +		return ret;
> +
>  	return max77693_set_charge_input_threshold_volt(chg,
>  			chg->charge_input_threshold_volt);
>  }
> @@ -681,6 +733,7 @@ static int max77693_reg_init(struct max77693_charger *chg)
>  static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
>  {
>  	struct device_node *np = dev->of_node;
> +	struct power_supply_battery_info *battery_info;
>  
>  	if (!np) {
>  		dev_err(dev, "no charger OF node\n");
> @@ -708,11 +761,20 @@ static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
>  		chg->charge_input_threshold_volt =
>  			DEFAULT_CHARGER_INPUT_THRESHOLD_VOLT;
>  
> +	if (power_supply_get_battery_info(chg->charger, &battery_info) ||
> +			!battery_info->constant_charge_current_max_ua)
> +		chg->fast_charge_current = DEFAULT_FAST_CHARGE_CURRENT;
> +	else
> +		chg->fast_charge_current =
> +			battery_info->constant_charge_current_max_ua;
> +
>  	return 0;
>  }
>  #else /* CONFIG_OF */
>  static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
>  {
> +	chg->fast_charge_current = DEFAULT_FAST_CHARGE_CURRENT;
> +
>  	return 0;
>  }
>  #endif /* CONFIG_OF */
> @@ -732,6 +794,15 @@ static int max77693_charger_probe(struct platform_device *pdev)
>  	chg->dev = &pdev->dev;
>  	chg->max77693 = max77693;
>  
> +	psy_cfg.drv_data = chg;
> +
> +	chg->charger = devm_power_supply_register(&pdev->dev,
> +						  &max77693_charger_desc,
> +						  &psy_cfg);
> +	if (IS_ERR(chg->charger))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(chg->charger),
> +				     "failed: power supply register\n");

This code move is not explained in the commit msg. At least I could not
find it. Please explain why you need it in the commit msg.

BTW, if you are interested in devices using this driver, have time, in
general care about the code and want to respond to patches, feel free to
add yourself to driver's maintainer entry.



Best regards,
Krzysztof
Artur Weber Aug. 16, 2024, 2:25 p.m. UTC | #2 
On 16.08.2024 11:54, Krzysztof Kozlowski wrote:
> On 16/08/2024 10:19, Artur Weber wrote:
>> @@ -732,6 +794,15 @@ static int max77693_charger_probe(struct platform_device *pdev)
>>   	chg->dev = &pdev->dev;
>>   	chg->max77693 = max77693;
>>   
>> +	psy_cfg.drv_data = chg;
>> +
>> +	chg->charger = devm_power_supply_register(&pdev->dev,
>> +						  &max77693_charger_desc,
>> +						  &psy_cfg);
>> +	if (IS_ERR(chg->charger))
>> +		return dev_err_probe(&pdev->dev, PTR_ERR(chg->charger),
>> +				     "failed: power supply register\n");
> 
> This code move is not explained in the commit msg. At least I could not
> find it. Please explain why you need it in the commit msg.

This is done because the call to power_supply_get_battery_info in
max77693_dt_init requires chg->charger to be set. (I was considering
putting this in the commit message, can't remember why I didn't do it.
I'll add it in the next version.)

Best regards
Artur
Krzysztof Kozlowski Aug. 16, 2024, 3:40 p.m. UTC | #3 
On 16/08/2024 16:25, Artur Weber wrote:
> 
> 
> On 16.08.2024 11:54, Krzysztof Kozlowski wrote:
>> On 16/08/2024 10:19, Artur Weber wrote:
>>> @@ -732,6 +794,15 @@ static int max77693_charger_probe(struct platform_device *pdev)
>>>   	chg->dev = &pdev->dev;
>>>   	chg->max77693 = max77693;
>>>   
>>> +	psy_cfg.drv_data = chg;
>>> +
>>> +	chg->charger = devm_power_supply_register(&pdev->dev,
>>> +						  &max77693_charger_desc,
>>> +						  &psy_cfg);
>>> +	if (IS_ERR(chg->charger))
>>> +		return dev_err_probe(&pdev->dev, PTR_ERR(chg->charger),
>>> +				     "failed: power supply register\n");
>>
>> This code move is not explained in the commit msg. At least I could not
>> find it. Please explain why you need it in the commit msg.
> 
> This is done because the call to power_supply_get_battery_info in
> max77693_dt_init requires chg->charger to be set. (I was considering
> putting this in the commit message, can't remember why I didn't do it.
> I'll add it in the next version.)

I think that's wrong. Power supply is being available to the system
before it is being configured.

Best regards,
Krzysztof
Sebastian Reichel Aug. 27, 2024, 5:14 p.m. UTC | #4 
Hi,

On Fri, Aug 16, 2024 at 05:40:37PM GMT, Krzysztof Kozlowski wrote:
> On 16/08/2024 16:25, Artur Weber wrote:
> > 
> > 
> > On 16.08.2024 11:54, Krzysztof Kozlowski wrote:
> >> On 16/08/2024 10:19, Artur Weber wrote:
> >>> @@ -732,6 +794,15 @@ static int max77693_charger_probe(struct platform_device *pdev)
> >>>   	chg->dev = &pdev->dev;
> >>>   	chg->max77693 = max77693;
> >>>   
> >>> +	psy_cfg.drv_data = chg;
> >>> +
> >>> +	chg->charger = devm_power_supply_register(&pdev->dev,
> >>> +						  &max77693_charger_desc,
> >>> +						  &psy_cfg);
> >>> +	if (IS_ERR(chg->charger))
> >>> +		return dev_err_probe(&pdev->dev, PTR_ERR(chg->charger),
> >>> +				     "failed: power supply register\n");
> >>
> >> This code move is not explained in the commit msg. At least I could not
> >> find it. Please explain why you need it in the commit msg.
> > 
> > This is done because the call to power_supply_get_battery_info in
> > max77693_dt_init requires chg->charger to be set. (I was considering
> > putting this in the commit message, can't remember why I didn't do it.
> > I'll add it in the next version.)
> 
> I think that's wrong. Power supply is being available to the system
> before it is being configured.

It's a known limitation of the power_supply_get_battery_info API.
I think it would be best to add an register_init() hook to struct
power_supply_desc, which would be called from __power_supply_register()
directly before it calls device_add(). At that point the power_supply
struct is initialized far enough for getting the battery info, but not
yet exposed to the remaining system.

As a nice side effect the register writes happen after checking the
supplies, so the registers are not written if the probe errors out
with a probe defer anyways.

Greetings,

-- Sebastian
diff mbox series

Patch

diff --git a/drivers/power/supply/max77693_charger.c b/drivers/power/supply/max77693_charger.c
index 4caac142c428..17975ec69a6a 100644
--- a/drivers/power/supply/max77693_charger.c
+++ b/drivers/power/supply/max77693_charger.c
@@ -26,6 +26,7 @@  struct max77693_charger {
 	u32 min_system_volt;
 	u32 thermal_regulation_temp;
 	u32 batttery_overcurrent;
+	u32 fast_charge_current;
 	u32 charge_input_threshold_volt;
 };
 
@@ -596,6 +597,48 @@  static int max77693_set_batttery_overcurrent(struct max77693_charger *chg,
 			CHG_CNFG_12_B2SOVRC_MASK, data);
 }
 
+static int max77693_set_input_current_limit(struct max77693_charger *chg,
+		unsigned int uamp)
+{
+	unsigned int data;
+
+	if (uamp < 60000 || uamp > 2540000) {
+		dev_err(chg->dev, "Wrong value for input current limit");
+		return -EINVAL;
+	};
+
+	data = uamp / 20000; /* 20mA steps */
+
+	data <<= CHG_CNFG_09_CHGIN_ILIM_SHIFT;
+
+	dev_dbg(chg->dev, "Input current limit: %u (0x%x)\n", uamp, data);
+
+	return regmap_update_bits(chg->max77693->regmap,
+			MAX77693_CHG_REG_CHG_CNFG_09,
+			CHG_CNFG_09_CHGIN_ILIM_MASK, data);
+}
+
+static int max77693_set_fast_charge_current(struct max77693_charger *chg,
+		unsigned int uamp)
+{
+	unsigned int data;
+
+	if (uamp > 2100000) {
+		dev_err(chg->dev, "Wrong value for fast charge current\n");
+		return -EINVAL;
+	}
+
+	data = uamp / 33300; /* 0.1A/3 steps */
+
+	data <<= CHG_CNFG_02_CC_SHIFT;
+
+	dev_dbg(chg->dev, "Fast charge current: %u (0x%x)\n", uamp, data);
+
+	return regmap_update_bits(chg->max77693->regmap,
+			MAX77693_CHG_REG_CHG_CNFG_02,
+			CHG_CNFG_02_CC_MASK, data);
+}
+
 static int max77693_set_charge_input_threshold_volt(struct max77693_charger *chg,
 		unsigned int uvolt)
 {
@@ -673,6 +716,15 @@  static int max77693_reg_init(struct max77693_charger *chg)
 	if (ret)
 		return ret;
 
+	ret = max77693_set_fast_charge_current(chg, chg->fast_charge_current);
+	if (ret)
+		return ret;
+
+	ret = max77693_set_input_current_limit(chg,
+				DEFAULT_FAST_CHARGE_CURRENT);
+	if (ret)
+		return ret;
+
 	return max77693_set_charge_input_threshold_volt(chg,
 			chg->charge_input_threshold_volt);
 }
@@ -681,6 +733,7 @@  static int max77693_reg_init(struct max77693_charger *chg)
 static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
 {
 	struct device_node *np = dev->of_node;
+	struct power_supply_battery_info *battery_info;
 
 	if (!np) {
 		dev_err(dev, "no charger OF node\n");
@@ -708,11 +761,20 @@  static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
 		chg->charge_input_threshold_volt =
 			DEFAULT_CHARGER_INPUT_THRESHOLD_VOLT;
 
+	if (power_supply_get_battery_info(chg->charger, &battery_info) ||
+			!battery_info->constant_charge_current_max_ua)
+		chg->fast_charge_current = DEFAULT_FAST_CHARGE_CURRENT;
+	else
+		chg->fast_charge_current =
+			battery_info->constant_charge_current_max_ua;
+
 	return 0;
 }
 #else /* CONFIG_OF */
 static int max77693_dt_init(struct device *dev, struct max77693_charger *chg)
 {
+	chg->fast_charge_current = DEFAULT_FAST_CHARGE_CURRENT;
+
 	return 0;
 }
 #endif /* CONFIG_OF */
@@ -732,6 +794,15 @@  static int max77693_charger_probe(struct platform_device *pdev)
 	chg->dev = &pdev->dev;
 	chg->max77693 = max77693;
 
+	psy_cfg.drv_data = chg;
+
+	chg->charger = devm_power_supply_register(&pdev->dev,
+						  &max77693_charger_desc,
+						  &psy_cfg);
+	if (IS_ERR(chg->charger))
+		return dev_err_probe(&pdev->dev, PTR_ERR(chg->charger),
+				     "failed: power supply register\n");
+
 	ret = max77693_dt_init(&pdev->dev, chg);
 	if (ret)
 		return ret;
@@ -740,8 +811,6 @@  static int max77693_charger_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	psy_cfg.drv_data = chg;
-
 	ret = device_create_file(&pdev->dev, &dev_attr_fast_charge_timer);
 	if (ret) {
 		dev_err(&pdev->dev, "failed: create fast charge timer sysfs entry\n");
@@ -761,15 +830,6 @@  static int max77693_charger_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	chg->charger = devm_power_supply_register(&pdev->dev,
-						  &max77693_charger_desc,
-						  &psy_cfg);
-	if (IS_ERR(chg->charger)) {
-		dev_err(&pdev->dev, "failed: power supply register\n");
-		ret = PTR_ERR(chg->charger);
-		goto err;
-	}
-
 	return 0;
 
 err:
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 20c5e02ed9da..0819cf0a4f5f 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -145,6 +145,8 @@  enum max77693_pmic_reg {
 #define DEFAULT_THERMAL_REGULATION_TEMP		100
 /* microamps */
 #define DEFAULT_BATTERY_OVERCURRENT		3500000
+/* microamps */
+#define DEFAULT_FAST_CHARGE_CURRENT		500000
 /* microvolts */
 #define DEFAULT_CHARGER_INPUT_THRESHOLD_VOLT	4300000