Commit 639c1524 authored Oct 16, 2019 by Tony Lindgren Committed by Sebastian Reichel Oct 20, 2019

power: supply: cpcap-battery: Check voltage before orderly_poweroff



We can get the low voltage interrupt trigger sometimes way too early,
maybe because of CPU load spikes. This causes orderly_poweroff() be
called too easily.

Let's check the voltage before orderly_poweroff in case it was not
yet a permanent condition. We will be getting more interrupts anyways
if the condition persists.

Let's also show the measured voltages for low battery and battery
empty warnings since we have them.

Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

parent 8bc8fc08

drivers/power/supply/cpcap-battery.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -562,12 +562,14 @@ static irqreturn_t cpcap_battery_irq_thread(int irq, void *data)
		switch (d->action) {
		case CPCAP_BATTERY_IRQ_ACTION_BATTERY_LOW:
		if (latest->current_ua >= 0)
		dev_warn(ddata->dev, "Battery low at 3.3V!\n");
		dev_warn(ddata->dev, "Battery low at %imV!\n",
		latest->voltage / 1000);
		break;
		case CPCAP_BATTERY_IRQ_ACTION_POWEROFF:
		if (latest->current_ua >= 0) {
		if (latest->current_ua >= 0 && latest->voltage <= 3200000) {
		dev_emerg(ddata->dev,
		"Battery empty at 3.1V, powering off\n");
		"Battery empty at %imV, powering off\n",
		latest->voltage / 1000);
		orderly_poweroff(true);
		}
		break;

Admin message