From: Wupeng Ma <mawupeng1@huawei.com>
To: <akpm@linux-foundation.org>, <catalin.marinas@arm.com>,
<will@kernel.org>, <corbet@lwn.net>
Cc: <ardb@kernel.org>, <tglx@linutronix.de>, <mingo@redhat.com>,
<bp@alien8.de>, <dave.hansen@linux.intel.com>, <x86@kernel.org>,
<hpa@zyccr.com>, <dvhart@infradead.org>, <andy@infradead.org>,
<rppt@kernel.org>, <paulmck@kernel.org>, <peterz@infradead.org>,
<jroedel@suse.de>, <songmuchun@bytedance.com>,
<macro@orcam.me.uk>, <frederic@kernel.org>, <W_Armin@gmx.de>,
<john.garry@huawei.com>, <seanjc@google.com>,
<tsbogend@alpha.franken.de>, <anshuman.khandual@arm.com>,
<chenhuacai@kernel.org>, <david@redhat.com>,
<gpiccoli@igalia.com>, <mark.rutland@arm.com>,
<wangkefeng.wang@huawei.com>, <mawupeng1@huawei.com>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-efi@vger.kernel.org>, <linux-ia64@vger.kernel.org>,
<platform-driver-x86@vger.kernel.org>, <linux-mm@kvack.org>
Subject: [PATCH 3/9] efi: Make efi_find_mirror() public
Date: Sat, 26 Mar 2022 14:46:26 +0800 [thread overview]
Message-ID: <20220326064632.131637-4-mawupeng1@huawei.com> (raw)
In-Reply-To: <20220326064632.131637-1-mawupeng1@huawei.com>
From: Ma Wupeng <mawupeng1@huawei.com>
Commit b05b9f5f9dcf ("x86, mirror: x86 enabling - find mirrored memory
ranges") introduce the efi_find_mirror function on x86. In order to reuse
the API we make it public in preparation for arm64 to support mirrord
memory.
Signed-off-by: Ma Wupeng <mawupeng1@huawei.com>
---
arch/x86/include/asm/efi.h | 4 ----
arch/x86/platform/efi/efi.c | 23 -----------------------
drivers/firmware/efi/efi.c | 23 +++++++++++++++++++++++
include/linux/efi.h | 3 +++
4 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index f0cc7766f53c..aae5933b7954 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -363,7 +363,6 @@ static inline bool efi_is_64bit(void)
extern bool efi_reboot_required(void);
extern bool efi_is_table_address(unsigned long phys_addr);
-extern void efi_find_mirror(void);
extern void efi_reserve_boot_services(void);
#else
static inline void parse_efi_setup(u64 phys_addr, u32 data_len) {}
@@ -375,9 +374,6 @@ static inline bool efi_is_table_address(unsigned long phys_addr)
{
return false;
}
-static inline void efi_find_mirror(void)
-{
-}
static inline void efi_reserve_boot_services(void)
{
}
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 7b130f39d841..fedbb228faea 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -105,29 +105,6 @@ static int __init setup_add_efi_memmap(char *arg)
}
early_param("add_efi_memmap", setup_add_efi_memmap);
-void __init efi_find_mirror(void)
-{
- efi_memory_desc_t *md;
- u64 mirror_size = 0, total_size = 0;
-
- if (!efi_enabled(EFI_MEMMAP))
- return;
-
- for_each_efi_memory_desc(md) {
- unsigned long long start = md->phys_addr;
- unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
-
- total_size += size;
- if (md->attribute & EFI_MEMORY_MORE_RELIABLE) {
- memblock_mark_mirror(start, size);
- mirror_size += size;
- }
- }
- if (mirror_size)
- pr_info("Memory: %lldM/%lldM mirrored memory\n",
- mirror_size>>20, total_size>>20);
-}
-
/*
* Tell the kernel about the EFI memory map. This might include
* more than the max 128 entries that can fit in the passed in e820
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 5502e176d51b..eb9ebf4efea1 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -438,6 +438,29 @@ static int __init efisubsys_init(void)
subsys_initcall(efisubsys_init);
+void __init efi_find_mirror(void)
+{
+ efi_memory_desc_t *md;
+ u64 mirror_size = 0, total_size = 0;
+
+ if (!efi_enabled(EFI_MEMMAP))
+ return;
+
+ for_each_efi_memory_desc(md) {
+ unsigned long long start = md->phys_addr;
+ unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
+
+ total_size += size;
+ if (md->attribute & EFI_MEMORY_MORE_RELIABLE) {
+ memblock_mark_mirror(start, size);
+ mirror_size += size;
+ }
+ }
+ if (mirror_size)
+ pr_info("Memory: %lldM/%lldM mirrored memory\n",
+ mirror_size>>20, total_size>>20);
+}
+
/*
* Find the efi memory descriptor for a given physical address. Given a
* physical address, determine if it exists within an EFI Memory Map entry,
diff --git a/include/linux/efi.h b/include/linux/efi.h
index de05682b233b..950c84ce3f16 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -853,6 +853,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
{
return (efi.runtime_supported_mask & mask) == mask;
}
+extern void efi_find_mirror(void);
#else
static inline bool efi_enabled(int feature)
{
@@ -870,6 +871,8 @@ static inline bool efi_rt_services_supported(unsigned int mask)
{
return false;
}
+
+static inline void efi_find_mirror(void) {}
#endif
extern int efi_status_to_err(efi_status_t status);
--
2.18.0.huawei.25
next prev parent reply other threads:[~2022-03-26 6:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-26 6:46 [PATCH 0/9] introduce mirrored memory support for arm64 Wupeng Ma
2022-03-26 6:46 ` [PATCH 1/9] efi: Make efi_print_memmap() public Wupeng Ma
2022-03-26 6:46 ` [PATCH 2/9] arm64: efi: Add fake memory support Wupeng Ma
2022-03-26 6:46 ` Wupeng Ma [this message]
2022-03-26 6:46 ` [PATCH 4/9] arm64/mirror: arm64 enabling - find mirrored memory ranges Wupeng Ma
2022-03-26 6:46 ` [PATCH 5/9] mm: Ratelimited mirrored memory related warning messages Wupeng Ma
2022-03-26 6:46 ` [PATCH 6/9] mm: Demote warning message in vmemmap_verify() to debug level Wupeng Ma
2022-03-26 6:46 ` [PATCH 7/9] mm: Calc the right pfn if page size is not 4K Wupeng Ma
2022-03-28 12:33 ` David Hildenbrand
2022-03-29 1:14 ` mawupeng
2022-03-26 6:46 ` [PATCH 8/9] efi: Disable mirror feature if kernelcore is not specified Wupeng Ma
2022-03-26 6:46 ` [PATCH 9/9] ia64/efi: Code simplification in efi_init Wupeng Ma
2022-03-29 8:26 ` [PATCH 0/9] introduce mirrored memory support for arm64 Ard Biesheuvel
2022-03-29 11:03 ` mawupeng
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=20220326064632.131637-4-mawupeng1@huawei.com \
--to=mawupeng1@huawei.com \
--cc=W_Armin@gmx.de \
--cc=akpm@linux-foundation.org \
--cc=andy@infradead.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=corbet@lwn.net \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dvhart@infradead.org \
--cc=frederic@kernel.org \
--cc=gpiccoli@igalia.com \
--cc=hpa@zyccr.com \
--cc=john.garry@huawei.com \
--cc=jroedel@suse.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=macro@orcam.me.uk \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rppt@kernel.org \
--cc=seanjc@google.com \
--cc=songmuchun@bytedance.com \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=wangkefeng.wang@huawei.com \
--cc=will@kernel.org \
--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