Commit 2e5602aa authored by Ma Wupeng's avatar Ma Wupeng Committed by Zheng Zengkai
Browse files

efi: Make efi_print_memmap() public 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4PM01


CVE: NA

--------------------------------

Make efi_print_memmap() public in preparation for adding fake memory
support for architecture with efi support, eg, arm64.

Co-developed-by: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent b9853df0

arch/x86/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ struct efi_scratch { 


extern struct efi_scratch efi_scratch;

extern int __init efi_memblock_x86_reserve_range(void);

extern void __init efi_print_memmap(void);

extern void __init efi_map_region(efi_memory_desc_t *md);

extern void __init efi_map_region_fixed(efi_memory_desc_t *md);

extern void efi_sync_low_kernel_mappings(void);

arch/x86/platform/efi/efi.c

+0 −16
Original line number Diff line number Diff line
@@ -323,22 +323,6 @@ static void __init efi_clean_memmap(void) 
	}

}



void __init efi_print_memmap(void)

{

	efi_memory_desc_t *md;

	int i = 0;



	for_each_efi_memory_desc(md) {

		char buf[64];



		pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",

			i++, efi_md_typeattr_format(buf, sizeof(buf), md),

			md->phys_addr,

			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,

			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));

	}

}



static int __init efi_systab_init(unsigned long phys)

{

	int size = efi_enabled(EFI_64BIT) ? sizeof(efi_system_table_64_t)

drivers/firmware/efi/memmap.c

+16 −0
Original line number Diff line number Diff line
@@ -376,3 +376,19 @@ void __init efi_memmap_insert(struct efi_memory_map *old_memmap, void *buf, 
		}

	}

}



void __init efi_print_memmap(void)

{

	efi_memory_desc_t *md;

	int i = 0;



	for_each_efi_memory_desc(md) {

		char buf[64];



		pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",

			i++, efi_md_typeattr_format(buf, sizeof(buf), md),

			md->phys_addr,

			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,

			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));

	}

}

include/linux/efi.h

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ extern int __init efi_memmap_split_count(efi_memory_desc_t *md, 
					 struct range *range);

extern void __init efi_memmap_insert(struct efi_memory_map *old_memmap,

				     void *buf, struct efi_mem_range *mem);

extern void __init efi_print_memmap(void);



#ifdef CONFIG_EFI_ESRT

extern void __init efi_esrt_init(void);