openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ppc/pnv: Add a PnvChip pointer to PnvCore 

We will use it to reset the interrupt presenter from the CPU reset
handler.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Message-Id: <20191022163812.330-5-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2019-10-22 18:38:09 +02:00 committed by David Gibson
parent fa06541b5d
commit aa5ac64b23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc/pnv_core.c
View File

@ -222,6 +222,7 @@ static void pnv_core_realize(DeviceState *dev, Error **errp)
"required link 'chip' not found: "); "required link 'chip' not found: ");
return; return;
} }
pc->chip = PNV_CHIP(chip);
pc->threads = g_new(PowerPCCPU *, cc->nr_threads); pc->threads = g_new(PowerPCCPU *, cc->nr_threads);
for (i = 0; i < cc->nr_threads; i++) { for (i = 0; i < cc->nr_threads; i++) {
@ -243,7 +244,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], PNV_CHIP(chip), &local_err); pnv_realize_vcpu(pc->threads[j], pc->chip, &local_err);
if (local_err) { if (local_err) {
goto err; goto err;
} }

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

@ -31,6 +31,8 @@
#define PNV_CORE_GET_CLASS(obj) \ #define PNV_CORE_GET_CLASS(obj) \
OBJECT_GET_CLASS(PnvCoreClass, (obj), TYPE_PNV_CORE) OBJECT_GET_CLASS(PnvCoreClass, (obj), TYPE_PNV_CORE)
typedef struct PnvChip PnvChip;
typedef struct PnvCore { typedef struct PnvCore {
/*< private >*/ /*< private >*/
CPUCore parent_obj; CPUCore parent_obj;
@ -38,6 +40,7 @@ typedef struct PnvCore {
/*< public >*/ /*< public >*/
PowerPCCPU **threads; PowerPCCPU **threads;
uint32_t pir; uint32_t pir;
PnvChip *chip;
MemoryRegion xscom_regs; MemoryRegion xscom_regs;
} PnvCore; } PnvCore;