[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/31] ppc/pnv: move PCI registers to PnvPHB4
From: |
Cédric Le Goater |
Subject: |
[PULL 12/31] ppc/pnv: move PCI registers to PnvPHB4 |
Date: |
Tue, 18 Jan 2022 14:07:11 +0100 |
From: Daniel Henrique Barboza <danielhb413@gmail.com>
Previous patch changed pnv_pec_stk_pci_xscom_read() and
pnv_pec_stk_pci_xscom_write() to use a PnvPHB4 opaque, making it easier
to move both pci_regs[] and the pci_regs_mr MemoryRegion to the PnvHB4
object.
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220113192952.911188-3-danielhb413@gmail.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
include/hw/pci-host/pnv_phb4.h | 10 +++++-----
hw/pci-host/pnv_phb4.c | 30 +++++++++++++++---------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 4b7ce8a7239f..4487c3a6e2da 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -107,6 +107,11 @@ struct PnvPHB4 {
MemoryRegion pci_mmio;
MemoryRegion pci_io;
+ /* PCI registers (excluding pass-through) */
+#define PHB4_PEC_PCI_STK_REGS_COUNT 0xf
+ uint64_t pci_regs[PHB4_PEC_PCI_STK_REGS_COUNT];
+ MemoryRegion pci_regs_mr;
+
/* On-chip IODA tables */
uint64_t ioda_LIST[PNV_PHB4_MAX_LSIs];
uint64_t ioda_MIST[PNV_PHB4_MAX_MIST];
@@ -155,11 +160,6 @@ struct PnvPhb4PecStack {
uint64_t nest_regs[PHB4_PEC_NEST_STK_REGS_COUNT];
MemoryRegion nest_regs_mr;
- /* PCI registers (excluding pass-through) */
-#define PHB4_PEC_PCI_STK_REGS_COUNT 0xf
- uint64_t pci_regs[PHB4_PEC_PCI_STK_REGS_COUNT];
- MemoryRegion pci_regs_mr;
-
/* PHB pass-through XSCOM */
MemoryRegion phb_regs_mr;
diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index e010572376dc..fd9f6af4b3a4 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1071,54 +1071,54 @@ static const MemoryRegionOps pnv_pec_stk_nest_xscom_ops
= {
static uint64_t pnv_pec_stk_pci_xscom_read(void *opaque, hwaddr addr,
unsigned size)
{
- PnvPhb4PecStack *stack = PNV_PHB4(opaque)->stack;
+ PnvPHB4 *phb = PNV_PHB4(opaque);
uint32_t reg = addr >> 3;
/* TODO: add list of allowed registers and error out if not */
- return stack->pci_regs[reg];
+ return phb->pci_regs[reg];
}
static void pnv_pec_stk_pci_xscom_write(void *opaque, hwaddr addr,
uint64_t val, unsigned size)
{
- PnvPhb4PecStack *stack = PNV_PHB4(opaque)->stack;
+ PnvPHB4 *phb = PNV_PHB4(opaque);
uint32_t reg = addr >> 3;
switch (reg) {
case PEC_PCI_STK_PCI_FIR:
- stack->pci_regs[reg] = val;
+ phb->pci_regs[reg] = val;
break;
case PEC_PCI_STK_PCI_FIR_CLR:
- stack->pci_regs[PEC_PCI_STK_PCI_FIR] &= val;
+ phb->pci_regs[PEC_PCI_STK_PCI_FIR] &= val;
break;
case PEC_PCI_STK_PCI_FIR_SET:
- stack->pci_regs[PEC_PCI_STK_PCI_FIR] |= val;
+ phb->pci_regs[PEC_PCI_STK_PCI_FIR] |= val;
break;
case PEC_PCI_STK_PCI_FIR_MSK:
- stack->pci_regs[reg] = val;
+ phb->pci_regs[reg] = val;
break;
case PEC_PCI_STK_PCI_FIR_MSKC:
- stack->pci_regs[PEC_PCI_STK_PCI_FIR_MSK] &= val;
+ phb->pci_regs[PEC_PCI_STK_PCI_FIR_MSK] &= val;
break;
case PEC_PCI_STK_PCI_FIR_MSKS:
- stack->pci_regs[PEC_PCI_STK_PCI_FIR_MSK] |= val;
+ phb->pci_regs[PEC_PCI_STK_PCI_FIR_MSK] |= val;
break;
case PEC_PCI_STK_PCI_FIR_ACT0:
case PEC_PCI_STK_PCI_FIR_ACT1:
- stack->pci_regs[reg] = val;
+ phb->pci_regs[reg] = val;
break;
case PEC_PCI_STK_PCI_FIR_WOF:
- stack->pci_regs[reg] = 0;
+ phb->pci_regs[reg] = 0;
break;
case PEC_PCI_STK_ETU_RESET:
- stack->pci_regs[reg] = val & 0x8000000000000000ull;
+ phb->pci_regs[reg] = val & 0x8000000000000000ull;
/* TODO: Implement reset */
break;
case PEC_PCI_STK_PBAIB_ERR_REPORT:
break;
case PEC_PCI_STK_PBAIB_TX_CMD_CRED:
case PEC_PCI_STK_PBAIB_TX_DAT_CRED:
- stack->pci_regs[reg] = val;
+ phb->pci_regs[reg] = val;
break;
default:
qemu_log_mask(LOG_UNIMP, "phb4_pec_stk: pci_xscom_write 0x%"HWADDR_PRIx
@@ -1477,7 +1477,7 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *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->pci_regs_mr, OBJECT(phb),
+ pnv_xscom_region_init(&phb->pci_regs_mr, OBJECT(phb),
&pnv_pec_stk_pci_xscom_ops, phb, name,
PHB4_PEC_PCI_STK_REGS_COUNT);
@@ -1496,7 +1496,7 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb)
&stack->nest_regs_mr);
pnv_xscom_add_subregion(pec->chip,
pec_pci_base + 0x40 * (stack->stack_no + 1),
- &stack->pci_regs_mr);
+ &phb->pci_regs_mr);
pnv_xscom_add_subregion(pec->chip,
pec_pci_base + PNV9_XSCOM_PEC_PCI_STK0 +
0x40 * stack->stack_no,
--
2.31.1
- [PULL 00/31] ppc queue, Cédric Le Goater, 2022/01/18
- [PULL 03/31] Link new ppc-spapr-hotplug.rst file to pseries.rst., Cédric Le Goater, 2022/01/18
- [PULL 04/31] rSTify ppc-spapr-uv-hcalls.txt., Cédric Le Goater, 2022/01/18
- [PULL 05/31] Rename ppc-spapr-uv-hcalls.txt to ppc-spapr-uv-hcalls.rst., Cédric Le Goater, 2022/01/18
- [PULL 14/31] ppc/pnv: move intbar to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 02/31] docs: Rename ppc-spapr-hotplug.txt to ppc-spapr-hotplug.rst., Cédric Le Goater, 2022/01/18
- [PULL 16/31] ppc/pnv: move mmbar0/mmbar1 and friends to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 10/31] tests/avocado: ppc: Add smoke tests for MPC7400 and MPC7450 families, Cédric Le Goater, 2022/01/18
- [PULL 13/31] ppc/pnv: move phbbar to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 09/31] target/ppc: Fix 7448 support, Cédric Le Goater, 2022/01/18
- [PULL 12/31] ppc/pnv: move PCI registers to PnvPHB4,
Cédric Le Goater <=
- [PULL 01/31] docs: rSTify ppc-spapr-hotplug.txt., Cédric Le Goater, 2022/01/18
- [PULL 11/31] ppc/pnv: use PHB4 obj in pnv_pec_stk_pci_xscom_ops, Cédric Le Goater, 2022/01/18
- [PULL 21/31] ppc/pnv: introduce PnvPHB4 'pec' property, Cédric Le Goater, 2022/01/18
- [PULL 22/31] ppc/pnv: reduce stack->stack_no usage, Cédric Le Goater, 2022/01/18
- [PULL 15/31] ppc/pnv: change pnv_phb4_update_regions() to use PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 07/31] target/ppc: Remove last user of .load_state_old, Cédric Le Goater, 2022/01/18
- [PULL 08/31] target/ppc: Finish removal of 401/403 CPUs, Cédric Le Goater, 2022/01/18
- [PULL 25/31] ppc/pnv: remove PnvPhb4PecStack::stack_no, Cédric Le Goater, 2022/01/18
- [PULL 06/31] Link new ppc-spapr-uv-hcalls.rst to pseries.rst., Cédric Le Goater, 2022/01/18
- [PULL 19/31] ppc/pnv: move nest_regs_mr to PnvPHB4, Cédric Le Goater, 2022/01/18