ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2017-02-27 15:29:26 +01:00 committed by David Gibson
parent b4f27d71e3
commit b0ec31290c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/xics_spapr.c
View File

@ -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[] = { uint32_t interrupt_server_ranges_prop[] = {
0, cpu_to_be32(xics->nr_servers), 0, cpu_to_be32(nr_servers),
}; };
int node; int node;

2
hw/ppc/spapr.c
View File

@ -966,7 +966,7 @@ static void *spapr_build_fdt(sPAPRMachineState *spapr,
_FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2)); _FDT(fdt_setprop_cell(fdt, 0, "#size-cells", 2));
/* /interrupt controller */ /* /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); ret = spapr_populate_memory(spapr, fdt);
if (ret < 0) { if (ret < 0) {

2
include/hw/ppc/xics.h
View File

@ -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, int spapr_ics_alloc_block(ICSState *ics, int num, bool lsi, bool align,
Error **errp); Error **errp);
void spapr_ics_free(ICSState *ics, int irq, int num); 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); qemu_irq xics_get_qirq(XICSFabric *xi, int irq);
ICPState *xics_icp_get(XICSFabric *xi, int server); ICPState *xics_icp_get(XICSFabric *xi, int server);