| Message ID | 20170418115842.16214-4-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Changes Requested, archived |
| Headers | show |
On Tue, 2017-04-18 at 13:58 +0200, Hans de Goede wrote: > On some systems we have a native PMIC driver which provides battery > monitoring, while the ACPI battery driver is broken on these systems > due to bad DSDTs or because we do not support the proprietary and > undocumented ACPI opregions these ACPI battery devices rely on > (e.g. BMOP opregion). > > This leads to there being 2 battery power_supply-s registed like this: > > ~$ acpi > Battery 0: Charging, 84%, 00:49:39 until charged > Battery 1: Unknown, 0%, rate information unavailable > > Even if the ACPI battery where to function fine (which on systems > where we have a native PMIC driver it often doesn't) we still do not > want to export the same battery to userspace twice. > > This commit adds a blacklist with PMIC ACPI HIDs for which we've a > native battery driver and makes the ACPI battery driver not register > itself when a PMIC on this list is present. > Some minor comments, sorry, didn't sent earlier. Since they are minor, consider to change if some more serious stuff comes up. > +/* Lists of PMIC ACPI HIDs with an (often better) native battery > driver */ > +static const char * const acpi_battery_blacklist[] = { > + "INT33F4", /* X-Powers AXP288 PMIC */ > + NULL Can we use ARRAY_SIZE() instead? > +}; > + > enum { > ACPI_BATTERY_ALARM_PRESENT, > ACPI_BATTERY_XINFO_PRESENT, > @@ -1316,7 +1322,15 @@ static struct acpi_driver acpi_battery_driver = > { > > static void __init acpi_battery_init_async(void *unused, > async_cookie_t cookie) > { > - int result; > + int i, result; > + > + for (i = 0; acpi_battery_blacklist[i]; i++) > + if (acpi_dev_present(acpi_battery_blacklist[i], "1", > -1)) { > + pr_info("ACPI: %s: found native %s PMIC, not > loading\n", pr_info(PREFIX "%s: ...
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index b35fca4..eacb816 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -94,6 +94,12 @@ static const struct acpi_device_id battery_device_ids[] = { MODULE_DEVICE_TABLE(acpi, battery_device_ids); +/* Lists of PMIC ACPI HIDs with an (often better) native battery driver */ +static const char * const acpi_battery_blacklist[] = { + "INT33F4", /* X-Powers AXP288 PMIC */ + NULL +}; + enum { ACPI_BATTERY_ALARM_PRESENT, ACPI_BATTERY_XINFO_PRESENT, @@ -1316,7 +1322,15 @@ static struct acpi_driver acpi_battery_driver = { static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) { - int result; + int i, result; + + for (i = 0; acpi_battery_blacklist[i]; i++) + if (acpi_dev_present(acpi_battery_blacklist[i], "1", -1)) { + pr_info("ACPI: %s: found native %s PMIC, not loading\n", + ACPI_BATTERY_DEVICE_NAME, + acpi_battery_blacklist[i]); + return; + } dmi_check_system(bat_dmi_table);
On some systems we have a native PMIC driver which provides battery monitoring, while the ACPI battery driver is broken on these systems due to bad DSDTs or because we do not support the proprietary and undocumented ACPI opregions these ACPI battery devices rely on (e.g. BMOP opregion). This leads to there being 2 battery power_supply-s registed like this: ~$ acpi Battery 0: Charging, 84%, 00:49:39 until charged Battery 1: Unknown, 0%, rate information unavailable Even if the ACPI battery where to function fine (which on systems where we have a native PMIC driver it often doesn't) we still do not want to export the same battery to userspace twice. This commit adds a blacklist with PMIC ACPI HIDs for which we've a native battery driver and makes the ACPI battery driver not register itself when a PMIC on this list is present. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=194811 Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- Changes in v2: -This is a new patch in v2 of this patch-set replacing: "ACPI: battery: Add acpi_battery_unregister() function" "power: supply: axp288_fuel_gauge: Unregister duplicate ACPI battery supply" --- drivers/acpi/battery.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)