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

Commit 990c634b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: smb-lib: Disable USB IRQs during high duty cycle"

parents 11042c52 4f4dcc1a

Documentation/devicetree/bindings/power/supply/qcom/qpnp-fg-gen3.txt

+7 −0
Original line number Diff line number Diff line
@@ -309,6 +309,13 @@ First Level Node - FG Gen3 device 
		    is specified to make it fully functional. Value has no

		    unit. Allowed range is 0 to 62200 in micro units.



- qcom,ki-coeff-full-dischg

	Usage:	    optional

	Value type: <u32>

	Definition: Ki coefficient full SOC value that will be applied during

		    discharging. If not specified, a value of 0 will be set.

		    Allowed range is from 245 to 62256.



- qcom,fg-rconn-mohms

	Usage:      optional

	Value type: <u32>

drivers/power/supply/qcom/fg-core.h

+3 −1
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ struct fg_dt_props { 
	int	esr_pulse_thresh_ma;

	int	esr_meas_curr_ma;

	int	bmd_en_delay_ms;

	int	ki_coeff_full_soc_dischg;

	int	jeita_thresholds[NUM_JEITA_LEVELS];

	int	ki_coeff_soc[KI_COEFF_SOC_LEVELS];

	int	ki_coeff_med_dischg[KI_COEFF_SOC_LEVELS];
@@ -416,6 +417,7 @@ struct fg_chip { 
	struct mutex		bus_lock;

	struct mutex		sram_rw_lock;

	struct mutex		charge_full_lock;

	struct mutex		qnovo_esr_ctrl_lock;

	u32			batt_soc_base;

	u32			batt_info_base;

	u32			mem_if_base;
@@ -424,7 +426,6 @@ struct fg_chip { 
	int			batt_id_ohms;

	int			ki_coeff_full_soc;

	int			charge_status;

	int			prev_charge_status;

	int			charge_done;

	int			charge_type;

	int			online_status;
@@ -450,6 +451,7 @@ struct fg_chip { 
	bool			slope_limit_en;

	bool			use_ima_single_mode;

	bool			use_dma;

	bool			qnovo_enable;

	struct completion	soc_update;

	struct completion	soc_ready;

	struct completion	mem_grant;

drivers/power/supply/qcom/qpnp-fg-gen3.c

+46 −18
Original line number Diff line number Diff line
@@ -1631,6 +1631,8 @@ static int fg_adjust_ki_coeff_full_soc(struct fg_chip *chip, int batt_temp) 


	if (batt_temp < 0)

		ki_coeff_full_soc = 0;

	else if (chip->charge_status == POWER_SUPPLY_STATUS_DISCHARGING)

		ki_coeff_full_soc = chip->dt.ki_coeff_full_soc_dischg;

	else

		ki_coeff_full_soc = KI_COEFF_FULL_SOC_DEFAULT;
@@ -1748,12 +1750,12 @@ static int fg_charge_full_update(struct fg_chip *chip) 


	/* We need 2 most significant bytes here */

	bsoc = (u32)bsoc >> 16;

	rc = fg_get_msoc(chip, &msoc);

	rc = fg_get_msoc_raw(chip, &msoc_raw);

	if (rc < 0) {

		pr_err("Error in getting msoc, rc=%d\n", rc);

		pr_err("Error in getting msoc_raw, rc=%d\n", rc);

		goto out;

	}

	msoc_raw = DIV_ROUND_CLOSEST(msoc * FULL_SOC_RAW, FULL_CAPACITY);

	msoc = DIV_ROUND_CLOSEST(msoc_raw * FULL_CAPACITY, FULL_SOC_RAW);



	fg_dbg(chip, FG_STATUS, "msoc: %d bsoc: %x health: %d status: %d full: %d\n",

		msoc, bsoc, chip->health, chip->charge_status,
@@ -2507,7 +2509,6 @@ static void status_change_work(struct work_struct *work) 
		goto out;

	}



	chip->prev_charge_status = chip->charge_status;

	chip->charge_status = prop.intval;

	rc = power_supply_get_property(chip->batt_psy,

			POWER_SUPPLY_PROP_CHARGE_TYPE, &prop);
@@ -3300,20 +3301,21 @@ static int fg_force_esr_meas(struct fg_chip *chip) 
	int rc;

	int esr_uohms;



	mutex_lock(&chip->qnovo_esr_ctrl_lock);

	/* force esr extraction enable */

	rc = fg_sram_masked_write(chip, ESR_EXTRACTION_ENABLE_WORD,

			ESR_EXTRACTION_ENABLE_OFFSET, BIT(0), BIT(0),

			FG_IMA_DEFAULT);

	if (rc < 0) {

		pr_err("failed to enable esr extn rc=%d\n", rc);

		return rc;

		goto out;

	}



	rc = fg_masked_write(chip, BATT_INFO_QNOVO_CFG(chip),

			LD_REG_CTRL_BIT, 0);

	if (rc < 0) {

		pr_err("Error in configuring qnovo_cfg rc=%d\n", rc);

		return rc;

		goto out;

	}



	rc = fg_masked_write(chip, BATT_INFO_TM_MISC1(chip),
@@ -3321,24 +3323,36 @@ static int fg_force_esr_meas(struct fg_chip *chip) 
			ESR_REQ_CTL_BIT | ESR_REQ_CTL_EN_BIT);

	if (rc < 0) {

		pr_err("Error in configuring force ESR rc=%d\n", rc);

		return rc;

		goto out;

	}



	/*

	 * Release and grab the lock again after 1.5 seconds so that prepare

	 * callback can succeed if the request comes in between.

	 */

	mutex_unlock(&chip->qnovo_esr_ctrl_lock);



	/* wait 1.5 seconds for hw to measure ESR */

	msleep(1500);



	mutex_lock(&chip->qnovo_esr_ctrl_lock);

	rc = fg_masked_write(chip, BATT_INFO_TM_MISC1(chip),

			ESR_REQ_CTL_BIT | ESR_REQ_CTL_EN_BIT,

			0);

	if (rc < 0) {

		pr_err("Error in restoring force ESR rc=%d\n", rc);

		return rc;

		goto out;

	}



	/* If qnovo is disabled, then leave ESR extraction enabled */

	if (!chip->qnovo_enable)

		goto done;



	rc = fg_masked_write(chip, BATT_INFO_QNOVO_CFG(chip),

			LD_REG_CTRL_BIT, LD_REG_CTRL_BIT);

	if (rc < 0) {

		pr_err("Error in restoring qnovo_cfg rc=%d\n", rc);

		return rc;

		goto out;

	}



	/* force esr extraction disable */
@@ -3347,36 +3361,46 @@ static int fg_force_esr_meas(struct fg_chip *chip) 
			FG_IMA_DEFAULT);

	if (rc < 0) {

		pr_err("failed to disable esr extn rc=%d\n", rc);

		return rc;

		goto out;

	}



done:

	fg_get_battery_resistance(chip, &esr_uohms);

	fg_dbg(chip, FG_STATUS, "ESR uohms = %d\n", esr_uohms);



out:

	mutex_unlock(&chip->qnovo_esr_ctrl_lock);

	return rc;

}



static int fg_prepare_for_qnovo(struct fg_chip *chip, int qnovo_enable)

{

	int rc;

	int rc = 0;



	mutex_lock(&chip->qnovo_esr_ctrl_lock);

	/* force esr extraction disable when qnovo enables */

	rc = fg_sram_masked_write(chip, ESR_EXTRACTION_ENABLE_WORD,

			ESR_EXTRACTION_ENABLE_OFFSET,

			BIT(0), qnovo_enable ? 0 : BIT(0),

			FG_IMA_DEFAULT);

	if (rc < 0)

	if (rc < 0) {

		pr_err("Error in configuring esr extraction rc=%d\n", rc);

		goto out;

	}



	rc = fg_masked_write(chip, BATT_INFO_QNOVO_CFG(chip),

			LD_REG_CTRL_BIT,

			qnovo_enable ? LD_REG_CTRL_BIT : 0);

	if (rc < 0) {

		pr_err("Error in configuring qnovo_cfg rc=%d\n", rc);

		return rc;

		goto out;

	}

	fg_dbg(chip, FG_STATUS, "Prepared for Qnovo\n");

	return 0;



	fg_dbg(chip, FG_STATUS, "%s for Qnovo\n",

		qnovo_enable ? "Prepared" : "Unprepared");

	chip->qnovo_enable = qnovo_enable;

out:

	mutex_unlock(&chip->qnovo_esr_ctrl_lock);

	return rc;

}



static void ttf_work(struct work_struct *work)
@@ -4503,7 +4527,11 @@ static int fg_parse_slope_limit_coefficients(struct fg_chip *chip) 
static int fg_parse_ki_coefficients(struct fg_chip *chip)

{

	struct device_node *node = chip->dev->of_node;

	int rc, i;

	int rc, i, temp;



	rc = of_property_read_u32(node, "qcom,ki-coeff-full-dischg", &temp);

	if (!rc)

		chip->dt.ki_coeff_full_soc_dischg = temp;



	rc = fg_parse_dt_property_u32_array(node, "qcom,ki-coeff-soc-dischg",

		chip->dt.ki_coeff_soc, KI_COEFF_SOC_LEVELS);
@@ -4972,7 +5000,6 @@ static int fg_gen3_probe(struct platform_device *pdev) 
	chip->debug_mask = &fg_gen3_debug_mask;

	chip->irqs = fg_irqs;

	chip->charge_status = -EINVAL;

	chip->prev_charge_status = -EINVAL;

	chip->ki_coeff_full_soc = -EINVAL;

	chip->online_status = -EINVAL;

	chip->regmap = dev_get_regmap(chip->dev->parent, NULL);
@@ -5045,6 +5072,7 @@ static int fg_gen3_probe(struct platform_device *pdev) 
	mutex_init(&chip->cl.lock);

	mutex_init(&chip->ttf.lock);

	mutex_init(&chip->charge_full_lock);

	mutex_init(&chip->qnovo_esr_ctrl_lock);

	init_completion(&chip->soc_update);

	init_completion(&chip->soc_ready);

	init_completion(&chip->mem_grant);

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

+11 −1
Original line number Diff line number Diff line
@@ -2811,7 +2811,7 @@ int smblib_set_prop_pd_active(struct smb_charger *chg, 
		hvdcp = stat & QC_CHARGER_BIT;

		vote(chg->apsd_disable_votable, PD_VOTER, false, 0);

		vote(chg->pd_allowed_votable, PD_VOTER, true, 0);

		vote(chg->usb_irq_enable_votable, PD_VOTER, true, 0);

		vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);

		vote(chg->hvdcp_disable_votable_indirect, PD_INACTIVE_VOTER,

								false, 0);
@@ -4288,6 +4288,14 @@ irqreturn_t smblib_handle_high_duty_cycle(int irq, void *data) 
	struct smb_charger *chg = irq_data->parent_data;



	chg->is_hdc = true;

	/*

	 * Disable usb IRQs after the flag set and re-enable IRQs after

	 * the flag cleared in the delayed work queue, to avoid any IRQ

	 * storming during the delays

	 */

	if (chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

		disable_irq_nosync(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);



	schedule_delayed_work(&chg->clear_hdc_work, msecs_to_jiffies(60));



	return IRQ_HANDLED;
@@ -4473,6 +4481,8 @@ static void clear_hdc_work(struct work_struct *work) 
						clear_hdc_work.work);



	chg->is_hdc = 0;

	if (chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq)

		enable_irq(chg->irq_info[HIGH_DUTY_CYCLE_IRQ].irq);

}



static void rdstd_cc2_detach_work(struct work_struct *work)

drivers/power/supply/qcom/smb1351-charger.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static int smb1351_chg_otg_regulator_is_enable(struct regulator_dev *rdev) 
	return (reg & CMD_OTG_EN_BIT) ? 1 : 0;

}



struct regulator_ops smb1351_chg_otg_reg_ops = {

static struct regulator_ops smb1351_chg_otg_reg_ops = {

	.enable		= smb1351_chg_otg_regulator_enable,

	.disable	= smb1351_chg_otg_regulator_disable,

	.is_enabled	= smb1351_chg_otg_regulator_is_enable,