Skip to contentSkip to conversation

Patch "power: supply: bq24190_charger: Handle fault before status on interrupt" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (2)
Stable branch Power supply
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

power: supply: bq24190_charger: Handle fault before status on interrupt

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
power-supply-bq24190_charger-handle-fault-before-status-on-interrupt.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ba52e75718784fda1b683ee0bfded72a0b83b047 Mon Sep 17 00:00:00 2001

From: Liam Breck <[email protected]>
Date: Wed, 18 Jan 2017 09:26:54 -0800
Subject: power: supply: bq24190_charger: Handle fault before status on interrupt

From: Liam Breck <[email protected]>

commit ba52e75718784fda1b683ee0bfded72a0b83b047 upstream.

Reading both fault and status registers and logging any fault should take priority over handling status register update.

Fix by moving the status handling to later in interrupt routine.

Fixes d7bf353fd0aa3 ("bq24190_charger: Add support for TI BQ24190 Battery Charger")
Signed-off-by Liam Breck <[email protected]>
Acked-by Mark Greer <[email protected]>
Acked-by Tony Lindgren <[email protected]>
Signed-off-by Sebastian Reichel <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 drivers/power/supply/bq24190_charger.c |   46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/power/supply/bq24190_charger.c +23 -23
@@ -1175,29 +1175,6 @@ static irqreturn_t bq24190_irq_handler_t
 		goto out;
 	}
 
-	if (ss_reg != bdi->ss_reg) {
-		/*
-		 * The device is in host mode so when PG_STAT goes from 1->0
-		 * (i.e., power removed) HIZ needs to be disabled.
-		 */
-		if ((bdi->ss_reg & BQ24190_REG_SS_PG_STAT_MASK) &&
-				!(ss_reg & BQ24190_REG_SS_PG_STAT_MASK)) {
-			ret = bq24190_write_mask(bdi, BQ24190_REG_ISC,
-					BQ24190_REG_ISC_EN_HIZ_MASK,
-					BQ24190_REG_ISC_EN_HIZ_SHIFT,
-					0);
-			if (ret < 0)
-				dev_err(bdi->dev, "Can't access ISC reg: %d\n",
-					ret);
-		}
-
-		if ((bdi->ss_reg & battery_mask_ss) != (ss_reg & battery_mask_ss))
-			alert_battery = true;
-		if ((bdi->ss_reg & ~battery_mask_ss) != (ss_reg & ~battery_mask_ss))
-			alert_charger = true;
-		bdi->ss_reg = ss_reg;
-	}
-
 	i = 0;
 	do {
 		ret = bq24190_read(bdi, BQ24190_REG_F, &f_reg);

@@ -1224,6 +1201,29 @@ static irqreturn_t bq24190_irq_handler_t
 		mutex_unlock(&bdi->f_reg_lock);
 	}
 
+	if (ss_reg != bdi->ss_reg) {
+		/*
+		 * The device is in host mode so when PG_STAT goes from 1->0
+		 * (i.e., power removed) HIZ needs to be disabled.
+		 */
+		if ((bdi->ss_reg & BQ24190_REG_SS_PG_STAT_MASK) &&
+				!(ss_reg & BQ24190_REG_SS_PG_STAT_MASK)) {
+			ret = bq24190_write_mask(bdi, BQ24190_REG_ISC,
+					BQ24190_REG_ISC_EN_HIZ_MASK,
+					BQ24190_REG_ISC_EN_HIZ_SHIFT,
+					0);
+			if (ret < 0)
+				dev_err(bdi->dev, "Can't access ISC reg: %d\n",
+					ret);
+		}
+
+		if ((bdi->ss_reg & battery_mask_ss) != (ss_reg & battery_mask_ss))
+			alert_battery = true;
+		if ((bdi->ss_reg & ~battery_mask_ss) != (ss_reg & ~battery_mask_ss))
+			alert_charger = true;
+		bdi->ss_reg = ss_reg;
+	}
+
 	if (alert_charger)
 		power_supply_changed(bdi->charger);
 	if (alert_battery)

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/power-supply-bq24190_charger-handle-fault-before-status-on-interrupt.patch queue-4.9/power-supply-bq24190_charger-call-power_supply_changed-for-relevant-component.patch queue-4.9/power-supply-bq24190_charger-install-irq_handler_thread-at-end-of-probe.patch queue-4.9/power-supply-bq24190_charger-call-set_mode_host-on-pm_resume.patch queue-4.9/power-supply-bq24190_charger-don-t-read-fault-register-outside-irq_handle_thread.patch queue-4.9/power-supply-bq24190_charger-fix-irq-trigger-to-irqf_trigger_falling.patch