xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xen.org
Cc: patches@linaro.org, Julien Grall <julien.grall@linaro.org>,
	ian.campbell@citrix.com, andre.przywara@linaro.org,
	stefano.stabellini@eu.citrix.com
Subject: [PATCH v4 17/27] xen/arm: Create a fake GIC node in dom0 device tree
Date: Fri, 13 Sep 2013 13:49:24 +0100	[thread overview]
Message-ID: <1379076574-28316-18-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1379076574-28316-1-git-send-email-julien.grall@linaro.org>

Recreate the GIC node and remove hypervisor specific ranges (vgic and hypervisor
controls).

Signed-off-by: Julien Grall <julien.grall@linaro.org>

---
    Changes in v3:
        - Use DT_MATCH_GIC
---
 xen/arch/arm/domain_build.c |   78 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 036155e..87382d5 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -439,6 +439,79 @@ static int make_cpus_node(const struct domain *d, void *fdt,
     return res;
 }
 
+static int make_gic_node(const struct domain *d, void *fdt,
+                         const struct dt_device_node *parent)
+{
+    const struct dt_device_node *gic = dt_interrupt_controller;
+    const void *compatible = NULL;
+    u32 len;
+    __be32 *new_cells, *tmp;
+    int res = 0;
+
+    DPRINT("Create gic node\n");
+
+    compatible = dt_get_property(gic, "compatible", &len);
+    if ( !compatible )
+    {
+        dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n");
+        return -FDT_ERR_XEN(ENOENT);
+    }
+
+    res = fdt_begin_node(fdt, "interrupt-controller");
+    if ( res )
+        return res;
+
+    res = fdt_property(fdt, "compatible", compatible, len);
+    if ( res )
+        return res;
+
+    res = fdt_property_cell(fdt, "#interrupt-cells", 3);
+    if ( res )
+        return res;
+
+    res = fdt_property(fdt, "interrupt-controller", NULL, 0);
+
+    if ( res )
+        return res;
+
+    len = dt_cells_to_size(dt_n_addr_cells(parent) + dt_n_size_cells(parent));
+    len *= 2;
+    new_cells = xzalloc_bytes(dt_cells_to_size(len));
+    if ( new_cells == NULL )
+        return -FDT_ERR_XEN(ENOMEM);
+
+    tmp = new_cells;
+    DPRINT("  Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n",
+           d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1);
+    dt_set_range(&tmp, parent, d->arch.vgic.dbase, PAGE_SIZE);
+
+    DPRINT("  Set Cpu Base 0x%"PRIpaddr" size = 0x%"PRIpaddr"\n",
+           d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1);
+    dt_set_range(&tmp, parent, d->arch.vgic.cbase, PAGE_SIZE * 2);
+
+    res = fdt_property(fdt, "reg", new_cells, len);
+    xfree(new_cells);
+
+    if ( res )
+        return res;
+
+    /*
+     * The value of the property "phandle" in the property "interrupts"
+     * to know on which interrupt controller the interrupt is wired.
+     */
+    if ( gic->phandle )
+    {
+        DPRINT("  Set phandle = 0x%x\n", gic->phandle);
+        res = fdt_property_cell(fdt, "phandle", gic->phandle);
+        if ( res )
+            return res;
+    }
+
+    res = fdt_end_node(fdt);
+
+    return res;
+}
+
 /* Map the device in the domain */
 static int map_device(struct domain *d, const struct dt_device_node *dev)
 {
@@ -528,6 +601,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
         DT_MATCH_COMPATIBLE("xen,multiboot-module"),
         DT_MATCH_COMPATIBLE("arm,psci"),
         DT_MATCH_PATH("/cpus"),
+        DT_MATCH_GIC,
         { /* sentinel */ },
     };
     const struct dt_device_node *child;
@@ -601,6 +675,10 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo,
         res = make_cpus_node(d, kinfo->fdt, np);
         if ( res )
             return res;
+
+        res = make_gic_node(d, kinfo->fdt, np);
+        if ( res )
+            return res;
     }
 
     res = fdt_end_node(kinfo->fdt);
-- 
1.7.10.4

  parent reply	other threads:[~2013-09-13 12:49 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-13 12:49 [PATCH v4 00/27] Allow Xen to boot with a raw device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 01/27] xen/dts: Constify device_tree_flattened Julien Grall
2013-09-13 12:49 ` [PATCH v4 02/27] xen/dts: Prefix device tree macro by dt_ Julien Grall
2013-09-13 12:49 ` [PATCH v4 03/27] xen/dts: Don't add a fake property "name" in the device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 04/27] xen/dts: Add new helpers to use " Julien Grall
2013-09-13 12:49 ` [PATCH v4 05/27] xen: Use the right string comparison function in " Julien Grall
2013-09-13 12:49 ` [PATCH v4 06/27] xen/dts: Remove device_get_reg call in process_cpu_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 07/27] xen/dts: Check "reg" property length in process_multiboot_node Julien Grall
2013-09-13 12:49 ` [PATCH v4 08/27] xen/dts: Check the CPU ID is not greater than NR_CPUS Julien Grall
2013-09-13 12:49 ` [PATCH v4 09/27] xen/video: hdlcd: Convert the driver to the new device tree API Julien Grall
2013-09-13 12:49 ` [PATCH v4 10/27] xen/video: hdlcd: Use early_printk instead of printk Julien Grall
2013-09-13 12:49 ` [PATCH v4 11/27] xen/arm: Use dt_device_match to avoid multiple if conditions Julien Grall
2013-09-13 12:49 ` [PATCH v4 12/27] xen/dts: dt_find_interrupt_controller: accept multiple compatible strings Julien Grall
2013-09-13 12:49 ` [PATCH v4 13/27] xen/arm: Build DOM0 FDT by browsing the device tree structure Julien Grall
2013-09-13 12:49 ` [PATCH v4 14/27] xen/arm: Don't map disabled device in DOM0 Julien Grall
2013-09-13 12:49 ` [PATCH v4 15/27] xen/arm: Create a fake PSCI node in dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 16/27] xen/arm: Create a fake cpus " Julien Grall
2013-09-13 12:49 ` Julien Grall [this message]
2013-09-13 12:49 ` [PATCH v4 18/27] xen/arm: Create a fake timer " Julien Grall
2013-09-13 12:49 ` [PATCH v4 19/27] xen/arm: Add new platform specific callback device_is_blacklist Julien Grall
2013-09-13 12:49 ` [PATCH v4 20/27] xen/arm: Remove devices used by Xen from dom0 device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 21/27] xen/arm: vexpress: Blacklist a list of board specific devices Julien Grall
2013-09-13 12:49 ` [PATCH v4 22/27] xen/arm: exynos5: Blacklist MCT device Julien Grall
2013-09-13 12:49 ` [PATCH v4 23/27] xen/dts: Clean up the exported API for device tree Julien Grall
2013-09-13 12:49 ` [PATCH v4 24/27] xen/dts: device_get_reg: cells are 32-bit big endian value Julien Grall
2013-09-13 12:49 ` [PATCH v4 25/27] xen/dts: replace get_val by dt_next_cell Julien Grall
2013-09-13 12:49 ` [PATCH v4 26/27] xen/arm: Check if the device is available before using it Julien Grall
2013-09-13 12:49 ` [PATCH v4 27/27] ARM: parse separate DT properties for different commandlines Julien Grall
2013-09-17 14:43 ` [PATCH v4 00/27] Allow Xen to boot with a raw device tree Ian Campbell

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=1379076574-28316-18-git-send-email-julien.grall@linaro.org \
    --to=julien.grall@linaro.org \
    --cc=andre.przywara@linaro.org \
    --cc=ian.campbell@citrix.com \
    --cc=patches@linaro.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xen.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).