[Xen-changelog] [xen staging] xen/arm: fix duplicate memory node in DT

[patchbot@xxxxxxx]

commit 98d1dac88f82c2b79d528faabe5e3fda8133e8bb
Author:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
AuthorDate: Mon Oct 7 18:15:01 2019 -0700
Commit:     Stefano Stabellini <sstabellini@xxxxxxxxxx>
CommitDate: Tue Oct 8 14:10:10 2019 -0700

    xen/arm: fix duplicate memory node in DT
    
    When reserved-memory regions are present in the host device tree, dom0
    is started with multiple memory nodes. Each memory node should have a
    unique name, but today they are all called "memory" leading to Linux
    printing the following warning at boot:
    
      OF: Duplicate name in base, renamed to "memory#1"
    
    This patch fixes the problem by appending a "@<unit-address>" to the
    name, as per the Device Tree specification, where <unit-address> matches
    the base of address of the first region.
    
    Fixes: 248faa637d2 (xen/arm: add reserved-memory regions to the dom0 memory 
node)
    Reported-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@xxxxxxxx>
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
    Acked-by: Julien Grall <julien.grall@xxxxxxx>
    Release-acked-by: Juergen Gross <jgross@xxxxxxxx>
---
 xen/arch/arm/domain_build.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 5ab84e5839..e7eaa35b14 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -646,6 +646,8 @@ static int __init make_memory_node(const struct domain *d,
     int res, i;
     int reg_size = addrcells + sizecells;
     int nr_cells = reg_size * mem->nr_banks;
+    /* Placeholder for memory@ + a 64-bit number + \0 */
+    char buf[24];
     __be32 reg[NR_MEM_BANKS * 4 /* Worst case addrcells + sizecells */];
     __be32 *cells;
 
@@ -657,7 +659,8 @@ static int __init make_memory_node(const struct domain *d,
                reg_size, nr_cells);
 
     /* ePAPR 3.4 */
-    res = fdt_begin_node(fdt, "memory");
+    snprintf(buf, sizeof(buf), "memory@%"PRIx64, mem->bank[0].start);
+    res = fdt_begin_node(fdt, buf);
     if ( res )
         return res;
 
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog