Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6397e8df authored by Ashay Jaiswal's avatar Ashay Jaiswal Committed by Guru Das Srinagesh
Browse files

power: smb5: fix USBIN-UV irq storm 



With weak adapter or high resistance cable there is a possibility
of USBIN-UV irq storm when battery voltage is close to AICL threshold.
Fix this by doing the following on seeing a IRQ storm:
1. If AICL configured threshold is lesser than the max AICL threshold,
   increase it by 200mV and restart AICL.
2. If AICL configured threshold is equal to max threshold, force ICL to
   100mA and restart AICL.

The AICL configuration and ICL is set back to the default value on
charger removal.

While at it, add support to configure torch in buck or boost mode for
its proper operation based on ICL.

Change-Id: I4188690574e20ae9483b904eec7ff7bce813fd25
Signed-off-by: default avatarAshay Jaiswal <ashayj@codeaurora.org>
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent 1fd6d18c

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

+42 −1
Original line number Diff line number Diff line
@@ -88,6 +88,22 @@ static struct smb_params smb5_pmi632_params = { 
		.step_u	= 400,

		.set_proc = smblib_set_chg_freq,

	},

	.aicl_5v_threshold		= {

		.name   = "AICL 5V threshold",

		.reg    = USBIN_5V_AICL_THRESHOLD_REG,

		.min_u  = 4000,

		.max_u  = 4700,

		.step_u = 100,

	},

	.aicl_cont_threshold		= {

		.name   = "AICL CONT threshold",

		.reg    = USBIN_CONT_AICL_THRESHOLD_REG,

		.min_u  = 4000,

		.max_u  = 8800,

		.step_u = 100,

		.get_proc = smblib_get_aicl_cont_threshold,

		.set_proc = smblib_set_aicl_cont_threshold,

	},

};



static struct smb_params smb5_pm8150b_params = {
@@ -164,6 +180,22 @@ static struct smb_params smb5_pm8150b_params = { 
		.step_u	= 400,

		.set_proc = smblib_set_chg_freq,

	},

	.aicl_5v_threshold		= {

		.name   = "AICL 5V threshold",

		.reg    = USBIN_5V_AICL_THRESHOLD_REG,

		.min_u  = 4000,

		.max_u  = 4700,

		.step_u = 100,

	},

	.aicl_cont_threshold		= {

		.name   = "AICL CONT threshold",

		.reg    = USBIN_CONT_AICL_THRESHOLD_REG,

		.min_u  = 4000,

		.max_u  = 11800,

		.step_u = 100,

		.get_proc = smblib_get_aicl_cont_threshold,

		.set_proc = smblib_set_aicl_cont_threshold,

	},

};



struct smb_dt_props {
@@ -302,6 +334,7 @@ static int smb5_chg_config_init(struct smb5 *chip) 
		break;

	case PMI632_SUBTYPE:

		chip->chg.smb_version = PMI632_SUBTYPE;

		chg->wa_flags |= WEAK_ADAPTER_WA;

		chg->param = smb5_pmi632_params;

		chg->use_extcon = true;

		chg->name = "pmi632_charger";
@@ -1563,7 +1596,7 @@ static int smb5_batt_set_prop(struct power_supply *psy, 
		rc = smblib_set_prop_ship_mode(chg, val);

		break;

	case POWER_SUPPLY_PROP_RERUN_AICL:

		rc = smblib_rerun_aicl(chg);

		rc = smblib_run_aicl(chg, RERUN_AICL);

		break;

	case POWER_SUPPLY_PROP_DP_DM:

		if (!chg->flash_active)
@@ -2070,6 +2103,12 @@ static int smb5_init_hw(struct smb5 *chip) 


	smblib_get_charge_param(chg, &chg->param.usb_icl,

				&chg->default_icl_ua);

	smblib_get_charge_param(chg, &chg->param.aicl_5v_threshold,

				&chg->default_aicl_5v_threshold_mv);

	chg->aicl_5v_threshold_mv = chg->default_aicl_5v_threshold_mv;

	smblib_get_charge_param(chg, &chg->param.aicl_cont_threshold,

				&chg->default_aicl_cont_threshold_mv);

	chg->aicl_cont_threshold_mv = chg->default_aicl_cont_threshold_mv;



	if (chg->charger_temp_max == -EINVAL) {

		rc = smblib_get_thermal_threshold(chg,
@@ -2626,6 +2665,8 @@ static struct smb_irq_info smb5_irqs[] = { 
	[USBIN_UV_IRQ] = {

		.name		= "usbin-uv",

		.handler	= usbin_uv_irq_handler,

		.wake		= true,

		.storm_data	= {true, 3000, 5},

	},

	[USBIN_OV_IRQ] = {

		.name		= "usbin-ov",

drivers/power/supply/qcom/schgm-flash.c

+26 −1
Original line number Diff line number Diff line
@@ -145,6 +145,31 @@ int schgm_flash_get_vreg_ok(struct smb_charger *chg, int *val) 
	return 0;

}



void schgm_flash_torch_priority(struct smb_charger *chg, enum torch_mode mode)

{

	int rc;

	u8 reg;



	/*

	 * If torch is configured in default BOOST mode, skip any update in the

	 * mode configuration.

	 */

	if (chg->headroom_mode == FIXED_MODE)

		return;



	if ((mode != TORCH_BOOST_MODE) && (mode != TORCH_BUCK_MODE))

		return;



	reg = mode;

	rc = smblib_masked_write(chg, SCHGM_TORCH_PRIORITY_CONTROL_REG,

					TORCH_PRIORITY_CONTROL_BIT, reg);

	if (rc < 0)

		pr_err("Couldn't configure Torch priority control rc=%d\n",

				rc);



	pr_debug("Torch priority changed to: %d\n", mode);

}



int schgm_flash_init(struct smb_charger *chg)

{

	int rc;
@@ -188,7 +213,7 @@ int schgm_flash_init(struct smb_charger *chg) 


		reg = (chg->headroom_mode == FIXED_MODE)

					? TORCH_PRIORITY_CONTROL_BIT : 0;

		rc = smblib_write(chg, SCHGM_TORCH_PRIORITY_CONTROL, reg);

		rc = smblib_write(chg, SCHGM_TORCH_PRIORITY_CONTROL_REG, reg);

		if (rc < 0) {

			pr_err("Couldn't force 5V boost in torch mode rc=%d\n",

					rc);

drivers/power/supply/qcom/schgm-flash.h

+7 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define SCHGM_FLASH_CONTROL_REG			(SCHGM_FLASH_BASE + 0x60)

#define SOC_LOW_FOR_FLASH_EN_BIT		BIT(7)



#define SCHGM_TORCH_PRIORITY_CONTROL		(SCHGM_FLASH_BASE + 0x63)

#define SCHGM_TORCH_PRIORITY_CONTROL_REG	(SCHGM_FLASH_BASE + 0x63)

#define TORCH_PRIORITY_CONTROL_BIT		BIT(0)



#define SCHGM_SOC_BASED_FLASH_DERATE_TH_CFG_REG	(SCHGM_FLASH_BASE + 0x67)
@@ -38,7 +38,13 @@ 
#define SCHGM_SOC_BASED_FLASH_DISABLE_TH_CFG_REG \

						(SCHGM_FLASH_BASE + 0x68)



enum torch_mode {

	TORCH_BUCK_MODE = 0,

	TORCH_BOOST_MODE,

};



int schgm_flash_get_vreg_ok(struct smb_charger *chg, int *val);

void schgm_flash_torch_priority(struct smb_charger *chg, enum torch_mode mode);

int schgm_flash_init(struct smb_charger *chg);

bool is_flash_active(struct smb_charger *chg);

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

+140 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "schgm-flash.h"

#include "step-chg-jeita.h"

#include "storm-watch.h"

#include "schgm-flash.h"



#define smblib_err(chg, fmt, ...)		\

	pr_err("%s: %s: " fmt, chg->name,	\
@@ -588,6 +589,25 @@ static int smblib_is_input_present(struct smb_charger *chg, 
	return 0;

}



#define AICL_RANGE2_MIN_MV		5600

#define AICL_RANGE2_STEP_DELTA_MV	200

#define AICL_RANGE2_OFFSET		16

int smblib_get_aicl_cont_threshold(struct smb_chg_param *param, u8 val_raw)

{

	int base = param->min_u;

	u8 reg = val_raw;

	int step = param->step_u;





	if (val_raw >= AICL_RANGE2_OFFSET) {

		reg = val_raw - AICL_RANGE2_OFFSET;

		base = AICL_RANGE2_MIN_MV;

		step = AICL_RANGE2_STEP_DELTA_MV;

	}



	return base + (reg * step);

}



/********************

 * REGISTER SETTERS *

 ********************/
@@ -826,6 +846,29 @@ static int smblib_set_usb_pd_allowed_voltage(struct smb_charger *chg, 
	return rc;

}



int smblib_set_aicl_cont_threshold(struct smb_chg_param *param,

				int val_u, u8 *val_raw)

{

	int base = param->min_u;

	int offset = 0;

	int step = param->step_u;



	if (val_u > param->max_u)

		val_u = param->max_u;

	if (val_u < param->min_u)

		val_u = param->min_u;



	if (val_u >= AICL_RANGE2_MIN_MV) {

		base = AICL_RANGE2_MIN_MV;

		step = AICL_RANGE2_STEP_DELTA_MV;

		offset = AICL_RANGE2_OFFSET;

	};



	*val_raw = ((val_u - base) / step) + offset;



	return 0;

}



/********************

 * HELPER FUNCTIONS *

 ********************/
@@ -1306,8 +1349,7 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua) 


	/* Re-run AICL */

	if (icl_override != SW_OVERRIDE_HC_MODE)

		rc = smblib_rerun_aicl(chg);



		rc = smblib_run_aicl(chg, RERUN_AICL);

out:

	return rc;

}
@@ -2081,7 +2123,7 @@ int smblib_set_prop_rechg_soc_thresh(struct smb_charger *chg, 
	return rc;

}



int smblib_rerun_aicl(struct smb_charger *chg)

int smblib_run_aicl(struct smb_charger *chg, int type)

{

	int rc;

	u8 stat;
@@ -2099,8 +2141,8 @@ int smblib_rerun_aicl(struct smb_charger *chg) 


	smblib_dbg(chg, PR_MISC, "re-running AICL\n");



	rc = smblib_masked_write(chg, AICL_CMD_REG, RERUN_AICL_BIT,

				RERUN_AICL_BIT);

	stat = (type == RERUN_AICL) ? RERUN_AICL_BIT : RESTART_AICL_BIT;

	rc = smblib_masked_write(chg, AICL_CMD_REG, stat, stat);

	if (rc < 0)

		smblib_err(chg, "Couldn't write to AICL_CMD_REG rc=%d\n",

				rc);
@@ -4189,6 +4231,8 @@ irqreturn_t batt_psy_changed_irq_handler(int irq, void *data) 
	return IRQ_HANDLED;

}



#define AICL_STEP_MV		200

#define MAX_AICL_THRESHOLD_MV	4800

irqreturn_t usbin_uv_irq_handler(int irq, void *data)

{

	struct smb_irq_data *irq_data = data;
@@ -4199,6 +4243,70 @@ irqreturn_t usbin_uv_irq_handler(int irq, void *data) 
	u8 stat = 0, max_pulses = 0;



	smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);



	if ((chg->wa_flags & WEAK_ADAPTER_WA)

			&& is_storming(&irq_data->storm_data)) {



		if (chg->aicl_max_reached) {

			smblib_dbg(chg, PR_MISC,

					"USBIN_UV storm at max AICL threshold\n");

			return IRQ_HANDLED;

		}



		smblib_dbg(chg, PR_MISC, "USBIN_UV storm at threshold %d\n",

				chg->aicl_5v_threshold_mv);



		/* suspend USBIN before updating AICL threshold */

		vote(chg->usb_icl_votable, AICL_THRESHOLD_VOTER, true, 0);



		/* delay for VASHDN deglitch */

		msleep(20);



		if (chg->aicl_5v_threshold_mv > MAX_AICL_THRESHOLD_MV) {

			/* reached max AICL threshold */

			chg->aicl_max_reached = true;

			goto unsuspend_input;

		}



		/* Increase AICL threshold by 200mV */

		rc = smblib_set_charge_param(chg, &chg->param.aicl_5v_threshold,

				chg->aicl_5v_threshold_mv + AICL_STEP_MV);

		if (rc < 0)

			dev_err(chg->dev,

				"Error in setting AICL threshold rc=%d\n", rc);

		else

			chg->aicl_5v_threshold_mv += AICL_STEP_MV;



		rc = smblib_set_charge_param(chg,

				&chg->param.aicl_cont_threshold,

				chg->aicl_cont_threshold_mv + AICL_STEP_MV);

		if (rc < 0)

			dev_err(chg->dev,

				"Error in setting AICL threshold rc=%d\n", rc);

		else

			chg->aicl_cont_threshold_mv += AICL_STEP_MV;



unsuspend_input:

		/* Force torch in boost mode to ensure it works with low ICL */

		if (chg->smb_version == PMI632_SUBTYPE)

			schgm_flash_torch_priority(chg, TORCH_BOOST_MODE);



		if (chg->aicl_max_reached) {

			smblib_dbg(chg, PR_MISC,

				"Reached max AICL threshold resctricting ICL to 100mA\n");

			vote(chg->usb_icl_votable, AICL_THRESHOLD_VOTER,

					true, USBIN_100MA);

			smblib_run_aicl(chg, RESTART_AICL);

		} else {

			smblib_run_aicl(chg, RESTART_AICL);

			vote(chg->usb_icl_votable, AICL_THRESHOLD_VOTER,

					false, 0);

		}



		wdata = &chg->irq_info[USBIN_UV_IRQ].irq_data->storm_data;

		reset_storm_count(wdata);

	}



	if (!chg->irq_info[SWITCHER_POWER_OK_IRQ].irq_data)

		return IRQ_HANDLED;
@@ -4428,6 +4536,33 @@ void smblib_usb_plugin_locked(struct smb_charger *chg) 
			vote(chg->fcc_votable, FCC_STEPPER_VOTER,

							true, 1500000);



		if (chg->wa_flags & WEAK_ADAPTER_WA) {

			chg->aicl_5v_threshold_mv =

					chg->default_aicl_5v_threshold_mv;

			chg->aicl_cont_threshold_mv =

					chg->default_aicl_cont_threshold_mv;



			smblib_set_charge_param(chg,

					&chg->param.aicl_5v_threshold,

					chg->aicl_5v_threshold_mv);

			smblib_set_charge_param(chg,

					&chg->param.aicl_cont_threshold,

					chg->aicl_cont_threshold_mv);

			chg->aicl_max_reached = false;



			if (chg->smb_version == PMI632_SUBTYPE)

				schgm_flash_torch_priority(chg,

						TORCH_BUCK_MODE);



			data = chg->irq_info[USBIN_UV_IRQ].irq_data;

			if (data) {

				wdata = &data->storm_data;

				reset_storm_count(wdata);

			}

			vote(chg->usb_icl_votable, AICL_THRESHOLD_VOTER,

					false, 0);

		}



		rc = smblib_request_dpdm(chg, false);

		if (rc < 0)

			smblib_err(chg, "Couldn't disable DPDM rc=%d\n", rc);

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

+18 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ enum print_reason { 
#define JEITA_ARB_VOTER			"JEITA_ARB_VOTER"

#define MOISTURE_VOTER			"MOISTURE_VOTER"

#define HVDCP2_ICL_VOTER		"HVDCP2_ICL_VOTER"

#define AICL_THRESHOLD_VOTER		"AICL_THRESHOLD_VOTER"



#define BOOST_BACK_STORM_COUNT	3

#define WEAK_CHG_STORM_COUNT	8
@@ -101,6 +102,7 @@ enum qc2_non_comp_voltage { 
enum {

	BOOST_BACK_WA			= BIT(0),

	SW_THERM_REGULATION_WA		= BIT(1),

	WEAK_ADAPTER_WA			= BIT(2),

};



enum jeita_cfg_stat {
@@ -109,6 +111,11 @@ enum jeita_cfg_stat { 
	JEITA_CFG_COMPLETE,

};



enum {

	RERUN_AICL = 0,

	RESTART_AICL,

};



enum smb_irq_index {

	/* CHGR */

	CHGR_ERROR_IRQ = 0,
@@ -302,6 +309,8 @@ struct smb_params { 
	struct smb_chg_param	jeita_cc_comp_hot;

	struct smb_chg_param	jeita_cc_comp_cold;

	struct smb_chg_param	freq_switcher;

	struct smb_chg_param	aicl_5v_threshold;

	struct smb_chg_param	aicl_cont_threshold;

};



struct parallel_params {
@@ -468,6 +477,11 @@ struct smb_charger { 
	bool			hw_connector_mitigation;

	bool			hw_skin_temp_mitigation;

	int			connector_pull_up;

	int			aicl_5v_threshold_mv;

	int			default_aicl_5v_threshold_mv;

	int			aicl_cont_threshold_mv;

	int			default_aicl_cont_threshold_mv;

	bool			aicl_max_reached;



	/* workaround flag */

	u32			wa_flags;
@@ -508,7 +522,7 @@ int smblib_batch_read(struct smb_charger *chg, u16 addr, u8 *val, int count); 
int smblib_get_charge_param(struct smb_charger *chg,

			    struct smb_chg_param *param, int *val_u);

int smblib_get_usb_suspend(struct smb_charger *chg, int *suspend);



int smblib_get_aicl_cont_threshold(struct smb_chg_param *param, u8 val_raw);

int smblib_enable_charging(struct smb_charger *chg, bool enable);

int smblib_set_charge_param(struct smb_charger *chg,

			    struct smb_chg_param *param, int val_u);
@@ -525,6 +539,8 @@ int smblib_set_chg_freq(struct smb_chg_param *param, 
				int val_u, u8 *val_raw);

int smblib_set_prop_boost_current(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_set_aicl_cont_threshold(struct smb_chg_param *param,

				int val_u, u8 *val_raw);

int smblib_vbus_regulator_enable(struct regulator_dev *rdev);

int smblib_vbus_regulator_disable(struct regulator_dev *rdev);

int smblib_vbus_regulator_is_enabled(struct regulator_dev *rdev);
@@ -667,7 +683,7 @@ int smblib_get_prop_fcc_delta(struct smb_charger *chg, 
int smblib_get_thermal_threshold(struct smb_charger *chg, u16 addr, int *val);

int smblib_dp_dm(struct smb_charger *chg, int val);

int smblib_disable_hw_jeita(struct smb_charger *chg, bool disable);

int smblib_rerun_aicl(struct smb_charger *chg);

int smblib_run_aicl(struct smb_charger *chg, int type);

int smblib_set_icl_current(struct smb_charger *chg, int icl_ua);

int smblib_get_icl_current(struct smb_charger *chg, int *icl_ua);

int smblib_get_charge_current(struct smb_charger *chg, int *total_current_ua);