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

ppc/pnv: Introduce PnvMachineClass::dt_power_mgt()

Browse Source 
We add an extra node to advertise power management on some machines,
namely powernv9 and powernv10. This is achieved by using the
pnv_is_power9() and pnv_is_power10() helpers.

This can be achieved with QOM. Add a method to the base class for
powernv machines and have it implemented by machine types that
support power management instead.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <157623839642.360005.9243510140436689941.stgit@bahia.lan>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2019-12-13 12:59:56 +01:00 committed by David Gibson
parent d76f2da7a5
commit 7a90c6a1b6
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/ppc/pnv.c
View File

@ -472,7 +472,7 @@ static void pnv_dt_isa(PnvMachineState *pnv, void *fdt)
&args); &args);
} }
static void pnv_dt_power_mgt(void *fdt) static void pnv_dt_power_mgt(PnvMachineState *pnv, void *fdt)
{ {
int off; int off;
@ -539,9 +539,9 @@ static void *pnv_dt_create(MachineState *machine)
pnv_dt_bmc_sensors(pnv->bmc, fdt); pnv_dt_bmc_sensors(pnv->bmc, fdt);
} }
/* Create an extra node for power management on Power9 and Power10 */ /* Create an extra node for power management on machines that support it */
if (pnv_is_power9(pnv) || pnv_is_power10(pnv)) { if (pmc->dt_power_mgt) {
pnv_dt_power_mgt(fdt); pmc->dt_power_mgt(pnv, fdt);
} }
return fdt; return fdt;
@ -1709,6 +1709,7 @@ static void pnv_machine_power9_class_init(ObjectClass *oc, void *data)
pmc->compat = compat; pmc->compat = compat;
pmc->compat_size = sizeof(compat); pmc->compat_size = sizeof(compat);
pmc->dt_power_mgt = pnv_dt_power_mgt;
} }
static void pnv_machine_power10_class_init(ObjectClass *oc, void *data) static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
@ -1722,6 +1723,7 @@ static void pnv_machine_power10_class_init(ObjectClass *oc, void *data)
pmc->compat = compat; pmc->compat = compat;
pmc->compat_size = sizeof(compat); pmc->compat_size = sizeof(compat);
pmc->dt_power_mgt = pnv_dt_power_mgt;
} }
static void pnv_machine_class_init(ObjectClass *oc, void *data) static void pnv_machine_class_init(ObjectClass *oc, void *data)

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

@ -190,6 +190,8 @@ PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
#define PNV_MACHINE_CLASS(klass) \ #define PNV_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(PnvMachineClass, klass, TYPE_PNV_MACHINE) OBJECT_CLASS_CHECK(PnvMachineClass, klass, TYPE_PNV_MACHINE)
typedef struct PnvMachineState PnvMachineState;
typedef struct PnvMachineClass { typedef struct PnvMachineClass {
/*< private >*/ /*< private >*/
MachineClass parent_class; MachineClass parent_class;
@ -197,9 +199,11 @@ typedef struct PnvMachineClass {
/*< public >*/ /*< public >*/
const char *compat; const char *compat;
int compat_size; int compat_size;
void (*dt_power_mgt)(PnvMachineState *pnv, void *fdt);
} PnvMachineClass; } PnvMachineClass;
typedef struct PnvMachineState { struct PnvMachineState {
/*< private >*/ /*< private >*/
MachineState parent_obj; MachineState parent_obj;
@ -216,7 +220,7 @@ typedef struct PnvMachineState {
Notifier powerdown_notifier; Notifier powerdown_notifier;
PnvPnor *pnor; PnvPnor *pnor;
} PnvMachineState; };
static inline bool pnv_chip_is_power9(const PnvChip *chip) static inline bool pnv_chip_is_power9(const PnvChip *chip)
{ {