Skip to content

Commit

Permalink
ACPI: SPCR: extend XGENE 8250 workaround to m400
Browse files Browse the repository at this point in the history
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>
Tested-by: Mark Salter <msalter@redhat.com>
Reviewed-by: Mark Salter <msalter@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Graeme Gregory authored and Rafael J. Wysocki committed Aug 15, 2017
1 parent ef95484 commit dee82bc
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/acpi/spcr.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,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;
}

/**
Expand Down

0 comments on commit dee82bc

Please sign in to comment.