[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 79/88] ppc/pnv: Introduce PnvMachineClass::dt_power_mgt()
From: |
David Gibson |
Subject: |
[PULL 79/88] ppc/pnv: Introduce PnvMachineClass::dt_power_mgt() |
Date: |
Tue, 17 Dec 2019 15:43:13 +1100 |
From: Greg Kurz <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/pnv.c | 10 ++++++----
include/hw/ppc/pnv.h | 8 ++++++--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 97845e7bde..a2ad7258f8 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -472,7 +472,7 @@ static void pnv_dt_isa(PnvMachineState *pnv, void *fdt)
&args);
}
-static void pnv_dt_power_mgt(void *fdt)
+static void pnv_dt_power_mgt(PnvMachineState *pnv, void *fdt)
{
int off;
@@ -539,9 +539,9 @@ static void *pnv_dt_create(MachineState *machine)
pnv_dt_bmc_sensors(pnv->bmc, fdt);
}
- /* Create an extra node for power management on Power9 and Power10 */
- if (pnv_is_power9(pnv) || pnv_is_power10(pnv)) {
- pnv_dt_power_mgt(fdt);
+ /* Create an extra node for power management on machines that support it */
+ if (pmc->dt_power_mgt) {
+ pmc->dt_power_mgt(pnv, fdt);
}
return fdt;
@@ -1709,6 +1709,7 @@ static void pnv_machine_power9_class_init(ObjectClass
*oc, void *data)
pmc->compat = 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)
@@ -1722,6 +1723,7 @@ static void pnv_machine_power10_class_init(ObjectClass
*oc, void *data)
pmc->compat = compat;
pmc->compat_size = sizeof(compat);
+ pmc->dt_power_mgt = pnv_dt_power_mgt;
}
static void pnv_machine_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index d534746bd4..8a42c199b6 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -190,6 +190,8 @@ PowerPCCPU *pnv_chip_find_cpu(PnvChip *chip, uint32_t pir);
#define PNV_MACHINE_CLASS(klass) \
OBJECT_CLASS_CHECK(PnvMachineClass, klass, TYPE_PNV_MACHINE)
+typedef struct PnvMachineState PnvMachineState;
+
typedef struct PnvMachineClass {
/*< private >*/
MachineClass parent_class;
@@ -197,9 +199,11 @@ typedef struct PnvMachineClass {
/*< public >*/
const char *compat;
int compat_size;
+
+ void (*dt_power_mgt)(PnvMachineState *pnv, void *fdt);
} PnvMachineClass;
-typedef struct PnvMachineState {
+struct PnvMachineState {
/*< private >*/
MachineState parent_obj;
@@ -216,7 +220,7 @@ typedef struct PnvMachineState {
Notifier powerdown_notifier;
PnvPnor *pnor;
-} PnvMachineState;
+};
static inline bool pnv_chip_is_power9(const PnvChip *chip)
{
--
2.23.0
- [PULL 83/88] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom(), (continued)
- [PULL 83/88] ppc/pnv: Pass XSCOM base address and address size to pnv_dt_xscom(), David Gibson, 2019/12/16
- [PULL 74/88] ppc/pnv: Fix OCC common area region mapping, David Gibson, 2019/12/16
- [PULL 81/88] ppc/pnv: Introduce PnvChipClass::intc_print_info() method, David Gibson, 2019/12/16
- [PULL 72/88] ppc/pnv: Make PnvXScomInterface an incomplete type, David Gibson, 2019/12/16
- [PULL 80/88] ppc/pnv: Drop pnv_is_power9() and pnv_is_power10() helpers, David Gibson, 2019/12/16
- [PULL 76/88] ppc/pnv: Introduce PnvPsiClass::compat, David Gibson, 2019/12/16
- [PULL 84/88] ppc/pnv: Pass content of the "compatible" property to pnv_dt_xscom(), David Gibson, 2019/12/16
- [PULL 77/88] ppc/pnv: Drop PnvPsiClass::chip_type, David Gibson, 2019/12/16
- [PULL 82/88] ppc/pnv: Introduce PnvChipClass::xscom_core_base() method, David Gibson, 2019/12/16
- [PULL 78/88] ppc/pnv: Introduce PnvMachineClass and PnvMachineClass::compat, David Gibson, 2019/12/16
- [PULL 79/88] ppc/pnv: Introduce PnvMachineClass::dt_power_mgt(),
David Gibson <=
- [PULL 73/88] ppc/pnv: Introduce PBA registers, David Gibson, 2019/12/16
- [PULL 85/88] ppc/pnv: Drop pnv_chip_is_power9() and pnv_chip_is_power10() helpers, David Gibson, 2019/12/16
- [PULL 86/88] ppc/pnv: Introduce PnvChipClass::xscom_pcba() method, David Gibson, 2019/12/16
- [PULL 87/88] ppc/pnv: Drop PnvChipClass::type, David Gibson, 2019/12/16
- [PULL 88/88] pseries: Update SLOF firmware image, David Gibson, 2019/12/16
- Re: [PULL 00/88] ppc-for-5.0 queue 20191217, Peter Maydell, 2019/12/17