Skip to content

Commit 446fcf4

Browse files
valpackettsre
authored andcommitted
power: supply: qcom_battmgr: support disabling charge control
Existing userspace (in particular, upower) disables charge control by setting the start threshold to 0 and the stop threshold to 100. Handle that by actually setting the enable bit to 0 when a start threshold of 0 was requested. Fixes: cc3e883 ("power: supply: qcom_battmgr: Add charge control support") Signed-off-by: Val Packett <val@packett.cool> Link: https://patch.msgid.link/20251012233333.19144-4-val@packett.cool Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
1 parent 8809980 commit 446fcf4

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/power/supply/qcom_battmgr.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ struct qcom_battmgr_info {
257257
unsigned int capacity_warning;
258258
unsigned int cycle_count;
259259
unsigned int charge_count;
260+
bool charge_ctrl_enable;
260261
unsigned int charge_ctrl_start;
261262
unsigned int charge_ctrl_end;
262263
char model_number[BATTMGR_STRING_LEN];
@@ -659,13 +660,13 @@ static int qcom_battmgr_bat_get_property(struct power_supply *psy,
659660
}
660661

661662
static int qcom_battmgr_set_charge_control(struct qcom_battmgr *battmgr,
662-
u32 target_soc, u32 delta_soc)
663+
bool enable, u32 target_soc, u32 delta_soc)
663664
{
664665
struct qcom_battmgr_charge_ctrl_request request = {
665666
.hdr.owner = cpu_to_le32(PMIC_GLINK_OWNER_BATTMGR),
666667
.hdr.type = cpu_to_le32(PMIC_GLINK_REQ_RESP),
667668
.hdr.opcode = cpu_to_le32(BATTMGR_CHG_CTRL_LIMIT_EN),
668-
.enable = cpu_to_le32(1),
669+
.enable = cpu_to_le32(enable),
669670
.target_soc = cpu_to_le32(target_soc),
670671
.delta_soc = cpu_to_le32(delta_soc),
671672
};
@@ -677,6 +678,7 @@ static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr,
677678
{
678679
u32 target_soc, delta_soc;
679680
int ret;
681+
bool enable = start_soc != 0;
680682

681683
start_soc = clamp(start_soc, CHARGE_CTRL_START_THR_MIN, CHARGE_CTRL_START_THR_MAX);
682684

@@ -696,9 +698,10 @@ static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr,
696698
}
697699

698700
mutex_lock(&battmgr->lock);
699-
ret = qcom_battmgr_set_charge_control(battmgr, target_soc, delta_soc);
701+
ret = qcom_battmgr_set_charge_control(battmgr, enable, target_soc, delta_soc);
700702
mutex_unlock(&battmgr->lock);
701703
if (!ret) {
704+
battmgr->info.charge_ctrl_enable = enable;
702705
battmgr->info.charge_ctrl_start = start_soc;
703706
battmgr->info.charge_ctrl_end = target_soc;
704707
}
@@ -710,14 +713,15 @@ static int qcom_battmgr_set_charge_end_threshold(struct qcom_battmgr *battmgr, i
710713
{
711714
u32 delta_soc = CHARGE_CTRL_DELTA_SOC;
712715
int ret;
716+
bool enable = battmgr->info.charge_ctrl_enable;
713717

714718
end_soc = clamp(end_soc, CHARGE_CTRL_END_THR_MIN, CHARGE_CTRL_END_THR_MAX);
715719

716720
if (battmgr->info.charge_ctrl_start && end_soc > battmgr->info.charge_ctrl_start)
717721
delta_soc = end_soc - battmgr->info.charge_ctrl_start;
718722

719723
mutex_lock(&battmgr->lock);
720-
ret = qcom_battmgr_set_charge_control(battmgr, end_soc, delta_soc);
724+
ret = qcom_battmgr_set_charge_control(battmgr, enable, end_soc, delta_soc);
721725
mutex_unlock(&battmgr->lock);
722726
if (!ret) {
723727
battmgr->info.charge_ctrl_start = end_soc - delta_soc;

0 commit comments

Comments
 (0)