Commit 8809980f authored by Val Packett's avatar Val Packett Committed by Sebastian Reichel
Browse files

power: supply: qcom_battmgr: clamp charge control thresholds 



The sysfs API documentation says that drivers "round written values to
the nearest supported value" for charge_control_end_threshold.

Let's do this for both thresholds, as userspace (e.g. upower) generally
does not expect these writes to fail at all.

Fixes: cc3e883a ("power: supply: qcom_battmgr: Add charge control support")
Signed-off-by: default avatarVal Packett <val@packett.cool>
Link: https://patch.msgid.link/20251012233333.19144-3-val@packett.cool


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent ea14bae6

drivers/power/supply/qcom_battmgr.c

+2 −12
Original line number Diff line number Diff line
@@ -678,12 +678,7 @@ static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr, 
	u32 target_soc, delta_soc;

	int ret;



	if (start_soc < CHARGE_CTRL_START_THR_MIN ||

	    start_soc > CHARGE_CTRL_START_THR_MAX) {

		dev_err(battmgr->dev, "charge control start threshold exceed range: [%u - %u]\n",

			CHARGE_CTRL_START_THR_MIN, CHARGE_CTRL_START_THR_MAX);

		return -EINVAL;

	}

	start_soc = clamp(start_soc, CHARGE_CTRL_START_THR_MIN, CHARGE_CTRL_START_THR_MAX);



	/*

	 * If the new start threshold is larger than the old end threshold,
@@ -716,12 +711,7 @@ static int qcom_battmgr_set_charge_end_threshold(struct qcom_battmgr *battmgr, i 
	u32 delta_soc = CHARGE_CTRL_DELTA_SOC;

	int ret;



	if (end_soc < CHARGE_CTRL_END_THR_MIN ||

	    end_soc > CHARGE_CTRL_END_THR_MAX) {

		dev_err(battmgr->dev, "charge control end threshold exceed range: [%u - %u]\n",

			CHARGE_CTRL_END_THR_MIN, CHARGE_CTRL_END_THR_MAX);

		return -EINVAL;

	}

	end_soc = clamp(end_soc, CHARGE_CTRL_END_THR_MIN, CHARGE_CTRL_END_THR_MAX);



	if (battmgr->info.charge_ctrl_start && end_soc > battmgr->info.charge_ctrl_start)

		delta_soc = end_soc - battmgr->info.charge_ctrl_start;