SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ppc/pnv: Subclass quad xscom callbacks

Browse Source 
Make the existing pnv_quad_xscom_read/write be P9 specific, in
preparation for a different P10 callback.

Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com>
Message-ID: <20230704054204.168547-3-joel@jms.id.au>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Joel Stanley 2023-07-04 15:12:01 +09:30 committed by Daniel Henrique Barboza
parent 19d197f5d1
commit fdc2b46aba
3 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc/pnv.c
View File

@ -1429,14 +1429,15 @@ static void pnv_chip_power9_instance_init(Object *obj)
} }
static void pnv_chip_quad_realize_one(PnvChip *chip, PnvQuad *eq, static void pnv_chip_quad_realize_one(PnvChip *chip, PnvQuad *eq,
PnvCore *pnv_core) PnvCore *pnv_core,
const char *type)
{ {
char eq_name[32]; char eq_name[32];
int core_id = CPU_CORE(pnv_core)->core_id; int core_id = CPU_CORE(pnv_core)->core_id;
snprintf(eq_name, sizeof(eq_name), "eq[%d]", core_id); snprintf(eq_name, sizeof(eq_name), "eq[%d]", core_id);
object_initialize_child_with_props(OBJECT(chip), eq_name, eq, object_initialize_child_with_props(OBJECT(chip), eq_name, eq,
sizeof(*eq), TYPE_PNV_QUAD, sizeof(*eq), type,
&error_fatal, NULL); &error_fatal, NULL);
object_property_set_int(OBJECT(eq), "quad-id", core_id, &error_fatal); object_property_set_int(OBJECT(eq), "quad-id", core_id, &error_fatal);
@ -1454,7 +1455,8 @@ static void pnv_chip_quad_realize(Pnv9Chip *chip9, Error **errp)
for (i = 0; i < chip9->nr_quads; i++) { for (i = 0; i < chip9->nr_quads; i++) {
PnvQuad *eq = &chip9->quads[i]; PnvQuad *eq = &chip9->quads[i];
pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4]); pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4],
PNV_QUAD_TYPE_NAME("power9"));
pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->quad_id), pnv_xscom_add_subregion(chip, PNV9_XSCOM_EQ_BASE(eq->quad_id),
&eq->xscom_regs); &eq->xscom_regs);
@ -1666,7 +1668,8 @@ static void pnv_chip_power10_quad_realize(Pnv10Chip *chip10, Error **errp)
for (i = 0; i < chip10->nr_quads; i++) { for (i = 0; i < chip10->nr_quads; i++) {
PnvQuad *eq = &chip10->quads[i]; PnvQuad *eq = &chip10->quads[i];
pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4]); pnv_chip_quad_realize_one(chip, eq, chip->cores[i * 4],
PNV_QUAD_TYPE_NAME("power9"));
pnv_xscom_add_subregion(chip, PNV10_XSCOM_EQ_BASE(eq->quad_id), pnv_xscom_add_subregion(chip, PNV10_XSCOM_EQ_BASE(eq->quad_id),
&eq->xscom_regs); &eq->xscom_regs);

40
hw/ppc/pnv_core.c
View File

@ -407,12 +407,14 @@ static const MemoryRegionOps pnv_quad_power9_xscom_ops = {
static void pnv_quad_realize(DeviceState *dev, Error **errp) static void pnv_quad_realize(DeviceState *dev, Error **errp)
{ {
PnvQuad *eq = PNV_QUAD(dev); PnvQuad *eq = PNV_QUAD(dev);
PnvQuadClass *pqc = PNV_QUAD_GET_CLASS(eq);
char name[32]; char name[32];
snprintf(name, sizeof(name), "xscom-quad.%d", eq->quad_id); snprintf(name, sizeof(name), "xscom-quad.%d", eq->quad_id);
pnv_xscom_region_init(&eq->xscom_regs, OBJECT(dev), pnv_xscom_region_init(&eq->xscom_regs, OBJECT(dev),
&pnv_quad_power9_xscom_ops, pqc->xscom_ops,
eq, name, PNV9_XSCOM_EQ_SIZE); eq, name,
pqc->xscom_size);
} }
static Property pnv_quad_properties[] = { static Property pnv_quad_properties[] = {
@ -420,6 +422,14 @@ static Property pnv_quad_properties[] = {
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),
}; };
static void pnv_quad_power9_class_init(ObjectClass *oc, void *data)
{
PnvQuadClass *pqc = PNV_QUAD_CLASS(oc);
pqc->xscom_ops = &pnv_quad_power9_xscom_ops;
pqc->xscom_size = PNV9_XSCOM_EQ_SIZE;
}
static void pnv_quad_class_init(ObjectClass *oc, void *data) static void pnv_quad_class_init(ObjectClass *oc, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
@ -429,16 +439,20 @@ static void pnv_quad_class_init(ObjectClass *oc, void *data)
dc->user_creatable = false; dc->user_creatable = false;
} }
static const TypeInfo pnv_quad_info = { static const TypeInfo pnv_quad_infos[] = {
.name = TYPE_PNV_QUAD, {
.parent = TYPE_DEVICE, .name = TYPE_PNV_QUAD,
.instance_size = sizeof(PnvQuad), .parent = TYPE_DEVICE,
.class_init = pnv_quad_class_init, .instance_size = sizeof(PnvQuad),
.class_size = sizeof(PnvQuadClass),
.class_init = pnv_quad_class_init,
.abstract = true,
},
{
.parent = TYPE_PNV_QUAD,
.name = PNV_QUAD_TYPE_NAME("power9"),
.class_init = pnv_quad_power9_class_init,
},
}; };
static void pnv_core_register_types(void) DEFINE_TYPES(pnv_quad_infos);
{
type_register_static(&pnv_quad_info);
}
type_init(pnv_core_register_types)

13
include/hw/ppc/pnv_core.h
View File

@ -60,8 +60,19 @@ static inline PnvCPUState *pnv_cpu_state(PowerPCCPU *cpu)
return (PnvCPUState *)cpu->machine_data; return (PnvCPUState *)cpu->machine_data;
} }
struct PnvQuadClass {
DeviceClass parent_class;
const MemoryRegionOps *xscom_ops;
uint64_t xscom_size;
};
#define TYPE_PNV_QUAD "powernv-cpu-quad" #define TYPE_PNV_QUAD "powernv-cpu-quad"
OBJECT_DECLARE_SIMPLE_TYPE(PnvQuad, PNV_QUAD)
#define PNV_QUAD_TYPE_SUFFIX "-" TYPE_PNV_QUAD
#define PNV_QUAD_TYPE_NAME(cpu_model) cpu_model PNV_QUAD_TYPE_SUFFIX
OBJECT_DECLARE_TYPE(PnvQuad, PnvQuadClass, PNV_QUAD)
struct PnvQuad { struct PnvQuad {
DeviceState parent_obj; DeviceState parent_obj;