From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 818EEC76191 for ; Mon, 15 Jul 2019 14:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57446217F9 for ; Mon, 15 Jul 2019 14:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202079; bh=e7MR/Fv+IEbv7EMdb55HrRhdv5/+a2kBpfqrFZEg+LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=E9oTjsb83vOoK2NwgUZlfuWMWZkwd2rR6K+rXIXMByym2veFKeVeHJUtYEa1abpI9 FGSepG1GFDipGFP7tJHYLf2HTRVy6ZCwGYy+OJzgnhrphIKX4kNfwD6ntnhnPRpZEN SdwX9XFUiE9Nc3lvfFd20sk2YjwMZbUJcj7zn2W8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732623AbfGOOr6 (ORCPT ); Mon, 15 Jul 2019 10:47:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:43814 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392255AbfGOOr4 (ORCPT ); Mon, 15 Jul 2019 10:47:56 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8FC5A2184C; Mon, 15 Jul 2019 14:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563202075; bh=e7MR/Fv+IEbv7EMdb55HrRhdv5/+a2kBpfqrFZEg+LE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hL+QMvRWnESUDsfjp47D5CGya5+VH4DeklN3BuWajP7afz/4aqPRQWvEG8oDPdLtI 0zi2rXFWTEPZ/+6jduyP4/sLbKXQHrY70CAVpuMOdsrL/2MNK7D1u+cXtxffJnCTQU h1g+1qlsQe2kUI1aEv16+RG56W85E7j7ngl60LjI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ard Biesheuvel , Sudeep Holla , Lee Jones , Graeme Gregory , Lorenzo Pieralisi , Hanjun Guo , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.4 38/53] acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 Date: Mon, 15 Jul 2019 10:45:20 -0400 Message-Id: <20190715144535.11636-38-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715144535.11636-1-sashal@kernel.org> References: <20190715144535.11636-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit 2af22f3ec3ca452f1e79b967f634708ff01ced8a ] Some Qualcomm Snapdragon based laptops built to run Microsoft Windows are clearly ACPI 5.1 based, given that that is the first ACPI revision that supports ARM, and introduced the FADT 'arm_boot_flags' field, which has a non-zero field on those systems. So in these cases, infer from the ARM boot flags that the FADT must be 5.1 or later, and treat it as 5.1. Acked-by: Sudeep Holla Tested-by: Lee Jones Reviewed-by: Graeme Gregory Acked-by: Lorenzo Pieralisi Acked-by: Hanjun Guo Signed-off-by: Ard Biesheuvel Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/acpi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index d1ce8e2f98b9..4d0577d09681 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -141,10 +141,14 @@ static int __init acpi_fadt_sanity_check(void) */ if (table->revision < 5 || (table->revision == 5 && fadt->minor_revision < 1)) { - pr_err("Unsupported FADT revision %d.%d, should be 5.1+\n", + pr_err(FW_BUG "Unsupported FADT revision %d.%d, should be 5.1+\n", table->revision, fadt->minor_revision); - ret = -EINVAL; - goto out; + + if (!fadt->arm_boot_flags) { + ret = -EINVAL; + goto out; + } + pr_err("FADT has ARM boot flags set, assuming 5.1\n"); } if (!(fadt->flags & ACPI_FADT_HW_REDUCED)) { -- 2.20.1