Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1133328ybt; Tue, 7 Jul 2020 08:29:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsIdvO0gpdoNvQXzaiH382Js5wDs6RZZV48c/mY0ni+V+Ixxy48MtjeCmw2rEbhTFH62PO X-Received: by 2002:a50:c88d:: with SMTP id d13mr62792492edh.104.1594135789450; Tue, 07 Jul 2020 08:29:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594135789; cv=none; d=google.com; s=arc-20160816; b=MuZSpBmfYxt3+1ciCoEdjQmnLTDtWlpOw+xldMMX/xYdCijRZYhwm3l/vKN857OkKA UJnKse8t8ztavwnvoiCieQYiQO4TaN65GalCRq6SpGxjGmcUvKtVLuM0CEX93VZv0jdN FRUrCNCNDviKPM0UWOBseztJaQZW2On9lVxxDsjRCqNJ/+vndPvUg3ZADE3g0ZtQ64HA kx/PKJPA+OQ+2uFfbtmQLLcwh7fztZ5s/7bLD59SCtz78dZvxjxd7Qev8VoyNqoAa9It z7I7Yp9JX07GAg1V6QERJWKCKsk7fHcckfbMZCHvb/wZTbNfrT5MbPw9pqFBleVrPPl6 HQqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XbFm8k2GNAtRcH7qPj6+8qwjMsMdO1I62s3vrO1eBFQ=; b=STTWw4/6UdW1TB9Mc8jlnYlM0enB5Ssw8b5Hd6Qt44zR7vTPz7iHH0/SPi8KU8lE36 VKGWzORR/u52/eKJCRfO+7an4mEDQ02cLu759K2sAmbP4x3KqhrRlQaxgBiie/mIFcc0 JUQ9j8Vc5QwGuH+YsJi4xFkZ9wqWfeCYIX6q96waVT6i9JlRZZEkYnUt+N7WmfdtJgeI ZSkJVbn0HkCNm6uYq/J+AI+wwC4Y6zX+blwDqQlMa3se0tfuKTe01s2uj34GAYR4DWqQ kZxUikhmbSEfXGtZj82haX9gsm5UXM0kQ8sjOy7ki4A9oA/H9GSP8bvD8Vs/OoMJZyiq Ojdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1JK5nV2i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id by7si15325216edb.303.2020.07.07.08.29.26; Tue, 07 Jul 2020 08:29:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1JK5nV2i; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728924AbgGGP1m (ORCPT + 99 others); Tue, 7 Jul 2020 11:27:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:41368 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730331AbgGGP1A (ORCPT ); Tue, 7 Jul 2020 11:27:00 -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 8BD7D2078D; Tue, 7 Jul 2020 15:26:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594135620; bh=qBg1OYO70NoWHYQ+EuSTu2RZv+PrX4Fl+JXFgjuN96Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1JK5nV2ilnyX8UKXkF0zFEFzxdBNJwe2IlCWewOewCpPgx0+lRSIDggv2yLo+mTpb JT5lT0fvR5U00Bhhb1yKHgn2Ti52k9smxtC/42RSOcv4SrghF5A/y502D59ArhdP9Z yFMu0EoEUn6Hf2MKzQsedfM3ngSOCWoH4aiYU+zY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Jones , Ard Biesheuvel Subject: [PATCH 5.7 112/112] efi: Make it possible to disable efivar_ssdt entirely Date: Tue, 7 Jul 2020 17:17:57 +0200 Message-Id: <20200707145806.296852863@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145800.925304888@linuxfoundation.org> References: <20200707145800.925304888@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Jones commit 435d1a471598752446a72ad1201b3c980526d869 upstream. In most cases, such as CONFIG_ACPI_CUSTOM_DSDT and CONFIG_ACPI_TABLE_UPGRADE, boot-time modifications to firmware tables are tied to specific Kconfig options. Currently this is not the case for modifying the ACPI SSDT via the efivar_ssdt kernel command line option and associated EFI variable. This patch adds CONFIG_EFI_CUSTOM_SSDT_OVERLAYS, which defaults disabled, in order to allow enabling or disabling that feature during the build. Cc: Signed-off-by: Peter Jones Link: https://lore.kernel.org/r/20200615202408.2242614-1-pjones@redhat.com Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/Kconfig | 11 +++++++++++ drivers/firmware/efi/efi.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) --- a/drivers/firmware/efi/Kconfig +++ b/drivers/firmware/efi/Kconfig @@ -267,3 +267,14 @@ config EFI_EARLYCON depends on SERIAL_EARLYCON && !ARM && !IA64 select FONT_SUPPORT select ARCH_USE_MEMREMAP_PROT + +config EFI_CUSTOM_SSDT_OVERLAYS + bool "Load custom ACPI SSDT overlay from an EFI variable" + depends on EFI_VARS && ACPI + default ACPI_TABLE_UPGRADE + help + Allow loading of an ACPI SSDT overlay from an EFI variable specified + by a kernel command line option. + + See Documentation/admin-guide/acpi/ssdt-overlays.rst for more + information. --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -189,7 +189,7 @@ static void generic_ops_unregister(void) efivars_unregister(&generic_efivars); } -#if IS_ENABLED(CONFIG_ACPI) +#ifdef CONFIG_EFI_CUSTOM_SSDT_OVERLAYS #define EFIVAR_SSDT_NAME_MAX 16 static char efivar_ssdt[EFIVAR_SSDT_NAME_MAX] __initdata; static int __init efivar_ssdt_setup(char *str)