From: Dave Young <dyoung@redhat.com>
To: Matt Fleming <matt@codeblueprint.co.uk>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
dyoung@redhat.com, x86@kernel.org,
Nicolai Stange <nicstange@gmail.com>,
Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
hpa@zytor.com, Dan Williams <dan.j.williams@intel.com>,
mika.penttila@nextfour.com, bhsharma@redhat.com
Subject: [PATCH V2 2/4] efi/x86: move efi_print_memmap to drivers/firmware/efi/memmap.c
Date: Mon, 16 Jan 2017 10:45:56 +0800 [thread overview]
Message-ID: <20170116025026.486040805@redhat.com> (raw)
In-Reply-To: 20170116024554.461236678@redhat.com
[-- Attachment #1: efi-add-print-memmap.patch --]
[-- Type: text/plain, Size: 2541 bytes --]
Signed-off-by: Dave Young <dyoung@redhat.com>
---
v1->v2: move efi_print_memmap declaration to general header file
arch/x86/include/asm/efi.h | 1 -
arch/x86/platform/efi/efi.c | 16 ----------------
drivers/firmware/efi/memmap.c | 16 ++++++++++++++++
include/linux/efi.h | 1 +
4 files changed, 17 insertions(+), 17 deletions(-)
--- linux-x86.orig/arch/x86/platform/efi/efi.c
+++ linux-x86/arch/x86/platform/efi/efi.c
@@ -278,22 +278,6 @@ static void __init efi_clean_memmap(void
}
}
-void __init efi_print_memmap(void)
-{
- efi_memory_desc_t *md;
- int i = 0;
-
- for_each_efi_memory_desc(md) {
- char buf[64];
-
- pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",
- i++, efi_md_typeattr_format(buf, sizeof(buf), md),
- md->phys_addr,
- md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
- (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
- }
-}
-
static int __init efi_systab_init(void *phys)
{
if (efi_enabled(EFI_64BIT)) {
--- linux-x86.orig/drivers/firmware/efi/memmap.c
+++ linux-x86/drivers/firmware/efi/memmap.c
@@ -10,6 +10,22 @@
#include <linux/io.h>
#include <asm/early_ioremap.h>
+void __init efi_print_memmap(void)
+{
+ efi_memory_desc_t *md;
+ int i = 0;
+
+ for_each_efi_memory_desc(md) {
+ char buf[64];
+
+ pr_info("mem%02u: %s range=[0x%016llx-0x%016llx] (%lluMB)\n",
+ i++, efi_md_typeattr_format(buf, sizeof(buf), md),
+ md->phys_addr,
+ md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1,
+ (md->num_pages >> (20 - EFI_PAGE_SHIFT)));
+ }
+}
+
/**
* __efi_memmap_init - Common code for mapping the EFI memory map
* @data: EFI memory map data
--- linux-x86.orig/arch/x86/include/asm/efi.h
+++ linux-x86/arch/x86/include/asm/efi.h
@@ -116,7 +116,6 @@ extern void __init efi_set_executable(ef
extern int __init efi_memblock_x86_reserve_range(void);
extern pgd_t * __init efi_call_phys_prolog(void);
extern void __init efi_call_phys_epilog(pgd_t *save_pgd);
-extern void __init efi_print_memmap(void);
extern void __init efi_memory_uc(u64 addr, unsigned long size);
extern void __init efi_map_region(efi_memory_desc_t *md);
extern void __init efi_map_region_fixed(efi_memory_desc_t *md);
--- linux-x86.orig/include/linux/efi.h
+++ linux-x86/include/linux/efi.h
@@ -949,6 +949,7 @@ static inline efi_status_t efi_query_var
return EFI_SUCCESS;
}
#endif
+extern void __init efi_print_memmap(void);
extern void __iomem *efi_lookup_mapped_addr(u64 phys_addr);
extern int __init efi_memmap_init_early(struct efi_memory_map_data *data);
next prev parent reply other threads:[~2017-01-16 2:53 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 2:45 [PATCH V2 0/4] efi/x86: move efi bgrt init code to early init Dave Young
2017-01-16 2:45 ` [PATCH V2 1/4] efi/x86: move efi bgrt init code to early init code Dave Young
2017-01-17 10:39 ` Nicolai Stange
2017-01-17 17:10 ` Ard Biesheuvel
2017-01-17 17:10 ` Ard Biesheuvel
2017-01-18 2:16 ` Dave Young
2017-01-18 2:16 ` Dave Young
2017-01-18 13:48 ` [PATCH V3 " Dave Young
2017-01-18 14:00 ` Ard Biesheuvel
2017-01-18 19:24 ` Bhupesh Sharma
2017-01-19 12:48 ` Ard Biesheuvel
2017-01-26 3:39 ` Dave Young
2017-01-16 2:45 ` Dave Young [this message]
2017-01-17 10:39 ` [PATCH V2 2/4] efi/x86: move efi_print_memmap to drivers/firmware/efi/memmap.c Nicolai Stange
2017-01-17 17:11 ` Ard Biesheuvel
2017-01-17 17:11 ` Ard Biesheuvel
2017-01-16 2:45 ` [PATCH V2 3/4] efi/x86: add debug code to print cooked memmap Dave Young
2017-01-16 2:45 ` Dave Young
2017-01-17 10:39 ` Nicolai Stange
2017-01-16 2:45 ` [PATCH V2 4/4] efi/x86: make efi_memmap_reserve only insert into boot mem areas Dave Young
2017-01-17 10:40 ` Nicolai Stange
2017-01-17 10:40 ` Nicolai Stange
2017-01-17 17:13 ` Ard Biesheuvel
2017-01-17 19:48 ` Nicolai Stange
2017-01-17 19:48 ` Nicolai Stange
2017-01-18 11:01 ` Dave Young
2017-01-18 11:06 ` Dave Young
2017-01-18 11:06 ` Dave Young
2017-01-18 13:33 ` Dave Young
2017-01-18 2:28 ` Dave Young
2017-01-18 2:28 ` Dave Young
2017-01-27 17:03 ` [PATCH V2 0/4] efi/x86: move efi bgrt init code to early init Ard Biesheuvel
2017-02-03 7:12 ` 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=20170116025026.486040805@redhat.com \
--to=dyoung@redhat.com \
--cc=ard.biesheuvel@linaro.org \
--cc=bhsharma@redhat.com \
--cc=dan.j.williams@intel.com \
--cc=hpa@zytor.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mika.penttila@nextfour.com \
--cc=mingo@kernel.org \
--cc=nicstange@gmail.com \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.