Hi Jim, On Thu, Oct 29, 2026 at 03:05:12PM +0000, Jim MacArthur wrote: > From: Pierrick Bouvier <[email protected]> > > Again, gated by the rme-cap=on flag for pcie-root-port.
Please, give some love to the commit messages :) Yeah, now this cap only makes sense on Arm and on CPUs with FEAT_RME. So I think it should actually be gated on a different flag, e.g.: "x-rme-da", this would allow more control considering other platforms. And then that's ok to keep this code in the generic root port code. Other archs will gate on different flags. I think we could then set "x-rme-da" globally at machine level, e.g., virt.c and sbsa-ref.c, based on CPU's "x-rme" property, so we don't need pass "x-rme-da" to every root port. Actually we could do that for "x-tee-io" (Patch 2/2) too, although I think it would be premature to that now for both "x-tee-io" and "x-rme-da". > Signed-off-by: Pierrick Bouvier <[email protected]> > Signed-off-by: Jim MacArthur <[email protected]> > --- > hw/pci-bridge/gen_pcie_root_port.c | 35 +++++++++++++++++++++++++++++++++++ > include/hw/pci/pcie_regs.h | 4 ++++ > 2 files changed, 39 insertions(+) > > diff --git a/hw/pci-bridge/gen_pcie_root_port.c > b/hw/pci-bridge/gen_pcie_root_port.c > index ab8087da87..fb8dbb7959 100644 > --- a/hw/pci-bridge/gen_pcie_root_port.c > +++ b/hw/pci-bridge/gen_pcie_root_port.c > @@ -28,6 +28,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(GenPCIERootPort, > GEN_PCIE_ROOT_PORT) > (GEN_PCIE_ROOT_PORT_AER_OFFSET + PCI_ERR_SIZEOF) > #define GEN_PCIE_ROOT_PORT_ACS_END \ > (GEN_PCIE_ROOT_PORT_ACS_OFFSET + PCI_ACS_SIZEOF) > + > #define GEN_PCIE_ROOT_PORT_MSIX_NR_VECTOR 1 > #define GEN_PCIE_ROOT_DEFAULT_IO_RANGE 4096 > > @@ -67,6 +68,39 @@ static void gen_rp_interrupts_uninit(PCIDevice *d) > msix_uninit_exclusive_bar(d); > } > > +static uint32_t add_rme_dvsec_capability(PCIDevice *device, uint32_t offset) > +{ > + /* > + * dvsec rme-da > + * https://developer.arm.com/documentation/den0129/latest/ > + * Arm RME System Architecture > + * 0x0000 RMEDA_ECH See B3.2.6.2.1 RME-DA Extended Capability Header > + * 0x0004 RMEDA_HEAD1 See B3.2.6.2.2 RME-DA DVSEC Header 1 > + * 0x0008 RMEDA_HEAD2 See B3.2.6.2.3 RME-DA DVSEC Header 2 > + * 0x000C RMEDA_CTL1 See B3.2.6.2.4 RME-DA Control register 1 > + * 0x0010 RMEDA_CTL2 See B3.2.6.2.5 RME-DA Control register 2 > + */ > + const uint32_t ARM_PCI_VID = 0x13b5; > + const uint32_t RME_DA_DVSEC_ID = 0; > + pcie_add_dvsec_capability(device, PCI_EXT_CAP_ID_DVSEC, 1, offset, > + PCI_RME_DVSEC_SIZE, ARM_PCI_VID, > + PCI_RME_DVSEC_VER, RME_DA_DVSEC_ID); > + const uint32_t ctl1 = 0x1; /* support tdisp */ > + const uint32_t ctl2 = 0x0; /* unlocked */ > + pci_set_long(device->config + offset + 0xC, ctl1); > + pci_set_long(device->config + offset + 0x10, ctl2); > + device->wmask[offset + 0xC] = 0xff; > + device->wmask[offset + 0xC + 1] = 0xff; > + device->wmask[offset + 0xC + 2] = 0xff; > + device->wmask[offset + 0xC + 3] = 0xff; > + device->wmask[offset + 0x10] = 0xff; > + device->wmask[offset + 0x10 + 1] = 0xff; > + device->wmask[offset + 0x10 + 2] = 0xff; > + device->wmask[offset + 0x10 + 3] = 0xff; > + offset += PCI_RME_DVSEC_SIZE; > + return offset; > +} > + > static void gen_rp_realize(DeviceState *dev, Error **errp) > { > PCIDevice *d = PCI_DEVICE(dev); > @@ -106,6 +140,7 @@ static void gen_rp_realize(DeviceState *dev, Error **errp) > } > > if (grp->rme_caps) { So it would be something like: if (tee_io) { ... if (rme_da) { add_rme_dvsec_capability(...); } } Cheers, Gustavo > + next_cap_offset = add_rme_dvsec_capability(d, next_cap_offset); > pcie_ide_init(d, next_cap_offset); > > /* Unused value, but may be useful for the next capability */ > diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h > index aa21177411..da812d32ff 100644 > --- a/include/hw/pci/pcie_regs.h > +++ b/include/hw/pci/pcie_regs.h > @@ -186,4 +186,8 @@ typedef enum PCIExpLinkWidth { > #define PCI_IDE_VER 0x1 > #define PCI_IDE_SIZEOF 12 > > +/* RME DVSEC */ > +#define PCI_RME_DVSEC_VER 0x1 > +#define PCI_RME_DVSEC_SIZE 20 > + > #endif /* QEMU_PCIE_REGS_H */ > > -- > 2.43.0 > >
