Commit 9b9a1908 authored by David Gibson's avatar David Gibson
Browse files

pseries: Move construction of /interrupt-controller fdt node 



Currently the device tree node for the XICS interrupt controller is in
spapr_create_fdt_skel().  As part of consolidating device tree construction
to reset time, this moves it to a function called from spapr_build_fdt().

In addition we move the actual code into hw/intc/xics_spapr.c with the
rest of the PAPR specific interrupt controller code.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 2cac78c1

hw/intc/xics_spapr.c

+22 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "qemu/timer.h"

#include "hw/ppc/spapr.h"

#include "hw/ppc/xics.h"

#include "hw/ppc/fdt.h"

#include "qapi/visitor.h"

#include "qapi/error.h"
@@ -449,6 +450,27 @@ void xics_spapr_free(XICSState *xics, int irq, int num) 
    }

}



void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle)

{

    uint32_t interrupt_server_ranges_prop[] = {

        0, cpu_to_be32(xics->nr_servers),

    };

    int node;



    _FDT(node = fdt_add_subnode(fdt, 0, "interrupt-controller"));



    _FDT(fdt_setprop_string(fdt, node, "device_type",

                            "PowerPC-External-Interrupt-Presentation"));

    _FDT(fdt_setprop_string(fdt, node, "compatible", "IBM,ppc-xicp"));

    _FDT(fdt_setprop(fdt, node, "interrupt-controller", NULL, 0));

    _FDT(fdt_setprop(fdt, node, "ibm,interrupt-server-ranges",

                     interrupt_server_ranges_prop,

                     sizeof(interrupt_server_ranges_prop)));

    _FDT(fdt_setprop_cell(fdt, node, "#interrupt-cells", 2));

    _FDT(fdt_setprop_cell(fdt, node, "linux,phandle", phandle));

    _FDT(fdt_setprop_cell(fdt, node, "phandle", phandle));

}



static void xics_spapr_register_types(void)

{

    type_register_static(&xics_spapr_info);

hw/ppc/spapr.c

+3 −17
Original line number Diff line number Diff line
@@ -280,7 +280,6 @@ static void *spapr_create_fdt_skel(sPAPRMachineState *spapr) 
    GString *hypertas = g_string_sized_new(256);

    GString *qemu_hypertas = g_string_sized_new(256);

    uint32_t refpoints[] = {cpu_to_be32(0x4), cpu_to_be32(0x4)};

    uint32_t interrupt_server_ranges_prop[] = {0, cpu_to_be32(max_cpus)};

    unsigned char vec5[] = {0x0, 0x0, 0x0, 0x0, 0x0, 0x80};

    char *buf;
@@ -402,22 +401,6 @@ static void *spapr_create_fdt_skel(sPAPRMachineState *spapr) 


    _FDT((fdt_end_node(fdt)));



    /* interrupt controller */

    _FDT((fdt_begin_node(fdt, "interrupt-controller")));



    _FDT((fdt_property_string(fdt, "device_type",

                              "PowerPC-External-Interrupt-Presentation")));

    _FDT((fdt_property_string(fdt, "compatible", "IBM,ppc-xicp")));

    _FDT((fdt_property(fdt, "interrupt-controller", NULL, 0)));

    _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)));



    /* vdevice */

    _FDT((fdt_begin_node(fdt, "vdevice")));
@@ -909,6 +892,9 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, 
    /* open out the base tree into a temp buffer for the final tweaks */

    _FDT((fdt_open_into(spapr->fdt_skel, fdt, FDT_MAX_SIZE)));



    /* /interrupt controller */

    spapr_dt_xics(spapr->xics, fdt, PHANDLE_XICP);



    ret = spapr_populate_memory(spapr, fdt);

    if (ret < 0) {

        error_report("couldn't setup memory nodes in fdt");

include/hw/ppc/xics.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ int xics_spapr_alloc(XICSState *icp, int irq_hint, bool lsi, Error **errp); 
int xics_spapr_alloc_block(XICSState *icp, int num, bool lsi, bool align,

                           Error **errp);

void xics_spapr_free(XICSState *icp, int irq, int num);

void spapr_dt_xics(XICSState *xics, void *fdt, uint32_t phandle);



void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);

void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);