iommu/amd: Reserve exclusion range in iova-domain

[mirror_ubuntu-bionic-kernel.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 13e7b56e33aebbc7965bc89d53086c42df179c31..f6ac6cc8c905d763bc464e60101c29abbe231f37 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -70,6 +70,7 @@ static async_cookie_t async_cookie;
 static bool battery_driver_registered;
 static int battery_bix_broken_package;
 static int battery_notification_delay_ms;
+static int battery_ac_is_broken;
 static unsigned int cache_time = 1000;
 module_param(cache_time, uint, 0644);
 MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -200,6 +201,20 @@ static int acpi_battery_is_charged(struct acpi_battery *battery)
        return 0;
 }
 
+static int acpi_battery_handle_discharging(struct acpi_battery *battery)
+{
+       /*
+        * Some devices wrongly report discharging if the battery's charge level
+        * was above the device's start charging threshold atm the AC adapter
+        * was plugged in and the device thus did not start a new charge cycle.
+        */
+       if ((battery_ac_is_broken || power_supply_is_system_supplied()) &&
+           battery->rate_now == 0)
+               return POWER_SUPPLY_STATUS_NOT_CHARGING;
+
+       return POWER_SUPPLY_STATUS_DISCHARGING;
+}
+
 static int acpi_battery_get_property(struct power_supply *psy,
                                     enum power_supply_property psp,
                                     union power_supply_propval *val)
@@ -215,7 +230,7 @@ static int acpi_battery_get_property(struct power_supply *psy,
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
                if (battery->state & ACPI_BATTERY_STATE_DISCHARGING)
-                       val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+                       val->intval = acpi_battery_handle_discharging(battery);
                else if (battery->state & ACPI_BATTERY_STATE_CHARGING)
                        val->intval = POWER_SUPPLY_STATUS_CHARGING;
                else if (acpi_battery_is_charged(battery))
@@ -1166,23 +1181,41 @@ battery_notification_delay_quirk(const struct dmi_system_id *d)
        return 0;
 }
 
+static int __init
+battery_ac_is_broken_quirk(const struct dmi_system_id *d)
+{
+       battery_ac_is_broken = 1;
+       return 0;
+}
+
 static const struct dmi_system_id bat_dmi_table[] __initconst = {
        {
+               /* NEC LZ750/LS */
                .callback = battery_bix_broken_package_quirk,
-               .ident = "NEC LZ750/LS",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "NEC"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "PC-LZ750LS"),
                },
        },
        {
+               /* Acer Aspire V5-573G */
                .callback = battery_notification_delay_quirk,
-               .ident = "Acer Aspire V5-573G",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "Aspire V5-573G"),
                },
        },
+       {
+               /* Point of View mobii wintab p800w */
+               .callback = battery_ac_is_broken_quirk,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "AMI Corporation"),
+                       DMI_MATCH(DMI_BOARD_NAME, "Aptio CRB"),
+                       DMI_MATCH(DMI_BIOS_VERSION, "3BAIR1013"),
+                       /* Above matches are too generic, add bios-date match */
+                       DMI_MATCH(DMI_BIOS_DATE, "08/22/2014"),
+               },
+       },
        {},
 };