From: David Gibson Date: Wed, 3 Aug 2011 21:02:17 +0000 (+0000) Subject: pseries: Add a phandle to the xicp interrupt controller device tree node X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0c103f8e6999889e974246533bf7bf9c433a0471;p=qemu.git pseries: Add a phandle to the xicp interrupt controller device tree node Future devices we will be adding to the pseries machine (e.g. PCI) will need nodes in the device tree which explicitly reference the top-level interrupt controller via interrupt-parent or interrupt-map properties. In order to do this, the interrupt controller node needs an assigned phandle. This patch adds the appropriate property, in preparation. Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- diff --git a/hw/spapr.c b/hw/spapr.c index 760e3231d1..bb00ae6a6f 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -57,6 +57,8 @@ #define MAX_CPUS 256 #define XICS_IRQS 1024 +#define PHANDLE_XICP 0x00001111 + sPAPREnvironment *spapr; static void *spapr_create_fdt_skel(const char *cpu_model, @@ -202,6 +204,9 @@ static void *spapr_create_fdt_skel(const char *cpu_model, _FDT((fdt_property(fdt, "ibm,interrupt-server-ranges", interrupt_server_ranges_prop, sizeof(interrupt_server_ranges_prop)))); + _FDT((fdt_property_cell(fdt, "#interrupt-cells", 2))); + _FDT((fdt_property_cell(fdt, "linux,phandle", PHANDLE_XICP))); + _FDT((fdt_property_cell(fdt, "phandle", PHANDLE_XICP))); _FDT((fdt_end_node(fdt)));