Commit b0ec3129 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by David Gibson
Browse files

ppc/xics: simplify spapr_dt_xics() interface 



spapr_dt_xics() only needs the number of servers to build the device
tree nodes. Let's change the routine interface to reflect that.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent b4f27d71

hw/intc/xics_spapr.c

+2 −2
Original line number Diff line number Diff line
@@ -387,10 +387,10 @@ void spapr_ics_free(ICSState *ics, int irq, int num) 
    }

}



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

void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle)

{

    uint32_t interrupt_server_ranges_prop[] = {

        0, cpu_to_be32(xics->nr_servers),

        0, cpu_to_be32(nr_servers),

    };

    int node;

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr, 
    _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2));



    /* /interrupt controller */

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

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



    ret = spapr_populate_memory(spapr, fdt);

    if (ret < 0) {

include/hw/ppc/xics.h

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ int spapr_ics_alloc(ICSState *ics, int irq_hint, bool lsi, Error **errp); 
int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align,

                           Error **errp);

void spapr_ics_free(ICSState *ics, int irq, int num);

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

void spapr_dt_xics(int nr_servers, void *fdt, uint32_t phandle);



qemu_irq xics_get_qirq(XICSFabric *xi, int irq);

ICPState *xics_icp_get(XICSFabric *xi, int server);