From patchwork Fri Aug 4 21:49:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Graeme Gregory X-Patchwork-Id: 109465 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp1884175obb; Fri, 4 Aug 2017 14:49:59 -0700 (PDT) X-Received: by 10.99.147.19 with SMTP id b19mr3810492pge.67.1501883399690; Fri, 04 Aug 2017 14:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501883399; cv=none; d=google.com; s=arc-20160816; b=jaHUIJ3d3d4y7jhpqpGzuoTmTqXcCF05hwpSEPOuQjFpio8kpuWtdFPKfxvitcYBC2 Lcid5ir3Vzzrgw1BXYRZlxdVb8dA3Ja5Uy4TYorvVsrKYlZtP9T2XJqYt86vRNczXat1 WTRx/cOYoBBbx1QRzisyyz6tHdZsEKyGZOh/C1IbiLqWGpQpBczOyEPpJfIgf34ajw8G GvOpf/z+3PwHq7hz7a8aOu4O5APhfzwdZX+H9F+TN5DpQze0Z/cLZrpN4ex2dLgBMfK0 NcgC/6LC5lrWa06VFf9xSvGIiBwvKcQwB2leHC+NJTdUcLrN7q/O95IS0NZqAMTMJQ0o aOAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=hWCPYxci/YBX3j87/5ILRpVOX8DH4VXQ700tz2gWgGE=; b=TJWcN9g21RlIXJDn0daBd7i88w6s6x1aWfLF0ECvxXs8GuE+vIlg46gBTzYuF8e7eB MIPXViyL6GBDJIyswuSCx9PUUZuOaLT+RQLdc1v7zsJsEkrVESOM4swzuWr6zOzUy4Ow jOl007EwRkRDgepyVIN0G8XOB5XtXJ5X9GWkChn4pdwW6puoDTe5Phxu01WtxihUUJGb woC29coSfF/7sBiQzep7r7UEF0cKLSDjMXmwEihq3rlZV7YbPMUbH6Y4wJmjSd3tyk1G TywFwJOz3cXR5o6UWVmk/s5gdu/yhbkPP2dcZ4rqfI04rNt+G3jd58j19pNX20RGzGxL zZQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=QTIuiYgL; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 66si1702413pla.1012.2017.08.04.14.49.59; Fri, 04 Aug 2017 14:49:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=QTIuiYgL; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752592AbdHDVt5 (ORCPT + 7 others); Fri, 4 Aug 2017 17:49:57 -0400 Received: from mail-wr0-f180.google.com ([209.85.128.180]:38765 "EHLO mail-wr0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbdHDVtx (ORCPT ); Fri, 4 Aug 2017 17:49:53 -0400 Received: by mail-wr0-f180.google.com with SMTP id f21so20963878wrf.5 for ; Fri, 04 Aug 2017 14:49:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rFGEDxkvmAJDfn0JKep7oSs9N4gsUZZ5bZIhw2SDZ54=; b=QTIuiYgLRNdUQBBo+rQVcdiBsJKfhEHBAWhhvj/sisbxaOwNZgq4bUqAq5hWzDB9pE VB2k5Mh6E9GJ1YTBJlkLrDlPDOah1mZivxPWraWjkzfJxLgClYiu6wvt8PcepBCWYYPl SJrMqx6C4Bi2IMpOeljP48TR1B6lSePAHXaFs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rFGEDxkvmAJDfn0JKep7oSs9N4gsUZZ5bZIhw2SDZ54=; b=oq/TFAZzfMyg8vcv1XmxpINahDsCRRHuIq8EKuotUi0Bp1cJueP7ChixNt6KbulrlU SwqJyPDi/Uft8I9vrvAi8bsbVtdTW4W1c3RJzQZUTP/jrxjwG1MRh1i4OZ7XmqkMtJkv PkLfqF2/ydLNirxxHdY1BtWnflWXXW2bg25sKS6uh4wFHvLcb/Aq3GdRgLBtkp7AGGKv 7AJjRFyqcOCwXi2bUScy6CzD8pa4lb+3+PuVBagNhYBptg7pO0lzrF/e1mggI/PNywa4 qY6miqjdUed9JAEfZRz+w1+HoZqDiMzKHw9fofI2hrtS1i1uGHezf5ZQ55HHW4X1okGi HVmg== X-Gm-Message-State: AIVw110+zbbnK8Krm3DBicZpWWePL3jSVYcAGG83MA0ZKqZjjMn2QE4z En3P72z4EiIuTmK6JPOStQ== X-Received: by 10.223.167.138 with SMTP id j10mr2728302wrc.97.1501883392185; Fri, 04 Aug 2017 14:49:52 -0700 (PDT) Received: from linaro-xps13-gg.xora.org.uk (host-92-20-158-19.as13285.net. [92.20.158.19]) by smtp.gmail.com with ESMTPSA id v65sm3630332wmf.10.2017.08.04.14.49.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 Aug 2017 14:49:51 -0700 (PDT) From: Graeme Gregory To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, rjw@rjwysocki.net, lenb@kernel.org, lho@apm.com, gregkh@linuxfoundation.org, jcm@redhat.com, Graeme Gregory Subject: [PATCH 1/2] ACPI: SPCR: extend XGENE 8250 workaround to m400 Date: Fri, 4 Aug 2017 22:49:43 +0100 Message-Id: <20170804214944.3910-2-graeme.gregory@linaro.org> X-Mailer: git-send-email 2.13.4 In-Reply-To: <20170804214944.3910-1-graeme.gregory@linaro.org> References: <20170804214944.3910-1-graeme.gregory@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org 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 --- drivers/acpi/spcr.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 2.13.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; } /**