mirror of https://gitee.com/openkylin/qemu.git
ppc/pnv: Implement the XiveFabric interface
The CAM line matching on the PowerNV machine now scans all chips of the system and all CPUs of a chip to find a dispatched NVT in the thread contexts. Reviewed-by: Greg Kurz <groug@kaod.org> Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20191125065820.927-10-clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
d3eb47a2a1
commit
c722579e8c
35
hw/ppc/pnv.c
35
hw/ppc/pnv.c
|
@ -1443,6 +1443,35 @@ static void pnv_pic_print_info(InterruptStatsProvider *obj,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int pnv_match_nvt(XiveFabric *xfb, uint8_t format,
|
||||||
|
uint8_t nvt_blk, uint32_t nvt_idx,
|
||||||
|
bool cam_ignore, uint8_t priority,
|
||||||
|
uint32_t logic_serv,
|
||||||
|
XiveTCTXMatch *match)
|
||||||
|
{
|
||||||
|
PnvMachineState *pnv = PNV_MACHINE(xfb);
|
||||||
|
int total_count = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < pnv->num_chips; i++) {
|
||||||
|
Pnv9Chip *chip9 = PNV9_CHIP(pnv->chips[i]);
|
||||||
|
XivePresenter *xptr = XIVE_PRESENTER(&chip9->xive);
|
||||||
|
XivePresenterClass *xpc = XIVE_PRESENTER_GET_CLASS(xptr);
|
||||||
|
int count;
|
||||||
|
|
||||||
|
count = xpc->match_nvt(xptr, format, nvt_blk, nvt_idx, cam_ignore,
|
||||||
|
priority, logic_serv, match);
|
||||||
|
|
||||||
|
if (count < 0) {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
|
||||||
|
total_count += count;
|
||||||
|
}
|
||||||
|
|
||||||
|
return total_count;
|
||||||
|
}
|
||||||
|
|
||||||
static void pnv_get_num_chips(Object *obj, Visitor *v, const char *name,
|
static void pnv_get_num_chips(Object *obj, Visitor *v, const char *name,
|
||||||
void *opaque, Error **errp)
|
void *opaque, Error **errp)
|
||||||
{
|
{
|
||||||
|
@ -1506,9 +1535,11 @@ static void pnv_machine_power8_class_init(ObjectClass *oc, void *data)
|
||||||
static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
|
static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
MachineClass *mc = MACHINE_CLASS(oc);
|
MachineClass *mc = MACHINE_CLASS(oc);
|
||||||
|
XiveFabricClass *xfc = XIVE_FABRIC_CLASS(oc);
|
||||||
|
|
||||||
mc->desc = "IBM PowerNV (Non-Virtualized) POWER9";
|
mc->desc = "IBM PowerNV (Non-Virtualized) POWER9";
|
||||||
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.0");
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("power9_v2.0");
|
||||||
|
xfc->match_nvt = pnv_match_nvt;
|
||||||
|
|
||||||
mc->alias = "powernv";
|
mc->alias = "powernv";
|
||||||
}
|
}
|
||||||
|
@ -1555,6 +1586,10 @@ static const TypeInfo types[] = {
|
||||||
.name = MACHINE_TYPE_NAME("powernv9"),
|
.name = MACHINE_TYPE_NAME("powernv9"),
|
||||||
.parent = TYPE_PNV_MACHINE,
|
.parent = TYPE_PNV_MACHINE,
|
||||||
.class_init = pnv_machine_power9_class_init,
|
.class_init = pnv_machine_power9_class_init,
|
||||||
|
.interfaces = (InterfaceInfo[]) {
|
||||||
|
{ TYPE_XIVE_FABRIC },
|
||||||
|
{ },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = MACHINE_TYPE_NAME("powernv8"),
|
.name = MACHINE_TYPE_NAME("powernv8"),
|
||||||
|
|
Loading…
Reference in New Issue