[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/17] ppc/pnv: move phb_regs_mr to PnvPHB4
From: |
Daniel Henrique Barboza |
Subject: |
[PATCH 10/17] ppc/pnv: move phb_regs_mr to PnvPHB4 |
Date: |
Thu, 13 Jan 2022 16:29:45 -0300 |
After recent changes, this MemoryRegion can be migrated to PnvPHB4
without too much trouble.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/pci-host/pnv_phb4.c | 6 +++---
include/hw/pci-host/pnv_phb4.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 37bab10fcb..b5045fca64 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1481,9 +1481,9 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb)
PHB4_PEC_PCI_STK_REGS_COUNT);
/* PHB pass-through */
- snprintf(name, sizeof(name), "xscom-pec-%d.%d-pci-stack-%d-phb",
+ snprintf(name, sizeof(name), "xscom-pec-%d.%d-pci-phb-%d",
pec->chip_id, pec->index, stack->stack_no);
- pnv_xscom_region_init(&stack->phb_regs_mr, OBJECT(phb),
+ pnv_xscom_region_init(&phb->phb_regs_mr, OBJECT(phb),
&pnv_phb4_xscom_ops, phb, name, 0x40);
pec_nest_base = pecc->xscom_nest_base(pec);
@@ -1499,7 +1499,7 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb)
pnv_xscom_add_subregion(pec->chip,
pec_pci_base + PNV9_XSCOM_PEC_PCI_STK0 +
0x40 * stack->stack_no,
- &stack->phb_regs_mr);
+ &phb->phb_regs_mr);
}
static void pnv_phb4_instance_init(Object *obj)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 1d53dda0ed..6968efaba8 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -117,6 +117,9 @@ struct PnvPHB4 {
uint64_t nest_regs[PHB4_PEC_NEST_STK_REGS_COUNT];
MemoryRegion nest_regs_mr;
+ /* PHB pass-through XSCOM */
+ MemoryRegion phb_regs_mr;
+
/* Memory windows from PowerBus to PHB */
MemoryRegion phbbar;
MemoryRegion intbar;
@@ -170,9 +173,6 @@ struct PnvPhb4PecStack {
/* My own stack number */
uint32_t stack_no;
- /* PHB pass-through XSCOM */
- MemoryRegion phb_regs_mr;
-
/* The owner PEC */
PnvPhb4PecState *pec;
--
2.33.1
- [PATCH 09/17] ppc/pnv: move nest_regs_mr to PnvPHB4, (continued)
- [PATCH 09/17] ppc/pnv: move nest_regs_mr to PnvPHB4, Daniel Henrique Barboza, 2022/01/13
- [PATCH 12/17] ppc/pnv: introduce PnvPHB4 'pec' property, Daniel Henrique Barboza, 2022/01/13
- [PATCH 13/17] ppc/pnv: remove stack pointer from PnvPHB4, Daniel Henrique Barboza, 2022/01/13
- [PATCH 07/17] ppc/pnv: move nest_regs[] to PnvPHB4, Daniel Henrique Barboza, 2022/01/13
- [PATCH 08/17] ppc/pnv: change pnv_pec_stk_update_map() to use PnvPHB4, Daniel Henrique Barboza, 2022/01/13
- [PATCH 10/17] ppc/pnv: move phb_regs_mr to PnvPHB4,
Daniel Henrique Barboza <=
- [PATCH 11/17] ppc/pnv: introduce PnvPHB4 'phb_number' property, Daniel Henrique Barboza, 2022/01/13
- [PATCH 14/17] ppc/pnv: move default_phb_realize() to pec_realize(), Daniel Henrique Barboza, 2022/01/13
- [PATCH 17/17] ppc/pnv: rename pnv_pec_stk_update_map(), Daniel Henrique Barboza, 2022/01/13
- [PATCH 16/17] ppc/pnv: remove PnvPhb4PecStack object, Daniel Henrique Barboza, 2022/01/13