Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e7300cf authored by Bhupesh Sharma's avatar Bhupesh Sharma Committed by Ingo Molnar
Browse files

efi/bgrt: Enable ACPI BGRT handling on arm64 



Now that the ACPI BGRT handling code has been made generic, we can
enable it for arm64.

Signed-off-by: default avatarBhupesh Sharma <bhsharma@redhat.com>
[ Updated commit log to reflect that BGRT is only enabled for arm64, and added
  missing 'return' statement to the dummy acpi_parse_bgrt() function. ]
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20170404160245.27812-8-ard.biesheuvel@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 75def552

arch/arm64/kernel/acpi.c

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/acpi.h>

#include <linux/bootmem.h>

#include <linux/cpumask.h>

#include <linux/efi-bgrt.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/irqdomain.h>
@@ -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);

	}

}

arch/x86/kernel/acpi/boot.c

+0 −6
Original line number Diff line number Diff line
@@ -1564,12 +1564,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 */

drivers/acpi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/bgrt.c

+6 −0
Original line number Diff line number Diff line
@@ -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;

include/linux/efi-bgrt.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */