@@ -35,11 +35,11 @@
#include <linux/delay.h>
#ifdef CONFIG_X86
#include <asm/mpspec.h>
+#include <linux/dmi.h>
#endif
#include <linux/acpi_iort.h>
#include <linux/pci.h>
#include <acpi/apei.h>
-#include <linux/dmi.h>
#include <linux/suspend.h>
#include "internal.h"
@@ -109,10 +109,6 @@ static const struct dmi_system_id acpi_q
},
{}
};
-#else
-static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
- {}
-};
#endif
/* --------------------------------------------------------------------------
@@ -1060,8 +1056,15 @@ void __init acpi_early_init(void)
acpi_permanent_mmap = true;
- /* Check machine-specific quirks */
+#ifdef CONFIG_X86
+ /*
+ * Check machine-specific quirks
+ * Note that calling dmi_check_system here on other architectures
+ * would not be OK because only x86 intializes dmi early enough.
+ * Thankfully only x86 systems need such quirks for now.
+ */
dmi_check_system(acpi_quirks_dmi_table);
+#endif
status = acpi_reallocate_root_table();
if (ACPI_FAILURE(status)) {
Calling dmi_check_system() early only works on X86. Other architectures initialize the DMI subsystem later so it's not ready yet when ACPI itself gets initialized. In the best case it results in a useless call to a function which will do nothing. But depending on the dmi implementation, it could also result in warnings. Best is to not call the function when it can't work and isn't needed. Additionally, if anyone ever needs to add non-x86 quirks, it would surprisingly not work, so document the limitation to avoid confusion. Signed-off-by: Jean Delvare <jdelvare@suse.de> Fixes: cce4f632db20 ("ACPI: fix early DSDT dmi check warnings on ia64") Cc: stable@vger.kernel.org Cc: Takashi Iwai <tiwai@suse.de> Cc: "Zheng, Lv" <lv.zheng@intel.com> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> (supporter:ACPI) Cc: Len Brown <lenb@kernel.org> (supporter:ACPI) --- drivers/acpi/bus.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)