| Message ID | 20170418115842.16214-5-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 Mains > monitoring, while the ACPI ac driver is broken on these systems > due to bad DSTDs or because we do not support the proprietary and > undocumented ACPI opregions these ACPI battery devices rely on > (e.g. BMOP opregion). > > This leads for example to a ADP1 power_supply which reports > itself as always online even if no mains are connected. > > This commit adds a blacklist with PMIC ACPI HIDs for which we've a > native charger or extcon driver and makes the ACPI ac driver not > register itself when a PMIC on this list is present. Same remark, change those minors if something else comes up. > static int __init acpi_ac_init(void) > { > - int result; > + int i, result; I would go with unsigned int i; (Same for previous patch considering ARRAY_SIZE() in use) > > if (acpi_disabled) > return -ENODEV; > > + for (i = 0; i < ARRAY_SIZE(acpi_ac_blacklist); i++) > + if (acpi_dev_present(acpi_ac_blacklist[i].hid, "1", > + acpi_ac_blacklist[i].hrv)) { > + pr_info("ACPI: AC: found native %s PMIC, not > loading\n", Do we have PREFIX defined in this module as well? > + acpi_ac_blacklist[i].hid); > + return -ENODEV; > + } > +
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index f71b756..8df95a1 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -57,12 +57,23 @@ static int acpi_ac_add(struct acpi_device *device); static int acpi_ac_remove(struct acpi_device *device); static void acpi_ac_notify(struct acpi_device *device, u32 event); +struct acpi_ac_bl { + const char *hid; + int hrv; +}; + static const struct acpi_device_id ac_device_ids[] = { {"ACPI0003", 0}, {"", 0}, }; MODULE_DEVICE_TABLE(acpi, ac_device_ids); +/* Lists of PMIC ACPI HIDs with an (often better) native charger driver */ +static const struct acpi_ac_bl acpi_ac_blacklist[] = { + { "INT33F4", -1 }, /* X-Powers AXP288 PMIC */ + { "INT34D3", 3 }, /* Intel Cherrytrail Whiskey Cove PMIC */ +}; + #ifdef CONFIG_PM_SLEEP static int acpi_ac_resume(struct device *dev); #endif @@ -424,11 +435,19 @@ static int acpi_ac_remove(struct acpi_device *device) static int __init acpi_ac_init(void) { - int result; + int i, result; if (acpi_disabled) return -ENODEV; + for (i = 0; i < ARRAY_SIZE(acpi_ac_blacklist); i++) + if (acpi_dev_present(acpi_ac_blacklist[i].hid, "1", + acpi_ac_blacklist[i].hrv)) { + pr_info("ACPI: AC: found native %s PMIC, not loading\n", + acpi_ac_blacklist[i].hid); + return -ENODEV; + } + #ifdef CONFIG_ACPI_PROCFS_POWER acpi_ac_dir = acpi_lock_ac_dir(); if (!acpi_ac_dir)
On some systems we have a native PMIC driver which provides Mains monitoring, while the ACPI ac driver is broken on these systems due to bad DSTDs or because we do not support the proprietary and undocumented ACPI opregions these ACPI battery devices rely on (e.g. BMOP opregion). This leads for example to a ADP1 power_supply which reports itself as always online even if no mains are connected. This commit adds a blacklist with PMIC ACPI HIDs for which we've a native charger or extcon driver and makes the ACPI ac driver not register itself when a PMIC on this list is present. 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: ac: Add acpi_ac_unregister() function" "power: supply: axp288_charger: Unregister duplicate ACPI ac supply" And also this patch from my local patch-queue (not submitted yet): "i2c-cht-wc: remove broken ACPI AC power-supply" --- drivers/acpi/ac.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-)