Hi Jan,
On 24 August 2017 at 10:11, Jan Beulich <JBeulich@xxxxxxxx> wrote:
> This follows efi_mem_attributes(), as it's similarly generic.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> ---
> arch/x86/platform/efi/efi.c | 19 -------------------
> drivers/firmware/efi/efi.c | 29 +++++++++++++++++++++++++++++
> 2 files changed, 29 insertions(+), 19 deletions(-)
>
> --- 4.13-rc6-EFI.orig/arch/x86/platform/efi/efi.c
> +++ 4.13-rc6-EFI/arch/x86/platform/efi/efi.c
> @@ -1032,25 +1032,6 @@ void __init efi_enter_virtual_mode(void)
> efi_dump_pagetable();
> }
>
> -/*
> - * Convenience functions to obtain memory types and attributes
> - */
> -u32 efi_mem_type(unsigned long phys_addr)
> -{
> - efi_memory_desc_t *md;
> -
> - if (!efi_enabled(EFI_MEMMAP))
> - return 0;
> -
> - for_each_efi_memory_desc(md) {
> - if ((md->phys_addr <= phys_addr) &&
> - (phys_addr < (md->phys_addr +
> - (md->num_pages << EFI_PAGE_SHIFT))))
> - return md->type;
> - }
> - return 0;
> -}
> -
> static int __init arch_parse_efi_cmdline(char *str)
> {
> if (!str) {
> --- 4.13-rc6-EFI.orig/drivers/firmware/efi/efi.c
> +++ 4.13-rc6-EFI/drivers/firmware/efi/efi.c
> @@ -819,6 +819,35 @@ u64 __weak efi_mem_attributes(unsigned l
> return 0;
> }
>
> +/*
> + * efi_mem_type - lookup memmap type for physical address
> + * @phys_addr: the physical address to lookup
> + *
> + * Search in the EFI memory map for the region covering @phys_addr.
> + * Returns the EFI memory type if the region was found in the memory
> + * map, EFI_RESERVED_TYPE (zero) otherwise.
> + *
> + * Despite being marked __weak, most architectures should *not*
> + * override this function. It is __weak solely for the benefit
> + * of ia64 which has a funky EFI memory map that doesn't work
> + * the same way as other architectures.
> + */
> +u32 __weak efi_mem_type(unsigned long phys_addr)
Why is this __weak now?
> +{
> + const efi_memory_desc_t *md;
> +
> + if (!efi_enabled(EFI_MEMMAP))
> + return 0;
> +
> + for_each_efi_memory_desc(md) {
> + if ((md->phys_addr <= phys_addr) &&
> + (phys_addr < (md->phys_addr +
> + (md->num_pages << EFI_PAGE_SHIFT))))
> + return md->type;
> + }
> + return EFI_RESERVED_TYPE;
> +}
> +
> int efi_status_to_err(efi_status_t status)
> {
> int err;
>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-efi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
