tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'acpi-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fixes from Rafael Wysocki:
"These fix a regression from the 4.18 cycle in the ACPI driver for
Intel SoCs (LPSS) and prevent dmi_check_system() from being called on
non-x86 systems in the ACPI core.

Specifics:

- Fix a power management regression in the ACPI driver for Intel SoCs
(LPSS) introduced by a system-wide suspend/resume fix during the
4.18 cycle (Zhang Rui).

- Prevent dmi_check_system() from being called on non-x86 systems in
the ACPI core (Jean Delvare)"

* tag 'acpi-4.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / LPSS: Force LPSS quirks on boot
ACPI / bus: Only call dmi_check_system() on X86

Linus Torvalds 53937340 69ddce94

+8 -7
+1 -1
drivers/acpi/acpi_lpss.c
··· 879 879 #define LPSS_GPIODEF0_DMA_LLP BIT(13) 880 880 881 881 static DEFINE_MUTEX(lpss_iosf_mutex); 882 - static bool lpss_iosf_d3_entered; 882 + static bool lpss_iosf_d3_entered = true; 883 883 884 884 static void lpss_iosf_enter_d3_state(void) 885 885 {
+7 -6
drivers/acpi/bus.c
··· 35 35 #include <linux/delay.h> 36 36 #ifdef CONFIG_X86 37 37 #include <asm/mpspec.h> 38 + #include <linux/dmi.h> 38 39 #endif 39 40 #include <linux/acpi_iort.h> 40 41 #include <linux/pci.h> 41 42 #include <acpi/apei.h> 42 - #include <linux/dmi.h> 43 43 #include <linux/suspend.h> 44 44 45 45 #include "internal.h" ··· 80 80 DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"), 81 81 }, 82 82 }, 83 - {} 84 - }; 85 - #else 86 - static const struct dmi_system_id dsdt_dmi_table[] __initconst = { 87 83 {} 88 84 }; 89 85 #endif ··· 1029 1033 1030 1034 acpi_permanent_mmap = true; 1031 1035 1036 + #ifdef CONFIG_X86 1032 1037 /* 1033 1038 * If the machine falls into the DMI check table, 1034 - * DSDT will be copied to memory 1039 + * DSDT will be copied to memory. 1040 + * Note that calling dmi_check_system() here on other architectures 1041 + * would not be OK because only x86 initializes dmi early enough. 1042 + * Thankfully only x86 systems need such quirks for now. 1035 1043 */ 1036 1044 dmi_check_system(dsdt_dmi_table); 1045 + #endif 1037 1046 1038 1047 status = acpi_reallocate_root_table(); 1039 1048 if (ACPI_FAILURE(status)) {