[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/18] ppc/pnv: Move num_phbs under Pnv8Chip
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH v2 09/18] ppc/pnv: Move num_phbs under Pnv8Chip |
Date: |
Wed, 5 Jan 2022 18:23:29 -0300 |
From: Cédric Le Goater <clg@kaod.org>
It is not used elsewhere so that's where it belongs.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/ppc/pnv.c | 7 +++----
include/hw/ppc/pnv.h | 4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 8dc6382357..fe7e67e73a 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -1099,7 +1099,6 @@ static void pnv_chip_power10_intc_print_info(PnvChip
*chip, PowerPCCPU *cpu,
static void pnv_chip_power8_instance_init(Object *obj)
{
- PnvChip *chip = PNV_CHIP(obj);
Pnv8Chip *chip8 = PNV8_CHIP(obj);
PnvChipClass *pcc = PNV_CHIP_GET_CLASS(obj);
int i;
@@ -1118,10 +1117,10 @@ static void pnv_chip_power8_instance_init(Object *obj)
object_initialize_child(obj, "homer", &chip8->homer, TYPE_PNV8_HOMER);
if (defaults_enabled()) {
- chip->num_phbs = pcc->num_phbs;
+ chip8->num_phbs = pcc->num_phbs;
}
- for (i = 0; i < chip->num_phbs; i++) {
+ for (i = 0; i < chip8->num_phbs; i++) {
object_initialize_child(obj, "phb[*]", &chip8->phbs[i], TYPE_PNV_PHB3);
}
@@ -1247,7 +1246,7 @@ static void pnv_chip_power8_realize(DeviceState *dev,
Error **errp)
&chip8->homer.regs);
/* PHB3 controllers */
- for (i = 0; i < chip->num_phbs; i++) {
+ for (i = 0; i < chip8->num_phbs; i++) {
PnvPHB3 *phb = &chip8->phbs[i];
object_property_set_int(OBJECT(phb), "index", i, &error_fatal);
diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h
index f4219da7c5..0e9e16544f 100644
--- a/include/hw/ppc/pnv.h
+++ b/include/hw/ppc/pnv.h
@@ -52,7 +52,6 @@ struct PnvChip {
uint64_t cores_mask;
PnvCore **cores;
- uint32_t num_phbs;
uint32_t num_pecs;
MemoryRegion xscom_mmio;
@@ -82,6 +81,7 @@ struct Pnv8Chip {
#define PNV8_CHIP_PHB3_MAX 4
PnvPHB3 phbs[PNV8_CHIP_PHB3_MAX];
+ uint32_t num_phbs;
XICSFabric *xics;
};
@@ -136,8 +136,8 @@ struct PnvChipClass {
/*< public >*/
uint64_t chip_cfam_id;
uint64_t cores_mask;
- uint32_t num_phbs;
uint32_t num_pecs;
+ uint32_t num_phbs;
DeviceRealize parent_realize;
--
2.33.1
- [PATCH v2 02/18] pnv_phb4.c: add unique chassis and slot for pnv_phb4_root_port, (continued)
- [PATCH v2 02/18] pnv_phb4.c: add unique chassis and slot for pnv_phb4_root_port, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 03/18] ppc/pnv: Attach PHB3 root port device when defaults are enabled, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 04/18] pnv_phb4.c: make pnv-phb4-root-port user creatable, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 05/18] pnv_phb4.c: check if root port exists in rc_config functions, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 06/18] ppc/pnv: Introduce support for user created PHB3 devices, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 07/18] ppc/pnv: Reparent user created PHB3 devices to the PnvChip, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 08/18] ppc/pnv: Complete user created PHB3 devices, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 09/18] ppc/pnv: Move num_phbs under Pnv8Chip,
Daniel Henrique Barboza <=
- [PATCH v2 10/18] pnv_phb3.h: change TYPE_PNV_PHB3_ROOT_BUS name, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 11/18] pnv_phb4.c: introduce pnv_phb4_set_stack_phb_props(), Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 12/18] pnv_phb4_pec.c: move pnv_pec_phb_offset() to pnv_phb4.c, Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 13/18] pnv_phb4_pec: use pnv_phb4_pec_get_phb_id() in pnv_pec_dt_xscom(), Daniel Henrique Barboza, 2022/01/05
- [PATCH v2 14/18] pnv_phb4.h: turn phb into a pointer in struct PnvPhb4PecStack, Daniel Henrique Barboza, 2022/01/05