| Message ID | 1430773335-22897-2-git-send-email-zjzhang@codeaurora.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Mon, 04 May, at 02:02:14PM, Jonathan (Zhixiong) Zhang wrote: > From: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org> > > Both x86 and ia64 implemented efi_mem_attributs function, which is architecture > agnositc. This function is moved to efi subsystem. > > efi_remap() function is added. If EFI memmap feature is enabled, and if a > memory region has attribute of EFI_MEMORY_UC, map it as uncached. > > --- > This patch was tested on an arm64 platform. It was built on x86 platform. > > Signed-off-by: Jonathan (Zhixiong) Zhang <zjzhang@codeaurora.org> > --- > arch/ia64/kernel/efi.c | 11 ----------- > arch/x86/platform/efi/efi.c | 18 ------------------ > drivers/firmware/efi/efi.c | 27 +++++++++++++++++++++++++++ > include/linux/efi.h | 1 + > 4 files changed, 28 insertions(+), 29 deletions(-) > > diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c > index c52d7540dc05..ef20ec784b04 100644 > --- a/arch/ia64/kernel/efi.c > +++ b/arch/ia64/kernel/efi.c > @@ -771,17 +771,6 @@ efi_mem_type (unsigned long phys_addr) > } > > u64 > -efi_mem_attributes (unsigned long phys_addr) > -{ > - efi_memory_desc_t *md = efi_memory_descriptor(phys_addr); > - > - if (md) > - return md->attribute; > - return 0; > -} > -EXPORT_SYMBOL(efi_mem_attributes); > - > -u64 > efi_mem_attribute (unsigned long phys_addr, unsigned long size) > { > unsigned long end = phys_addr + size; > diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c > index dbc8627a5cdf..88b3ebaeb72f 100644 > --- a/arch/x86/platform/efi/efi.c > +++ b/arch/x86/platform/efi/efi.c > @@ -917,24 +917,6 @@ u32 efi_mem_type(unsigned long phys_addr) > return 0; > } > > -u64 efi_mem_attributes(unsigned long phys_addr) > -{ > - efi_memory_desc_t *md; > - void *p; > - > - if (!efi_enabled(EFI_MEMMAP)) > - return 0; > - > - for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { > - md = p; > - if ((md->phys_addr <= phys_addr) && > - (phys_addr < (md->phys_addr + > - (md->num_pages << EFI_PAGE_SHIFT)))) > - return md->attribute; > - } > - return 0; > -} > - > static int __init arch_parse_efi_cmdline(char *str) > { > if (parse_option_str(str, "old_map")) This should be split into two patches, one to remove the duplicate efi_mem_attributes() and the other to create the new efi_ioremap() function. > +void __iomem *efi_remap(phys_addr_t phys_addr, size_t size) > +{ > + if (efi_enabled(EFI_MEMMAP) && > + (efi_mem_attributes(phys_addr) & EFI_MEMORY_UC)) > + return ioremap(phys_addr, size); > + else > + return ioremap_cache(phys_addr, size); > +} Note that on x86 we don't leave the EFI memmap mapped throughout runtime, it gets unmapped in efi_free_boot_services(). Which means that the second patch in this series isn't going to work correctly if an error is reported after the kernel has finished booting. It looks like arm64 leaves the EFI memmap mapped at runtime, right?
Thank you Matt very much for the code review! Pls. see comments inline. On 5/27/2015 5:31 AM, Matt Fleming wrote: > On Mon, 04 May, at 02:02:14PM, Jonathan (Zhixiong) Zhang wrote: >> From: "Jonathan (Zhixiong) Zhang" <zjzhang@codeaurora.org> >> >> Both x86 and ia64 implemented efi_mem_attributs function, which is architecture >> agnositc. This function is moved to efi subsystem. >> >> efi_remap() function is added. If EFI memmap feature is enabled, and if a >> memory region has attribute of EFI_MEMORY_UC, map it as uncached. >> >> --- >> This patch was tested on an arm64 platform. It was built on x86 platform. >> >> Signed-off-by: Jonathan (Zhixiong) Zhang <zjzhang@codeaurora.org> >> --- >> arch/ia64/kernel/efi.c | 11 ----------- >> arch/x86/platform/efi/efi.c | 18 ------------------ >> drivers/firmware/efi/efi.c | 27 +++++++++++++++++++++++++++ >> include/linux/efi.h | 1 + >> 4 files changed, 28 insertions(+), 29 deletions(-) >> >> <snipped> > > This should be split into two patches, one to remove the duplicate > efi_mem_attributes() and the other to create the new efi_ioremap() > function. Makes sense, will do. > >> +void __iomem *efi_remap(phys_addr_t phys_addr, size_t size) >> +{ >> + if (efi_enabled(EFI_MEMMAP) && >> + (efi_mem_attributes(phys_addr) & EFI_MEMORY_UC)) >> + return ioremap(phys_addr, size); >> + else >> + return ioremap_cache(phys_addr, size); >> +} > > Note that on x86 we don't leave the EFI memmap mapped throughout > runtime, it gets unmapped in efi_free_boot_services(). > > Which means that the second patch in this series isn't going to work > correctly if an error is reported after the kernel has finished booting. > > It looks like arm64 leaves the EFI memmap mapped at runtime, right? > Correct, only x86 unmaps EFI memmap since efi_free_boot_services() is not implemented for other architectures, as shown in include/linux/efi.h . With x86 arch, efi_unmap_memmap() is called in efi_free_boot_services() to unmap EFI memmap, this function is defined in arch/x86/platform/efi/efi.c. It clears EFI_MEMMAP bit in efi flag. Therefore in this case, efi_enabled(EFI_MEMMAP) returns false for x86 platforms with EFI memory map support, after kernel finished booting; efi_remap() function in turn maps the memory region as cached. Therefore, I believe the second patch in this series will work correctly for above situation as well. How do you think?
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index c52d7540dc05..ef20ec784b04 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -771,17 +771,6 @@ efi_mem_type (unsigned long phys_addr) } u64 -efi_mem_attributes (unsigned long phys_addr) -{ - efi_memory_desc_t *md = efi_memory_descriptor(phys_addr); - - if (md) - return md->attribute; - return 0; -} -EXPORT_SYMBOL(efi_mem_attributes); - -u64 efi_mem_attribute (unsigned long phys_addr, unsigned long size) { unsigned long end = phys_addr + size; diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index dbc8627a5cdf..88b3ebaeb72f 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -917,24 +917,6 @@ u32 efi_mem_type(unsigned long phys_addr) return 0; } -u64 efi_mem_attributes(unsigned long phys_addr) -{ - efi_memory_desc_t *md; - void *p; - - if (!efi_enabled(EFI_MEMMAP)) - return 0; - - for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { - md = p; - if ((md->phys_addr <= phys_addr) && - (phys_addr < (md->phys_addr + - (md->num_pages << EFI_PAGE_SHIFT)))) - return md->attribute; - } - return 0; -} - static int __init arch_parse_efi_cmdline(char *str) { if (parse_option_str(str, "old_map")) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 3061bb8629dc..5b42bb6d1fde 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -517,3 +517,30 @@ char * __init efi_md_typeattr_format(char *buf, size_t size, attr & EFI_MEMORY_UC ? "UC" : ""); return buf; } + +u64 efi_mem_attributes(unsigned long phys_addr) +{ + efi_memory_desc_t *md; + void *p; + + if (!efi_enabled(EFI_MEMMAP)) + return 0; + + for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { + md = p; + if ((md->phys_addr <= phys_addr) && + (phys_addr < (md->phys_addr + + (md->num_pages << EFI_PAGE_SHIFT)))) + return md->attribute; + } + return 0; +} + +void __iomem *efi_remap(phys_addr_t phys_addr, size_t size) +{ + if (efi_enabled(EFI_MEMMAP) && + (efi_mem_attributes(phys_addr) & EFI_MEMORY_UC)) + return ioremap(phys_addr, size); + else + return ioremap_cache(phys_addr, size); +} diff --git a/include/linux/efi.h b/include/linux/efi.h index cf7e431cbc73..3279b5acea11 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -891,6 +891,7 @@ extern struct efi_memory_map memmap; extern int efi_reboot_quirk_mode; extern bool efi_poweroff_required(void); +extern void __iomem *efi_remap(phys_addr_t phys_addr, size_t size); /* Iterate through an efi_memory_map */ #define for_each_efi_memory_desc(m, md) \