ppc/pnv: Introduce a "xics" property under the POWER8 chip
POWER8 is the only chip using the XICS interface. Add a "xics" link and a XICSFabric attribute under this chip to remove the use of qdev_get_machine() Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Message-Id: <20200106145645.4539-3-clg@kaod.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
34bdca8fae
commit
245cdb7f54
24
hw/ppc/pnv.c
24
hw/ppc/pnv.c
|
@ -802,6 +802,13 @@ static void pnv_init(MachineState *machine)
|
||||||
&error_fatal);
|
&error_fatal);
|
||||||
object_property_set_int(chip, machine->smp.cores,
|
object_property_set_int(chip, machine->smp.cores,
|
||||||
"nr-cores", &error_fatal);
|
"nr-cores", &error_fatal);
|
||||||
|
/*
|
||||||
|
* The POWER8 machine use the XICS interrupt interface.
|
||||||
|
* Propagate the XICS fabric to the chip and its controllers.
|
||||||
|
*/
|
||||||
|
if (object_dynamic_cast(OBJECT(pnv), TYPE_XICS_FABRIC)) {
|
||||||
|
object_property_set_link(chip, OBJECT(pnv), "xics", &error_abort);
|
||||||
|
}
|
||||||
object_property_set_bool(chip, true, "realized", &error_fatal);
|
object_property_set_bool(chip, true, "realized", &error_fatal);
|
||||||
}
|
}
|
||||||
g_free(chip_typename);
|
g_free(chip_typename);
|
||||||
|
@ -843,12 +850,12 @@ static uint32_t pnv_chip_core_pir_p8(PnvChip *chip, uint32_t core_id)
|
||||||
static void pnv_chip_power8_intc_create(PnvChip *chip, PowerPCCPU *cpu,
|
static void pnv_chip_power8_intc_create(PnvChip *chip, PowerPCCPU *cpu,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
|
Pnv8Chip *chip8 = PNV8_CHIP(chip);
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
Object *obj;
|
Object *obj;
|
||||||
PnvCPUState *pnv_cpu = pnv_cpu_state(cpu);
|
PnvCPUState *pnv_cpu = pnv_cpu_state(cpu);
|
||||||
|
|
||||||
obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, XICS_FABRIC(qdev_get_machine()),
|
obj = icp_create(OBJECT(cpu), TYPE_PNV_ICP, chip8->xics, &local_err);
|
||||||
&local_err);
|
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_propagate(errp, local_err);
|
error_propagate(errp, local_err);
|
||||||
return;
|
return;
|
||||||
|
@ -1002,6 +1009,12 @@ static void pnv_chip_power8_instance_init(Object *obj)
|
||||||
{
|
{
|
||||||
Pnv8Chip *chip8 = PNV8_CHIP(obj);
|
Pnv8Chip *chip8 = PNV8_CHIP(obj);
|
||||||
|
|
||||||
|
object_property_add_link(obj, "xics", TYPE_XICS_FABRIC,
|
||||||
|
(Object **)&chip8->xics,
|
||||||
|
object_property_allow_set_link,
|
||||||
|
OBJ_PROP_LINK_STRONG,
|
||||||
|
&error_abort);
|
||||||
|
|
||||||
object_initialize_child(obj, "psi", &chip8->psi, sizeof(chip8->psi),
|
object_initialize_child(obj, "psi", &chip8->psi, sizeof(chip8->psi),
|
||||||
TYPE_PNV8_PSI, &error_abort, NULL);
|
TYPE_PNV8_PSI, &error_abort, NULL);
|
||||||
|
|
||||||
|
@ -1021,7 +1034,6 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp)
|
||||||
PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
|
PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
|
||||||
int i, j;
|
int i, j;
|
||||||
char *name;
|
char *name;
|
||||||
XICSFabric *xi = XICS_FABRIC(qdev_get_machine());
|
|
||||||
|
|
||||||
name = g_strdup_printf("icp-%x", chip->chip_id);
|
name = g_strdup_printf("icp-%x", chip->chip_id);
|
||||||
memory_region_init(&chip8->icp_mmio, OBJECT(chip), name, PNV_ICP_SIZE);
|
memory_region_init(&chip8->icp_mmio, OBJECT(chip), name, PNV_ICP_SIZE);
|
||||||
|
@ -1037,7 +1049,7 @@ static void pnv_chip_icp_realize(Pnv8Chip *chip8, Error **errp)
|
||||||
|
|
||||||
for (j = 0; j < CPU_CORE(pnv_core)->nr_threads; j++) {
|
for (j = 0; j < CPU_CORE(pnv_core)->nr_threads; j++) {
|
||||||
uint32_t pir = pcc->core_pir(chip, core_hwid) + j;
|
uint32_t pir = pcc->core_pir(chip, core_hwid) + j;
|
||||||
PnvICPState *icp = PNV_ICP(xics_icp_get(xi, pir));
|
PnvICPState *icp = PNV_ICP(xics_icp_get(chip8->xics, pir));
|
||||||
|
|
||||||
memory_region_add_subregion(&chip8->icp_mmio, pir << 12,
|
memory_region_add_subregion(&chip8->icp_mmio, pir << 12,
|
||||||
&icp->mmio);
|
&icp->mmio);
|
||||||
|
@ -1053,6 +1065,8 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)
|
||||||
Pnv8Psi *psi8 = &chip8->psi;
|
Pnv8Psi *psi8 = &chip8->psi;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
||||||
|
assert(chip8->xics);
|
||||||
|
|
||||||
/* XSCOM bridge is first */
|
/* XSCOM bridge is first */
|
||||||
pnv_xscom_realize(chip, PNV_XSCOM_SIZE, &local_err);
|
pnv_xscom_realize(chip, PNV_XSCOM_SIZE, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
|
@ -1070,7 +1084,7 @@ static void pnv_chip_power8_realize(DeviceState *dev, Error **errp)
|
||||||
/* Processor Service Interface (PSI) Host Bridge */
|
/* Processor Service Interface (PSI) Host Bridge */
|
||||||
object_property_set_int(OBJECT(&chip8->psi), PNV_PSIHB_BASE(chip),
|
object_property_set_int(OBJECT(&chip8->psi), PNV_PSIHB_BASE(chip),
|
||||||
"bar", &error_fatal);
|
"bar", &error_fatal);
|
||||||
object_property_set_link(OBJECT(&chip8->psi), OBJECT(qdev_get_machine()),
|
object_property_set_link(OBJECT(&chip8->psi), OBJECT(chip8->xics),
|
||||||
ICS_PROP_XICS, &error_abort);
|
ICS_PROP_XICS, &error_abort);
|
||||||
object_property_set_bool(OBJECT(&chip8->psi), true, "realized", &local_err);
|
object_property_set_bool(OBJECT(&chip8->psi), true, "realized", &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
|
|
|
@ -72,6 +72,8 @@ typedef struct Pnv8Chip {
|
||||||
Pnv8Psi psi;
|
Pnv8Psi psi;
|
||||||
PnvOCC occ;
|
PnvOCC occ;
|
||||||
PnvHomer homer;
|
PnvHomer homer;
|
||||||
|
|
||||||
|
XICSFabric *xics;
|
||||||
} Pnv8Chip;
|
} Pnv8Chip;
|
||||||
|
|
||||||
#define TYPE_PNV9_CHIP "pnv9-chip"
|
#define TYPE_PNV9_CHIP "pnv9-chip"
|
||||||
|
|
Loading…
Reference in a new issue