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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 35789C32750 for ; Fri, 2 Aug 2019 09:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C9E621852 for ; Fri, 2 Aug 2019 09:32:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738321; bh=Ml2SiAEKPIbhZjyoReVWSvKjyK4gZdthtZdGGwtk6T0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tWdyRoKQ5TWW1HvuRGpdTkpl4FCtFdzAzW1Qu+l0GY4FjelnMMJ6m/ITI7U4gdE3R J63dE7neXmb83R0211ZR40KmBSLW7RKFClm2J9CRQuPys2MFHdOyDCnfIp4r1qpsYs OZvt7RgjUGQfIrX8NHOZMMzjbjwIihU9j7REvZtQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391123AbfHBJcA (ORCPT ); Fri, 2 Aug 2019 05:32:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:58486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391114AbfHBJb4 (ORCPT ); Fri, 2 Aug 2019 05:31:56 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 43AB4217D4; Fri, 2 Aug 2019 09:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564738315; bh=Ml2SiAEKPIbhZjyoReVWSvKjyK4gZdthtZdGGwtk6T0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EL7k7d4ADXcMdBG4Pe77m/YO2ksJhpxThVhhHHgSz/SABuelz6f0e19pFb4tFDO+9 HsQz2pw5EGBG7W6VPE7fTudXAypYoMGNfrIip4FToFuyr5ZT82eUjWCaHgbX+EMCLm u9yfdl+GZv407aVc4Main1HvKn6leIvjkzcHw4Mw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sudeep Holla , Lee Jones , Graeme Gregory , Lorenzo Pieralisi , Hanjun Guo , Ard Biesheuvel , Catalin Marinas , Sasha Levin Subject: [PATCH 4.4 039/158] acpi/arm64: ignore 5.1 FADTs that are reported as 5.0 Date: Fri, 2 Aug 2019 11:27:40 +0200 Message-Id: <20190802092211.962722926@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092203.671944552@linuxfoundation.org> References: <20190802092203.671944552@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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