Re: [PATCH 02/10] pnv/phb4: Add reset logic to PHB4

qemu-devel

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

Re: [PATCH 02/10] pnv/phb4: Add reset logic to PHB4

From:	Cédric Le Goater
Subject:	Re: [PATCH 02/10] pnv/phb4: Add reset logic to PHB4
Date:	Mon, 25 Mar 2024 14:32:03 +0100
User-agent:	Mozilla Thunderbird

Cc: +Fred +Daniel

On 3/21/24 11:04, Saif Abrar wrote:

Add a method to be invoked on QEMU reset.
Also add CFG and PBL core-blocks reset logic using
appropriate bits of PHB_PCIE_CRESET register.

Tested by reading the reset value of a register.

Signed-off-by: Saif Abrar <saif.abrar@linux.vnet.ibm.com>
---
  hw/pci-host/pnv_phb4.c              | 104 +++++++++++++++++++++++++++-
  include/hw/pci-host/pnv_phb4_regs.h |  16 ++++-
  tests/qtest/pnv-phb4-test.c         |  10 +++
  3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/hw/pci-host/pnv_phb4.c b/hw/pci-host/pnv_phb4.c
index 075499d36d..d2e7403b37 100644
--- a/hw/pci-host/pnv_phb4.c
+++ b/hw/pci-host/pnv_phb4.c
@@ -1,7 +1,7 @@
  /*
- * QEMU PowerPC PowerNV (POWER9) PHB4 model
+ * QEMU PowerPC PowerNV (POWER10) PHB4 model


You can add an extra line for POWER10/PHB5 but please keep POWER9/PHB4.
POWER8 and POWER9 are still supported.

   *
- * Copyright (c) 2018-2020, IBM Corporation.
+ * Copyright (c) 2018-2024, IBM Corporation.
   *
   * This code is licensed under the GPL version 2 or later. See the
   * COPYING file in the top-level directory.
@@ -22,6 +22,7 @@
  #include "hw/qdev-properties.h"
  #include "qom/object.h"
  #include "trace.h"
+#include "sysemu/reset.h"

#define phb_error(phb, fmt, ...) \

      qemu_log_mask(LOG_GUEST_ERROR, "phb4[%d:%d]: " fmt "\n",            \
@@ -499,6 +500,86 @@ static void pnv_phb4_update_xsrc(PnvPHB4 *phb)
      }
  }

+/*

+ * Get the PCI-E capability offset from the root-port
+ */
+static uint32_t get_exp_offset(PnvPHB4 *phb)
+{
+    PCIHostState *pci = PCI_HOST_BRIDGE(phb->phb_base);
+    PCIDevice *pdev;
+    pdev = pci_find_device(pci->bus, 0, 0);
+    if (!pdev) {
+        phb_error(phb, "PCI device not found");
+        return ~0;
+    }
+    PCIERootPortClass *rpc = PCIE_ROOT_PORT_GET_CLASS(pdev);
+    return rpc->exp_offset;
+}
+
+#define RC_CONFIG_WRITE(a, v) pnv_phb4_rc_config_write(phb, a, 4, v);


This helper RC_CONFIG_WRITE doesn't look very useful.

+
+static void pnv_phb4_cfg_core_reset(PnvPHB4 *phb)
+{
+    /* Zero all registers initially */
+    int i;
+    for (i = PCI_COMMAND ; i < PHB_RC_CONFIG_SIZE ; i += 4) {
+            RC_CONFIG_WRITE(i, 0)
+    }
+
+    RC_CONFIG_WRITE(PCI_COMMAND,          0x100100);
+    RC_CONFIG_WRITE(PCI_CLASS_REVISION,   0x6040000);
+    RC_CONFIG_WRITE(PCI_CACHE_LINE_SIZE,  0x10000);
+    RC_CONFIG_WRITE(PCI_MEMORY_BASE,      0x10);
+    RC_CONFIG_WRITE(PCI_PREF_MEMORY_BASE, 0x10011);
+    RC_CONFIG_WRITE(PCI_CAPABILITY_LIST,  0x40);
+    RC_CONFIG_WRITE(PCI_INTERRUPT_LINE,   0x20000);


Can we use literal defined values instead of numerical ones ? It would
help the reader understand what are the default settings.

+    /* PM Capabilities Register */
+    RC_CONFIG_WRITE(PCI_BRIDGE_CONTROL + PCI_PM_PMC, 0xC8034801);
+
+    uint32_t exp_offset = get_exp_offset(phb);
+    RC_CONFIG_WRITE(exp_offset, 0x420010);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_DEVCAP,  0x8022);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_DEVCTL,  0x140);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_LNKCAP,  0x300105);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_LNKCTL,  0x2010008);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_SLTCTL,  0x2000);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_DEVCAP2, 0x1003F);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_DEVCTL2, 0x20);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_LNKCAP2, 0x80003E);
+    RC_CONFIG_WRITE(exp_offset + PCI_EXP_LNKCTL2, 0x5);
+
+    RC_CONFIG_WRITE(PHB_AER_ECAP,    0x14810001);
+    RC_CONFIG_WRITE(PHB_AER_CAPCTRL, 0xA0);
+    RC_CONFIG_WRITE(PHB_SEC_ECAP,    0x1A010019);
+
+    RC_CONFIG_WRITE(PHB_LMR_ECAP, 0x1E810027);
+    /* LMR - Margining Lane Control / Status Register # 2 to 16 */
+    for (i = PHB_LMR_CTLSTA_2 ; i <= PHB_LMR_CTLSTA_16 ; i += 4) {
+        RC_CONFIG_WRITE(i, 0x9C38);
+    }
+
+    RC_CONFIG_WRITE(PHB_DLF_ECAP, 0x1F410025);
+    RC_CONFIG_WRITE(PHB_DLF_CAP,  0x80000001);
+    RC_CONFIG_WRITE(P16_ECAP,     0x22410026);
+    RC_CONFIG_WRITE(P32_ECAP,     0x1002A);
+    RC_CONFIG_WRITE(P32_CAP,      0x103);
+}


The reset of the root complex register values should be done in
pnv_phb_root_port_reset_hold().

A lot of changes were done on the PHB4/5 models 2 or 3 years ago to
prepare libvirt support of the PowerNV machines. User created PHB
devices was added and generic models of the root complex and the PHB
were introduced to facilitate the machine definition from a libvirt
POV.

Livirt support was abandoned but the PHB models didn't change. I think
there are possible cleanups if we deprecate the generic models.

+static void pnv_phb4_pbl_core_reset(PnvPHB4 *phb)
+{
+    /* Zero all registers initially */
+    int i;
+    for (i = PHB_PBL_CONTROL ; i <= PHB_PBL_ERR1_STATUS_MASK ; i += 8) {
+        phb->regs[i >> 3] = 0x0;
+    }
+
+    /* Set specific register values */
+    phb->regs[PHB_PBL_CONTROL       >> 3] = 0xC009000000000000;
+    phb->regs[PHB_PBL_TIMEOUT_CTRL  >> 3] = 0x2020000000000000;
+    phb->regs[PHB_PBL_NPTAG_ENABLE  >> 3] = 0xFFFFFFFF00000000;
+    phb->regs[PHB_PBL_SYS_LINK_INIT >> 3] = 0x80088B4642473000;
+}
+
  static void pnv_phb4_reg_write(void *opaque, hwaddr off, uint64_t val,
                                 unsigned size)
  {
@@ -612,6 +693,16 @@ static void pnv_phb4_reg_write(void *opaque, hwaddr off, 
uint64_t val,
          pnv_phb4_update_xsrc(phb);
          break;

+ /* Reset core blocks */

+    case PHB_PCIE_CRESET:
+        if (val & PHB_PCIE_CRESET_CFG_CORE) {
+            pnv_phb4_cfg_core_reset(phb);
+        }
+        if (val & PHB_PCIE_CRESET_PBL) {
+            pnv_phb4_pbl_core_reset(phb);
+        }
+        break;
+
      /* Silent simple writes */
      case PHB_ASN_CMPM:
      case PHB_CONFIG_ADDRESS:
@@ -1531,6 +1622,13 @@ static void pnv_phb4_xscom_realize(PnvPHB4 *phb)
  static PCIIOMMUOps pnv_phb4_iommu_ops = {
      .get_address_space = pnv_phb4_dma_iommu,
  };
+static void pnv_phb4_reset(void *dev)
+{
+    PnvPHB4 *phb = PNV_PHB4(dev);
+    pnv_phb4_cfg_core_reset(phb);
+    pnv_phb4_pbl_core_reset(phb);
+    phb->regs[PHB_PCIE_CRESET >> 3] = 0xE000000000000000;
+}

static void pnv_phb4_instance_init(Object *obj)

  {
@@ -1608,6 +1706,8 @@ static void pnv_phb4_realize(DeviceState *dev, Error 
**errp)
      phb->qirqs = qemu_allocate_irqs(xive_source_set_irq, xsrc, xsrc->nr_irqs);

pnv_phb4_xscom_realize(phb);

+
+    qemu_register_reset(pnv_phb4_reset, dev);


That's the old reset style. Please take a look at the ResettableClass :

  https://qemu.readthedocs.io/en/v8.2.1/devel/reset.html

Thanks,

C.

/*

diff --git a/include/hw/pci-host/pnv_phb4_regs.h 
b/include/hw/pci-host/pnv_phb4_regs.h
index bea96f4d91..6892e21cc9 100644
--- a/include/hw/pci-host/pnv_phb4_regs.h
+++ b/include/hw/pci-host/pnv_phb4_regs.h
@@ -343,6 +343,18 @@
  #define PHB_RC_CONFIG_BASE                      0x1000
  #define   PHB_RC_CONFIG_SIZE                    0x800

+#define PHB_AER_ECAP 0x100

+#define PHB_AER_CAPCTRL                         0x118
+#define PHB_SEC_ECAP                            0x148
+#define PHB_LMR_ECAP                            0x1A0
+#define PHB_LMR_CTLSTA_2                        0x1AC
+#define PHB_LMR_CTLSTA_16                       0x1E4
+#define PHB_DLF_ECAP                            0x1E8
+#define PHB_DLF_CAP                             0x1EC
+#define P16_ECAP                                0x1F4
+#define P32_ECAP                                0x224
+#define P32_CAP                                 0x228
+
  /* PHB4 REGB registers */

/* PBL core */

@@ -368,7 +380,7 @@
  #define PHB_PCIE_SCR                    0x1A00
  #define   PHB_PCIE_SCR_SLOT_CAP         PPC_BIT(15)
  #define   PHB_PCIE_SCR_MAXLINKSPEED     PPC_BITMASK(32, 35)
-
+#define PHB_PCIE_BNR                    0x1A08

#define PHB_PCIE_CRESET 0x1A10

  #define   PHB_PCIE_CRESET_CFG_CORE      PPC_BIT(0)
@@ -423,6 +435,8 @@
  #define PHB_PCIE_LANE_EQ_CNTL23         0x1B08 /* DD1 only */
  #define PHB_PCIE_TRACE_CTRL             0x1B20
  #define PHB_PCIE_MISC_STRAP             0x1B30
+#define PHB_PCIE_PHY_RXEQ_STAT_G3_00_03 0x1B40
+#define PHB_PCIE_PHY_RXEQ_STAT_G5_12_15 0x1B98

/* Error */

  #define PHB_REGB_ERR_STATUS             0x1C00
diff --git a/tests/qtest/pnv-phb4-test.c b/tests/qtest/pnv-phb4-test.c
index e3b809e9c4..44141462f6 100644
--- a/tests/qtest/pnv-phb4-test.c
+++ b/tests/qtest/pnv-phb4-test.c
@@ -54,6 +54,13 @@ static void phb4_version_test(QTestState *qts)
      g_assert_cmpuint(ver, ==, 0xA5);
  }

+/* Assert that 'PHB PBL Control' register has correct reset value */

+static void phb4_reset_test(QTestState *qts)
+{
+    g_assert_cmpuint(pnv_phb4_xscom_read(qts, PHB_PBL_CONTROL),
+                     ==, 0xC009000000000000);
+}
+
  static void test_phb4(void)
  {
      QTestState *qts = NULL;
@@ -63,6 +70,9 @@ static void test_phb4(void)
      /* Make sure test is running on PHB */
      phb4_version_test(qts);

+ /* Check reset value of a register */

+    phb4_reset_test(qts);
+
      qtest_quit(qts);
  }

[Prev in Thread]

Current Thread

[Next in Thread]

[PATCH 00/10] pnv/phb4: Update PHB4 to the latest spec PH5, Saif Abrar, 2024/03/21
- [PATCH 07/10] pnv/phb4: Set link speed and width in the DLP training control register, Saif Abrar, 2024/03/21
  - Re: [PATCH 07/10] pnv/phb4: Set link speed and width in the DLP training control register, Cédric Le Goater, 2024/03/25
- [PATCH 08/10] pnv/phb4: Implement IODA PCT table, Saif Abrar, 2024/03/21
  - Re: [PATCH 08/10] pnv/phb4: Implement IODA PCT table, Cédric Le Goater, 2024/03/25
- [PATCH 04/10] pnv/phb4: Implement read-only and write-only bits of registers, Saif Abrar, 2024/03/21
  - Re: [PATCH 04/10] pnv/phb4: Implement read-only and write-only bits of registers, Cédric Le Goater, 2024/03/25
- [PATCH 10/10] pnv/phb4: Mask off LSI Source-ID based on number of interrupts, Saif Abrar, 2024/03/21
  - Re: [PATCH 10/10] pnv/phb4: Mask off LSI Source-ID based on number of interrupts, Cédric Le Goater, 2024/03/25
- [PATCH 02/10] pnv/phb4: Add reset logic to PHB4, Saif Abrar, 2024/03/21
  - Re: [PATCH 02/10] pnv/phb4: Add reset logic to PHB4, Cédric Le Goater <=
- [PATCH 05/10] pnv/phb4: Implement write-clear and return 1's on unimplemented reg read, Saif Abrar, 2024/03/21
  - Re: [PATCH 05/10] pnv/phb4: Implement write-clear and return 1's on unimplemented reg read, Cédric Le Goater, 2024/03/25
- [PATCH 09/10] hw/pci: Set write-mask bits for PCIE Link-Control-2 register, Saif Abrar, 2024/03/21
  - Re: [PATCH 09/10] hw/pci: Set write-mask bits for PCIE Link-Control-2 register, Cédric Le Goater, 2024/03/25
    - Re: [PATCH 09/10] hw/pci: Set write-mask bits for PCIE Link-Control-2 register, Cornelia Huck, 2024/03/25
- [PATCH 06/10] pnv/phb4: Set link-active status in HPSTAT and LMR registers, Saif Abrar, 2024/03/21
- [PATCH 03/10] pnv/phb4: Implement sticky reset logic in PHB4, Saif Abrar, 2024/03/21
- [PATCH 01/10] qtest/phb4: Add testbench for PHB4, Saif Abrar, 2024/03/21
  - Re: [PATCH 01/10] qtest/phb4: Add testbench for PHB4, Cédric Le Goater, 2024/03/25

Prev by Date: [PATCH for-9.0] target/arm: take HSTR traps of cp15 accesses to EL2, not EL1
Next by Date: [PATCH-for-9.0? v2 0/8] hw/clock: Propagate clock changes when STM32L4X5 MUX is updated
Previous by thread: [PATCH 02/10] pnv/phb4: Add reset logic to PHB4
Next by thread: [PATCH 05/10] pnv/phb4: Implement write-clear and return 1's on unimplemented reg read
Index(es):
- Date
- Thread