diff mbox series

[2/2] xen/arm: Skip inclusion of domU nodes into hwdom dt /chosen node

Message ID 20230810112544.17365-3-michal.orzel@amd.com (mailing list archive)
State New, archived
Headers show
Series xen/arm: fixes around device tree generation | expand

Commit Message

Michal Orzel Aug. 10, 2023, 11:25 a.m. UTC
Configuration for dom0less domUs is stored under /chosen/<domu> nodes
present in the host device tree provided to Xen. All the properties and
sub nodes there are meant only for Xen. However, at the moment we still
copy them (except for modules that we skip) into hardware domain /chosen
node. Fix it by adding "xen,domain" compatible into the list of nodes to
skip in handle_node().

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
 xen/arch/arm/domain_build.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Luca Fancellu Aug. 10, 2023, 1:34 p.m. UTC | #1
> On 10 Aug 2023, at 12:25, Michal Orzel <michal.orzel@amd.com> wrote:
> 
> Configuration for dom0less domUs is stored under /chosen/<domu> nodes
> present in the host device tree provided to Xen. All the properties and
> sub nodes there are meant only for Xen. However, at the moment we still
> copy them (except for modules that we skip) into hardware domain /chosen
> node. Fix it by adding "xen,domain" compatible into the list of nodes to
> skip in handle_node().
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>
Stefano Stabellini Aug. 11, 2023, 1:56 a.m. UTC | #2
On Thu, 10 Aug 2023, Luca Fancellu wrote:
> > On 10 Aug 2023, at 12:25, Michal Orzel <michal.orzel@amd.com> wrote:
> > 
> > Configuration for dom0less domUs is stored under /chosen/<domu> nodes
> > present in the host device tree provided to Xen. All the properties and
> > sub nodes there are meant only for Xen. However, at the moment we still
> > copy them (except for modules that we skip) into hardware domain /chosen
> > node. Fix it by adding "xen,domain" compatible into the list of nodes to
> > skip in handle_node().
> > 
> > Signed-off-by: Michal Orzel <michal.orzel@amd.com>
> 
> Reviewed-by: Luca Fancellu <luca.fancellu@arm.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>
diff mbox series

Patch

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index c6881de8bd85..54bf5623c889 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2592,6 +2592,7 @@  static int __init handle_node(struct domain *d, struct kernel_info *kinfo,
 {
     static const struct dt_device_match skip_matches[] __initconst =
     {
+        DT_MATCH_COMPATIBLE("xen,domain"),
         DT_MATCH_COMPATIBLE("xen,xen"),
         DT_MATCH_COMPATIBLE("xen,multiboot-module"),
         DT_MATCH_COMPATIBLE("multiboot,module"),