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

efi: Make efi_find_mirror() public 

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


CVE: NA

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

Commit b05b9f5f ("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 in preparation for arm64 to support mirrord
memory.

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 4159882e

arch/x86/platform/efi/efi.c

+0 −23
Original line number Diff line number Diff line
@@ -105,29 +105,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

drivers/firmware/efi/efi.c

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

include/linux/efi.h

+3 −0
Original line number Diff line number Diff line
@@ -812,6 +812,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)

{
@@ -835,6 +836,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);