1 files changed, 38 insertions, 7 deletions

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index f87ed3be779a..676c9788e1c8 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -66,10 +66,37 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
         return 0;
 }
 #endif
+static int set_gbl_term_list(const struct dmi_system_id *id)
+{
+        acpi_gbl_parse_table_as_term_list = 1;
+        return 0;
+}
 
-static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
+static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
+        /*
+         * Touchpad on Dell XPS 9570/Precision M5530 doesn't work under I2C
+         * mode.
+         * https://bugzilla.kernel.org/show_bug.cgi?id=198515
+         */
+        {
+                .callback = set_gbl_term_list,
+                .ident = "Dell Precision M5530",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Precision M5530"),
+                },
+        },
+        {
+                .callback = set_gbl_term_list,
+                .ident = "Dell XPS 15 9570",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "XPS 15 9570"),
+                },
+        },
         /*
          * Invoke DSDT corruption work-around on all Toshiba Satellite.
+         * DSDT will be copied to memory.
          * https://bugzilla.kernel.org/show_bug.cgi?id=14679
          */
         {
@@ -83,7 +110,7 @@ static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
         {}
 };
 #else
-static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
+static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
         {}
 };
 #endif
@@ -108,6 +135,7 @@ acpi_status acpi_bus_get_status_handle(acpi_handle handle,
         }
         return status;
 }
+EXPORT_SYMBOL_GPL(acpi_bus_get_status_handle);
 
 int acpi_bus_get_status(struct acpi_device *device)
 {
@@ -119,6 +147,12 @@ int acpi_bus_get_status(struct acpi_device *device)
                 return 0;
         }
 
+        /* Battery devices must have their deps met before calling _STA */
+        if (acpi_device_is_battery(device) && device->dep_unmet) {
+                acpi_set_device_status(device, 0);
+                return 0;
+        }
+
         status = acpi_bus_get_status_handle(device->handle, &sta);
         if (ACPI_FAILURE(status))
                 return -ENODEV;
@@ -1019,11 +1053,8 @@ void __init acpi_early_init(void)
 
         acpi_permanent_mmap = true;
 
-        /*
-         * If the machine falls into the DMI check table,
-         * DSDT will be copied to memory
-         */
-        dmi_check_system(dsdt_dmi_table);
+        /* Check machine-specific quirks */
+        dmi_check_system(acpi_quirks_dmi_table);
 
         status = acpi_reallocate_root_table();
         if (ACPI_FAILURE(status)) {