Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fac031db authored by Leif Lindholm's avatar Leif Lindholm Committed by Joonwoo Park
Browse files

efi: x86: make efi_lookup_mapped_addr() a common function 



efi_lookup_mapped_addr() is a handy utility for other platforms than
x86. Move it from arch/x86 to drivers/firmware. Add memmap pointer
to global efi structure, and initialise it on x86.

Signed-off-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Git-commit: 258f6fd738221766b512cd8c7120563b78d62829
Signed-off-by: default avatarJoonwoo Park <joonwoop@codeaurora.org>
parent e9dde8f9

arch/x86/platform/efi/efi.c

+2 −28
Original line number Original line Diff line number Diff line
@@ -391,6 +391,8 @@ int __init efi_memblock_x86_reserve_range(void) 




	memblock_reserve(pmap, memmap.nr_map * memmap.desc_size);

	memblock_reserve(pmap, memmap.nr_map * memmap.desc_size);





	efi.memmap = &memmap;



	return 0;

	return 0;

}

}
@@ -727,34 +729,6 @@ static void __init runtime_code_page_mkexec(void) 
	}

	}

}

}





/*

 * We can't ioremap data in EFI boot services RAM, because we've already mapped

 * it as RAM.  So, look it up in the existing EFI memory map instead.  Only

 * callable after efi_enter_virtual_mode and before efi_free_boot_services.

 */

void __iomem *efi_lookup_mapped_addr(u64 phys_addr)

{

	void *p;

	if (WARN_ON(!memmap.map))

		return NULL;

	for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {

		efi_memory_desc_t *md = p;

		u64 size = md->num_pages << EFI_PAGE_SHIFT;

		u64 end = md->phys_addr + size;

		if (!(md->attribute & EFI_MEMORY_RUNTIME) &&

		    md->type != EFI_BOOT_SERVICES_CODE &&

		    md->type != EFI_BOOT_SERVICES_DATA)

			continue;

		if (!md->virt_addr)

			continue;

		if (phys_addr >= md->phys_addr && phys_addr < end) {

			phys_addr += md->virt_addr - md->phys_addr;

			return (__force void __iomem *)(unsigned long)phys_addr;

		}

	}

	return NULL;

}



void efi_memory_uc(u64 addr, unsigned long size)

void efi_memory_uc(u64 addr, unsigned long size)

{

{

	unsigned long page_shift = 1UL << EFI_PAGE_SHIFT;

	unsigned long page_shift = 1UL << EFI_PAGE_SHIFT;

drivers/firmware/efi/efi.c

+32 −0
Original line number Original line Diff line number Diff line
@@ -150,6 +150,38 @@ err_put: 
subsys_initcall(efisubsys_init);

subsys_initcall(efisubsys_init);









/*

 * We can't ioremap data in EFI boot services RAM, because we've already mapped

 * it as RAM.  So, look it up in the existing EFI memory map instead.  Only

 * callable after efi_enter_virtual_mode and before efi_free_boot_services.

 */

void __iomem *efi_lookup_mapped_addr(u64 phys_addr)

{

	struct efi_memory_map *map;

	void *p;

	map = efi.memmap;

	if (!map)

		return NULL;

	if (WARN_ON(!map->map))

		return NULL;

	for (p = map->map; p < map->map_end; p += map->desc_size) {

		efi_memory_desc_t *md = p;

		u64 size = md->num_pages << EFI_PAGE_SHIFT;

		u64 end = md->phys_addr + size;

		if (!(md->attribute & EFI_MEMORY_RUNTIME) &&

		    md->type != EFI_BOOT_SERVICES_CODE &&

		    md->type != EFI_BOOT_SERVICES_DATA)

			continue;

		if (!md->virt_addr)

			continue;

		if (phys_addr >= md->phys_addr && phys_addr < end) {

			phys_addr += md->virt_addr - md->phys_addr;

			return (__force void __iomem *)(unsigned long)phys_addr;

		}

	}

	return NULL;

}



static __initdata efi_config_table_type_t common_tables[] = {

static __initdata efi_config_table_type_t common_tables[] = {

	{ACPI_20_TABLE_GUID, "ACPI 2.0", &efi.acpi20},

	{ACPI_20_TABLE_GUID, "ACPI 2.0", &efi.acpi20},

	{ACPI_TABLE_GUID, "ACPI", &efi.acpi},

	{ACPI_TABLE_GUID, "ACPI", &efi.acpi},

include/linux/efi.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -558,6 +558,7 @@ extern struct efi { 
	efi_get_next_high_mono_count_t *get_next_high_mono_count;

	efi_get_next_high_mono_count_t *get_next_high_mono_count;

	efi_reset_system_t *reset_system;

	efi_reset_system_t *reset_system;

	efi_set_virtual_address_map_t *set_virtual_address_map;

	efi_set_virtual_address_map_t *set_virtual_address_map;

	struct efi_memory_map *memmap;

} efi;

} efi;





static inline int

static inline int