public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Young <dyoung@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-efi@vger.kernel.org, x86@kernel.org, mjg59@srcf.ucam.org,
	hpa@zytor.com, James.Bottomley@HansenPartnership.com,
	vgoyal@redhat.com, ebiederm@xmission.com, horms@verge.net.au,
	kexec@lists.infradead.org, bp@alien8.de, greg@kroah.com,
	matt@console-pimps.org, toshi.kani@hp.com
Subject: [PATCH v4 08/12] efi: only print saved efi runtime maps instead of all memmap ranges for kexec
Date: Tue, 26 Nov 2013 13:57:53 +0800	[thread overview]
Message-ID: <1385445477-9665-9-git-send-email-dyoung@redhat.com> (raw)
In-Reply-To: <1385445477-9665-1-git-send-email-dyoung@redhat.com>

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.

Signed-off-by: Dave Young <dyoung@redhat.com>
---
 arch/x86/platform/efi/efi.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index fafeb40..c65b0b8 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -430,6 +430,24 @@ int __init efi_memblock_x86_reserve_range(void)
 	return 0;
 }
 
+/* for kexec kernel runtime maps are passed in setup_data */
+static void __init print_saved_runtime_map(void)
+{
+#ifdef EFI_DEBUG
+	int i;
+	efi_memory_desc_t *md;
+
+	for (i = 0; i < nr_efi_runtime_map; i++) {
+		md = esdata->map + i;
+		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)));
+	}
+#endif  /*  EFI_DEBUG  */
+}
+
 static void __init print_efi_memmap(void)
 {
 #ifdef EFI_DEBUG
@@ -782,7 +800,10 @@ void __init efi_init(void)
 		x86_platform.set_wallclock = efi_set_rtc_mmss;
 	}
 #endif
-	print_efi_memmap();
+	if (esdata)
+		print_saved_runtime_map();
+	else
+		print_efi_memmap();
 }
 
 void __init efi_late_init(void)
-- 
1.8.3.1


  parent reply	other threads:[~2013-11-26  6:00 UTC|newest]

Thread overview: 73+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-26  5:57 [PATCH v4 00/12] kexec kernel efi runtime support Dave Young
2013-11-26  5:57 ` [PATCH v4 01/12] efi: remove unused variables in __map_region Dave Young
2013-11-26  5:57 ` [PATCH v4 02/12] efi: add a wrapper function efi_map_region_fixed Dave Young
2013-11-26  5:57 ` [PATCH v4 03/12] efi: reserve boot service fix Dave Young
2013-11-26  5:57 ` [PATCH v4 04/12] efi: cleanup efi_enter_virtual_mode function Dave Young
2013-11-26 14:51   ` Matt Fleming
2013-11-26  5:57 ` [PATCH v4 05/12] efi: export more efi table variable to sysfs Dave Young
2013-11-26  8:50   ` Borislav Petkov
2013-11-26  9:13     ` Dave Young
2013-11-26 15:57   ` Matt Fleming
2013-11-27  2:53     ` Dave Young
2013-11-26  5:57 ` [PATCH v4 06/12] efi: export efi runtime memory mapping " Dave Young
2013-11-26 19:30   ` Matt Fleming
2013-11-27  3:07     ` Dave Young
2013-11-27  8:17       ` Dave Young
2013-11-27 11:44   ` Borislav Petkov
2013-11-29  9:40     ` Dave Young
2013-11-29 11:50       ` Borislav Petkov
2013-11-29 11:59         ` Matt Fleming
2013-12-02  2:51           ` Dave Young
2013-12-02  2:59         ` Dave Young
2013-12-02  9:40           ` Borislav Petkov
2013-12-07  9:01             ` Dave Young
2013-12-07 13:30               ` Borislav Petkov
2013-12-07 21:46                 ` H. Peter Anvin
2013-12-09  2:23                 ` Dave Young
2013-11-26  5:57 ` [PATCH v4 07/12] efi: passing kexec necessary efi data via setup_data Dave Young
2013-11-26 22:04   ` Matt Fleming
2013-11-27  4:52     ` Dave Young
2013-11-27 10:17       ` Matt Fleming
2013-11-29  9:46         ` Dave Young
2013-11-27 14:07   ` Borislav Petkov
2013-11-29  9:14     ` Dave Young
2013-11-29 16:46       ` Borislav Petkov
2013-12-02  2:49         ` Dave Young
2013-12-02  9:44           ` Borislav Petkov
2013-12-02 22:33       ` Toshi Kani
2013-12-03  1:31         ` Toshi Kani
2013-12-03  1:56           ` Dave Young
2013-12-03 15:39             ` Toshi Kani
2013-12-04  2:46               ` Dave Young
2013-12-04 16:43                 ` Toshi Kani
2013-12-05  1:56                   ` Dave Young
2013-12-05 11:51                     ` Borislav Petkov
2013-12-05 15:56                       ` Toshi Kani
2013-12-05 20:52                         ` Borislav Petkov
2013-12-06  1:31                           ` Dave Young
2013-11-26  5:57 ` Dave Young [this message]
2013-11-27 10:27   ` [PATCH v4 08/12] efi: only print saved efi runtime maps instead of all memmap ranges for kexec Matt Fleming
2013-11-27 14:27     ` Borislav Petkov
2013-11-29  8:50       ` Dave Young
2013-11-29 16:47         ` Borislav Petkov
2013-12-02  2:38           ` Dave Young
2013-11-29  8:47     ` Dave Young
2013-11-26  5:57 ` [PATCH v4 09/12] x86: add xloadflags bit for efi runtime support on kexec Dave Young
2013-11-27 14:27   ` Borislav Petkov
2013-11-29  8:44     ` Dave Young
2013-11-26  5:57 ` [PATCH v4 10/12] x86: export x86 boot_params to sysfs Dave Young
2013-11-27 11:20   ` Matt Fleming
2013-11-29  9:44     ` Dave Young
2013-11-27 14:56   ` Borislav Petkov
2013-11-29  8:42     ` Dave Young
2013-11-26  5:57 ` [PATCH v4 11/12] x86: reserve setup_data ranges late after parsing memmap cmdline Dave Young
2013-11-27 15:07   ` Borislav Petkov
2013-11-29  8:35     ` Dave Young
2013-11-29 16:56       ` Borislav Petkov
2013-11-26  5:57 ` [PATCH v4 12/12] x86: kdebugfs do not use __va for getting setup_data virt addr Dave Young
2013-11-26  6:04 ` [PATCH v4 00/12] kexec kernel efi runtime support Dave Young
2013-11-27 12:50 ` Matt Fleming
2013-11-28  2:08   ` Dave Young
2013-11-29  8:28     ` Dave Young
2013-11-29 17:02       ` Borislav Petkov
2013-12-02  2:32         ` Dave Young

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1385445477-9665-9-git-send-email-dyoung@redhat.com \
    --to=dyoung@redhat.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bp@alien8.de \
    --cc=ebiederm@xmission.com \
    --cc=greg@kroah.com \
    --cc=horms@verge.net.au \
    --cc=hpa@zytor.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt@console-pimps.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=toshi.kani@hp.com \
    --cc=vgoyal@redhat.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox