| Message ID | 20220614092156.1972846-2-mawupeng1@huawei.com |
|---|---|
| State | New |
| Headers | show |
| Series | introduce mirrored memory support for arm64 | expand |
On Tue, Jun 14, 2022 at 05:21:52PM +0800, Wupeng Ma wrote: > From: Ma Wupeng <mawupeng1@huawei.com> > > Commit b05b9f5f9dcf ("x86, mirror: x86 enabling - find mirrored memory > ranges") introduce the efi_find_mirror() function on x86. In order to reuse > the API we make it public. > > Arm64 can support mirrored memory too, so function efi_find_mirror() is added to > efi_init() to this support for arm64. > > Since efi_init() is shared by ARM, arm64 and riscv, this patch will bring > mirror memory support for these architectures, but this support is only tested > in arm64. > > Signed-off-by: Ma Wupeng <mawupeng1@huawei.com> > --- > arch/x86/include/asm/efi.h | 4 ---- > arch/x86/platform/efi/efi.c | 23 ----------------------- > drivers/firmware/efi/efi-init.c | 1 + > drivers/firmware/efi/efi.c | 23 +++++++++++++++++++++++ > include/linux/efi.h | 3 +++ The subject prefix says "efi: arm64: " but it looks like x86 diffstat here. You may want to get an ack from the x86 maintainers.
On Wed, 15 Jun 2022 at 12:02, Catalin Marinas <catalin.marinas@arm.com> wrote: > > On Tue, Jun 14, 2022 at 05:21:52PM +0800, Wupeng Ma wrote: > > From: Ma Wupeng <mawupeng1@huawei.com> > > > > Commit b05b9f5f9dcf ("x86, mirror: x86 enabling - find mirrored memory > > ranges") introduce the efi_find_mirror() function on x86. In order to reuse > > the API we make it public. > > > > Arm64 can support mirrored memory too, so function efi_find_mirror() is added to > > efi_init() to this support for arm64. > > > > Since efi_init() is shared by ARM, arm64 and riscv, this patch will bring > > mirror memory support for these architectures, but this support is only tested > > in arm64. > > > > Signed-off-by: Ma Wupeng <mawupeng1@huawei.com> > > --- > > arch/x86/include/asm/efi.h | 4 ---- > > arch/x86/platform/efi/efi.c | 23 ----------------------- > > drivers/firmware/efi/efi-init.c | 1 + > > drivers/firmware/efi/efi.c | 23 +++++++++++++++++++++++ > > include/linux/efi.h | 3 +++ > > The subject prefix says "efi: arm64: " but it looks like x86 diffstat > here. You may want to get an ack from the x86 maintainers. > This just moves efi code around, and this is going through the EFI tree, so that should be fine. I'll fix the subject in any case, though.
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 71943dce691e..eb90206eae80 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -383,7 +383,6 @@ static inline bool efi_is_64bit(void) extern bool efi_reboot_required(void); extern bool efi_is_table_address(unsigned long phys_addr); -extern void efi_find_mirror(void); extern void efi_reserve_boot_services(void); #else static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {} @@ -395,9 +394,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr) { return false; } -static inline void efi_find_mirror(void) -{ -} static inline void efi_reserve_boot_services(void) { } diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 1591d67e0bcd..6e598bd78eef 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -108,29 +108,6 @@ static int __init setup_add_efi_memmap(char *arg) } early_param("add_efi_memmap", setup_add_efi_memmap); -void __init efi_find_mirror(void) -{ - efi_memory_desc_t *md; - u64 mirror_size = 0, total_size = 0; - - if (!efi_enabled(EFI_MEMMAP)) - return; - - for_each_efi_memory_desc(md) { - unsigned long long start = md->phys_addr; - unsigned long long size = md->num_pages << EFI_PAGE_SHIFT; - - total_size += size; - if (md->attribute & EFI_MEMORY_MORE_RELIABLE) { - memblock_mark_mirror(start, size); - mirror_size += size; - } - } - if (mirror_size) - pr_info("Memory: %lldM/%lldM mirrored memory\n", - mirror_size>>20, total_size>>20); -} - /* * Tell the kernel about the EFI memory map. This might include * more than the max 128 entries that can fit in the passed in e820 diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c index b2c829e95bd1..8e3a0d14dac5 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -241,6 +241,7 @@ void __init efi_init(void) */ early_init_dt_check_for_usable_mem_range(); + efi_find_mirror(); efi_esrt_init(); efi_mokvar_table_init(); memblock_reserve(data.phys_map & PAGE_MASK, diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 860534bcfdac..79c232e07de7 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -446,6 +446,29 @@ static int __init efisubsys_init(void) subsys_initcall(efisubsys_init); +void __init efi_find_mirror(void) +{ + efi_memory_desc_t *md; + u64 mirror_size = 0, total_size = 0; + + if (!efi_enabled(EFI_MEMMAP)) + return; + + for_each_efi_memory_desc(md) { + unsigned long long start = md->phys_addr; + unsigned long long size = md->num_pages << EFI_PAGE_SHIFT; + + total_size += size; + if (md->attribute & EFI_MEMORY_MORE_RELIABLE) { + memblock_mark_mirror(start, size); + mirror_size += size; + } + } + if (mirror_size) + pr_info("Memory: %lldM/%lldM mirrored memory\n", + mirror_size>>20, total_size>>20); +} + /* * Find the efi memory descriptor for a given physical address. Given a * physical address, determine if it exists within an EFI Memory Map entry, diff --git a/include/linux/efi.h b/include/linux/efi.h index 7d9b0bb47eb3..53f64c14a525 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -872,6 +872,7 @@ static inline bool efi_rt_services_supported(unsigned int mask) { return (efi.runtime_supported_mask & mask) == mask; } +extern void efi_find_mirror(void); #else static inline bool efi_enabled(int feature) { @@ -889,6 +890,8 @@ static inline bool efi_rt_services_supported(unsigned int mask) { return false; } + +static inline void efi_find_mirror(void) {} #endif extern int efi_status_to_err(efi_status_t status);