From: Thomas Renninger <trenn@suse.de>
To: hpa@zytor.com
Cc: lenb@kernel.org, initramfs@vger.kernel.org,
robert.moore@intel.com, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, yinghai@kernel.org,
Thomas Renninger <trenn@suse.de>
Subject: [PATCH 2/6] X86 ACPI: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling
Date: Tue, 25 Sep 2012 16:55:57 +0200 [thread overview]
Message-ID: <1348584961-1476-3-git-send-email-trenn@suse.de> (raw)
In-Reply-To: <1348584961-1476-1-git-send-email-trenn@suse.de>
This is needed for ACPI table overriding via initrd. Beside reserving
memblocks, X86 also requires to flag the memory area to E820_RESERVED or
E820_ACPI in the e820 mappings to be able to io(re)map it later.
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
arch/x86/kernel/acpi/boot.c | 6 ++++++
include/linux/acpi.h | 9 +++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index b2297e5..6b75777 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1700,3 +1700,9 @@ int __acpi_release_global_lock(unsigned int *lock)
} while (unlikely (val != old));
return old & 0x1;
}
+
+void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
+{
+ e820_add_region(addr, size, E820_ACPI);
+ update_e820();
+}
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 4f2a762..bf6a0ad 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -430,4 +430,13 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state,
#define acpi_os_set_prepare_sleep(func, pm1a_ctrl, pm1b_ctrl) do { } while (0)
#endif
+#if CONFIG_X86
+void arch_reserve_mem_area(acpi_physical_address addr, size_t size);
+#else
+static inline void void arch_reserve_mem_area(acpi_physical_address addr,
+ size_t size)
+{
+}
+#endif /* CONFIG_X86 */
+
#endif /*_LINUX_ACPI_H*/
--
1.7.6.1
next prev parent reply other threads:[~2012-09-25 14:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 14:55 [RESEND] Early cpio decoder and ACPI table override via initrd making use of it Thomas Renninger
[not found] ` <1348584961-1476-1-git-send-email-trenn-l3A5Bk7waGM@public.gmane.org>
2012-09-25 14:55 ` [PATCH 1/6] lib: Add early cpio decoder Thomas Renninger
2012-09-25 14:55 ` Thomas Renninger [this message]
2012-09-25 15:12 ` [PATCH 2/6] X86 ACPI: Introduce x86 arch specific arch_reserve_mem_area() for e820 handling Thomas Renninger
2012-10-05 22:05 ` [PATCH] X86 ACPI: Use #ifdef not #if for CONFIG_X86 check Luck, Tony
2012-09-25 14:55 ` [PATCH 3/6] ACPI: Store valid ACPI tables passed via early initrd in reserved memblock areas Thomas Renninger
[not found] ` <1348584961-1476-4-git-send-email-trenn-l3A5Bk7waGM@public.gmane.org>
2012-09-25 15:15 ` H. Peter Anvin
2012-09-25 14:55 ` [PATCH 4/6] ACPI: Implement physical address table override Thomas Renninger
2012-09-25 14:56 ` [PATCH 5/6] ACPI: Create acpi_table_taint() function to avoid code duplication Thomas Renninger
2012-09-25 14:56 ` [PATCH 6/6] ACPI: Document ACPI table overriding via initrd Thomas Renninger
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=1348584961-1476-3-git-send-email-trenn@suse.de \
--to=trenn@suse.de \
--cc=hpa@zytor.com \
--cc=initramfs@vger.kernel.org \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robert.moore@intel.com \
--cc=yinghai@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;
as well as URLs for NNTP newsgroup(s).