Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1123250ybt; Tue, 7 Jul 2020 08:17:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrVOY8WpgxRCm3Gljc/IXPSEDmO+IYTNEjqs3Ma5/ZklTZaT1zdhPy4P1XKFt6GzL37UCp X-Received: by 2002:a50:da83:: with SMTP id q3mr64113372edj.325.1594135023455; Tue, 07 Jul 2020 08:17:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594135023; cv=none; d=google.com; s=arc-20160816; b=s+li3u1o8XNphD/PRy6AWviZNWOc8e8xhVcsOIiSAjegxJJ/vCG1oLiLzMq5snMkPf 4kruTazMf4ZRP0kU/IhXHHF5EL7927NYtcJ36JzIR7NyO++A8eYfNVrYtU92u+9wjhw9 FVAmPo07qcI7Wc5rZJz7qxXaKrHRC9FMQPtSMY4ad3TMX6ZiZDJmpgcM7Y7XuUi17fA1 tT3RktbXve4rnPkBBGEZ7FxXMO5Bn6GXwSdkhdEluxBa0+KBp+/MvzCPeVy+Z7lBveyj cZ+uN/8k15WQzpjYpq4kcac6WFENDr0s5Ku15T7boYvehYU6teleltH9BIrAKffkOceh OwbA== 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=5TwTC/v6nmC63fZmkzR/Zdjnz0PdyIwkvVrErWhJ13c=; b=XLUtdZT5ZQDTDJKTPlkcfsiIVkwD+eAUv4aNDfUAVY+b1FSkxQqSHVbt1bNOaZgViN KwOJ3mNaqataCAWcXdSV2JiqvORz8Kf8fi+bVMTENyKP1dGKTwIpx/Lmge7ZwaE17LD+ cCGIj+z+tnVs9fk8CkbnrpfdoGI576T9sWCG5ZDF2cFCQJLy/JYLDa0Q6LoPEnz4TqX5 z/R1kUfJK0wP4BIuf/DoPp+5FRl2lPmTlykZ4JThXOT4nXVL8NTE49j00q8L/vLPO1oD 31oLd8nkwTTsEBz/p6jEkZhZlBFoftQ61gyMZ3c5qWbheGT9lrlruk9GXiZfgdaGp6hy PUoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Nhz3GtDw; 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 l3si14547288eja.81.2020.07.07.08.16.40; Tue, 07 Jul 2020 08:17:03 -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=Nhz3GtDw; 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 S1728740AbgGGPOp (ORCPT + 99 others); Tue, 7 Jul 2020 11:14:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:54126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728732AbgGGPOn (ORCPT ); Tue, 7 Jul 2020 11:14:43 -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 45BB5207CD; Tue, 7 Jul 2020 15:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594134882; bh=QHDXzivtkwC3kforEMyWKXWhN8/o4mt0nziV458Ra/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nhz3GtDw0Ykf0aEM1yZ/L5gid2N87YhhNPURNgO8lhE7AQa7vkbuHHSR57+6Qjh7U qRFpSN6uD6hKrdNlF2bfSUOFyu1W955iH1+qJ8gx4Au+vuIotyOu0SEMTq9ZkyMLYw x31uIfMRRDUI1qhB2f+PabOvF6nKtG1YkUvN1q7M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Jones , Ard Biesheuvel Subject: [PATCH 4.9 24/24] efi: Make it possible to disable efivar_ssdt entirely Date: Tue, 7 Jul 2020 17:13:56 +0200 Message-Id: <20200707145750.141120398@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200707145748.952502272@linuxfoundation.org> References: <20200707145748.952502272@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 @@ -129,6 +129,17 @@ config EFI_TEST Say Y here to enable the runtime services support via /dev/efi_test. If unsure, say N. +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. + endmenu config UEFI_CPER --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -198,7 +198,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)