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,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 02AB6C7618F for ; Mon, 15 Jul 2019 14:39:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C0F8B20896 for ; Mon, 15 Jul 2019 14:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201589; bh=ITXJugpKLCv6VgKT5ktCbiPT/AuZq5yy6n5SN1ErbLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GQHtUGt0dm5nk5ZYsHsHwCR6rbdtQxTNH41gJsq9mbyvuUPhZALoWwPl4pj9jzz5/ Bj7SDBone8+i//AmxYRKnQfPWpqHtUd3dE3kmK5VuwQ3g/b901SjIN90Xfx2/5Bq5+ tYybJZ+tRim+iDgmMwWx/Wl/4+spZHq+SR/ZjSE0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392130AbfGOOjs (ORCPT ); Mon, 15 Jul 2019 10:39:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:39940 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731516AbfGOOjq (ORCPT ); Mon, 15 Jul 2019 10:39:46 -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 4ADF220868; Mon, 15 Jul 2019 14:39:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563201585; bh=ITXJugpKLCv6VgKT5ktCbiPT/AuZq5yy6n5SN1ErbLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J4lK51fEQkb/8ZoxX6o1/4P0hypjLcUe3V4UpRlyNseQlyvsW/Q6EHEGhG/NI1C1J vx1NxTPHZVbCWVCea9thhs5iLtz9LOPvwneyMsOziAQyHs3KuSqDDxxgcQdb3ANpUm 0V1Dhb01M1IggfUVfjePPLgWSWJ56k91uWwZr7Ag= 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.9 48/73] acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 Date: Mon, 15 Jul 2019 10:36:04 -0400 Message-Id: <20190715143629.10893-48-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715143629.10893-1-sashal@kernel.org> References: <20190715143629.10893-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 252a6d9c1da5..1a95d135def2 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -157,10 +157,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