power: supply: qcom_battmgr: Add charge control support
authorFenglin Wu <fenglin.wu@oss.qualcomm.com>
Wed, 17 Sep 2025 10:15:20 +0000 (18:15 +0800)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Wed, 17 Sep 2025 23:01:03 +0000 (01:01 +0200)
Add charge control support for SM8550 and X1E80100. It's supported
with below two power supply properties:

charge_control_end_threshold: The battery SoC (State of Charge)
threshold at which the charging should be terminated.

charge_control_start_threshold: The battery SoC threshold at
which the charging should be resumed.

Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on Thinkpad T14S OLED
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Fenglin Wu <fenglin.wu@oss.qualcomm.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/qcom_battmgr.c

index 99d1de3..0fe14a1 100644 (file)
@@ -7,6 +7,7 @@
 #include <linux/auxiliary_bus.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/nvmem-consumer.h>
 #include <linux/of_device.h>
 #include <linux/power_supply.h>
 #include <linux/property.h>
@@ -68,6 +69,9 @@ enum qcom_battmgr_variant {
 #define BATT_RESISTANCE                        21
 #define BATT_POWER_NOW                 22
 #define BATT_POWER_AVG                 23
+#define BATT_CHG_CTRL_EN               24
+#define BATT_CHG_CTRL_START_THR                25
+#define BATT_CHG_CTRL_END_THR          26
 
 #define BATTMGR_USB_PROPERTY_GET       0x32
 #define BATTMGR_USB_PROPERTY_SET       0x33
@@ -92,6 +96,13 @@ enum qcom_battmgr_variant {
 #define WLS_TYPE                       5
 #define WLS_BOOST_EN                   6
 
+#define BATTMGR_CHG_CTRL_LIMIT_EN      0x48
+#define CHARGE_CTRL_START_THR_MIN      50
+#define CHARGE_CTRL_START_THR_MAX      95
+#define CHARGE_CTRL_END_THR_MIN                55
+#define CHARGE_CTRL_END_THR_MAX                100
+#define CHARGE_CTRL_DELTA_SOC          5
+
 struct qcom_battmgr_enable_request {
        struct pmic_glink_hdr hdr;
        __le32 battery_id;
@@ -126,6 +137,13 @@ struct qcom_battmgr_discharge_time_request {
        __le32 reserved;
 };
 
+struct qcom_battmgr_charge_ctrl_request {
+       struct pmic_glink_hdr hdr;
+       __le32 enable;
+       __le32 target_soc;
+       __le32 delta_soc;
+};
+
 struct qcom_battmgr_message {
        struct pmic_glink_hdr hdr;
        union {
@@ -238,6 +256,8 @@ struct qcom_battmgr_info {
        unsigned int capacity_warning;
        unsigned int cycle_count;
        unsigned int charge_count;
+       unsigned int charge_ctrl_start;
+       unsigned int charge_ctrl_end;
        char model_number[BATTMGR_STRING_LEN];
        char serial_number[BATTMGR_STRING_LEN];
        char oem_info[BATTMGR_STRING_LEN];
@@ -426,6 +446,8 @@ static const u8 sm8350_bat_prop_map[] = {
        [POWER_SUPPLY_PROP_INTERNAL_RESISTANCE] = BATT_RESISTANCE,
        [POWER_SUPPLY_PROP_STATE_OF_HEALTH] = BATT_SOH,
        [POWER_SUPPLY_PROP_POWER_NOW] = BATT_POWER_NOW,
+       [POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD] = BATT_CHG_CTRL_START_THR,
+       [POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD] = BATT_CHG_CTRL_END_THR,
 };
 
 static int qcom_battmgr_bat_sm8350_update(struct qcom_battmgr *battmgr,
@@ -604,6 +626,12 @@ static int qcom_battmgr_bat_get_property(struct power_supply *psy,
        case POWER_SUPPLY_PROP_TIME_TO_FULL_AVG:
                val->intval = battmgr->status.charge_time;
                break;
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD:
+               val->intval = battmgr->info.charge_ctrl_start;
+               break;
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD:
+               val->intval = battmgr->info.charge_ctrl_end;
+               break;
        case POWER_SUPPLY_PROP_MANUFACTURE_YEAR:
                val->intval = battmgr->info.year;
                break;
@@ -629,6 +657,149 @@ static int qcom_battmgr_bat_get_property(struct power_supply *psy,
        return 0;
 }
 
+static int qcom_battmgr_set_charge_control(struct qcom_battmgr *battmgr,
+                                          u32 target_soc, u32 delta_soc)
+{
+       struct qcom_battmgr_charge_ctrl_request request = {
+               .hdr.owner = cpu_to_le32(PMIC_GLINK_OWNER_BATTMGR),
+               .hdr.type = cpu_to_le32(PMIC_GLINK_REQ_RESP),
+               .hdr.opcode = cpu_to_le32(BATTMGR_CHG_CTRL_LIMIT_EN),
+               .enable = cpu_to_le32(1),
+               .target_soc = cpu_to_le32(target_soc),
+               .delta_soc = cpu_to_le32(delta_soc),
+       };
+
+       return qcom_battmgr_request(battmgr, &request, sizeof(request));
+}
+
+static int qcom_battmgr_set_charge_start_threshold(struct qcom_battmgr *battmgr, int start_soc)
+{
+       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;
+       }
+
+       /*
+        * If the new start threshold is larger than the old end threshold,
+        * move the end threshold one step (DELTA_SOC) after the new start
+        * threshold.
+        */
+       if (start_soc > battmgr->info.charge_ctrl_end) {
+               target_soc = start_soc + CHARGE_CTRL_DELTA_SOC;
+               target_soc = min_t(u32, target_soc, CHARGE_CTRL_END_THR_MAX);
+               delta_soc = target_soc - start_soc;
+               delta_soc = min_t(u32, delta_soc, CHARGE_CTRL_DELTA_SOC);
+       } else {
+               target_soc =  battmgr->info.charge_ctrl_end;
+               delta_soc = battmgr->info.charge_ctrl_end - start_soc;
+       }
+
+       mutex_lock(&battmgr->lock);
+       ret = qcom_battmgr_set_charge_control(battmgr, target_soc, delta_soc);
+       mutex_unlock(&battmgr->lock);
+       if (!ret) {
+               battmgr->info.charge_ctrl_start = start_soc;
+               battmgr->info.charge_ctrl_end = target_soc;
+       }
+
+       return 0;
+}
+
+static int qcom_battmgr_set_charge_end_threshold(struct qcom_battmgr *battmgr, int end_soc)
+{
+       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;
+       }
+
+       if (battmgr->info.charge_ctrl_start && end_soc > battmgr->info.charge_ctrl_start)
+               delta_soc = end_soc - battmgr->info.charge_ctrl_start;
+
+       mutex_lock(&battmgr->lock);
+       ret = qcom_battmgr_set_charge_control(battmgr, end_soc, delta_soc);
+       mutex_unlock(&battmgr->lock);
+       if (!ret) {
+               battmgr->info.charge_ctrl_start = end_soc - delta_soc;
+               battmgr->info.charge_ctrl_end = end_soc;
+       }
+
+       return 0;
+}
+
+static int qcom_battmgr_charge_control_thresholds_init(struct qcom_battmgr *battmgr)
+{
+       int ret;
+       u8 en, end_soc, start_soc, delta_soc;
+
+       ret = nvmem_cell_read_u8(battmgr->dev->parent, "charge_limit_en", &en);
+       if (!ret && en != 0) {
+               ret = nvmem_cell_read_u8(battmgr->dev->parent, "charge_limit_end", &end_soc);
+               if (ret < 0)
+                       return ret;
+
+               ret = nvmem_cell_read_u8(battmgr->dev->parent, "charge_limit_delta", &delta_soc);
+               if (ret < 0)
+                       return ret;
+
+               if (delta_soc >= end_soc)
+                       return -EINVAL;
+
+               start_soc = end_soc - delta_soc;
+               end_soc = clamp(end_soc, CHARGE_CTRL_END_THR_MIN, CHARGE_CTRL_END_THR_MAX);
+               start_soc = clamp(start_soc, CHARGE_CTRL_START_THR_MIN, CHARGE_CTRL_START_THR_MAX);
+
+               battmgr->info.charge_ctrl_start = start_soc;
+               battmgr->info.charge_ctrl_end = end_soc;
+       }
+
+       return 0;
+}
+
+static int qcom_battmgr_bat_is_writeable(struct power_supply *psy,
+                                        enum power_supply_property psp)
+{
+       switch (psp) {
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD:
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD:
+               return 1;
+       default:
+               return 0;
+       }
+
+       return 0;
+}
+
+static int qcom_battmgr_bat_set_property(struct power_supply *psy,
+                                        enum power_supply_property psp,
+                                        const union power_supply_propval *pval)
+{
+       struct qcom_battmgr *battmgr = power_supply_get_drvdata(psy);
+
+       if (!battmgr->service_up)
+               return -EAGAIN;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD:
+               return qcom_battmgr_set_charge_start_threshold(battmgr, pval->intval);
+       case POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD:
+               return qcom_battmgr_set_charge_end_threshold(battmgr, pval->intval);
+       default:
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
 static const enum power_supply_property sc8280xp_bat_props[] = {
        POWER_SUPPLY_PROP_STATUS,
        POWER_SUPPLY_PROP_PRESENT,
@@ -663,6 +834,43 @@ static const struct power_supply_desc sc8280xp_bat_psy_desc = {
        .get_property = qcom_battmgr_bat_get_property,
 };
 
+static const enum power_supply_property x1e80100_bat_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_PRESENT,
+       POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_CYCLE_COUNT,
+       POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_POWER_NOW,
+       POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+       POWER_SUPPLY_PROP_CHARGE_FULL,
+       POWER_SUPPLY_PROP_CHARGE_EMPTY,
+       POWER_SUPPLY_PROP_CHARGE_NOW,
+       POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
+       POWER_SUPPLY_PROP_ENERGY_FULL,
+       POWER_SUPPLY_PROP_ENERGY_EMPTY,
+       POWER_SUPPLY_PROP_ENERGY_NOW,
+       POWER_SUPPLY_PROP_TEMP,
+       POWER_SUPPLY_PROP_MANUFACTURE_YEAR,
+       POWER_SUPPLY_PROP_MANUFACTURE_MONTH,
+       POWER_SUPPLY_PROP_MANUFACTURE_DAY,
+       POWER_SUPPLY_PROP_MODEL_NAME,
+       POWER_SUPPLY_PROP_MANUFACTURER,
+       POWER_SUPPLY_PROP_SERIAL_NUMBER,
+       POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD,
+       POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD,
+};
+
+static const struct power_supply_desc x1e80100_bat_psy_desc = {
+       .name = "qcom-battmgr-bat",
+       .type = POWER_SUPPLY_TYPE_BATTERY,
+       .properties = x1e80100_bat_props,
+       .num_properties = ARRAY_SIZE(x1e80100_bat_props),
+       .get_property = qcom_battmgr_bat_get_property,
+       .set_property = qcom_battmgr_bat_set_property,
+       .property_is_writeable = qcom_battmgr_bat_is_writeable,
+};
+
 static const enum power_supply_property sm8350_bat_props[] = {
        POWER_SUPPLY_PROP_STATUS,
        POWER_SUPPLY_PROP_HEALTH,
@@ -695,6 +903,42 @@ static const struct power_supply_desc sm8350_bat_psy_desc = {
        .get_property = qcom_battmgr_bat_get_property,
 };
 
+static const enum power_supply_property sm8550_bat_props[] = {
+       POWER_SUPPLY_PROP_STATUS,
+       POWER_SUPPLY_PROP_HEALTH,
+       POWER_SUPPLY_PROP_PRESENT,
+       POWER_SUPPLY_PROP_CHARGE_TYPE,
+       POWER_SUPPLY_PROP_CAPACITY,
+       POWER_SUPPLY_PROP_VOLTAGE_OCV,
+       POWER_SUPPLY_PROP_VOLTAGE_NOW,
+       POWER_SUPPLY_PROP_VOLTAGE_MAX,
+       POWER_SUPPLY_PROP_CURRENT_NOW,
+       POWER_SUPPLY_PROP_TEMP,
+       POWER_SUPPLY_PROP_TECHNOLOGY,
+       POWER_SUPPLY_PROP_CHARGE_COUNTER,
+       POWER_SUPPLY_PROP_CYCLE_COUNT,
+       POWER_SUPPLY_PROP_CHARGE_FULL_DESIGN,
+       POWER_SUPPLY_PROP_CHARGE_FULL,
+       POWER_SUPPLY_PROP_MODEL_NAME,
+       POWER_SUPPLY_PROP_TIME_TO_FULL_AVG,
+       POWER_SUPPLY_PROP_TIME_TO_EMPTY_AVG,
+       POWER_SUPPLY_PROP_INTERNAL_RESISTANCE,
+       POWER_SUPPLY_PROP_STATE_OF_HEALTH,
+       POWER_SUPPLY_PROP_POWER_NOW,
+       POWER_SUPPLY_PROP_CHARGE_CONTROL_START_THRESHOLD,
+       POWER_SUPPLY_PROP_CHARGE_CONTROL_END_THRESHOLD,
+};
+
+static const struct power_supply_desc sm8550_bat_psy_desc = {
+       .name = "qcom-battmgr-bat",
+       .type = POWER_SUPPLY_TYPE_BATTERY,
+       .properties = sm8550_bat_props,
+       .num_properties = ARRAY_SIZE(sm8550_bat_props),
+       .get_property = qcom_battmgr_bat_get_property,
+       .set_property = qcom_battmgr_bat_set_property,
+       .property_is_writeable = qcom_battmgr_bat_is_writeable,
+};
+
 static int qcom_battmgr_ac_get_property(struct power_supply *psy,
                                        enum power_supply_property psp,
                                        union power_supply_propval *val)
@@ -1114,6 +1358,9 @@ static void qcom_battmgr_sc8280xp_callback(struct qcom_battmgr *battmgr,
        case BATTMGR_BAT_CHARGE_TIME:
                battmgr->status.charge_time = le32_to_cpu(resp->time);
                break;
+       case BATTMGR_CHG_CTRL_LIMIT_EN:
+               battmgr->error = 0;
+               break;
        default:
                dev_warn(battmgr->dev, "unknown message %#x\n", opcode);
                break;
@@ -1227,6 +1474,12 @@ static void qcom_battmgr_sm8350_callback(struct qcom_battmgr *battmgr,
                case BATT_POWER_NOW:
                        battmgr->status.power_now = le32_to_cpu(resp->intval.value);
                        break;
+               case BATT_CHG_CTRL_START_THR:
+                       battmgr->info.charge_ctrl_start = le32_to_cpu(resp->intval.value);
+                       break;
+               case BATT_CHG_CTRL_END_THR:
+                       battmgr->info.charge_ctrl_end = le32_to_cpu(resp->intval.value);
+                       break;
                default:
                        dev_warn(battmgr->dev, "unknown property %#x\n", property);
                        break;
@@ -1309,6 +1562,7 @@ static void qcom_battmgr_sm8350_callback(struct qcom_battmgr *battmgr,
                }
                break;
        case BATTMGR_REQUEST_NOTIFICATION:
+       case BATTMGR_CHG_CTRL_LIMIT_EN:
                battmgr->error = 0;
                break;
        default:
@@ -1376,11 +1630,13 @@ static char *qcom_battmgr_battery[] = { "battery" };
 static int qcom_battmgr_probe(struct auxiliary_device *adev,
                              const struct auxiliary_device_id *id)
 {
+       const struct power_supply_desc *psy_desc;
        struct power_supply_config psy_cfg_supply = {};
        struct power_supply_config psy_cfg = {};
        const struct of_device_id *match;
        struct qcom_battmgr *battmgr;
        struct device *dev = &adev->dev;
+       int ret;
 
        battmgr = devm_kzalloc(dev, sizeof(*battmgr), GFP_KERNEL);
        if (!battmgr)
@@ -1406,9 +1662,19 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev,
        else
                battmgr->variant = QCOM_BATTMGR_SM8350;
 
+       ret = qcom_battmgr_charge_control_thresholds_init(battmgr);
+       if (ret < 0)
+               return dev_err_probe(dev, ret,
+                                    "failed to init battery charge control thresholds\n");
+
        if (battmgr->variant == QCOM_BATTMGR_SC8280XP ||
            battmgr->variant == QCOM_BATTMGR_X1E80100) {
-               battmgr->bat_psy = devm_power_supply_register(dev, &sc8280xp_bat_psy_desc, &psy_cfg);
+               if (battmgr->variant == QCOM_BATTMGR_X1E80100)
+                       psy_desc = &x1e80100_bat_psy_desc;
+               else
+                       psy_desc = &sc8280xp_bat_psy_desc;
+
+               battmgr->bat_psy = devm_power_supply_register(dev, psy_desc, &psy_cfg);
                if (IS_ERR(battmgr->bat_psy))
                        return dev_err_probe(dev, PTR_ERR(battmgr->bat_psy),
                                             "failed to register battery power supply\n");
@@ -1428,7 +1694,12 @@ static int qcom_battmgr_probe(struct auxiliary_device *adev,
                        return dev_err_probe(dev, PTR_ERR(battmgr->wls_psy),
                                             "failed to register wireless charing power supply\n");
        } else {
-               battmgr->bat_psy = devm_power_supply_register(dev, &sm8350_bat_psy_desc, &psy_cfg);
+               if (battmgr->variant == QCOM_BATTMGR_SM8550)
+                       psy_desc = &sm8550_bat_psy_desc;
+               else
+                       psy_desc = &sm8350_bat_psy_desc;
+
+               battmgr->bat_psy = devm_power_supply_register(dev, psy_desc, &psy_cfg);
                if (IS_ERR(battmgr->bat_psy))
                        return dev_err_probe(dev, PTR_ERR(battmgr->bat_psy),
                                             "failed to register battery power supply\n");