* [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler
@ 2021-09-14 12:18 Sebastian Krzyszkowiak
2021-09-14 12:18 ` [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Sebastian Krzyszkowiak
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Sebastian Krzyszkowiak @ 2021-09-14 12:18 UTC (permalink / raw)
To: Sebastian Reichel, linux-pm
Cc: linux-kernel, Krzysztof Kozlowski, Dirk Brandewie, kernel,
Sebastian Krzyszkowiak, stable
The gauge requires us to clear the status bits manually for some alerts
to be properly dismissed. Previously the IRQ was configured to react only
on falling edge, which wasn't technically correct (the ALRT line is active
low), but it had a happy side-effect of preventing interrupt storms
on uncleared alerts from happening.
Fixes: 7fbf6b731bca ("power: supply: max17042: Do not enforce (incorrect) interrupt trigger type")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
---
v2: added a comment on why it clears all alert bits
---
drivers/power/supply/max17042_battery.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index 8dffae76b6a3..da78ffe6a3ec 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -876,6 +876,10 @@ static irqreturn_t max17042_thread_handler(int id, void *dev)
max17042_set_soc_threshold(chip, 1);
}
+ /* we implicitly handle all alerts via power_supply_changed */
+ regmap_clear_bits(chip->regmap, MAX17042_STATUS,
+ 0xFFFF & ~(STATUS_POR_BIT | STATUS_BST_BIT));
+
power_supply_changed(chip->battery);
return IRQ_HANDLED;
}
--
2.33.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
2021-09-14 12:18 [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Sebastian Krzyszkowiak
@ 2021-09-14 12:18 ` Sebastian Krzyszkowiak
2021-09-16 10:26 ` Krzysztof Kozlowski
2021-09-16 10:26 ` [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Krzysztof Kozlowski
2021-10-11 3:32 ` Sebastian Krzyszkowiak
2 siblings, 1 reply; 6+ messages in thread
From: Sebastian Krzyszkowiak @ 2021-09-14 12:18 UTC (permalink / raw)
To: Sebastian Reichel, linux-pm
Cc: linux-kernel, Krzysztof Kozlowski, Dirk Brandewie, kernel,
Sebastian Krzyszkowiak, stable
max17042_set_soc_threshold gets called with offset set to 1, which means
that minimum threshold value would underflow once SOC got down to 0,
causing invalid alerts from the gauge.
Fixes: e5f3872d2044 ("max17042: Add support for signalling change in SOC")
Cc: <stable@vger.kernel.org>
Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
---
v2: added commit description
---
drivers/power/supply/max17042_battery.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
index da78ffe6a3ec..189c1979bc7b 100644
--- a/drivers/power/supply/max17042_battery.c
+++ b/drivers/power/supply/max17042_battery.c
@@ -857,7 +857,8 @@ static void max17042_set_soc_threshold(struct max17042_chip *chip, u16 off)
regmap_read(map, MAX17042_RepSOC, &soc);
soc >>= 8;
soc_tr = (soc + off) << 8;
- soc_tr |= (soc - off);
+ if (off < soc)
+ soc_tr |= soc - off;
regmap_write(map, MAX17042_SALRT_Th, soc_tr);
}
--
2.33.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold
2021-09-14 12:18 ` [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Sebastian Krzyszkowiak
@ 2021-09-16 10:26 ` Krzysztof Kozlowski
0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-16 10:26 UTC (permalink / raw)
To: Sebastian Krzyszkowiak, Sebastian Reichel, linux-pm
Cc: linux-kernel, Dirk Brandewie, kernel, stable
On 14/09/2021 14:18, Sebastian Krzyszkowiak wrote:
> max17042_set_soc_threshold gets called with offset set to 1, which means
> that minimum threshold value would underflow once SOC got down to 0,
> causing invalid alerts from the gauge.
>
> Fixes: e5f3872d2044 ("max17042: Add support for signalling change in SOC")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
> v2: added commit description
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler
2021-09-14 12:18 [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Sebastian Krzyszkowiak
2021-09-14 12:18 ` [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Sebastian Krzyszkowiak
@ 2021-09-16 10:26 ` Krzysztof Kozlowski
2021-10-11 3:32 ` Sebastian Krzyszkowiak
2 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2021-09-16 10:26 UTC (permalink / raw)
To: Sebastian Krzyszkowiak, Sebastian Reichel, linux-pm
Cc: linux-kernel, Dirk Brandewie, kernel, stable
On 14/09/2021 14:18, Sebastian Krzyszkowiak wrote:
> The gauge requires us to clear the status bits manually for some alerts
> to be properly dismissed. Previously the IRQ was configured to react only
> on falling edge, which wasn't technically correct (the ALRT line is active
> low), but it had a happy side-effect of preventing interrupt storms
> on uncleared alerts from happening.
>
> Fixes: 7fbf6b731bca ("power: supply: max17042: Do not enforce (incorrect) interrupt trigger type")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
> v2: added a comment on why it clears all alert bits
> ---
> drivers/power/supply/max17042_battery.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler
2021-09-14 12:18 [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Sebastian Krzyszkowiak
2021-09-14 12:18 ` [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Sebastian Krzyszkowiak
2021-09-16 10:26 ` [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Krzysztof Kozlowski
@ 2021-10-11 3:32 ` Sebastian Krzyszkowiak
2021-10-12 16:01 ` Sebastian Reichel
2 siblings, 1 reply; 6+ messages in thread
From: Sebastian Krzyszkowiak @ 2021-10-11 3:32 UTC (permalink / raw)
To: Sebastian Reichel, linux-pm
Cc: linux-kernel, Krzysztof Kozlowski, Dirk Brandewie, kernel, stable
On wtorek, 14 września 2021 14:18:05 CEST Sebastian Krzyszkowiak wrote:
> The gauge requires us to clear the status bits manually for some alerts
> to be properly dismissed. Previously the IRQ was configured to react only
> on falling edge, which wasn't technically correct (the ALRT line is active
> low), but it had a happy side-effect of preventing interrupt storms
> on uncleared alerts from happening.
>
> Fixes: 7fbf6b731bca ("power: supply: max17042: Do not enforce (incorrect)
> interrupt trigger type") Cc: <stable@vger.kernel.org>
> Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> ---
> v2: added a comment on why it clears all alert bits
> ---
> drivers/power/supply/max17042_battery.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/power/supply/max17042_battery.c
> b/drivers/power/supply/max17042_battery.c index 8dffae76b6a3..da78ffe6a3ec
> 100644
> --- a/drivers/power/supply/max17042_battery.c
> +++ b/drivers/power/supply/max17042_battery.c
> @@ -876,6 +876,10 @@ static irqreturn_t max17042_thread_handler(int id, void
> *dev) max17042_set_soc_threshold(chip, 1);
> }
>
> + /* we implicitly handle all alerts via power_supply_changed */
> + regmap_clear_bits(chip->regmap, MAX17042_STATUS,
> + 0xFFFF & ~(STATUS_POR_BIT |
STATUS_BST_BIT));
> +
> power_supply_changed(chip->battery);
> return IRQ_HANDLED;
> }
Ping? Seems this didn't get applied yet.
S.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler
2021-10-11 3:32 ` Sebastian Krzyszkowiak
@ 2021-10-12 16:01 ` Sebastian Reichel
0 siblings, 0 replies; 6+ messages in thread
From: Sebastian Reichel @ 2021-10-12 16:01 UTC (permalink / raw)
To: Sebastian Krzyszkowiak
Cc: linux-pm, linux-kernel, Krzysztof Kozlowski, Dirk Brandewie,
kernel, stable
[-- Attachment #1: Type: text/plain, Size: 1662 bytes --]
Hi,
On Mon, Oct 11, 2021 at 05:32:30AM +0200, Sebastian Krzyszkowiak wrote:
> On wtorek, 14 września 2021 14:18:05 CEST Sebastian Krzyszkowiak wrote:
> > The gauge requires us to clear the status bits manually for some alerts
> > to be properly dismissed. Previously the IRQ was configured to react only
> > on falling edge, which wasn't technically correct (the ALRT line is active
> > low), but it had a happy side-effect of preventing interrupt storms
> > on uncleared alerts from happening.
> >
> > Fixes: 7fbf6b731bca ("power: supply: max17042: Do not enforce (incorrect)
> > interrupt trigger type") Cc: <stable@vger.kernel.org>
> > Signed-off-by: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
> > ---
> > v2: added a comment on why it clears all alert bits
> > ---
> > drivers/power/supply/max17042_battery.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/drivers/power/supply/max17042_battery.c
> > b/drivers/power/supply/max17042_battery.c index 8dffae76b6a3..da78ffe6a3ec
> > 100644
> > --- a/drivers/power/supply/max17042_battery.c
> > +++ b/drivers/power/supply/max17042_battery.c
> > @@ -876,6 +876,10 @@ static irqreturn_t max17042_thread_handler(int id, void
> > *dev) max17042_set_soc_threshold(chip, 1);
> > }
> >
> > + /* we implicitly handle all alerts via power_supply_changed */
> > + regmap_clear_bits(chip->regmap, MAX17042_STATUS,
> > + 0xFFFF & ~(STATUS_POR_BIT |
> STATUS_BST_BIT));
> > +
> > power_supply_changed(chip->battery);
> > return IRQ_HANDLED;
> > }
>
> Ping? Seems this didn't get applied yet.
Thanks, both queued now.
-- Sebastian
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-10-12 16:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14 12:18 [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Sebastian Krzyszkowiak
2021-09-14 12:18 ` [PATCH v2 2/2] power: supply: max17042_battery: Prevent int underflow in set_soc_threshold Sebastian Krzyszkowiak
2021-09-16 10:26 ` Krzysztof Kozlowski
2021-09-16 10:26 ` [PATCH v2 1/2] power: supply: max17042_battery: Clear status bits in interrupt handler Krzysztof Kozlowski
2021-10-11 3:32 ` Sebastian Krzyszkowiak
2021-10-12 16:01 ` Sebastian Reichel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®