Merge "power: smb5-lib: Cancel alarm_timer conditionally" (19060faf) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/power/supply/qcom/qpnp-smb5.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -322,19 +322,21 @@ static int smb5_chg_config_init(struct smb5 *chip)
		chip->chg.smb_version = PM8150B_SUBTYPE;
		chg->param = smb5_pm8150b_params;
		chg->name = "pm8150b_charger";
		chg->wa_flags \|= CHG_TERMINATION_WA;
		break;
		case PM6150_SUBTYPE:
		chip->chg.smb_version = PM6150_SUBTYPE;
		chg->param = smb5_pm8150b_params;
		chg->name = "pm6150_charger";
		chg->wa_flags \|= SW_THERM_REGULATION_WA;
		chg->wa_flags \|= SW_THERM_REGULATION_WA \| CHG_TERMINATION_WA;
		if (pmic_rev_id->rev4 >= 2)
		chg->uusb_moisture_protection_capable = true;
		chg->main_fcc_max = PM6150_MAX_FCC_UA;
		break;
		case PMI632_SUBTYPE:
		chip->chg.smb_version = PMI632_SUBTYPE;
		chg->wa_flags \|= WEAK_ADAPTER_WA \| USBIN_OV_WA;
		chg->wa_flags \|= WEAK_ADAPTER_WA \| USBIN_OV_WA
		\| CHG_TERMINATION_WA;
		chg->param = smb5_pmi632_params;
		chg->use_extcon = true;
		chg->name = "pmi632_charger";

drivers/power/supply/qcom/smb5-lib.c

+171 −0

Original line number	Diff line number	Diff line
		@@ -1079,6 +1079,9 @@ static void smblib_uusb_removal(struct smb_charger *chg)

		cancel_delayed_work_sync(&chg->pl_enable_work);

		if (chg->wa_flags & CHG_TERMINATION_WA)
		alarm_cancel(&chg->chg_termination_alarm);

		if (chg->wa_flags & BOOST_BACK_WA) {
		data = chg->irq_info[SWITCHER_POWER_OK_IRQ].irq_data;
		if (data) {
		@@ -1099,6 +1102,7 @@ static void smblib_uusb_removal(struct smb_charger *chg)
		is_flash_active(chg) ? SDP_CURRENT_UA : SDP_100_MA);
		vote(chg->usb_icl_votable, SW_QC3_VOTER, false, 0);
		vote(chg->usb_icl_votable, HVDCP2_ICL_VOTER, false, 0);
		vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, false, 0);

		/* Remove SW thermal regulation WA votes */
		vote(chg->usb_icl_votable, SW_THERM_REGULATION_VOTER, false, 0);
		@@ -1836,6 +1840,16 @@ int smblib_get_prop_batt_status(struct smb_charger *chg,
		return 0;
		}

		/*
		* If charge termination WA is active and has suspended charging, then
		* continue reporting charging status as FULL.
		*/
		if (is_client_vote_enabled(chg->usb_icl_votable,
		CHG_TERMINATION_VOTER)) {
		val->intval = POWER_SUPPLY_STATUS_FULL;
		return 0;
		}

		if (val->intval != POWER_SUPPLY_STATUS_CHARGING)
		return 0;

		@@ -2765,6 +2779,12 @@ int smblib_get_prop_dc_online(struct smb_charger *chg,
		return rc;
		}

		if (is_client_vote_enabled(chg->dc_suspend_votable,
		CHG_TERMINATION_VOTER)) {
		rc = smblib_get_prop_dc_present(chg, val);
		return rc;
		}

		rc = smblib_read(chg, POWER_PATH_STATUS_REG, &stat);
		if (rc < 0) {
		smblib_err(chg, "Couldn't read POWER_PATH_STATUS rc=%d\n",
		@@ -2877,6 +2897,12 @@ int smblib_get_prop_usb_online(struct smb_charger *chg,
		return rc;
		}

		if (is_client_vote_enabled(chg->usb_icl_votable,
		CHG_TERMINATION_VOTER)) {
		rc = smblib_get_prop_usb_present(chg, val);
		return rc;
		}

		rc = smblib_read(chg, POWER_PATH_STATUS_REG, &stat);
		if (rc < 0) {
		smblib_err(chg, "Couldn't read POWER_PATH_STATUS rc=%d\n",
		@@ -4230,6 +4256,38 @@ irqreturn_t default_irq_handler(int irq, void *data)
		return IRQ_HANDLED;
		}

		#define CHG_TERM_WA_ENTRY_DELAY_MS 300000 /* 5 min */
		#define CHG_TERM_WA_EXIT_DELAY_MS 60000 /* 1 min */
		static void smblib_eval_chg_termination(struct smb_charger *chg, u8 batt_status)
		{
		union power_supply_propval pval = {0, };
		int rc = 0;

		rc = smblib_get_prop_from_bms(chg, POWER_SUPPLY_PROP_CAPACITY, &pval);
		if (rc < 0) {
		smblib_err(chg, "Couldn't read SOC value, rc=%d\n", rc);
		return;
		}

		/*
		* Post charge termination, switch to BSM mode triggers the risk of
		* over charging as BATFET opening may take some time post the necessity
		* of staying in supplemental mode, leading to unintended charging of
		* battery. Trigger the charge termination WA once charging is completed
		* to prevent overcharing.
		*/
		if ((batt_status == TERMINATE_CHARGE) && (pval.intval == 100)) {
		alarm_start_relative(&chg->chg_termination_alarm,
		ms_to_ktime(CHG_TERM_WA_ENTRY_DELAY_MS));
		} else if (pval.intval < 100) {
		/*
		* Reset CC_SOC reference value for charge termination WA once
		* we exit the TERMINATE_CHARGE state and soc drops below 100%
		*/
		chg->cc_soc_ref = 0;
		}
		}

		irqreturn_t chg_state_change_irq_handler(int irq, void *data)
		{
		struct smb_irq_data *irq_data = data;
		@@ -4247,6 +4305,10 @@ irqreturn_t chg_state_change_irq_handler(int irq, void *data)
		}

		stat = stat & BATTERY_CHARGER_STATUS_MASK;

		if (chg->wa_flags & CHG_TERMINATION_WA)
		smblib_eval_chg_termination(chg, stat);

		power_supply_changed(chg->batt_psy);
		return IRQ_HANDLED;
		}
		@@ -5044,6 +5106,9 @@ static void typec_src_removal(struct smb_charger *chg)

		cancel_delayed_work_sync(&chg->pl_enable_work);

		if (chg->wa_flags & CHG_TERMINATION_WA)
		alarm_cancel(&chg->chg_termination_alarm);

		/* reset input current limit voters */
		vote(chg->usb_icl_votable, SW_ICL_MAX_VOTER, true,
		is_flash_active(chg) ? SDP_CURRENT_UA : SDP_100_MA);
		@@ -5054,6 +5119,7 @@ static void typec_src_removal(struct smb_charger *chg)
		vote(chg->usb_icl_votable, OTG_VOTER, false, 0);
		vote(chg->usb_icl_votable, CTM_VOTER, false, 0);
		vote(chg->usb_icl_votable, HVDCP2_ICL_VOTER, false, 0);
		vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, false, 0);

		/* reset usb irq voters */
		vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);
		@@ -5895,6 +5961,94 @@ static enum alarmtimer_restart moisture_protection_alarm_cb(struct alarm *alarm,
		return ALARMTIMER_NORESTART;
		}

		static void smblib_chg_termination_work(struct work_struct *work)
		{
		union power_supply_propval pval;
		struct smb_charger *chg = container_of(work, struct smb_charger,
		chg_termination_work);
		int rc, input_present, delay = CHG_TERM_WA_ENTRY_DELAY_MS;

		/*
		* Hold awake votable to prevent pm_relax being called prior to
		* completion of this work.
		*/
		vote(chg->awake_votable, CHG_TERMINATION_VOTER, true, 0);

		rc = smblib_is_input_present(chg, &input_present);
		if ((rc < 0) \|\| !input_present)
		goto out;

		rc = smblib_get_prop_from_bms(chg, POWER_SUPPLY_PROP_CAPACITY, &pval);
		if ((rc < 0) \|\| (pval.intval < 100)) {
		vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, false, 0);
		goto out;
		}

		rc = smblib_get_prop_from_bms(chg, POWER_SUPPLY_PROP_CHARGE_FULL,
		&pval);
		if (rc < 0)
		goto out;

		/*
		* On change in the value of learned capacity, re-initialize the
		* reference cc_soc value due to change in cc_soc characteristic value
		* at full capacity. Also, in case cc_soc_ref value is reset,
		* re-initialize it.
		*/
		if (pval.intval != chg->charge_full_cc \|\| !chg->cc_soc_ref) {
		chg->charge_full_cc = pval.intval;
		rc = smblib_get_prop_from_bms(chg, POWER_SUPPLY_PROP_CC_SOC,
		&pval);
		if (rc < 0)
		goto out;

		chg->cc_soc_ref = pval.intval;
		} else {
		rc = smblib_get_prop_from_bms(chg, POWER_SUPPLY_PROP_CC_SOC,
		&pval);
		if (rc < 0)
		goto out;
		}

		/*
		* Suspend/Unsuspend USB input to keep cc_soc within the 0.5% to 0.75%
		* overshoot range of the cc_soc value at termination, to prevent
		* overcharging.
		*/
		if (pval.intval < DIV_ROUND_CLOSEST(chg->cc_soc_ref * 10050, 10000)) {
		vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, false, 0);
		vote(chg->dc_suspend_votable, CHG_TERMINATION_VOTER, false, 0);
		delay = CHG_TERM_WA_ENTRY_DELAY_MS;
		} else if (pval.intval > DIV_ROUND_CLOSEST(chg->cc_soc_ref * 10075,
		10000)) {
		vote(chg->usb_icl_votable, CHG_TERMINATION_VOTER, true, 0);
		vote(chg->dc_suspend_votable, CHG_TERMINATION_VOTER, true, 0);
		delay = CHG_TERM_WA_EXIT_DELAY_MS;
		}

		smblib_dbg(chg, PR_MISC, "Chg Term WA readings: cc_soc: %d, cc_soc_ref: %d, delay: %d\n",
		pval.intval, chg->cc_soc_ref, delay);
		alarm_start_relative(&chg->chg_termination_alarm, ms_to_ktime(delay));
		out:
		vote(chg->awake_votable, CHG_TERMINATION_VOTER, false, 0);
		}

		static enum alarmtimer_restart chg_termination_alarm_cb(struct alarm *alarm,
		ktime_t now)
		{
		struct smb_charger *chg = container_of(alarm, struct smb_charger,
		chg_termination_alarm);

		smblib_dbg(chg, PR_MISC, "Charge termination WA alarm triggered %lld\n",
		ktime_to_ms(now));

		/* Atomic context, cannot use voter */
		pm_stay_awake(chg->dev);
		schedule_work(&chg->chg_termination_work);

		return ALARMTIMER_NORESTART;
		}

		static void jeita_update_work(struct work_struct *work)
		{
		struct smb_charger *chg = container_of(work, struct smb_charger,
		@@ -6266,6 +6420,19 @@ int smblib_init(struct smb_charger *chg)
		smblib_thermal_regulation_work);
		INIT_DELAYED_WORK(&chg->usbov_dbc_work, smblib_usbov_dbc_work);

		if (chg->wa_flags & CHG_TERMINATION_WA) {
		INIT_WORK(&chg->chg_termination_work,
		smblib_chg_termination_work);

		if (alarmtimer_get_rtcdev()) {
		alarm_init(&chg->chg_termination_alarm, ALARM_BOOTTIME,
		chg_termination_alarm_cb);
		} else {
		smblib_err(chg, "Couldn't get rtc device\n");
		return -ENODEV;
		}
		}

		if (chg->uusb_moisture_protection_enabled) {
		INIT_WORK(&chg->moisture_protection_work,
		smblib_moisture_protection_work);
		@@ -6375,6 +6542,10 @@ int smblib_deinit(struct smb_charger *chg)
		alarm_cancel(&chg->moisture_protection_alarm);
		cancel_work_sync(&chg->moisture_protection_work);
		}
		if (chg->wa_flags & CHG_TERMINATION_WA) {
		alarm_cancel(&chg->chg_termination_alarm);
		cancel_work_sync(&chg->chg_termination_work);
		}
		cancel_work_sync(&chg->bms_update_work);
		cancel_work_sync(&chg->jeita_update_work);
		cancel_work_sync(&chg->pl_update_work);

drivers/power/supply/qcom/smb5-lib.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,7 @@ enum print_reason {
		#define HVDCP2_ICL_VOTER "HVDCP2_ICL_VOTER"
		#define AICL_THRESHOLD_VOTER "AICL_THRESHOLD_VOTER"
		#define USBOV_DBC_VOTER "USBOV_DBC_VOTER"
		#define CHG_TERMINATION_VOTER "CHG_TERMINATION_VOTER"

		#define BOOST_BACK_STORM_COUNT 3
		#define WEAK_CHG_STORM_COUNT 8
		@@ -107,6 +108,7 @@ enum {
		SW_THERM_REGULATION_WA = BIT(1),
		WEAK_ADAPTER_WA = BIT(2),
		USBIN_OV_WA = BIT(3),
		CHG_TERMINATION_WA = BIT(4),
		};

		enum jeita_cfg_stat {
		@@ -395,6 +397,7 @@ struct smb_charger {
		struct work_struct pl_update_work;
		struct work_struct jeita_update_work;
		struct work_struct moisture_protection_work;
		struct work_struct chg_termination_work;
		struct delayed_work ps_change_timeout_work;
		struct delayed_work clear_hdc_work;
		struct delayed_work icl_change_work;
		@@ -408,6 +411,7 @@ struct smb_charger {

		struct alarm lpd_recheck_timer;
		struct alarm moisture_protection_alarm;
		struct alarm chg_termination_alarm;

		/* secondary charger config */
		bool sec_pl_present;
		@@ -488,6 +492,8 @@ struct smb_charger {
		int aicl_cont_threshold_mv;
		int default_aicl_cont_threshold_mv;
		bool aicl_max_reached;
		int charge_full_cc;
		int cc_soc_ref;

		/* workaround flag */
		u32 wa_flags;