mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ppc/pnv: introduce a new intc_create() operation to the chip model 

On Power9, the thread interrupt presenter has a different type and is
linked to the chip owning the cores.

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 2018-06-15 17:25:33 +02:00 committed by David Gibson
parent 46012db666
commit d35aefa9ae
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/ppc/pnv.c
View File

@ -671,6 +671,13 @@ static uint32_t pnv_chip_core_pir_p8(PnvChip *chip, uint32_t core_id)
return (chip->chip_id << 7) | (core_id << 3); return (chip->chip_id << 7) | (core_id << 3);
} }
static Object *pnv_chip_power8_intc_create(PnvChip *chip, Object *child,
Error **errp)
{
return icp_create(child, TYPE_PNV_ICP, XICS_FABRIC(qdev_get_machine()),
errp);
}
/* /*
* 0:48 Reserved - Read as zeroes * 0:48 Reserved - Read as zeroes
* 49:52 Node ID * 49:52 Node ID
@ -686,6 +693,12 @@ static uint32_t pnv_chip_core_pir_p9(PnvChip *chip, uint32_t core_id)
return (chip->chip_id << 8) | (core_id << 2); return (chip->chip_id << 8) | (core_id << 2);
} }
static Object *pnv_chip_power9_intc_create(PnvChip *chip, Object *child,
Error **errp)
{
return NULL;
}
/* Allowed core identifiers on a POWER8 Processor Chip : /* Allowed core identifiers on a POWER8 Processor Chip :
* *
* <EX0 reserved> * <EX0 reserved>
@ -721,6 +734,7 @@ static void pnv_chip_power8e_class_init(ObjectClass *klass, void *data)
k->chip_cfam_id = 0x221ef04980000000ull; /* P8 Murano DD2.1 */ k->chip_cfam_id = 0x221ef04980000000ull; /* P8 Murano DD2.1 */
k->cores_mask = POWER8E_CORE_MASK; k->cores_mask = POWER8E_CORE_MASK;
k->core_pir = pnv_chip_core_pir_p8; k->core_pir = pnv_chip_core_pir_p8;
k->intc_create = pnv_chip_power8_intc_create;
k->xscom_base = 0x003fc0000000000ull; k->xscom_base = 0x003fc0000000000ull;
dc->desc = "PowerNV Chip POWER8E"; dc->desc = "PowerNV Chip POWER8E";
} }
@ -734,6 +748,7 @@ static void pnv_chip_power8_class_init(ObjectClass *klass, void *data)
k->chip_cfam_id = 0x220ea04980000000ull; /* P8 Venice DD2.0 */ k->chip_cfam_id = 0x220ea04980000000ull; /* P8 Venice DD2.0 */
k->cores_mask = POWER8_CORE_MASK; k->cores_mask = POWER8_CORE_MASK;
k->core_pir = pnv_chip_core_pir_p8; k->core_pir = pnv_chip_core_pir_p8;
k->intc_create = pnv_chip_power8_intc_create;
k->xscom_base = 0x003fc0000000000ull; k->xscom_base = 0x003fc0000000000ull;
dc->desc = "PowerNV Chip POWER8"; dc->desc = "PowerNV Chip POWER8";
} }
@ -747,6 +762,7 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data)
k->chip_cfam_id = 0x120d304980000000ull; /* P8 Naples DD1.0 */ k->chip_cfam_id = 0x120d304980000000ull; /* P8 Naples DD1.0 */
k->cores_mask = POWER8_CORE_MASK; k->cores_mask = POWER8_CORE_MASK;
k->core_pir = pnv_chip_core_pir_p8; k->core_pir = pnv_chip_core_pir_p8;
k->intc_create = pnv_chip_power8_intc_create;
k->xscom_base = 0x003fc0000000000ull; k->xscom_base = 0x003fc0000000000ull;
dc->desc = "PowerNV Chip POWER8NVL"; dc->desc = "PowerNV Chip POWER8NVL";
} }
@ -760,6 +776,7 @@ static void pnv_chip_power9_class_init(ObjectClass *klass, void *data)
k->chip_cfam_id = 0x220d104900008000ull; /* P9 Nimbus DD2.0 */ k->chip_cfam_id = 0x220d104900008000ull; /* P9 Nimbus DD2.0 */
k->cores_mask = POWER9_CORE_MASK; k->cores_mask = POWER9_CORE_MASK;
k->core_pir = pnv_chip_core_pir_p9; k->core_pir = pnv_chip_core_pir_p9;
k->intc_create = pnv_chip_power9_intc_create;
k->xscom_base = 0x00603fc00000000ull; k->xscom_base = 0x00603fc00000000ull;
dc->desc = "PowerNV Chip POWER9"; dc->desc = "PowerNV Chip POWER9";
} }
@ -892,8 +909,8 @@ static void pnv_chip_core_realize(PnvChip *chip, Error **errp)
object_property_set_int(OBJECT(pnv_core), object_property_set_int(OBJECT(pnv_core),
pcc->core_pir(chip, core_hwid), pcc->core_pir(chip, core_hwid),
"pir", &error_fatal); "pir", &error_fatal);
object_property_add_const_link(OBJECT(pnv_core), "xics", object_property_add_const_link(OBJECT(pnv_core), "chip",
qdev_get_machine(), &error_fatal); OBJECT(chip), &error_fatal);
object_property_set_bool(OBJECT(pnv_core), true, "realized", object_property_set_bool(OBJECT(pnv_core), true, "realized",
&error_fatal); &error_fatal);
object_unref(OBJECT(pnv_core)); object_unref(OBJECT(pnv_core));

18
hw/ppc/pnv_core.c
View File

@ -99,13 +99,14 @@ static const MemoryRegionOps pnv_core_xscom_ops = {
.endianness = DEVICE_BIG_ENDIAN, .endianness = DEVICE_BIG_ENDIAN,
}; };
static void pnv_realize_vcpu(PowerPCCPU *cpu, XICSFabric *xi, Error **errp) static void pnv_realize_vcpu(PowerPCCPU *cpu, PnvChip *chip, Error **errp)
{ {
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
int core_pir; int core_pir;
int thread_index = 0; /* TODO: TCG supports only one thread */ int thread_index = 0; /* TODO: TCG supports only one thread */
ppc_spr_t *pir = &env->spr_cb[SPR_PIR]; ppc_spr_t *pir = &env->spr_cb[SPR_PIR];
Error *local_err = NULL; Error *local_err = NULL;
PnvChipClass *pcc = PNV_CHIP_GET_CLASS(chip);
object_property_set_bool(OBJECT(cpu), true, "realized", &local_err); object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);
if (local_err) { if (local_err) {
@ -113,7 +114,7 @@ static void pnv_realize_vcpu(PowerPCCPU *cpu, XICSFabric *xi, Error **errp)
return; return;
} }
cpu->intc = icp_create(OBJECT(cpu), TYPE_PNV_ICP, xi, &local_err); cpu->intc = pcc->intc_create(chip, OBJECT(cpu), &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;
@ -143,13 +144,12 @@ static void pnv_core_realize(DeviceState *dev, Error **errp)
void *obj; void *obj;
int i, j; int i, j;
char name[32]; char name[32];
Object *xi; Object *chip;
xi = object_property_get_link(OBJECT(dev), "xics", &local_err); chip = object_property_get_link(OBJECT(dev), "chip", &local_err);
if (!xi) { if (!chip) {
error_setg(errp, "%s: required link 'xics' not found: %s", error_propagate(errp, local_err);
__func__, error_get_pretty(local_err)); error_prepend(errp, "required link 'chip' not found: ");
return;
} }
pc->threads = g_new(PowerPCCPU *, cc->nr_threads); pc->threads = g_new(PowerPCCPU *, cc->nr_threads);
@ -166,7 +166,7 @@ static void pnv_core_realize(DeviceState *dev, Error **errp)
} }
for (j = 0; j < cc->nr_threads; j++) { for (j = 0; j < cc->nr_threads; j++) {
pnv_realize_vcpu(pc->threads[j], XICS_FABRIC(xi), &local_err); pnv_realize_vcpu(pc->threads[j], PNV_CHIP(chip), &local_err);
if (local_err) { if (local_err) {
goto err; goto err;
} }

1
include/hw/ppc/pnv.h
View File

@ -76,6 +76,7 @@ typedef struct PnvChipClass {
hwaddr xscom_base; hwaddr xscom_base;
uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id); uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id);
Object *(*intc_create)(PnvChip *chip, Object *child, Error **errp);
} PnvChipClass; } PnvChipClass;
#define PNV_CHIP_TYPE_SUFFIX "-" TYPE_PNV_CHIP #define PNV_CHIP_TYPE_SUFFIX "-" TYPE_PNV_CHIP