Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers

qemu-ppc

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers

From:	Cédric Le Goater
Subject:	Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers
Date:	Thu, 12 Oct 2023 14:47:17 +0200
User-agent:	Mozilla Thunderbird

On 10/12/23 12:48, Saif Abrar wrote:

Add new XSCOM registers introduced in PHB5.
Apply bit-masks within xscom-write methods.

Signed-off-by: Saif Abrar <saif.abrar@linux.vnet.ibm.com>


I didn't check the masks, the rest looks correct.

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

---
  hw/pci-host/pnv_phb4.c              | 29 +++++++++++++++----------
  hw/pci-host/pnv_phb4_pec.c          | 33 ++++++++++++++++++++++++-----
  include/hw/pci-host/pnv_phb4.h      |  2 +-
  include/hw/pci-host/pnv_phb4_regs.h |  4 +++-
  4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 29cb11a5d9..5661ed1472 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -855,7 +855,7 @@ static uint64_t pnv_pec_stk_nest_xscom_read(void *opaque, 
hwaddr addr,
      PnvPHB4 *phb = PNV_PHB4(opaque);
      uint32_t reg = addr >> 3;

- /* TODO: add list of allowed registers and error out if not */

+    /* All registers are read-able */
      return phb->nest_regs[reg];
  }

@@ -1000,7 +1000,7 @@ static void pnv_pec_stk_nest_xscom_write(void *opaque, hwaddr addr,switch (reg) {

      case PEC_NEST_STK_PCI_NEST_FIR:
-        phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR] = val;
+        phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR] = val & 
0xfffffff000000000ull;
          break;
      case PEC_NEST_STK_PCI_NEST_FIR_CLR:
          phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR] &= val;
@@ -1009,7 +1009,8 @@ static void pnv_pec_stk_nest_xscom_write(void *opaque, 
hwaddr addr,
          phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR] |= val;
          break;
      case PEC_NEST_STK_PCI_NEST_FIR_MSK:
-        phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR_MSK] = val;
+        phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR_MSK] = val
+                                                        & 
0xfffffff000000000ull;
          break;
      case PEC_NEST_STK_PCI_NEST_FIR_MSKC:
          phb->nest_regs[PEC_NEST_STK_PCI_NEST_FIR_MSK] &= val;
@@ -1019,7 +1020,7 @@ static void pnv_pec_stk_nest_xscom_write(void *opaque, 
hwaddr addr,
          break;
      case PEC_NEST_STK_PCI_NEST_FIR_ACT0:
      case PEC_NEST_STK_PCI_NEST_FIR_ACT1:
-        phb->nest_regs[reg] = val;
+        phb->nest_regs[reg] = val & 0xfffffff000000000ull;
          break;
      case PEC_NEST_STK_PCI_NEST_FIR_WOF:
          phb->nest_regs[reg] = 0;
@@ -1060,10 +1061,15 @@ static void pnv_pec_stk_nest_xscom_write(void *opaque, 
hwaddr addr,
          pnv_pec_phb_update_map(phb);
          break;
      case PEC_NEST_STK_DATA_FRZ_TYPE:
-    case PEC_NEST_STK_PBCQ_TUN_BAR:
          /* Not used for now */
          phb->nest_regs[reg] = val;
          break;
+    case PEC_NEST_STK_PBCQ_SPARSE_PAGE:
+        phb->nest_regs[reg] = val & 0x1c00000000000000ull;
+        break;
+    case PEC_NEST_STK_PBCQ_CACHE_INJ:
+        phb->nest_regs[reg] = val & 0xff00000000000000ull;
+        break;
      default:
          qemu_log_mask(LOG_UNIMP, "phb4_pec: nest_xscom_write 0x%"HWADDR_PRIx
                        "=%"PRIx64"\n", addr, val);
@@ -1086,7 +1092,7 @@ static uint64_t pnv_pec_stk_pci_xscom_read(void *opaque, 
hwaddr addr,
      PnvPHB4 *phb = PNV_PHB4(opaque);
      uint32_t reg = addr >> 3;

- /* TODO: add list of allowed registers and error out if not */

+    /* All registers are read-able */
      return phb->pci_regs[reg];
  }

@@ -1095,10 +1101,9 @@ static void pnv_pec_stk_pci_xscom_write(void *opaque, hwaddr addr,

  {
      PnvPHB4 *phb = PNV_PHB4(opaque);
      uint32_t reg = addr >> 3;
-
      switch (reg) {
      case PEC_PCI_STK_PCI_FIR:
-        phb->pci_regs[reg] = val;
+        phb->pci_regs[reg] = val & 0xfc00000000000000ull;
          break;
      case PEC_PCI_STK_PCI_FIR_CLR:
          phb->pci_regs[PEC_PCI_STK_PCI_FIR] &= val;
@@ -1107,7 +1112,7 @@ static void pnv_pec_stk_pci_xscom_write(void *opaque, 
hwaddr addr,
          phb->pci_regs[PEC_PCI_STK_PCI_FIR] |= val;
          break;
      case PEC_PCI_STK_PCI_FIR_MSK:
-        phb->pci_regs[reg] = val;
+        phb->pci_regs[reg] = val & 0xfc00000000000000ull;
          break;
      case PEC_PCI_STK_PCI_FIR_MSKC:
          phb->pci_regs[PEC_PCI_STK_PCI_FIR_MSK] &= val;
@@ -1117,7 +1122,7 @@ static void pnv_pec_stk_pci_xscom_write(void *opaque, 
hwaddr addr,
          break;
      case PEC_PCI_STK_PCI_FIR_ACT0:
      case PEC_PCI_STK_PCI_FIR_ACT1:
-        phb->pci_regs[reg] = val;
+        phb->pci_regs[reg] = val & 0xfc00000000000000ull;
          break;
      case PEC_PCI_STK_PCI_FIR_WOF:
          phb->pci_regs[reg] = 0;
@@ -1129,8 +1134,10 @@ static void pnv_pec_stk_pci_xscom_write(void *opaque, 
hwaddr addr,
      case PEC_PCI_STK_PBAIB_ERR_REPORT:
          break;
      case PEC_PCI_STK_PBAIB_TX_CMD_CRED:
+        phb->pci_regs[reg] = val & 0xe03fe03fe07fe03full;
+        break;
      case PEC_PCI_STK_PBAIB_TX_DAT_CRED:
-        phb->pci_regs[reg] = val;
+        phb->pci_regs[reg] = val & 0x600f0000;
          break;
      default:
          qemu_log_mask(LOG_UNIMP, "phb4_pec_stk: pci_xscom_write 
0x%"HWADDR_PRIx
diff --git a/hw/pci-host/pnv_phb4_pec.c b/hw/pci-host/pnv_phb4_pec.c
index 3b2850f7a3..6c9b4650ad 100644
--- a/hw/pci-host/pnv_phb4_pec.c
+++ b/hw/pci-host/pnv_phb4_pec.c
@@ -34,7 +34,7 @@ static uint64_t pnv_pec_nest_xscom_read(void *opaque, hwaddr 
addr,
      PnvPhb4PecState *pec = PNV_PHB4_PEC(opaque);
      uint32_t reg = addr >> 3;

- /* TODO: add list of allowed registers and error out if not */

+    /* All registers are readable */
      return pec->nest_regs[reg];
  }

@@ -45,18 +45,36 @@ static void pnv_pec_nest_xscom_write(void *opaque, hwaddr addr,

      uint32_t reg = addr >> 3;

switch (reg) {

-    case PEC_NEST_PBCQ_HW_CONFIG:
      case PEC_NEST_DROP_PRIO_CTRL:
+        pec->nest_regs[reg] = val & 0xFFFFFFC000000000ull;
+        break;
      case PEC_NEST_PBCQ_ERR_INJECT:
+        pec->nest_regs[reg] = val & 0xFFE0000000000000ull;
+        break;
      case PEC_NEST_PCI_NEST_CLK_TRACE_CTL:
+        pec->nest_regs[reg] = val & 0xFFFF800000000000ull;
+        break;
      case PEC_NEST_PBCQ_PMON_CTRL:
+        pec->nest_regs[reg] = val & 0xFFFFFFFFFC000000ull;
+        break;
      case PEC_NEST_PBCQ_PBUS_ADDR_EXT:
+        pec->nest_regs[reg] = val & 0xFFE0000000000000ull;
+        break;
      case PEC_NEST_PBCQ_PRED_VEC_TIMEOUT:
-    case PEC_NEST_CAPP_CTRL:
+        pec->nest_regs[reg] = val & 0xFFFF000000000000ull;
+        break;
      case PEC_NEST_PBCQ_READ_STK_OVR:
+        pec->nest_regs[reg] = val & 0xFFFFFFFFFFFF8000ull;
+        break;
      case PEC_NEST_PBCQ_WRITE_STK_OVR:
      case PEC_NEST_PBCQ_STORE_STK_OVR:
+        pec->nest_regs[reg] = val & 0xFFFFFF8000000000ull;
+        break;
      case PEC_NEST_PBCQ_RETRY_BKOFF_CTRL:
+        pec->nest_regs[reg] = val & 0xFFFFFFFFFFC00000ull;
+        break;
+    case PEC_NEST_PBCQ_HW_CONFIG:
+    case PEC_NEST_CAPP_CTRL:
          pec->nest_regs[reg] = val;
          break;
      default:
@@ -81,7 +99,7 @@ static uint64_t pnv_pec_pci_xscom_read(void *opaque, hwaddr 
addr,
      PnvPhb4PecState *pec = PNV_PHB4_PEC(opaque);
      uint32_t reg = addr >> 3;

- /* TODO: add list of allowed registers and error out if not */

+    /* All registers are readable */
      return pec->pci_regs[reg];
  }

@@ -93,8 +111,13 @@ static void pnv_pec_pci_xscom_write(void *opaque, hwaddr addr,switch (reg) {

      case PEC_PCI_PBAIB_HW_CONFIG:
+        pec->pci_regs[reg] = val & 0xffffffffffe00000ull;
+        break;
+    case PEC_PCI_PBAIB_HW_OVR:
+        pec->pci_regs[reg] = val & 0xffff000000000000ull;
+        break;
      case PEC_PCI_PBAIB_READ_STK_OVR:
-        pec->pci_regs[reg] = val;
+        pec->pci_regs[reg] = val & 0xffffffffffff8000ull;
          break;
      default:
          phb_pec_error(pec, "%s @0x%"HWADDR_PRIx"=%"PRIx64"\n", __func__,
diff --git a/include/hw/pci-host/pnv_phb4.h b/include/hw/pci-host/pnv_phb4.h
index 2d026db9a3..3212e68160 100644
--- a/include/hw/pci-host/pnv_phb4.h
+++ b/include/hw/pci-host/pnv_phb4.h
@@ -117,7 +117,7 @@ struct PnvPHB4 {
      MemoryRegion pci_regs_mr;

/* Nest registers */

-#define PHB4_PEC_NEST_STK_REGS_COUNT  0x17
+#define PHB4_PEC_NEST_STK_REGS_COUNT  0x18
      uint64_t nest_regs[PHB4_PEC_NEST_STK_REGS_COUNT];
      MemoryRegion nest_regs_mr;

diff --git a/include/hw/pci-host/pnv_phb4_regs.h b/include/hw/pci-host/pnv_phb4_regs.h

index 4a0d3b28ef..bea96f4d91 100644
--- a/include/hw/pci-host/pnv_phb4_regs.h
+++ b/include/hw/pci-host/pnv_phb4_regs.h
@@ -77,10 +77,12 @@
  #define   PEC_NEST_STK_BAR_EN_PHB               PPC_BIT(2)
  #define   PEC_NEST_STK_BAR_EN_INT               PPC_BIT(3)
  #define PEC_NEST_STK_DATA_FRZ_TYPE      0x15
-#define PEC_NEST_STK_PBCQ_TUN_BAR       0x16
+#define PEC_NEST_STK_PBCQ_SPARSE_PAGE   0x16 /* P10 */
+#define PEC_NEST_STK_PBCQ_CACHE_INJ     0x17 /* P10 */

/* XSCOM PCI global registers */

  #define PEC_PCI_PBAIB_HW_CONFIG         0x00
+#define PEC_PCI_PBAIB_HW_OVR            0x01
  #define PEC_PCI_PBAIB_READ_STK_OVR      0x02

/* XSCOM PCI per-stack registers */

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH] hw/pci-host: Update PHB5 XSCOM registers, Saif Abrar, 2023/10/12
- Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers, Cédric Le Goater <=
- Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers, Harsh Prateek Bora, 2023/10/13

Prev by Date: [PATCH v2 14/14] spapr: nested: Introduce H_GUEST_RUN_VCPU hcall.
Next by Date: [PATCH v11 05/18] target/ppc: Use GDBFeature for dynamic XML
Previous by thread: [PATCH] hw/pci-host: Update PHB5 XSCOM registers
Next by thread: Re: [PATCH] hw/pci-host: Update PHB5 XSCOM registers
Index(es):
- Date
- Thread