[v2,1/1] UBUNTU: SAUCE: ACPI / bus: Add some Lenovo laptops in list of acpi table term list
diff mbox series

Message ID 20190402041013.12799-2-aaron.ma@canonical.com
State New
Headers show
Series
  • UBUNTU: SAUCE: Fix ACPI bug that
Related show

Commit Message

Aaron Ma April 2, 2019, 4:10 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1819921

Some Lenovo laptops failed to boot because of no package handling
with module-level code which is supported from v4.17-rc1.

Due to the regression concerns, add these series of laptops in a quirk
list to be handled.

V2:
Fix non-x86 building error.

Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
---
 drivers/acpi/bus.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

Comments

Hui Wang April 16, 2019, 4:06 a.m. UTC | #1
Looks good to me.

Acked-by: Hui Wang <hui.wang@canonical.com>

On 2019/4/2 下午12:10, Aaron Ma wrote:
> BugLink: https://bugs.launchpad.net/bugs/1819921
>

Patch
diff mbox series

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index f0348e388d01..0b306a7cef77 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -109,10 +109,43 @@  static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
 	},
 	{}
 };
+
+static const char * const acpi_quirk_lenovo_bios_ids[] = {
+	"N2H", /* first 3 bytes of Lenovo BIOS version */
+	NULL
+};
+
+bool acpi_quirk_matches_bios_ids(const char * const ids[])
+{
+	const char *bios_vendor = dmi_get_system_info(DMI_BIOS_VENDOR);
+	const char *bios_ver = dmi_get_system_info(DMI_BIOS_VERSION);
+	int i;
+
+	if ((!bios_vendor) && (!bios_ver) && strncmp(bios_vendor, "LENOVO", 6))
+		return false;
+
+	for (i = 0; ids[i]; i++)
+		if (!strncmp(bios_ver, ids[i], 3)) {
+			acpi_gbl_parse_table_as_term_list = 1;
+			return true;
+		}
+
+	return false;
+}
+
 #else
 static const struct dmi_system_id acpi_quirks_dmi_table[] __initconst = {
 	{}
 };
+
+static const char * const acpi_quirk_lenovo_bios_ids[] = {
+	NULL
+};
+
+bool acpi_quirk_matches_bios_ids(const char * const ids[])
+{
+	return false;
+}
 #endif
 
 /* --------------------------------------------------------------------------
@@ -1036,6 +1069,7 @@  void __init acpi_early_init(void)
 
 	/* Check machine-specific quirks */
 	dmi_check_system(acpi_quirks_dmi_table);
+	acpi_quirk_matches_bios_ids(acpi_quirk_lenovo_bios_ids);
 
 	status = acpi_reallocate_root_table();
 	if (ACPI_FAILURE(status)) {