c0a58bf
From 1e494dc5f3140005ff1f17bc06c0c16d6d50d580 Mon Sep 17 00:00:00 2001
181211f
From: Mark Salter <msalter@redhat.com>
181211f
Date: Thu, 19 Apr 2018 23:29:47 -0400
c0a58bf
Subject: [PATCH] ACPI / scan: Fix regression related to X-Gene UARTs
181211f
181211f
Commit e361d1f85855 ("ACPI / scan: Fix enumeration for special UART
181211f
devices") caused a regression with some X-Gene based platforms (Mustang
181211f
and M400) with invalid DSDT. The DSDT makes it appear that the UART
181211f
device is also a slave device attached to itself. With the above commit
181211f
the UART won't be enumerated by ACPI scan (slave serial devices shouldn't
181211f
be). So check for X-Gene UART device and skip slace device check on it.
181211f
181211f
Signed-off-by: Mark Salter <msalter@redhat.com>
181211f
---
181211f
 drivers/acpi/scan.c | 8 ++++++++
181211f
 1 file changed, 8 insertions(+)
181211f
181211f
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
c0a58bf
index e1b6231cfa1c..542dafac4306 100644
181211f
--- a/drivers/acpi/scan.c
181211f
+++ b/drivers/acpi/scan.c
c0a58bf
@@ -1567,6 +1567,14 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
c0a58bf
 	if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids))
c0a58bf
 		return false;
181211f
 
181211f
+	/*
181211f
+	 * Firmware on some arm64 X-Gene platforms will make the UART
181211f
+	 * device appear as both a UART and a slave of that UART. Just
181211f
+	 * bail out here for X-Gene UARTs.
181211f
+	 */
181211f
+	if (!strcmp(acpi_device_hid(device), "APMC0D08"))
181211f
+		return false;
181211f
+
181211f
 	INIT_LIST_HEAD(&resource_list);
181211f
 	acpi_dev_get_resources(device, &resource_list,
181211f
 			       acpi_check_serial_bus_slave,
c0a58bf
-- 
c0a58bf
2.17.1
c0a58bf