From 60b73c7131f7e6a399d3a87c139c63b5fc1e66e5 Mon Sep 17 00:00:00 2001 From: Yang Qiang Date: Mon, 15 Aug 2022 14:38:18 +0800 Subject: [PATCH] efi: do some cleanups for efi_map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sunway inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I56OLG -------------------------------- Since GRUB has fixed the member's physical address of EFI memory descriptor, there is no need to add stale stuff here. Signed-off-by: Yang Qiang Signed-off-by: Gu Zitao --- drivers/firmware/efi/sunway-init.c | 36 +----------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/drivers/firmware/efi/sunway-init.c b/drivers/firmware/efi/sunway-init.c index 9871508df58c..b130218634fb 100644 --- a/drivers/firmware/efi/sunway-init.c +++ b/drivers/firmware/efi/sunway-init.c @@ -25,8 +25,6 @@ #include -extern bool __virt_addr_valid(unsigned long x); - static int __init is_memory(efi_memory_desc_t *md) { if (md->attribute & (EFI_MEMORY_WB|EFI_MEMORY_WT|EFI_MEMORY_WC)) @@ -128,23 +126,7 @@ static __init int is_usable_memory(efi_memory_desc_t *md) } return false; } -static __initdata char memory_type_name1[][20] = { - "Reserved", - "Loader Code", - "Loader Data", - "Boot Code", - "Boot Data", - "Runtime Code", - "Runtime Data", - "Conventional Memory", - "Unusable Memory", - "ACPI Reclaim Memory", - "ACPI Memory NVS", - "Memory Mapped I/O", - "MMIO Port Space", - "PAL Code", - "Persistent Memory", -}; + static __init void reserve_regions(void) { efi_memory_desc_t *md; @@ -157,22 +139,6 @@ static __init void reserve_regions(void) paddr = md->phys_addr; npages = md->num_pages; - if (!__virt_addr_valid(paddr)) - continue; - - if (md->type >= ARRAY_SIZE(memory_type_name1)) - continue; - - if (md->attribute & ~(EFI_MEMORY_UC | EFI_MEMORY_WC | EFI_MEMORY_WT | - EFI_MEMORY_WB | EFI_MEMORY_UCE | EFI_MEMORY_RO | - EFI_MEMORY_WP | EFI_MEMORY_RP | EFI_MEMORY_XP | - EFI_MEMORY_NV | - EFI_MEMORY_RUNTIME | EFI_MEMORY_MORE_RELIABLE)) - continue; - - if (strncmp(memory_type_name1[md->type], "Reserved", 8) == 0) - continue; - if (efi_enabled(EFI_DBG)) { char buf[64]; -- GitLab