From patchwork Tue Apr 4 16:02:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 96742 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp263293qgd; Tue, 4 Apr 2017 09:03:36 -0700 (PDT) X-Received: by 10.84.232.67 with SMTP id f3mr30038854pln.42.1491321816839; Tue, 04 Apr 2017 09:03:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si7404096pge.59.2017.04.04.09.03.36; Tue, 04 Apr 2017 09:03:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932159AbdDDQDb (ORCPT + 25 others); Tue, 4 Apr 2017 12:03:31 -0400 Received: from mail-wr0-f177.google.com ([209.85.128.177]:36065 "EHLO mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932122AbdDDQD3 (ORCPT ); Tue, 4 Apr 2017 12:03:29 -0400 Received: by mail-wr0-f177.google.com with SMTP id w11so216821249wrc.3 for ; Tue, 04 Apr 2017 09:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZEt6FzLlWs2T3BrbRahC/eZKd7vTwWpa0y4f2PD9y+4=; b=V0mmzeZCxIqnSu2gezC42gLm9vrGc5kIzrmj+me8cECIVUjqRKKq/zOf9C0w05si4w zXqSVoYdubMP9Y+Dv7JByG8Kjz+svrYaiJMuFlOrGzdk21/+1uW1ZANbEFYwnsLNa1/U Y4IKWM/XXfwHcC7KSBmLT3yAJuKLZab59/sTw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZEt6FzLlWs2T3BrbRahC/eZKd7vTwWpa0y4f2PD9y+4=; b=CiuqM92gsGxpur91cqi8CIy3grAM8YIbyUAUtODRof3+6RXsegQcU6eXMTKYF2iwXl 6+adAKwhamgnZNxOHaHmhMs+B41c7q+AvfopspoH/uUl3yZJ0J1EKt166lQLXRhN26do AoZb8FhvPrfhZdxO/6XoDVTNpR1bNzjadafxvfbA0Uq5AH6dKC09moC/Jhx+4lT+Wj6c n4lUTd1un7att+wwHTX06yPk9cP6iCIiYwo0lZDkaHPvZ1vp5ajqGdKK62TE+N/NPkDh uVAA8fYC10vGKkGha37ngzcjp4kPKHtY8dsktey0dIgJo9xldqPhw/3zGPwQVQuuEppq USXw== X-Gm-Message-State: AFeK/H0RT5o0q3f8HKyG+A8z9RBpCUfzctD267vaCrktel2NmUsxzp40rtyrdqUlfOjau3VR X-Received: by 10.223.154.2 with SMTP id z2mr21685454wrb.136.1491321802531; Tue, 04 Apr 2017 09:03:22 -0700 (PDT) Received: from localhost.localdomain ([160.163.145.113]) by smtp.gmail.com with ESMTPSA id z88sm19686465wrb.1.2017.04.04.09.03.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Apr 2017 09:03:21 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Bhupesh Sharma , Ard Biesheuvel , linux-kernel@vger.kernel.org Subject: [PATCH 05/12] efi: bgrt: Enable ACPI BGRT handling on arm64 Date: Tue, 4 Apr 2017 17:02:41 +0100 Message-Id: <20170404160245.27812-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org> References: <20170404160245.27812-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bhupesh Sharma Now that the ACPI BGRT handling code has been made generic, we can enable it for arm64. Cc: Matt Fleming Signed-off-by: Bhupesh Sharma [ardb: - update commit log to reflect that BGRT is only enabled for arm64 - add missing 'return' statement to dummy acpi_parse_bgrt()] Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/acpi.c | 3 +++ arch/x86/kernel/acpi/boot.c | 6 ------ drivers/acpi/Kconfig | 2 +- drivers/acpi/bgrt.c | 6 ++++++ include/linux/efi-bgrt.h | 5 +++++ 5 files changed, 15 insertions(+), 7 deletions(-) -- 2.9.3 diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 64d9cbd61678..e25c11e727fe 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -233,6 +234,8 @@ void __init acpi_boot_table_init(void) early_init_dt_scan_chosen_stdout(); } else { parse_spcr(earlycon_init_is_deferred); + if (IS_ENABLED(CONFIG_ACPI_BGRT)) + acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt); } } diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index ae32838cac5f..a9d4fbcd1fd6 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1559,12 +1559,6 @@ int __init early_acpi_boot_init(void) return 0; } -static int __init acpi_parse_bgrt(struct acpi_table_header *table) -{ - efi_bgrt_init(table); - return 0; -} - int __init acpi_boot_init(void) { /* those are executed after early-quirks are executed */ diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 83e5f7e1a20d..dad02c0f21b9 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -440,7 +440,7 @@ config ACPI_CUSTOM_METHOD config ACPI_BGRT bool "Boottime Graphics Resource Table support" - depends on EFI && X86 + depends on EFI && (X86 || ARM64) help This driver adds support for exposing the ACPI Boottime Graphics Resource Table, which allows the operating system to obtain diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c index ca28aa572aa9..df1c629205e7 100644 --- a/drivers/acpi/bgrt.c +++ b/drivers/acpi/bgrt.c @@ -81,6 +81,12 @@ static struct attribute_group bgrt_attribute_group = { .bin_attrs = bgrt_bin_attributes, }; +int __init acpi_parse_bgrt(struct acpi_table_header *table) +{ + efi_bgrt_init(table); + return 0; +} + static int __init bgrt_init(void) { int ret; diff --git a/include/linux/efi-bgrt.h b/include/linux/efi-bgrt.h index 2fd3993c370b..e6f624b53c3d 100644 --- a/include/linux/efi-bgrt.h +++ b/include/linux/efi-bgrt.h @@ -6,6 +6,7 @@ #ifdef CONFIG_ACPI_BGRT void efi_bgrt_init(struct acpi_table_header *table); +int __init acpi_parse_bgrt(struct acpi_table_header *table); /* The BGRT data itself; only valid if bgrt_image != NULL. */ extern size_t bgrt_image_size; @@ -14,6 +15,10 @@ extern struct acpi_table_bgrt bgrt_tab; #else /* !CONFIG_ACPI_BGRT */ static inline void efi_bgrt_init(struct acpi_table_header *table) {} +static inline int __init acpi_parse_bgrt(struct acpi_table_header *table) +{ + return 0; +} #endif /* !CONFIG_ACPI_BGRT */