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

Commit 132c08ff authored by Xiaozhe Shi's avatar Xiaozhe Shi Committed by Abhijeet Dharmapurikar
Browse files

power: qpnp-smbcharger: use source detect for usb detection 



False USB undervoltage (USBIN_UV) interrupts can fire when the battery
voltage is above the AICL threshold (4.25V) - 180mV (about 4.07V) and
battery charging is not happening. When this happens, the charger
hardware will use the autoshutdown threshold for both USBIN_UV and
AICL. When a very weak charger collapses under these conditions, an
USBIN_UV interrupt will also be generated since the USBIN voltage
is below both thresholds. When this occurs, the AICL algorithm does not
limit the input current within the AICL deglitch period of 20 ms,
causing an USBIN_UV interrupt to be sent out.

Fix this by using only USBIN source detection interrupt (USBIN_SRC_DET)
for insertion and removals. USBIN_SRC_DET uses an 1V threshold, so it
is much safer in the case of weak chargers.

CRs-Fixed: 832406
Change-Id: I0b8724318d2991b83738fd54aa9acf8c1c811657
Signed-off-by: default avatarXiaozhe Shi <xiaozhes@codeaurora.org>
parent ad88a05b

drivers/power/qpnp-smbcharger.c

+22 −32
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static bool is_usb_present(struct smbchg_chip *chip) 
		dev_err(chip->dev, "Couldn't read usb rt status rc = %d\n", rc);

		return false;

	}

	if ((reg & USBIN_UV_BIT) || (reg & USBIN_OV_BIT))

	if (!(reg & USBIN_SRC_DET_BIT) || (reg & USBIN_OV_BIT))

		return false;



	rc = smbchg_read(chip, &reg, chip->usb_chgpth_base + INPUT_STS, 1);
@@ -4459,40 +4459,26 @@ out: 
 */

static irqreturn_t usbin_uv_handler(int irq, void *_chip)

{

	struct smbchg_chip *chip = _chip;

	int aicl_level = smbchg_get_aicl_level_ma(chip);

	int rc;

	u8 reg;

	union power_supply_propval prop = {0, };

	struct smbchg_chip *chip = _chip;

	bool usb_present = is_usb_present(chip);



	rc = smbchg_read(chip, &reg, chip->usb_chgpth_base + RT_STS, 1);

	if (rc) {

		pr_err("could not read rt sts: %d", rc);

		goto out;

	}



	pr_smb(PR_STATUS,

		"%s chip->usb_present = %d usb_present = %d apsd_rerun_ignore_uv_irq = %d\n",

		"%s chip->usb_present = %d rt_sts = 0x%02x apsd_rerun_ignore_uv_irq = %d aicl = %d\n",

		chip->apsd_rerun_ignore_uv_irq ? "Ignoring":"",

		chip->usb_present, usb_present, chip->apsd_rerun_ignore_uv_irq);

		chip->usb_present, reg, chip->apsd_rerun_ignore_uv_irq,

		aicl_level);



	if (chip->apsd_rerun_ignore_uv_irq)

		goto out;



	rc = smbchg_read(chip, &reg, chip->usb_chgpth_base + RT_STS, 1);

	if (rc < 0) {

		dev_err(chip->dev, "Couldn't read usb rt status rc = %d\n", rc);

		goto out;

	}

	reg &= USBIN_UV_BIT;



	if (reg && chip->usb_psy && !chip->usb_psy->get_property(chip->usb_psy,

							POWER_SUPPLY_PROP_TYPE,

							&prop)) {

		if ((prop.intval == POWER_SUPPLY_TYPE_USB_HVDCP)

			|| (prop.intval == POWER_SUPPLY_TYPE_USB_DCP)

			|| (prop.intval == POWER_SUPPLY_TYPE_UNKNOWN)) {

				if (!usb_present) {

					update_usb_status(chip, 0, false);

					chip->aicl_irq_count = 0;

				}

		}

	}

	smbchg_wipower_check(chip);

out:

	return IRQ_HANDLED;
@@ -4526,14 +4512,18 @@ static irqreturn_t src_detect_handler(int irq, void *_chip) 
		goto out;

	}



	if (src_detect) {

		if (usb_present || chip->apsd_rerun)

			update_usb_status(chip, usb_present, chip->apsd_rerun);

	} else if (chip->usb_present) {

	/*

		 * Handle all the charger removals here. Note that DCP/HVDCP

		 * would have been handled already in UV handler.

	 * When VBAT is above the AICL threshold (4.25V) - 180mV (4.07V),

	 * an input collapse due to AICL will actually cause an USBIN_UV

	 * interrupt to fire as well.

	 *

	 * Handle USB insertions and removals in the source detect handler

	 * instead of the USBIN_UV handler since the latter is untrustworthy

	 * when the battery voltage is high.

	 */

	if (src_detect) {

		update_usb_status(chip, usb_present, chip->apsd_rerun);

	} else {

		update_usb_status(chip, 0, false);

		chip->aicl_irq_count = 0;

	}