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,
akpm@linux-foundation.org, mingo@kernel.org, msalter@redhat.com,
leif.lindholm@linaro.org
Subject: [PATCH v7 04/12] efi: add a wrapper function efi_map_region_fixed
Date: Fri, 20 Dec 2013 18:02:14 +0800 [thread overview]
Message-ID: <1387533742-18018-5-git-send-email-dyoung@redhat.com> (raw)
In-Reply-To: <1387533742-18018-1-git-send-email-dyoung@redhat.com>
Kexec kernel will use saved runtime virtual mapping, so add a
new function efi_map_region_fixed for directly mapping a md
to md->virt.
The md is passed in from 1st kernel, the virtual addr is
saved in md->virt_addr.
Matt: coding style
reuse __map_region
Boris: Strenthen comment lines to 80 cols.
Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
---
arch/x86/include/asm/efi.h | 1 +
arch/x86/platform/efi/efi_32.c | 2 ++
arch/x86/platform/efi/efi_64.c | 10 ++++++++++
3 files changed, 13 insertions(+)
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 89a05b0..9fbaeb2 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -128,6 +128,7 @@ extern void efi_call_phys_epilog(void);
extern void efi_unmap_memmap(void);
extern void 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);
extern void efi_sync_low_kernel_mappings(void);
extern void efi_setup_page_tables(void);
extern void __init old_map_region(efi_memory_desc_t *md);
diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
index e94557c..7b3ec6e 100644
--- a/arch/x86/platform/efi/efi_32.c
+++ b/arch/x86/platform/efi/efi_32.c
@@ -47,6 +47,8 @@ void __init efi_map_region(efi_memory_desc_t *md)
old_map_region(md);
}
+void __init efi_map_region_fixed(efi_memory_desc_t *md) {}
+
void efi_call_phys_prelog(void)
{
struct desc_ptr gdt_descr;
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
index c5a6491..ff08cb1 100644
--- a/arch/x86/platform/efi/efi_64.c
+++ b/arch/x86/platform/efi/efi_64.c
@@ -199,6 +199,16 @@ void __init efi_map_region(efi_memory_desc_t *md)
md->virt_addr = efi_va;
}
+/*
+ * kexec kernel will use efi_map_region_fixed to map efi runtime memory ranges.
+ * md->virt_addr is the original virtual address which had been mapped in kexec
+ * 1st kernel.
+ */
+void __init efi_map_region_fixed(efi_memory_desc_t *md)
+{
+ __map_region(md, md->virt_addr);
+}
+
void __iomem *__init efi_ioremap(unsigned long phys_addr, unsigned long size,
u32 type, u64 attribute)
{
--
1.8.3.1
next prev parent reply other threads:[~2013-12-20 10:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 10:02 [PATCH v7 00/12] kexec kernel efi runtime support Dave Young
2013-12-20 10:02 ` [PATCH v7 01/12] x86/mm: sparse warning fix for early_memremap Dave Young
2013-12-20 10:02 ` [PATCH v7 02/12] efi: Use early_memremap and early_memunmap to fix sparse warnings Dave Young
2013-12-20 10:02 ` [PATCH v7 03/12] efi: remove unused variables in __map_region Dave Young
2013-12-20 10:02 ` Dave Young [this message]
2013-12-20 10:02 ` [PATCH v7 05/12] efi: reserve boot service fix Dave Young
2013-12-20 10:02 ` [PATCH v7 06/12] efi: cleanup efi_enter_virtual_mode function Dave Young
2013-12-20 10:02 ` [PATCH v7 07/12] efi: export more efi table variable to sysfs Dave Young
2013-12-20 10:02 ` [PATCH v7 08/12] efi: export efi runtime memory mapping " Dave Young
2013-12-20 10:02 ` [PATCH v7 09/12] efi: passing kexec necessary efi data via setup_data Dave Young
2013-12-21 14:53 ` Matt Fleming
2013-12-23 2:06 ` Dave Young
2013-12-21 16:06 ` Matt Fleming
2013-12-23 2:09 ` Dave Young
2013-12-23 6:09 ` Dave Young
2013-12-23 8:07 ` Matt Fleming
2013-12-25 3:12 ` Dave Young
2013-12-25 3:32 ` Dave Young
2013-12-29 13:05 ` Matt Fleming
2013-12-30 1:38 ` Dave Young
2013-12-20 10:02 ` [PATCH v7 10/12] x86: add xloadflags bit for efi runtime support on kexec Dave Young
2013-12-20 10:02 ` [PATCH v7 11/12] x86: export x86 boot_params to sysfs Dave Young
2013-12-20 10:02 ` [PATCH v7 12/12] x86: reserve setup_data ranges late after parsing memmap cmdline Dave Young
2013-12-20 18:01 ` [PATCH v7 00/12] kexec kernel efi runtime support Toshi Kani
2013-12-21 17:35 ` Matt Fleming
2013-12-22 21:27 ` Toshi Kani
2013-12-23 7:36 ` Matt Fleming
2013-12-24 20:31 ` Toshi Kani
2013-12-25 3:09 ` Dave Young
2013-12-23 2:32 ` Dave Young
2014-01-02 2:42 ` Dave Young
2014-01-02 10:35 ` Matt Fleming
2014-01-03 4: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=1387533742-18018-5-git-send-email-dyoung@redhat.com \
--to=dyoung@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=akpm@linux-foundation.org \
--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=leif.lindholm@linaro.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@console-pimps.org \
--cc=mingo@kernel.org \
--cc=mjg59@srcf.ucam.org \
--cc=msalter@redhat.com \
--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