Loading drivers/power/power_supply_sysfs.c +4 −1 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ static ssize_t power_supply_show_property(struct device *dev, static char *type_text[] = { "Unknown", "Battery", "UPS", "Mains", "USB", "USB_DCP", "USB_CDP", "USB_ACA", "USB_HVDCP", "USB_HVDCP_3", "USB_PD", "Wireless", "BMS", "USB_Parallel", "Wipower", "Wireless", "BMS", "Parallel", "Main", "Wipower", "TYPEC", "TYPEC_UFP", "TYPEC_DFP" }; static char *status_text[] = { Loading Loading @@ -280,6 +280,9 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(set_ship_mode), POWER_SUPPLY_ATTR(soc_reporting_ready), POWER_SUPPLY_ATTR(debug_battery), POWER_SUPPLY_ATTR(fcc_delta), POWER_SUPPLY_ATTR(icl_reduction), POWER_SUPPLY_ATTR(parallel_mode), /* Local extensions of type int64_t */ POWER_SUPPLY_ATTR(charge_counter_ext), /* Properties of type `const char *' */ Loading drivers/power/supply/qcom/Makefile +3 −3 Original line number Diff line number Diff line Loading @@ -6,6 +6,6 @@ obj-$(CONFIG_SMB1351_USB_CHARGER) += smb1351-charger.o pmic-voter.o obj-$(CONFIG_MSM_BCL_CTL) += msm_bcl.o obj-$(CONFIG_MSM_BCL_PERIPHERAL_CTL) += bcl_peripheral.o obj-$(CONFIG_BATTERY_BCL) += battery_current_limit.o obj-$(CONFIG_QPNP_SMB2) += qpnp-smb2.o smb-lib.o pmic-voter.o storm-watch.o obj-$(CONFIG_SMB138X_CHARGER) += smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o obj-$(CONFIG_QPNP_QNOVO) += qpnp-qnovo.o obj-$(CONFIG_QPNP_SMB2) += qpnp-smb2.o smb-lib.o pmic-voter.o storm-watch.o battery.o obj-$(CONFIG_SMB138X_CHARGER) += smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o battery.o obj-$(CONFIG_QPNP_QNOVO) += qpnp-qnovo.o battery.o drivers/power/supply/qcom/battery.c 0 → 100644 +730 −0 Original line number Diff line number Diff line /* Copyright (c) 2017 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and * only version 2 as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ #define pr_fmt(fmt) "QCOM-BATT: %s: " fmt, __func__ #include <linux/device.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/power_supply.h> #include <linux/interrupt.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/qpnp/qpnp-revid.h> #include <linux/printk.h> #include <linux/pm_wakeup.h> #include <linux/slab.h> #include "pmic-voter.h" #define DRV_MAJOR_VERSION 1 #define DRV_MINOR_VERSION 0 #define CHG_STATE_VOTER "CHG_STATE_VOTER" #define TAPER_END_VOTER "TAPER_END_VOTER" #define PL_TAPER_EARLY_BAD_VOTER "PL_TAPER_EARLY_BAD_VOTER" #define PARALLEL_PSY_VOTER "PARALLEL_PSY_VOTER" struct pl_data { int pl_mode; int slave_pct; int taper_pct; int slave_fcc_ua; struct votable *fcc_votable; struct votable *fv_votable; struct votable *pl_disable_votable; struct work_struct status_change_work; struct delayed_work pl_taper_work; struct power_supply *main_psy; struct power_supply *pl_psy; struct power_supply *batt_psy; int settled_ua; int charge_type; struct class qcom_batt_class; struct wakeup_source *pl_ws; struct notifier_block nb; }; struct pl_data *the_chip; enum print_reason { PR_PARALLEL = BIT(0), }; static int debug_mask; module_param_named(debug_mask, debug_mask, int, S_IRUSR | S_IWUSR); #define pl_dbg(chip, reason, fmt, ...) \ do { \ if (debug_mask & (reason)) \ pr_info(fmt, ##__VA_ARGS__); \ else \ pr_debug(fmt, ##__VA_ARGS__); \ } while (0) enum { VER = 0, SLAVE_PCT, }; /******* * ICL * ********/ static void split_settled(struct pl_data *chip) { int slave_icl_pct; int slave_ua; union power_supply_propval pval = {0, }; int rc; /* TODO some parallel chargers do not have a fine ICL resolution. For * them implement a psy interface which returns the closest lower ICL * for desired split */ if (chip->pl_mode != POWER_SUPPLY_PARALLEL_USBIN_USBIN) return; if (chip->main_psy) return; slave_ua = 0; if (!get_effective_result_locked(chip->pl_disable_votable)) { /* read the aicl settled value */ rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) { pr_err("Couldn't get aicl settled value rc=%d\n", rc); return; } chip->settled_ua = pval.intval; /* slave gets 10 percent points less for ICL */ slave_icl_pct = max(0, chip->slave_pct - 10); slave_ua = (chip->settled_ua * slave_icl_pct) / 100; } /* ICL_REDUCTION on main could be 0mA when pl is disabled */ pval.intval = slave_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_ICL_REDUCTION, &pval); if (rc < 0) { pr_err("Couldn't change slave suspend state rc=%d\n", rc); return; } /* set parallel's ICL could be 0mA when pl is disabled */ pval.intval = slave_ua; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Couldn't set parallel icl, rc=%d\n", rc); return; } } static ssize_t version_show(struct class *c, struct class_attribute *attr, char *buf) { return snprintf(buf, PAGE_SIZE, "%d.%d\n", DRV_MAJOR_VERSION, DRV_MINOR_VERSION); } /************* * SLAVE PCT * **************/ static ssize_t slave_pct_show(struct class *c, struct class_attribute *attr, char *ubuf) { struct pl_data *chip = container_of(c, struct pl_data, qcom_batt_class); return snprintf(ubuf, PAGE_SIZE, "%d\n", chip->slave_pct); } static ssize_t slave_pct_store(struct class *c, struct class_attribute *attr, const char *ubuf, size_t count) { struct pl_data *chip = container_of(c, struct pl_data, qcom_batt_class); unsigned long val; if (kstrtoul(ubuf, 10, &val)) return -EINVAL; chip->slave_pct = val; rerun_election(chip->fcc_votable); rerun_election(chip->fv_votable); split_settled(chip); return count; } static struct class_attribute pl_attributes[] = { [VER] = __ATTR_RO(version), [SLAVE_PCT] = __ATTR(parallel_pct, S_IRUGO | S_IWUSR, slave_pct_show, slave_pct_store), __ATTR_NULL, }; /*********** * TAPER * ************/ #define MINIMUM_PARALLEL_FCC_UA 500000 #define PL_TAPER_WORK_DELAY_MS 100 #define TAPER_RESIDUAL_PCT 75 static void pl_taper_work(struct work_struct *work) { struct pl_data *chip = container_of(work, struct pl_data, pl_taper_work.work); union power_supply_propval pval = {0, }; int rc; /* exit immediately if parallel is disabled */ if (get_effective_result(chip->pl_disable_votable)) { pl_dbg(chip, PR_PARALLEL, "terminating parallel not in progress\n"); goto done; } pl_dbg(chip, PR_PARALLEL, "entering parallel taper work slave_fcc = %d\n", chip->slave_fcc_ua); if (chip->slave_fcc_ua < MINIMUM_PARALLEL_FCC_UA) { pl_dbg(chip, PR_PARALLEL, "terminating parallel's share lower than 500mA\n"); vote(chip->pl_disable_votable, TAPER_END_VOTER, true, 0); goto done; } rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); goto done; } chip->charge_type = pval.intval; if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { pl_dbg(chip, PR_PARALLEL, "master is taper charging; reducing slave FCC\n"); __pm_stay_awake(chip->pl_ws); /* Reduce the taper percent by 25 percent */ chip->taper_pct = chip->taper_pct * TAPER_RESIDUAL_PCT / 100; rerun_election(chip->fcc_votable); pl_dbg(chip, PR_PARALLEL, "taper entry scheduling work after %d ms\n", PL_TAPER_WORK_DELAY_MS); schedule_delayed_work(&chip->pl_taper_work, msecs_to_jiffies(PL_TAPER_WORK_DELAY_MS)); return; } /* * Master back to Fast Charge, get out of this round of taper reduction */ pl_dbg(chip, PR_PARALLEL, "master is fast charging; waiting for next taper\n"); done: __pm_relax(chip->pl_ws); } /********* * FCC * **********/ #define EFFICIENCY_PCT 80 #define MICRO_5V 5000000 static void split_fcc(struct pl_data *chip, int total_ua, int *master_ua, int *slave_ua) { int rc, effective_total_ua, slave_limited_ua, hw_cc_delta_ua = 0, aicl_settled_ua, input_limited_fcc_ua; union power_supply_propval pval = {0, }; rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_FCC_DELTA, &pval); if (rc < 0) hw_cc_delta_ua = 0; else hw_cc_delta_ua = pval.intval; input_limited_fcc_ua = INT_MAX; if (chip->pl_mode == POWER_SUPPLY_PARALLEL_MID_MID) { rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) aicl_settled_ua = 0; else aicl_settled_ua = pval.intval; input_limited_fcc_ua = div64_s64( (s64)aicl_settled_ua * MICRO_5V * EFFICIENCY_PCT, (s64)get_effective_result(chip->fv_votable) * 100); } effective_total_ua = max(0, total_ua + hw_cc_delta_ua); slave_limited_ua = min(effective_total_ua, input_limited_fcc_ua); *slave_ua = (slave_limited_ua * chip->slave_pct) / 100; *slave_ua = (*slave_ua * chip->taper_pct) / 100; *master_ua = max(0, total_ua - *slave_ua); } static int pl_fcc_vote_callback(struct votable *votable, void *data, int total_fcc_ua, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc, master_fcc_ua = total_fcc_ua, slave_fcc_ua = 0; if (total_fcc_ua < 0) return 0; if (!chip->main_psy) return 0; if (chip->pl_mode == POWER_SUPPLY_PARALLEL_NONE || get_effective_result_locked(chip->pl_disable_votable)) { pval.intval = total_fcc_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) pr_err("Couldn't set main fcc, rc=%d\n", rc); return rc; } split_fcc(chip, total_fcc_ua, &master_fcc_ua, &slave_fcc_ua); pval.intval = slave_fcc_ua; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Couldn't set parallel fcc, rc=%d\n", rc); return rc; } chip->slave_fcc_ua = slave_fcc_ua; pval.intval = master_fcc_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Could not set main fcc, rc=%d\n", rc); return rc; } pl_dbg(chip, PR_PARALLEL, "master_fcc=%d slave_fcc=%d distribution=(%d/%d)\n", master_fcc_ua, slave_fcc_ua, (master_fcc_ua * 100) / total_fcc_ua, (slave_fcc_ua * 100) / total_fcc_ua); return 0; } #define PARALLEL_FLOAT_VOLTAGE_DELTA_UV 50000 static int pl_fv_vote_callback(struct votable *votable, void *data, int fv_uv, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc = 0; if (fv_uv < 0) return 0; if (!chip->main_psy) return 0; pval.intval = fv_uv; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &pval); if (rc < 0) { pr_err("Couldn't set main fv, rc=%d\n", rc); return rc; } if (chip->pl_mode != POWER_SUPPLY_PARALLEL_NONE) { pval.intval = fv_uv + PARALLEL_FLOAT_VOLTAGE_DELTA_UV; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &pval); if (rc < 0) { pr_err("Couldn't set float on parallel rc=%d\n", rc); return rc; } } return 0; } static int pl_disable_vote_callback(struct votable *votable, void *data, int pl_disable, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc; chip->settled_ua = 0; chip->taper_pct = 100; if (!pl_disable) { /* enable */ rerun_election(chip->fv_votable); rerun_election(chip->fcc_votable); if (chip->pl_psy) { pval.intval = 0; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval); if (rc < 0) pr_err("Couldn't change slave suspend state rc=%d\n", rc); } if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) split_settled(chip); /* * we could have been enabled while in taper mode, * start the taper work if so */ rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); } else { if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { pl_dbg(chip, PR_PARALLEL, "pl enabled in Taper scheduing work\n"); schedule_delayed_work(&chip->pl_taper_work, 0); } } } else { if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) split_settled(chip); if (chip->pl_psy) { pval.intval = 1; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval); if (rc < 0) pr_err("Couldn't change slave suspend state rc=%d\n", rc); } rerun_election(chip->fcc_votable); rerun_election(chip->fv_votable); } pl_dbg(chip, PR_PARALLEL, "parallel charging %s\n", pl_disable ? "disabled" : "enabled"); return 0; } static bool is_main_available(struct pl_data *chip) { if (!chip->main_psy) chip->main_psy = power_supply_get_by_name("main"); if (!chip->main_psy) return false; return true; } static bool is_batt_available(struct pl_data *chip) { if (!chip->batt_psy) chip->batt_psy = power_supply_get_by_name("battery"); if (!chip->batt_psy) return false; return true; } static bool is_parallel_available(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (chip->pl_psy) return true; chip->pl_psy = power_supply_get_by_name("parallel"); if (!chip->pl_psy) return false; rc = power_supply_get_property(chip->pl_psy, POWER_SUPPLY_PROP_PARALLEL_MODE, &pval); if (rc < 0) { pr_err("Couldn't get parallel mode from parallel rc=%d\n", rc); return false; } /* * Note that pl_mode only be udpated to anything other than a _NONE * only after pl_psy is found. IOW pl_mode != _NONE implies that * pl_psy is present and valid */ chip->pl_mode = pval.intval; vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, false, 0); return true; } static void handle_main_charge_type(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); return; } /* not fast/not taper state to disables parallel */ if ((pval.intval != POWER_SUPPLY_CHARGE_TYPE_FAST) && (pval.intval != POWER_SUPPLY_CHARGE_TYPE_TAPER)) { vote(chip->pl_disable_votable, CHG_STATE_VOTER, true, 0); chip->taper_pct = 100; vote(chip->pl_disable_votable, TAPER_END_VOTER, false, 0); vote(chip->pl_disable_votable, PL_TAPER_EARLY_BAD_VOTER, false, 0); chip->charge_type = pval.intval; return; } /* handle fast/taper charge entry */ if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER || pval.intval == POWER_SUPPLY_CHARGE_TYPE_FAST) { pl_dbg(chip, PR_PARALLEL, "chg_state enabling parallel\n"); vote(chip->pl_disable_votable, CHG_STATE_VOTER, false, 0); chip->charge_type = pval.intval; return; } /* handle taper charge entry */ if (chip->charge_type == POWER_SUPPLY_CHARGE_TYPE_FAST && (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER)) { chip->charge_type = pval.intval; pl_dbg(chip, PR_PARALLEL, "taper entry scheduling work\n"); schedule_delayed_work(&chip->pl_taper_work, 0); return; } /* remember the new state only if it isn't any of the above */ chip->charge_type = pval.intval; } static void handle_settled_aicl_split(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (!get_effective_result(chip->pl_disable_votable) && chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) { /* * call aicl split only when USBIN_USBIN and enabled * and if aicl changed */ rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) { pr_err("Couldn't get aicl settled value rc=%d\n", rc); return; } if (chip->settled_ua != pval.intval) { chip->settled_ua = pval.intval; split_settled(chip); } } } static void handle_parallel_in_taper(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (get_effective_result_locked(chip->pl_disable_votable)) return; if (!chip->pl_psy) return; rc = power_supply_get_property(chip->pl_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get pl charge type rc=%d\n", rc); return; } /* * if parallel is seen in taper mode ever, that is an anomaly and * we disable parallel charger */ if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { vote(chip->pl_disable_votable, PL_TAPER_EARLY_BAD_VOTER, true, 0); return; } } static void status_change_work(struct work_struct *work) { struct pl_data *chip = container_of(work, struct pl_data, status_change_work); if (!is_main_available(chip)) return; if (!is_batt_available(chip)) return; is_parallel_available(chip); handle_main_charge_type(chip); handle_settled_aicl_split(chip); handle_parallel_in_taper(chip); } static int pl_notifier_call(struct notifier_block *nb, unsigned long ev, void *v) { struct power_supply *psy = v; struct pl_data *chip = container_of(nb, struct pl_data, nb); if (ev != PSY_EVENT_PROP_CHANGED) return NOTIFY_OK; if ((strcmp(psy->desc->name, "parallel") == 0) || (strcmp(psy->desc->name, "battery") == 0)) schedule_work(&chip->status_change_work); return NOTIFY_OK; } static int pl_register_notifier(struct pl_data *chip) { int rc; chip->nb.notifier_call = pl_notifier_call; rc = power_supply_reg_notifier(&chip->nb); if (rc < 0) { pr_err("Couldn't register psy notifier rc = %d\n", rc); return rc; } return 0; } static int pl_determine_initial_status(struct pl_data *chip) { status_change_work(&chip->status_change_work); return 0; } static int pl_init(void) { struct pl_data *chip; int rc = 0; chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; chip->slave_pct = 50; chip->pl_ws = wakeup_source_register("qcom-battery"); if (!chip->pl_ws) goto cleanup; chip->fcc_votable = create_votable("FCC", VOTE_MIN, pl_fcc_vote_callback, chip); if (IS_ERR(chip->fcc_votable)) { rc = PTR_ERR(chip->fcc_votable); goto release_wakeup_source; } chip->fv_votable = create_votable("FV", VOTE_MAX, pl_fv_vote_callback, chip); if (IS_ERR(chip->fv_votable)) { rc = PTR_ERR(chip->fv_votable); goto destroy_votable; } chip->pl_disable_votable = create_votable("PL_DISABLE", VOTE_SET_ANY, pl_disable_vote_callback, chip); if (IS_ERR(chip->pl_disable_votable)) { rc = PTR_ERR(chip->pl_disable_votable); goto destroy_votable; } vote(chip->pl_disable_votable, CHG_STATE_VOTER, true, 0); vote(chip->pl_disable_votable, TAPER_END_VOTER, false, 0); vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, true, 0); INIT_WORK(&chip->status_change_work, status_change_work); INIT_DELAYED_WORK(&chip->pl_taper_work, pl_taper_work); rc = pl_register_notifier(chip); if (rc < 0) { pr_err("Couldn't register psy notifier rc = %d\n", rc); goto unreg_notifier; } rc = pl_determine_initial_status(chip); if (rc < 0) { pr_err("Couldn't determine initial status rc=%d\n", rc); goto unreg_notifier; } chip->qcom_batt_class.name = "qcom-battery", chip->qcom_batt_class.owner = THIS_MODULE, chip->qcom_batt_class.class_attrs = pl_attributes; rc = class_register(&chip->qcom_batt_class); if (rc < 0) { pr_err("couldn't register pl_data sysfs class rc = %d\n", rc); goto unreg_notifier; } return rc; unreg_notifier: power_supply_unreg_notifier(&chip->nb); destroy_votable: destroy_votable(chip->pl_disable_votable); destroy_votable(chip->fv_votable); destroy_votable(chip->fcc_votable); release_wakeup_source: wakeup_source_unregister(chip->pl_ws); cleanup: kfree(chip); return rc; } static void pl_deinit(void) { struct pl_data *chip = the_chip; power_supply_unreg_notifier(&chip->nb); destroy_votable(chip->pl_disable_votable); destroy_votable(chip->fv_votable); destroy_votable(chip->fcc_votable); wakeup_source_unregister(chip->pl_ws); kfree(chip); } module_init(pl_init); module_exit(pl_deinit) MODULE_DESCRIPTION(""); MODULE_LICENSE("GPL v2"); drivers/power/supply/qcom/qpnp-fg-gen3.c +46 −40 Original line number Diff line number Diff line Loading @@ -981,6 +981,38 @@ static int fg_set_esr_timer(struct fg_chip *chip, int cycles, bool charging, /* Other functions HERE */ static void fg_notify_charger(struct fg_chip *chip) { union power_supply_propval prop = {0, }; int rc; if (!chip->batt_psy) return; if (!chip->profile_available) return; prop.intval = chip->bp.float_volt_uv; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (rc < 0) { pr_err("Error in setting voltage_max property on batt_psy, rc=%d\n", rc); return; } prop.intval = chip->bp.fastchg_curr_ma * 1000; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (rc < 0) { pr_err("Error in setting constant_charge_current_max property on batt_psy, rc=%d\n", rc); return; } fg_dbg(chip, FG_STATUS, "Notified charger on float voltage and FCC\n"); } static int fg_awake_cb(struct votable *votable, void *data, int awake, const char *client) { Loading @@ -995,14 +1027,18 @@ static int fg_awake_cb(struct votable *votable, void *data, int awake, return 0; } static bool is_charger_available(struct fg_chip *chip) static bool batt_psy_initialized(struct fg_chip *chip) { if (!chip->batt_psy) chip->batt_psy = power_supply_get_by_name("battery"); if (chip->batt_psy) return true; chip->batt_psy = power_supply_get_by_name("battery"); if (!chip->batt_psy) return false; /* batt_psy is initialized, set the fcc and fv */ fg_notify_charger(chip); return true; } Loading Loading @@ -1359,7 +1395,7 @@ static int fg_charge_full_update(struct fg_chip *chip) if (!chip->dt.hold_soc_while_full) return 0; if (!is_charger_available(chip)) if (!batt_psy_initialized(chip)) return 0; rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_HEALTH, Loading Loading @@ -1723,7 +1759,7 @@ static void status_change_work(struct work_struct *work) union power_supply_propval prop = {0, }; int rc; if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { fg_dbg(chip, FG_STATUS, "Charger not available?!\n"); goto out; } Loading Loading @@ -2040,37 +2076,6 @@ out: return rc; } static void fg_notify_charger(struct fg_chip *chip) { union power_supply_propval prop = {0, }; int rc; if (!is_charger_available(chip)) { pr_warn("Charger not available yet?\n"); return; } prop.intval = chip->bp.float_volt_uv; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (rc < 0) { pr_err("Error in setting voltage_max property on batt_psy, rc=%d\n", rc); return; } prop.intval = chip->bp.fastchg_curr_ma * 1000; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (rc < 0) { pr_err("Error in setting constant_charge_current_max property on batt_psy, rc=%d\n", rc); return; } fg_dbg(chip, FG_STATUS, "Notified charger on float voltage and FCC\n"); } static void profile_load_work(struct work_struct *work) { struct fg_chip *chip = container_of(work, Loading Loading @@ -2136,6 +2141,7 @@ done: rc); } batt_psy_initialized(chip); fg_notify_charger(chip); chip->profile_loaded = true; chip->soc_reporting_ready = true; Loading Loading @@ -2296,7 +2302,7 @@ static int fg_get_time_to_full(struct fg_chip *chip, int *val) return -ENODATA; } if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { fg_dbg(chip, FG_TTF, "charger is not available\n"); return -ENODATA; } Loading Loading @@ -3004,7 +3010,7 @@ static irqreturn_t fg_delta_batt_temp_irq_handler(int irq, void *data) if (rc < 0) pr_err("Error in configuring ESR filter rc:%d\n", rc); if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { chip->last_batt_temp = batt_temp; return IRQ_HANDLED; } Loading Loading @@ -3062,7 +3068,7 @@ static irqreturn_t fg_delta_soc_irq_handler(int irq, void *data) if (rc < 0) pr_err("Error in adjusting ki_coeff_dischg, rc=%d\n", rc); if (is_charger_available(chip)) if (batt_psy_initialized(chip)) power_supply_changed(chip->batt_psy); return IRQ_HANDLED; Loading @@ -3073,7 +3079,7 @@ static irqreturn_t fg_empty_soc_irq_handler(int irq, void *data) struct fg_chip *chip = data; fg_dbg(chip, FG_IRQ, "irq %d triggered\n", irq); if (is_charger_available(chip)) if (batt_psy_initialized(chip)) power_supply_changed(chip->batt_psy); return IRQ_HANDLED; Loading drivers/power/supply/qcom/qpnp-smb2.c +116 −30 File changed.Preview size limit exceeded, changes collapsed. Show changes Loading
drivers/power/power_supply_sysfs.c +4 −1 Original line number Diff line number Diff line Loading @@ -46,7 +46,7 @@ static ssize_t power_supply_show_property(struct device *dev, static char *type_text[] = { "Unknown", "Battery", "UPS", "Mains", "USB", "USB_DCP", "USB_CDP", "USB_ACA", "USB_HVDCP", "USB_HVDCP_3", "USB_PD", "Wireless", "BMS", "USB_Parallel", "Wipower", "Wireless", "BMS", "Parallel", "Main", "Wipower", "TYPEC", "TYPEC_UFP", "TYPEC_DFP" }; static char *status_text[] = { Loading Loading @@ -280,6 +280,9 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(set_ship_mode), POWER_SUPPLY_ATTR(soc_reporting_ready), POWER_SUPPLY_ATTR(debug_battery), POWER_SUPPLY_ATTR(fcc_delta), POWER_SUPPLY_ATTR(icl_reduction), POWER_SUPPLY_ATTR(parallel_mode), /* Local extensions of type int64_t */ POWER_SUPPLY_ATTR(charge_counter_ext), /* Properties of type `const char *' */ Loading
drivers/power/supply/qcom/Makefile +3 −3 Original line number Diff line number Diff line Loading @@ -6,6 +6,6 @@ obj-$(CONFIG_SMB1351_USB_CHARGER) += smb1351-charger.o pmic-voter.o obj-$(CONFIG_MSM_BCL_CTL) += msm_bcl.o obj-$(CONFIG_MSM_BCL_PERIPHERAL_CTL) += bcl_peripheral.o obj-$(CONFIG_BATTERY_BCL) += battery_current_limit.o obj-$(CONFIG_QPNP_SMB2) += qpnp-smb2.o smb-lib.o pmic-voter.o storm-watch.o obj-$(CONFIG_SMB138X_CHARGER) += smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o obj-$(CONFIG_QPNP_QNOVO) += qpnp-qnovo.o obj-$(CONFIG_QPNP_SMB2) += qpnp-smb2.o smb-lib.o pmic-voter.o storm-watch.o battery.o obj-$(CONFIG_SMB138X_CHARGER) += smb138x-charger.o smb-lib.o pmic-voter.o storm-watch.o battery.o obj-$(CONFIG_QPNP_QNOVO) += qpnp-qnovo.o battery.o
drivers/power/supply/qcom/battery.c 0 → 100644 +730 −0 Original line number Diff line number Diff line /* Copyright (c) 2017 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and * only version 2 as published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ #define pr_fmt(fmt) "QCOM-BATT: %s: " fmt, __func__ #include <linux/device.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/power_supply.h> #include <linux/interrupt.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/qpnp/qpnp-revid.h> #include <linux/printk.h> #include <linux/pm_wakeup.h> #include <linux/slab.h> #include "pmic-voter.h" #define DRV_MAJOR_VERSION 1 #define DRV_MINOR_VERSION 0 #define CHG_STATE_VOTER "CHG_STATE_VOTER" #define TAPER_END_VOTER "TAPER_END_VOTER" #define PL_TAPER_EARLY_BAD_VOTER "PL_TAPER_EARLY_BAD_VOTER" #define PARALLEL_PSY_VOTER "PARALLEL_PSY_VOTER" struct pl_data { int pl_mode; int slave_pct; int taper_pct; int slave_fcc_ua; struct votable *fcc_votable; struct votable *fv_votable; struct votable *pl_disable_votable; struct work_struct status_change_work; struct delayed_work pl_taper_work; struct power_supply *main_psy; struct power_supply *pl_psy; struct power_supply *batt_psy; int settled_ua; int charge_type; struct class qcom_batt_class; struct wakeup_source *pl_ws; struct notifier_block nb; }; struct pl_data *the_chip; enum print_reason { PR_PARALLEL = BIT(0), }; static int debug_mask; module_param_named(debug_mask, debug_mask, int, S_IRUSR | S_IWUSR); #define pl_dbg(chip, reason, fmt, ...) \ do { \ if (debug_mask & (reason)) \ pr_info(fmt, ##__VA_ARGS__); \ else \ pr_debug(fmt, ##__VA_ARGS__); \ } while (0) enum { VER = 0, SLAVE_PCT, }; /******* * ICL * ********/ static void split_settled(struct pl_data *chip) { int slave_icl_pct; int slave_ua; union power_supply_propval pval = {0, }; int rc; /* TODO some parallel chargers do not have a fine ICL resolution. For * them implement a psy interface which returns the closest lower ICL * for desired split */ if (chip->pl_mode != POWER_SUPPLY_PARALLEL_USBIN_USBIN) return; if (chip->main_psy) return; slave_ua = 0; if (!get_effective_result_locked(chip->pl_disable_votable)) { /* read the aicl settled value */ rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) { pr_err("Couldn't get aicl settled value rc=%d\n", rc); return; } chip->settled_ua = pval.intval; /* slave gets 10 percent points less for ICL */ slave_icl_pct = max(0, chip->slave_pct - 10); slave_ua = (chip->settled_ua * slave_icl_pct) / 100; } /* ICL_REDUCTION on main could be 0mA when pl is disabled */ pval.intval = slave_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_ICL_REDUCTION, &pval); if (rc < 0) { pr_err("Couldn't change slave suspend state rc=%d\n", rc); return; } /* set parallel's ICL could be 0mA when pl is disabled */ pval.intval = slave_ua; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Couldn't set parallel icl, rc=%d\n", rc); return; } } static ssize_t version_show(struct class *c, struct class_attribute *attr, char *buf) { return snprintf(buf, PAGE_SIZE, "%d.%d\n", DRV_MAJOR_VERSION, DRV_MINOR_VERSION); } /************* * SLAVE PCT * **************/ static ssize_t slave_pct_show(struct class *c, struct class_attribute *attr, char *ubuf) { struct pl_data *chip = container_of(c, struct pl_data, qcom_batt_class); return snprintf(ubuf, PAGE_SIZE, "%d\n", chip->slave_pct); } static ssize_t slave_pct_store(struct class *c, struct class_attribute *attr, const char *ubuf, size_t count) { struct pl_data *chip = container_of(c, struct pl_data, qcom_batt_class); unsigned long val; if (kstrtoul(ubuf, 10, &val)) return -EINVAL; chip->slave_pct = val; rerun_election(chip->fcc_votable); rerun_election(chip->fv_votable); split_settled(chip); return count; } static struct class_attribute pl_attributes[] = { [VER] = __ATTR_RO(version), [SLAVE_PCT] = __ATTR(parallel_pct, S_IRUGO | S_IWUSR, slave_pct_show, slave_pct_store), __ATTR_NULL, }; /*********** * TAPER * ************/ #define MINIMUM_PARALLEL_FCC_UA 500000 #define PL_TAPER_WORK_DELAY_MS 100 #define TAPER_RESIDUAL_PCT 75 static void pl_taper_work(struct work_struct *work) { struct pl_data *chip = container_of(work, struct pl_data, pl_taper_work.work); union power_supply_propval pval = {0, }; int rc; /* exit immediately if parallel is disabled */ if (get_effective_result(chip->pl_disable_votable)) { pl_dbg(chip, PR_PARALLEL, "terminating parallel not in progress\n"); goto done; } pl_dbg(chip, PR_PARALLEL, "entering parallel taper work slave_fcc = %d\n", chip->slave_fcc_ua); if (chip->slave_fcc_ua < MINIMUM_PARALLEL_FCC_UA) { pl_dbg(chip, PR_PARALLEL, "terminating parallel's share lower than 500mA\n"); vote(chip->pl_disable_votable, TAPER_END_VOTER, true, 0); goto done; } rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); goto done; } chip->charge_type = pval.intval; if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { pl_dbg(chip, PR_PARALLEL, "master is taper charging; reducing slave FCC\n"); __pm_stay_awake(chip->pl_ws); /* Reduce the taper percent by 25 percent */ chip->taper_pct = chip->taper_pct * TAPER_RESIDUAL_PCT / 100; rerun_election(chip->fcc_votable); pl_dbg(chip, PR_PARALLEL, "taper entry scheduling work after %d ms\n", PL_TAPER_WORK_DELAY_MS); schedule_delayed_work(&chip->pl_taper_work, msecs_to_jiffies(PL_TAPER_WORK_DELAY_MS)); return; } /* * Master back to Fast Charge, get out of this round of taper reduction */ pl_dbg(chip, PR_PARALLEL, "master is fast charging; waiting for next taper\n"); done: __pm_relax(chip->pl_ws); } /********* * FCC * **********/ #define EFFICIENCY_PCT 80 #define MICRO_5V 5000000 static void split_fcc(struct pl_data *chip, int total_ua, int *master_ua, int *slave_ua) { int rc, effective_total_ua, slave_limited_ua, hw_cc_delta_ua = 0, aicl_settled_ua, input_limited_fcc_ua; union power_supply_propval pval = {0, }; rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_FCC_DELTA, &pval); if (rc < 0) hw_cc_delta_ua = 0; else hw_cc_delta_ua = pval.intval; input_limited_fcc_ua = INT_MAX; if (chip->pl_mode == POWER_SUPPLY_PARALLEL_MID_MID) { rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) aicl_settled_ua = 0; else aicl_settled_ua = pval.intval; input_limited_fcc_ua = div64_s64( (s64)aicl_settled_ua * MICRO_5V * EFFICIENCY_PCT, (s64)get_effective_result(chip->fv_votable) * 100); } effective_total_ua = max(0, total_ua + hw_cc_delta_ua); slave_limited_ua = min(effective_total_ua, input_limited_fcc_ua); *slave_ua = (slave_limited_ua * chip->slave_pct) / 100; *slave_ua = (*slave_ua * chip->taper_pct) / 100; *master_ua = max(0, total_ua - *slave_ua); } static int pl_fcc_vote_callback(struct votable *votable, void *data, int total_fcc_ua, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc, master_fcc_ua = total_fcc_ua, slave_fcc_ua = 0; if (total_fcc_ua < 0) return 0; if (!chip->main_psy) return 0; if (chip->pl_mode == POWER_SUPPLY_PARALLEL_NONE || get_effective_result_locked(chip->pl_disable_votable)) { pval.intval = total_fcc_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) pr_err("Couldn't set main fcc, rc=%d\n", rc); return rc; } split_fcc(chip, total_fcc_ua, &master_fcc_ua, &slave_fcc_ua); pval.intval = slave_fcc_ua; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Couldn't set parallel fcc, rc=%d\n", rc); return rc; } chip->slave_fcc_ua = slave_fcc_ua; pval.intval = master_fcc_ua; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &pval); if (rc < 0) { pr_err("Could not set main fcc, rc=%d\n", rc); return rc; } pl_dbg(chip, PR_PARALLEL, "master_fcc=%d slave_fcc=%d distribution=(%d/%d)\n", master_fcc_ua, slave_fcc_ua, (master_fcc_ua * 100) / total_fcc_ua, (slave_fcc_ua * 100) / total_fcc_ua); return 0; } #define PARALLEL_FLOAT_VOLTAGE_DELTA_UV 50000 static int pl_fv_vote_callback(struct votable *votable, void *data, int fv_uv, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc = 0; if (fv_uv < 0) return 0; if (!chip->main_psy) return 0; pval.intval = fv_uv; rc = power_supply_set_property(chip->main_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &pval); if (rc < 0) { pr_err("Couldn't set main fv, rc=%d\n", rc); return rc; } if (chip->pl_mode != POWER_SUPPLY_PARALLEL_NONE) { pval.intval = fv_uv + PARALLEL_FLOAT_VOLTAGE_DELTA_UV; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &pval); if (rc < 0) { pr_err("Couldn't set float on parallel rc=%d\n", rc); return rc; } } return 0; } static int pl_disable_vote_callback(struct votable *votable, void *data, int pl_disable, const char *client) { struct pl_data *chip = data; union power_supply_propval pval = {0, }; int rc; chip->settled_ua = 0; chip->taper_pct = 100; if (!pl_disable) { /* enable */ rerun_election(chip->fv_votable); rerun_election(chip->fcc_votable); if (chip->pl_psy) { pval.intval = 0; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval); if (rc < 0) pr_err("Couldn't change slave suspend state rc=%d\n", rc); } if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) split_settled(chip); /* * we could have been enabled while in taper mode, * start the taper work if so */ rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); } else { if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { pl_dbg(chip, PR_PARALLEL, "pl enabled in Taper scheduing work\n"); schedule_delayed_work(&chip->pl_taper_work, 0); } } } else { if (chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) split_settled(chip); if (chip->pl_psy) { pval.intval = 1; rc = power_supply_set_property(chip->pl_psy, POWER_SUPPLY_PROP_INPUT_SUSPEND, &pval); if (rc < 0) pr_err("Couldn't change slave suspend state rc=%d\n", rc); } rerun_election(chip->fcc_votable); rerun_election(chip->fv_votable); } pl_dbg(chip, PR_PARALLEL, "parallel charging %s\n", pl_disable ? "disabled" : "enabled"); return 0; } static bool is_main_available(struct pl_data *chip) { if (!chip->main_psy) chip->main_psy = power_supply_get_by_name("main"); if (!chip->main_psy) return false; return true; } static bool is_batt_available(struct pl_data *chip) { if (!chip->batt_psy) chip->batt_psy = power_supply_get_by_name("battery"); if (!chip->batt_psy) return false; return true; } static bool is_parallel_available(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (chip->pl_psy) return true; chip->pl_psy = power_supply_get_by_name("parallel"); if (!chip->pl_psy) return false; rc = power_supply_get_property(chip->pl_psy, POWER_SUPPLY_PROP_PARALLEL_MODE, &pval); if (rc < 0) { pr_err("Couldn't get parallel mode from parallel rc=%d\n", rc); return false; } /* * Note that pl_mode only be udpated to anything other than a _NONE * only after pl_psy is found. IOW pl_mode != _NONE implies that * pl_psy is present and valid */ chip->pl_mode = pval.intval; vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, false, 0); return true; } static void handle_main_charge_type(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get batt charge type rc=%d\n", rc); return; } /* not fast/not taper state to disables parallel */ if ((pval.intval != POWER_SUPPLY_CHARGE_TYPE_FAST) && (pval.intval != POWER_SUPPLY_CHARGE_TYPE_TAPER)) { vote(chip->pl_disable_votable, CHG_STATE_VOTER, true, 0); chip->taper_pct = 100; vote(chip->pl_disable_votable, TAPER_END_VOTER, false, 0); vote(chip->pl_disable_votable, PL_TAPER_EARLY_BAD_VOTER, false, 0); chip->charge_type = pval.intval; return; } /* handle fast/taper charge entry */ if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER || pval.intval == POWER_SUPPLY_CHARGE_TYPE_FAST) { pl_dbg(chip, PR_PARALLEL, "chg_state enabling parallel\n"); vote(chip->pl_disable_votable, CHG_STATE_VOTER, false, 0); chip->charge_type = pval.intval; return; } /* handle taper charge entry */ if (chip->charge_type == POWER_SUPPLY_CHARGE_TYPE_FAST && (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER)) { chip->charge_type = pval.intval; pl_dbg(chip, PR_PARALLEL, "taper entry scheduling work\n"); schedule_delayed_work(&chip->pl_taper_work, 0); return; } /* remember the new state only if it isn't any of the above */ chip->charge_type = pval.intval; } static void handle_settled_aicl_split(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (!get_effective_result(chip->pl_disable_votable) && chip->pl_mode == POWER_SUPPLY_PARALLEL_USBIN_USBIN) { /* * call aicl split only when USBIN_USBIN and enabled * and if aicl changed */ rc = power_supply_get_property(chip->main_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_SETTLED, &pval); if (rc < 0) { pr_err("Couldn't get aicl settled value rc=%d\n", rc); return; } if (chip->settled_ua != pval.intval) { chip->settled_ua = pval.intval; split_settled(chip); } } } static void handle_parallel_in_taper(struct pl_data *chip) { union power_supply_propval pval = {0, }; int rc; if (get_effective_result_locked(chip->pl_disable_votable)) return; if (!chip->pl_psy) return; rc = power_supply_get_property(chip->pl_psy, POWER_SUPPLY_PROP_CHARGE_TYPE, &pval); if (rc < 0) { pr_err("Couldn't get pl charge type rc=%d\n", rc); return; } /* * if parallel is seen in taper mode ever, that is an anomaly and * we disable parallel charger */ if (pval.intval == POWER_SUPPLY_CHARGE_TYPE_TAPER) { vote(chip->pl_disable_votable, PL_TAPER_EARLY_BAD_VOTER, true, 0); return; } } static void status_change_work(struct work_struct *work) { struct pl_data *chip = container_of(work, struct pl_data, status_change_work); if (!is_main_available(chip)) return; if (!is_batt_available(chip)) return; is_parallel_available(chip); handle_main_charge_type(chip); handle_settled_aicl_split(chip); handle_parallel_in_taper(chip); } static int pl_notifier_call(struct notifier_block *nb, unsigned long ev, void *v) { struct power_supply *psy = v; struct pl_data *chip = container_of(nb, struct pl_data, nb); if (ev != PSY_EVENT_PROP_CHANGED) return NOTIFY_OK; if ((strcmp(psy->desc->name, "parallel") == 0) || (strcmp(psy->desc->name, "battery") == 0)) schedule_work(&chip->status_change_work); return NOTIFY_OK; } static int pl_register_notifier(struct pl_data *chip) { int rc; chip->nb.notifier_call = pl_notifier_call; rc = power_supply_reg_notifier(&chip->nb); if (rc < 0) { pr_err("Couldn't register psy notifier rc = %d\n", rc); return rc; } return 0; } static int pl_determine_initial_status(struct pl_data *chip) { status_change_work(&chip->status_change_work); return 0; } static int pl_init(void) { struct pl_data *chip; int rc = 0; chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (!chip) return -ENOMEM; chip->slave_pct = 50; chip->pl_ws = wakeup_source_register("qcom-battery"); if (!chip->pl_ws) goto cleanup; chip->fcc_votable = create_votable("FCC", VOTE_MIN, pl_fcc_vote_callback, chip); if (IS_ERR(chip->fcc_votable)) { rc = PTR_ERR(chip->fcc_votable); goto release_wakeup_source; } chip->fv_votable = create_votable("FV", VOTE_MAX, pl_fv_vote_callback, chip); if (IS_ERR(chip->fv_votable)) { rc = PTR_ERR(chip->fv_votable); goto destroy_votable; } chip->pl_disable_votable = create_votable("PL_DISABLE", VOTE_SET_ANY, pl_disable_vote_callback, chip); if (IS_ERR(chip->pl_disable_votable)) { rc = PTR_ERR(chip->pl_disable_votable); goto destroy_votable; } vote(chip->pl_disable_votable, CHG_STATE_VOTER, true, 0); vote(chip->pl_disable_votable, TAPER_END_VOTER, false, 0); vote(chip->pl_disable_votable, PARALLEL_PSY_VOTER, true, 0); INIT_WORK(&chip->status_change_work, status_change_work); INIT_DELAYED_WORK(&chip->pl_taper_work, pl_taper_work); rc = pl_register_notifier(chip); if (rc < 0) { pr_err("Couldn't register psy notifier rc = %d\n", rc); goto unreg_notifier; } rc = pl_determine_initial_status(chip); if (rc < 0) { pr_err("Couldn't determine initial status rc=%d\n", rc); goto unreg_notifier; } chip->qcom_batt_class.name = "qcom-battery", chip->qcom_batt_class.owner = THIS_MODULE, chip->qcom_batt_class.class_attrs = pl_attributes; rc = class_register(&chip->qcom_batt_class); if (rc < 0) { pr_err("couldn't register pl_data sysfs class rc = %d\n", rc); goto unreg_notifier; } return rc; unreg_notifier: power_supply_unreg_notifier(&chip->nb); destroy_votable: destroy_votable(chip->pl_disable_votable); destroy_votable(chip->fv_votable); destroy_votable(chip->fcc_votable); release_wakeup_source: wakeup_source_unregister(chip->pl_ws); cleanup: kfree(chip); return rc; } static void pl_deinit(void) { struct pl_data *chip = the_chip; power_supply_unreg_notifier(&chip->nb); destroy_votable(chip->pl_disable_votable); destroy_votable(chip->fv_votable); destroy_votable(chip->fcc_votable); wakeup_source_unregister(chip->pl_ws); kfree(chip); } module_init(pl_init); module_exit(pl_deinit) MODULE_DESCRIPTION(""); MODULE_LICENSE("GPL v2");
drivers/power/supply/qcom/qpnp-fg-gen3.c +46 −40 Original line number Diff line number Diff line Loading @@ -981,6 +981,38 @@ static int fg_set_esr_timer(struct fg_chip *chip, int cycles, bool charging, /* Other functions HERE */ static void fg_notify_charger(struct fg_chip *chip) { union power_supply_propval prop = {0, }; int rc; if (!chip->batt_psy) return; if (!chip->profile_available) return; prop.intval = chip->bp.float_volt_uv; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (rc < 0) { pr_err("Error in setting voltage_max property on batt_psy, rc=%d\n", rc); return; } prop.intval = chip->bp.fastchg_curr_ma * 1000; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (rc < 0) { pr_err("Error in setting constant_charge_current_max property on batt_psy, rc=%d\n", rc); return; } fg_dbg(chip, FG_STATUS, "Notified charger on float voltage and FCC\n"); } static int fg_awake_cb(struct votable *votable, void *data, int awake, const char *client) { Loading @@ -995,14 +1027,18 @@ static int fg_awake_cb(struct votable *votable, void *data, int awake, return 0; } static bool is_charger_available(struct fg_chip *chip) static bool batt_psy_initialized(struct fg_chip *chip) { if (!chip->batt_psy) chip->batt_psy = power_supply_get_by_name("battery"); if (chip->batt_psy) return true; chip->batt_psy = power_supply_get_by_name("battery"); if (!chip->batt_psy) return false; /* batt_psy is initialized, set the fcc and fv */ fg_notify_charger(chip); return true; } Loading Loading @@ -1359,7 +1395,7 @@ static int fg_charge_full_update(struct fg_chip *chip) if (!chip->dt.hold_soc_while_full) return 0; if (!is_charger_available(chip)) if (!batt_psy_initialized(chip)) return 0; rc = power_supply_get_property(chip->batt_psy, POWER_SUPPLY_PROP_HEALTH, Loading Loading @@ -1723,7 +1759,7 @@ static void status_change_work(struct work_struct *work) union power_supply_propval prop = {0, }; int rc; if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { fg_dbg(chip, FG_STATUS, "Charger not available?!\n"); goto out; } Loading Loading @@ -2040,37 +2076,6 @@ out: return rc; } static void fg_notify_charger(struct fg_chip *chip) { union power_supply_propval prop = {0, }; int rc; if (!is_charger_available(chip)) { pr_warn("Charger not available yet?\n"); return; } prop.intval = chip->bp.float_volt_uv; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (rc < 0) { pr_err("Error in setting voltage_max property on batt_psy, rc=%d\n", rc); return; } prop.intval = chip->bp.fastchg_curr_ma * 1000; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (rc < 0) { pr_err("Error in setting constant_charge_current_max property on batt_psy, rc=%d\n", rc); return; } fg_dbg(chip, FG_STATUS, "Notified charger on float voltage and FCC\n"); } static void profile_load_work(struct work_struct *work) { struct fg_chip *chip = container_of(work, Loading Loading @@ -2136,6 +2141,7 @@ done: rc); } batt_psy_initialized(chip); fg_notify_charger(chip); chip->profile_loaded = true; chip->soc_reporting_ready = true; Loading Loading @@ -2296,7 +2302,7 @@ static int fg_get_time_to_full(struct fg_chip *chip, int *val) return -ENODATA; } if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { fg_dbg(chip, FG_TTF, "charger is not available\n"); return -ENODATA; } Loading Loading @@ -3004,7 +3010,7 @@ static irqreturn_t fg_delta_batt_temp_irq_handler(int irq, void *data) if (rc < 0) pr_err("Error in configuring ESR filter rc:%d\n", rc); if (!is_charger_available(chip)) { if (!batt_psy_initialized(chip)) { chip->last_batt_temp = batt_temp; return IRQ_HANDLED; } Loading Loading @@ -3062,7 +3068,7 @@ static irqreturn_t fg_delta_soc_irq_handler(int irq, void *data) if (rc < 0) pr_err("Error in adjusting ki_coeff_dischg, rc=%d\n", rc); if (is_charger_available(chip)) if (batt_psy_initialized(chip)) power_supply_changed(chip->batt_psy); return IRQ_HANDLED; Loading @@ -3073,7 +3079,7 @@ static irqreturn_t fg_empty_soc_irq_handler(int irq, void *data) struct fg_chip *chip = data; fg_dbg(chip, FG_IRQ, "irq %d triggered\n", irq); if (is_charger_available(chip)) if (batt_psy_initialized(chip)) power_supply_changed(chip->batt_psy); return IRQ_HANDLED; Loading
drivers/power/supply/qcom/qpnp-smb2.c +116 −30 File changed.Preview size limit exceeded, changes collapsed. Show changes
