Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1704241

[PATCH 1/2] ACPI: SPCR: extend XGENE 8250 workaround to m400

Show all headers | View raw

xgene v1/v2 chips are also used on moonshot cartridges that have
different table headers to the ones on Mustang. Extend the quirk
so it also recognises the Moonshot M400 variant too.

Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
---
 drivers/acpi/spcr.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/spcr.c b/drivers/acpi/spcr.c
index 4ac3e06b41d8..1457ef0b0fd5 100644
--- a/drivers/acpi/spcr.c
+++ b/drivers/acpi/spcr.c
@@ -43,17 +43,24 @@ static bool qdf2400_erratum_44_present(struct acpi_table_header *h)
  */
 static bool xgene_8250_erratum_present(struct acpi_table_spcr *tb)
 {
+	bool xgene_8250 = false;
+
 	if (tb->interface_type != ACPI_DBG2_16550_COMPATIBLE)
 		return false;
 
-	if (memcmp(tb->header.oem_id, "APMC0D", ACPI_OEM_ID_SIZE))
+	if (memcmp(tb->header.oem_id, "APMC0D", ACPI_OEM_ID_SIZE) &&
+	    memcmp(tb->header.oem_id, "HPE   ", ACPI_OEM_ID_SIZE))
 		return false;
 
 	if (!memcmp(tb->header.oem_table_id, "XGENESPC",
 	    ACPI_OEM_TABLE_ID_SIZE) && tb->header.oem_revision == 0)
-		return true;
+		xgene_8250 = true;
 
-	return false;
+	if (!memcmp(tb->header.oem_table_id, "ProLiant",
+	    ACPI_OEM_TABLE_ID_SIZE) && tb->header.oem_revision == 1)
+		xgene_8250 = true;
+
+	return xgene_8250;
 }
 
 /**
-- 
2.13.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang Graeme Gregory <graeme.gregory@linaro.org> - 2017-08-04 23:50 +0200
  [PATCH 2/2] ACPI: SPCR: work around clock issue on xgene UART Graeme Gregory <graeme.gregory@linaro.org> - 2017-08-05 00:00 +0200
  [PATCH 1/2] ACPI: SPCR: extend XGENE 8250 workaround to m400 Graeme Gregory <graeme.gregory@linaro.org> - 2017-08-05 00:00 +0200
  Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang "Rafael J. Wysocki" <rafael@kernel.org> - 2017-08-05 01:00 +0200
    Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang Graeme Gregory <graeme.gregory@linaro.org> - 2017-08-05 09:30 +0200
      Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang "Rafael J. Wysocki" <rafael@kernel.org> - 2017-08-05 14:30 +0200
  Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang "Rafael J. Wysocki" <rafael@kernel.org> - 2017-08-05 14:40 +0200
    Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2017-08-11 01:20 +0200
  Re: [PATCH 0/2] Updated SPCR quirks for Moonshot/Mustang Mark Salter <msalter@redhat.com> - 2017-08-06 04:30 +0200

csiph-web