[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 13/13] pnv/xive: Deduce the PnvXive pointer from XiveTCTX::xpt
From: |
Cédric Le Goater |
Subject: |
[PATCH v2 13/13] pnv/xive: Deduce the PnvXive pointer from XiveTCTX::xptr |
Date: |
Thu, 19 Dec 2019 19:11:55 +0100 |
From: Greg Kurz <address@hidden>
And use it instead of reaching out to the machine. This allows to get
rid of pnv_get_chip().
Signed-off-by: Greg Kurz <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
---
include/hw/ppc/pnv.h | 2 --
hw/intc/pnv_xive.c | 8 ++------
hw/ppc/pnv.c | 14 --------------
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index d016ab0d0319..5f0b7d3374ef 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -221,8 +221,6 @@ struct PnvMachineState {
PnvPnor *pnor;
};
-PnvChip *pnv_get_chip(uint32_t chip_id);
-
#define PNV_FDT_ADDR 0x01000000
#define PNV_TIMEBASE_FREQ 512000000ULL
diff --git a/hw/intc/pnv_xive.c b/hw/intc/pnv_xive.c
index 1962f884d6de..79a5dfe9a858 100644
--- a/hw/intc/pnv_xive.c
+++ b/hw/intc/pnv_xive.c
@@ -472,12 +472,8 @@ static uint8_t pnv_xive_get_block_id(XiveRouter *xrtr)
static PnvXive *pnv_xive_tm_get_xive(PowerPCCPU *cpu)
{
int pir = ppc_cpu_pir(cpu);
- PnvChip *chip;
- PnvXive *xive;
-
- chip = pnv_get_chip(PNV9_PIR2CHIP(pir));
- assert(chip);
- xive = &PNV9_CHIP(chip)->xive;
+ XivePresenter *xptr = XIVE_TCTX(pnv_cpu_state(cpu)->intc)->xptr;
+ PnvXive *xive = PNV_XIVE(xptr);
if (!pnv_xive_is_cpu_enabled(xive, cpu)) {
xive_error(xive, "IC: CPU %x is not enabled", pir);
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index d100b6f559e2..e1c218dc03f5 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1724,20 +1724,6 @@ static int pnv_match_nvt(XiveFabric *xfb, uint8_t format,
return total_count;
}
-PnvChip *pnv_get_chip(uint32_t chip_id)
-{
- PnvMachineState *pnv = PNV_MACHINE(qdev_get_machine());
- int i;
-
- for (i = 0; i < pnv->num_chips; i++) {
- PnvChip *chip = pnv->chips[i];
- if (chip->chip_id == chip_id) {
- return chip;
- }
- }
- return NULL;
-}
-
static void pnv_get_num_chips(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp)
{
--
2.21.0
- Re: [PATCH v2 06/13] pnv/xive: Use device_class_set_parent_realize(), (continued)
- [PATCH v2 07/13] spapr, pnv, xive: Add a "xive-fabric" link to the XIVE router, Cédric Le Goater, 2019/12/19
- [PATCH v2 08/13] xive: Use the XIVE fabric link under the XIVE router, Cédric Le Goater, 2019/12/19
- [PATCH v2 09/13] ppc/pnv: Add an "nr-threads" property to the base chip class, Cédric Le Goater, 2019/12/19
- [PATCH v2 10/13] ppc/pnv: Add a "pnor" const link property to the BMC internal simulator, Cédric Le Goater, 2019/12/19
- [PATCH v2 11/13] xive: Add a "presenter" link property to the TCTX object, Cédric Le Goater, 2019/12/19
- [PATCH v2 12/13] spapr/xive: Deduce the SpaprXive pointer from XiveTCTX::xptr, Cédric Le Goater, 2019/12/19
- [PATCH v2 13/13] pnv/xive: Deduce the PnvXive pointer from XiveTCTX::xptr,
Cédric Le Goater <=
- Re: [PATCH v2 00/13] ppc/pnv: remove the use of qdev_get_machine() and get_system_memory(), David Gibson, 2019/12/23