From: Julien Grall <julien@xen.org>
To: xen-devel@lists.xenproject.org
Cc: alex.bennee@linaro.org, masami.hiramatsu@linaro.org,
ehem+xen@m5p.com, bertrand.marquis@arm.com,
andre.przywara@arm.com, Julien Grall <jgrall@amazon.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Julien Grall <julien@xen.org>,
Volodymyr Babchuk <Volodymyr_Babchuk@epam.com>
Subject: [PATCH 4/4] xen/arm: Introduce fw_unreserved_regions() and use it
Date: Sat, 26 Sep 2020 21:55:42 +0100 [thread overview]
Message-ID: <20200926205542.9261-5-julien@xen.org> (raw)
In-Reply-To: <20200926205542.9261-1-julien@xen.org>
From: Julien Grall <jgrall@amazon.com>
Since commit 6e3e77120378 "xen/arm: setup: Relocate the Device-Tree
later on in the boot", the device-tree will not be kept mapped when
using ACPI.
However, a few places are calling dt_unreserved_regions() which expects
a valid DT. This will lead to a crash.
As the DT should not be used for ACPI (other than for detecting the
modules), a new function fw_unreserved_regions() is introduced.
It will behave the same way on DT system. On ACPI system, it will
unreserve the whole region.
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
Is there any region we should exclude on ACPI?
---
xen/arch/arm/kernel.c | 2 +-
xen/arch/arm/setup.c | 22 +++++++++++++++++-----
xen/include/asm-arm/setup.h | 2 +-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index 032923853f2c..ab78689ed2a6 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -307,7 +307,7 @@ static __init int kernel_decompress(struct bootmodule *mod)
* Free the original kernel, update the pointers to the
* decompressed kernel
*/
- dt_unreserved_regions(addr, addr + size, init_domheap_pages, 0);
+ fw_unreserved_regions(addr, addr + size, init_domheap_pages, 0);
return 0;
}
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 35e5bee04efa..7fcff9af2a7e 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -196,8 +196,9 @@ static void __init processor_id(void)
processor_setup();
}
-void __init dt_unreserved_regions(paddr_t s, paddr_t e,
- void (*cb)(paddr_t, paddr_t), int first)
+static void __init dt_unreserved_regions(paddr_t s, paddr_t e,
+ void (*cb)(paddr_t, paddr_t),
+ int first)
{
int i, nr = fdt_num_mem_rsv(device_tree_flattened);
@@ -244,6 +245,17 @@ void __init dt_unreserved_regions(paddr_t s, paddr_t e,
cb(s, e);
}
+void __init fw_unreserved_regions(paddr_t s, paddr_t e,
+ void (*cb)(paddr_t, paddr_t), int first)
+{
+ if ( acpi_disabled )
+ dt_unreserved_regions(s, e, cb, first);
+ else
+ cb(s, e);
+}
+
+
+
struct bootmodule __init *add_boot_module(bootmodule_kind kind,
paddr_t start, paddr_t size,
bool domU)
@@ -405,7 +417,7 @@ void __init discard_initial_modules(void)
!mfn_valid(maddr_to_mfn(e)) )
continue;
- dt_unreserved_regions(s, e, init_domheap_pages, 0);
+ fw_unreserved_regions(s, e, init_domheap_pages, 0);
}
mi->nr_mods = 0;
@@ -712,7 +724,7 @@ static void __init setup_mm(void)
n = mfn_to_maddr(mfn_add(xenheap_mfn_start, xenheap_pages));
}
- dt_unreserved_regions(s, e, init_boot_pages, 0);
+ fw_unreserved_regions(s, e, init_boot_pages, 0);
s = n;
}
@@ -765,7 +777,7 @@ static void __init setup_mm(void)
if ( e > bank_end )
e = bank_end;
- dt_unreserved_regions(s, e, init_boot_pages, 0);
+ fw_unreserved_regions(s, e, init_boot_pages, 0);
s = n;
}
}
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index 2f8f24e286ed..34df23247b87 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -96,7 +96,7 @@ int construct_dom0(struct domain *d);
void create_domUs(void);
void discard_initial_modules(void);
-void dt_unreserved_regions(paddr_t s, paddr_t e,
+void fw_unreserved_regions(paddr_t s, paddr_t e,
void (*cb)(paddr_t, paddr_t), int first);
size_t boot_fdt_info(const void *fdt, paddr_t paddr);
--
2.17.1
next prev parent reply other threads:[~2020-09-26 20:56 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-26 20:55 [PATCH 0/4] xen/arm: Unbreak ACPI Julien Grall
2020-09-26 20:55 ` [PATCH 1/4] xen/acpi: Rework acpi_os_map_memory() and acpi_os_unmap_memory() Julien Grall
2020-09-28 8:18 ` Jan Beulich
2020-09-28 9:58 ` Julien Grall
2020-09-28 10:09 ` Jan Beulich
2020-09-28 10:39 ` Julien Grall
2020-10-10 9:49 ` Julien Grall
2020-10-10 10:04 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-10-01 0:06 ` Stefano Stabellini
2020-10-01 15:09 ` Julien Grall
2020-09-26 20:55 ` [PATCH 2/4] xen/arm: acpi: The fixmap area should always be cleared during failure/unmap Julien Grall
2020-09-29 11:13 ` Rahul Singh
2020-10-01 0:30 ` Stefano Stabellini
2020-10-01 15:14 ` Julien Grall
2020-09-26 20:55 ` [PATCH 3/4] xen/arm: Check if the platform is not using ACPI before initializing Dom0less Julien Grall
2020-09-29 11:17 ` Rahul Singh
2020-09-30 23:26 ` Stefano Stabellini
2020-09-26 20:55 ` Julien Grall [this message]
2020-09-30 23:40 ` [PATCH 4/4] xen/arm: Introduce fw_unreserved_regions() and use it Stefano Stabellini
2020-10-01 15:34 ` Julien Grall
2020-09-27 1:47 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-09-29 15:28 ` Elliott Mitchell
2020-09-28 6:47 ` Masami Hiramatsu
2020-09-28 12:41 ` [PATCH] xen: acpi: Hide UART address only if SPCR exists Masami Hiramatsu
2020-09-28 12:42 ` Masami Hiramatsu
2021-01-19 7:25 ` Elliott Mitchell
2021-01-20 18:05 ` Julien Grall
2020-09-28 13:00 ` [PATCH 0/4] xen/arm: Unbreak ACPI Masami Hiramatsu
2020-10-16 22:33 ` Xen-ARM EFI/ACPI problems (was: Re: [PATCH 0/4] xen/arm: Unbreak ACPI) Elliott Mitchell
2020-10-17 5:12 ` Elliott Mitchell
2020-10-08 18:39 ` [PATCH 0/4] xen/arm: Unbreak ACPI Elliott Mitchell
2020-10-09 9:39 ` Julien Grall
2020-10-09 14:22 ` Elliott Mitchell
2020-10-09 18:15 ` Julien Grall
2020-10-09 22:36 ` Elliott Mitchell
2020-10-09 21:49 ` Elliott Mitchell
2020-10-10 11:02 ` Julien Grall
2020-10-12 19:02 ` Stefano Stabellini
2020-10-12 21:34 ` Elliott Mitchell
2020-10-14 1:06 ` Stefano Stabellini
2020-10-14 1:37 ` Elliott Mitchell
2020-10-14 17:47 ` Julien Grall
2020-10-15 18:00 ` Stefano Stabellini
2020-10-14 17:44 ` Julien Grall
2020-09-29 11:10 ` Rahul Singh
2020-09-29 15:29 ` Alex Bennée
2020-09-29 17:07 ` Julien Grall
2020-09-29 21:11 ` Alex Bennée
2020-09-29 23:39 ` André Przywara
2020-09-30 8:51 ` Alex Bennée
2020-09-30 10:35 ` Julien Grall
2020-09-30 9:42 ` Julien Grall
2020-09-30 10:38 ` Alex Bennée
2020-09-30 11:10 ` Julien Grall
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=20200926205542.9261-5-julien@xen.org \
--to=julien@xen.org \
--cc=Volodymyr_Babchuk@epam.com \
--cc=alex.bennee@linaro.org \
--cc=andre.przywara@arm.com \
--cc=bertrand.marquis@arm.com \
--cc=ehem+xen@m5p.com \
--cc=jgrall@amazon.com \
--cc=masami.hiramatsu@linaro.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.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).