From: Penny Zheng <penny.zheng@arm.com>
To: <xen-devel@lists.xenproject.org>, <sstabellini@kernel.org>,
<julien@xen.org>
Cc: <Bertrand.Marquis@arm.com>, <Penny.Zheng@arm.com>,
<Wei.Chen@arm.com>, <nd@arm.com>
Subject: [PATCH 02/10] xen/arm: handle static memory in dt_unreserved_regions
Date: Tue, 18 May 2021 05:21:05 +0000 [thread overview]
Message-ID: <20210518052113.725808-3-penny.zheng@arm.com> (raw)
In-Reply-To: <20210518052113.725808-1-penny.zheng@arm.com>
static memory regions overlap with memory nodes. The
overlapping memory is reserved-memory and should be
handled accordingly:
dt_unreserved_regions should skip these regions the
same way they are already skipping mem-reserved regions.
Signed-off-by: Penny Zheng <penny.zheng@arm.com>
---
xen/arch/arm/setup.c | 39 +++++++++++++++++++++++++++++++++------
1 file changed, 33 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 00aad1c194..444dbbd676 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -201,7 +201,7 @@ 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);
+ int i, nr_reserved, nr_static, nr = fdt_num_mem_rsv(device_tree_flattened);
for ( i = first; i < nr ; i++ )
{
@@ -222,18 +222,45 @@ static void __init dt_unreserved_regions(paddr_t s, paddr_t e,
}
/*
- * i is the current bootmodule we are evaluating across all possible
- * kinds.
+ * i is the current reserved RAM banks we are evaluating across all
+ * possible kinds.
*
* When retrieving the corresponding reserved-memory addresses
* below, we need to index the bootinfo.reserved_mem bank starting
* from 0, and only counting the reserved-memory modules. Hence,
* we need to use i - nr.
*/
- for ( ; i - nr < bootinfo.reserved_mem.nr_banks; i++ )
+ i = i - nr;
+ nr_reserved = bootinfo.reserved_mem.nr_banks;
+ for ( ; i < nr_reserved; i++ )
{
- paddr_t r_s = bootinfo.reserved_mem.bank[i - nr].start;
- paddr_t r_e = r_s + bootinfo.reserved_mem.bank[i - nr].size;
+ paddr_t r_s = bootinfo.reserved_mem.bank[i].start;
+ paddr_t r_e = r_s + bootinfo.reserved_mem.bank[i].size;
+
+ if ( s < r_e && r_s < e )
+ {
+ dt_unreserved_regions(r_e, e, cb, i + 1);
+ dt_unreserved_regions(s, r_s, cb, i + 1);
+ return;
+ }
+ }
+
+ /*
+ * i is the current reserved RAM banks we are evaluating across all
+ * possible kinds.
+ *
+ * When retrieving the corresponding static-memory bank address
+ * below, we need to index the bootinfo.static_mem starting
+ * from 0, and only counting the static-memory bank. Hence,
+ * we need to use i - nr_reserved.
+ */
+
+ i = i - nr_reserved;
+ nr_static = bootinfo.static_mem.nr_banks;
+ for ( ; i < nr_static; i++ )
+ {
+ paddr_t r_s = bootinfo.static_mem.bank[i].start;
+ paddr_t r_e = r_s + bootinfo.static_mem.bank[i].size;
if ( s < r_e && r_s < e )
{
--
2.25.1
next prev parent reply other threads:[~2021-05-18 5:22 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-18 5:21 [PATCH 00/10] Domain on Static Allocation Penny Zheng
2021-05-18 5:21 ` [PATCH 01/10] xen/arm: introduce domain " Penny Zheng
2021-05-18 8:58 ` Julien Grall
2021-05-19 2:22 ` Penny Zheng
2021-05-19 18:27 ` Julien Grall
2021-05-20 6:07 ` Penny Zheng
2021-05-20 8:50 ` Julien Grall
2021-06-02 10:09 ` Penny Zheng
2021-06-03 9:09 ` Julien Grall
2021-06-03 21:32 ` Stefano Stabellini
2021-06-03 22:07 ` Julien Grall
2021-06-03 23:55 ` Stefano Stabellini
2021-06-04 4:00 ` Penny Zheng
2021-06-05 2:00 ` Stefano Stabellini
2021-06-07 18:09 ` Julien Grall
2021-06-09 9:56 ` Bertrand Marquis
2021-06-09 10:47 ` Julien Grall
2021-06-15 6:08 ` Penny Zheng
2021-06-17 11:22 ` Julien Grall
2021-05-18 5:21 ` Penny Zheng [this message]
2021-05-18 9:04 ` [PATCH 02/10] xen/arm: handle static memory in dt_unreserved_regions Julien Grall
2021-05-18 5:21 ` [PATCH 03/10] xen/arm: introduce PGC_reserved Penny Zheng
2021-05-18 9:45 ` Julien Grall
2021-05-19 3:16 ` Penny Zheng
2021-05-19 9:49 ` Jan Beulich
2021-05-19 19:49 ` Julien Grall
2021-05-20 7:05 ` Jan Beulich
2021-05-19 19:46 ` Julien Grall
2021-05-20 6:19 ` Penny Zheng
2021-05-20 8:40 ` Penny Zheng
2021-05-20 8:59 ` Julien Grall
2021-05-20 9:27 ` Jan Beulich
2021-05-20 9:45 ` Julien Grall
2021-05-18 5:21 ` [PATCH 04/10] xen/arm: static memory initialization Penny Zheng
2021-05-18 7:15 ` Jan Beulich
2021-05-18 9:51 ` Penny Zheng
2021-05-18 10:43 ` Jan Beulich
2021-05-20 9:04 ` Penny Zheng
2021-05-20 9:32 ` Jan Beulich
2021-05-18 10:00 ` Julien Grall
2021-05-18 10:01 ` Julien Grall
2021-05-19 5:02 ` Penny Zheng
2021-05-18 5:21 ` [PATCH 05/10] xen/arm: introduce alloc_staticmem_pages Penny Zheng
2021-05-18 7:24 ` Jan Beulich
2021-05-18 9:30 ` Penny Zheng
2021-05-18 10:09 ` Julien Grall
2021-05-18 10:15 ` Julien Grall
2021-05-19 5:23 ` Penny Zheng
2021-05-24 10:10 ` Penny Zheng
2021-05-24 10:24 ` Julien Grall
2021-05-18 5:21 ` [PATCH 06/10] xen: replace order with nr_pfns in assign_pages for better compatibility Penny Zheng
2021-05-18 7:27 ` Jan Beulich
2021-05-18 9:11 ` Penny Zheng
2021-05-18 10:20 ` Julien Grall
2021-05-19 5:35 ` Penny Zheng
2021-05-18 5:21 ` [PATCH 07/10] xen/arm: intruduce alloc_domstatic_pages Penny Zheng
2021-05-18 7:34 ` Jan Beulich
2021-05-18 8:57 ` Penny Zheng
2021-05-18 11:23 ` Jan Beulich
2021-05-21 6:41 ` Penny Zheng
2021-05-21 7:09 ` Jan Beulich
2021-06-03 2:44 ` Penny Zheng
2021-05-18 12:13 ` Julien Grall
2021-05-19 7:52 ` Penny Zheng
2021-05-19 20:01 ` Julien Grall
2021-05-18 10:30 ` Julien Grall
2021-05-19 6:03 ` Penny Zheng
2021-05-18 5:21 ` [PATCH 08/10] xen/arm: introduce reserved_page_list Penny Zheng
2021-05-18 7:39 ` Jan Beulich
2021-05-18 8:38 ` Penny Zheng
2021-05-18 11:24 ` Jan Beulich
2021-05-19 6:46 ` Penny Zheng
2021-05-18 11:02 ` Julien Grall
2021-05-19 6:43 ` Penny Zheng
2021-05-18 5:21 ` [PATCH 09/10] xen/arm: parse `xen,static-mem` info during domain construction Penny Zheng
2021-05-18 12:09 ` Julien Grall
2021-05-19 7:58 ` Penny Zheng
2021-05-18 5:21 ` [PATCH 10/10] xen/arm: introduce allocate_static_memory Penny Zheng
2021-05-18 12:05 ` Julien Grall
2021-05-19 7:27 ` Penny Zheng
2021-05-19 20:10 ` Julien Grall
2021-05-20 6:29 ` Penny Zheng
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=20210518052113.725808-3-penny.zheng@arm.com \
--to=penny.zheng@arm.com \
--cc=Bertrand.Marquis@arm.com \
--cc=Wei.Chen@arm.com \
--cc=julien@xen.org \
--cc=nd@arm.com \
--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).