efi: Move UGA and PROP table handling to x86 code

The UGA table is x86 specific (its handling was introduced when the
EFI support code was modified to accommodate IA32), so there is no
need to handle it in generic code.

The EFI properties table is not strictly x86 specific, but it was
deprecated almost immediately after having been introduced, due to
implementation difficulties. Only x86 takes it into account today,
and this is not going to change, so make this table x86 only as well.

Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 61ebaae6289433ca60bb2cbafe328dc40d7678e8..421f082535c5f1574e8ce85e4d1732f90755a076 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -57,7 +57,12 @@
 static efi_system_table_t efi_systab __initdata;
 static u64 efi_systab_phys __initdata;
 
+static unsigned long prop_phys = EFI_INVALID_TABLE_ADDR;
+static unsigned long uga_phys = EFI_INVALID_TABLE_ADDR;
+
 static efi_config_table_type_t arch_tables[] __initdata = {
+       {EFI_PROPERTIES_TABLE_GUID, "PROP", &prop_phys},
+       {UGA_IO_PROTOCOL_GUID, "UGA", &uga_phys},
 #ifdef CONFIG_X86_UV
        {UV_SYSTEM_TABLE_GUID, "UVsystab", &uv_systab_phys},
 #endif
@@ -69,7 +74,7 @@ static const unsigned long * const efi_tables[] = {
        &efi.acpi20,
        &efi.smbios,
        &efi.smbios3,
-       &efi.uga,
+       &uga_phys,
 #ifdef CONFIG_X86_UV
        &uv_systab_phys,
 #endif
@@ -77,7 +82,7 @@ static const unsigned long * const efi_tables[] = {
        &efi.runtime,
        &efi.config_table,
        &efi.esrt,
-       &efi.properties_table,
+       &prop_phys,
        &efi.mem_attr_table,
 #ifdef CONFIG_EFI_RCI2_TABLE
        &rci2_table_phys,
@@ -490,6 +495,22 @@ void __init efi_init(void)
                return;
        }
 
+       /* Parse the EFI Properties table if it exists */
+       if (prop_phys != EFI_INVALID_TABLE_ADDR) {
+               efi_properties_table_t *tbl;
+
+               tbl = early_memremap_ro(prop_phys, sizeof(*tbl));
+               if (tbl == NULL) {
+                       pr_err("Could not map Properties table!\n");
+               } else {
+                       if (tbl->memory_protection_attribute &
+                           EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA)
+                               set_bit(EFI_NX_PE_DATA, &efi.flags);
+
+                       early_memunmap(tbl, sizeof(*tbl));
+               }
+       }
+
        set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
        efi_clean_memmap();
 
@@ -993,3 +1014,10 @@ bool efi_is_table_address(unsigned long phys_addr)
 
        return false;
 }
+
+char *efi_systab_show_arch(char *str)
+{
+       if (uga_phys != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "UGA=0x%lx\n", uga_phys);
+       return str;
+}

diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 8129a52f8ef517f7e068e0fe41bcc5814b0f0d3e..68527fbbe01c083ea960624f4b99f2aa90b15746 100644 (file)
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -39,12 +39,10 @@ struct efi __read_mostly efi = {
        .acpi20                 = EFI_INVALID_TABLE_ADDR,
        .smbios                 = EFI_INVALID_TABLE_ADDR,
        .smbios3                = EFI_INVALID_TABLE_ADDR,
-       .uga                    = EFI_INVALID_TABLE_ADDR,
        .fw_vendor              = EFI_INVALID_TABLE_ADDR,
        .runtime                = EFI_INVALID_TABLE_ADDR,
        .config_table           = EFI_INVALID_TABLE_ADDR,
        .esrt                   = EFI_INVALID_TABLE_ADDR,
-       .properties_table       = EFI_INVALID_TABLE_ADDR,
        .mem_attr_table         = EFI_INVALID_TABLE_ADDR,
        .rng_seed               = EFI_INVALID_TABLE_ADDR,
        .tpm_log                = EFI_INVALID_TABLE_ADDR,
@@ -132,10 +130,8 @@ static ssize_t systab_show(struct kobject *kobj,
                str += sprintf(str, "SMBIOS3=0x%lx\n", efi.smbios3);
        if (efi.smbios != EFI_INVALID_TABLE_ADDR)
                str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
-       if (efi.uga != EFI_INVALID_TABLE_ADDR)
-               str += sprintf(str, "UGA=0x%lx\n", efi.uga);
 
-       if (IS_ENABLED(CONFIG_IA64)) {
+       if (IS_ENABLED(CONFIG_IA64) || IS_ENABLED(CONFIG_X86)) {
                extern char *efi_systab_show_arch(char *str);
 
                str = efi_systab_show_arch(str);
@@ -469,9 +465,7 @@ static __initdata efi_config_table_type_t common_tables[] = {
        {ACPI_TABLE_GUID, "ACPI", &efi.acpi},
        {SMBIOS_TABLE_GUID, "SMBIOS", &efi.smbios},
        {SMBIOS3_TABLE_GUID, "SMBIOS 3.0", &efi.smbios3},
-       {UGA_IO_PROTOCOL_GUID, "UGA", &efi.uga},
        {EFI_SYSTEM_RESOURCE_TABLE_GUID, "ESRT", &efi.esrt},
-       {EFI_PROPERTIES_TABLE_GUID, "PROP", &efi.properties_table},
        {EFI_MEMORY_ATTRIBUTES_TABLE_GUID, "MEMATTR", &efi.mem_attr_table},
        {LINUX_EFI_RANDOM_SEED_TABLE_GUID, "RNG", &efi.rng_seed},
        {LINUX_EFI_TPM_EVENT_LOG_GUID, "TPMEventLog", &efi.tpm_log},
@@ -570,23 +564,6 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
 
        efi_tpm_eventlog_init();
 
-       /* Parse the EFI Properties table if it exists */
-       if (efi.properties_table != EFI_INVALID_TABLE_ADDR) {
-               efi_properties_table_t *tbl;
-
-               tbl = early_memremap(efi.properties_table, sizeof(*tbl));
-               if (tbl == NULL) {
-                       pr_err("Could not map Properties table!\n");
-                       return -ENOMEM;
-               }
-
-               if (tbl->memory_protection_attribute &
-                   EFI_PROPERTIES_RUNTIME_MEMORY_PROTECTION_NON_EXECUTABLE_PE_DATA)
-                       set_bit(EFI_NX_PE_DATA, &efi.flags);
-
-               early_memunmap(tbl, sizeof(*tbl));
-       }
-
        if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {
                unsigned long prsv = efi.mem_reserve;
 

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 45443932104f872742c4577ca78b8299570005ba..e091f2aff61df4d87dec3062d07d659733372d77 100644 (file)
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -535,12 +535,10 @@ extern struct efi {
        unsigned long acpi20;           /* ACPI table  (ACPI 2.0) */
        unsigned long smbios;           /* SMBIOS table (32 bit entry point) */
        unsigned long smbios3;          /* SMBIOS table (64 bit entry point) */
-       unsigned long uga;              /* UGA table */
        unsigned long fw_vendor;        /* fw_vendor */
        unsigned long runtime;          /* runtime table */
        unsigned long config_table;     /* config tables */
        unsigned long esrt;             /* ESRT table */
-       unsigned long properties_table; /* properties table */
        unsigned long mem_attr_table;   /* memory attributes table */
        unsigned long rng_seed;         /* UEFI firmware random seed */
        unsigned long tpm_log;          /* TPM2 Event Log table */