On Mon, Dec 09, 2013 at 05:42:23PM +0800, Dave Young wrote:
> For kexec/kdump kernel efi runtime mappings are saved, printing original whole
> memmap ranges does not make sense anymore. So introduce a new function to only
> print runtime maps in case kexec/kdump kernel is used.
>
> changelog:
> Matt: use efi_setup instead of esdata
> share function print_efi_memmap for both normal and kexec boot.
>
> Signed-off-by: Dave Young <dyoung at redhat.com>
> ---
> arch/x86/platform/efi/efi.c | 24 +++++++++++++++++-------
> 1 file changed, 17 insertions(+), 7 deletions(-)
>
> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
> index 69a6ec2..94a1cbc 100644
> --- a/arch/x86/platform/efi/efi.c
> +++ b/arch/x86/platform/efi/efi.c
> @@ -423,19 +423,16 @@ int __init efi_memblock_x86_reserve_range(void)
> return 0;
> }
>
> -static void __init print_efi_memmap(void)
> +static void __init print_efi_memmap(void *map, int nr_map, int md_size)
> {
> #ifdef EFI_DEBUG
> efi_memory_desc_t *md;
> void *p;
> int i;
>
> - for (p = memmap.map, i = 0;
> - p < memmap.map_end;
> - p += memmap.desc_size, i++) {
> + for (p = map, i = 0; i < nr_map; p += md_size, i++) {
> md = p;
> - pr_info("mem%02u: type=%u, attr=0x%llx, "
> - "range=[0x%016llx-0x%016llx) (%lluMB)\n",
> + pr_info("mem%02u: type=%u, attr=0x%llx, range=[0x%016llx-0x%016llx) (%lluMB)\n",
> i, md->type, md->attribute, md->phys_addr,
> md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
> (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
> @@ -797,7 +794,20 @@ void __init efi_init(void)
> x86_platform.set_wallclock = efi_set_rtc_mmss;
> }
> #endif
> - print_efi_memmap();
> + if (efi_setup) {
> + int s;
> + struct efi_setup_data *data;
> +
> + s = sizeof(*data) + nr_efi_runtime_map * sizeof(data->map[0]);
> + data = early_memremap(efi_setup, s);
> + if (!data)
> + return;
> + print_efi_memmap(data->map, nr_efi_runtime_map,
> + sizeof(data->map[0]));
> + early_memunmap(data, s);
Well, if you call print_efi_memmap() in parse_efi_setup() you can save
yourself that map/unmaping no?
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
