[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/26] pcie: Add a simple PCIe ACS (Access Control Se
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 24/26] pcie: Add a simple PCIe ACS (Access Control Services) helper function |
Date: |
Tue, 12 Mar 2019 22:55:39 -0400 |
From: Knut Omang <address@hidden>
Implementing an ACS capability on downstream ports and multifunction
endpoints indicates isolation and IOMMU visibility to a finer
granularity. This creates smaller IOMMU groups in the guest and thus
more flexibility in assigning endpoints to guest userspace or an L2
guest.
Signed-off-by: Knut Omang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Alex Williamson <address@hidden>
---
include/hw/pci/pcie.h | 6 ++++++
include/hw/pci/pcie_regs.h | 4 ++++
hw/pci/pcie.c | 38 ++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
index 5b82a0d244..e30334d74d 100644
--- a/include/hw/pci/pcie.h
+++ b/include/hw/pci/pcie.h
@@ -79,6 +79,9 @@ struct PCIExpressDevice {
/* Offset of ATS capability in config space */
uint16_t ats_cap;
+
+ /* ACS */
+ uint16_t acs_cap;
};
#define COMPAT_PROP_PCP "power_controller_present"
@@ -128,6 +131,9 @@ void pcie_add_capability(PCIDevice *dev,
uint16_t offset, uint16_t size);
void pcie_sync_bridge_lnk(PCIDevice *dev);
+void pcie_acs_init(PCIDevice *dev, uint16_t offset);
+void pcie_acs_reset(PCIDevice *dev);
+
void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn);
void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_num);
void pcie_ats_init(PCIDevice *dev, uint16_t offset);
diff --git a/include/hw/pci/pcie_regs.h b/include/hw/pci/pcie_regs.h
index ad4e7808b8..1db86b0ec4 100644
--- a/include/hw/pci/pcie_regs.h
+++ b/include/hw/pci/pcie_regs.h
@@ -175,4 +175,8 @@ typedef enum PCIExpLinkWidth {
PCI_ERR_COR_INTERNAL | \
PCI_ERR_COR_HL_OVERFLOW)
+/* ACS */
+#define PCI_ACS_VER 0x1
+#define PCI_ACS_SIZEOF 8
+
#endif /* QEMU_PCIE_REGS_H */
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 640f678773..cf1ca30f93 100644
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -914,3 +914,41 @@ void pcie_ats_init(PCIDevice *dev, uint16_t offset)
pci_set_word(dev->wmask + dev->exp.ats_cap + PCI_ATS_CTRL, 0x800f);
}
+
+/* ACS (Access Control Services) */
+void pcie_acs_init(PCIDevice *dev, uint16_t offset)
+{
+ bool is_downstream = pci_is_express_downstream_port(dev);
+ uint16_t cap_bits = 0;
+
+ /* For endpoints, only multifunction devs may have an ACS capability: */
+ assert(is_downstream ||
+ (dev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) ||
+ PCI_FUNC(dev->devfn));
+
+ pcie_add_capability(dev, PCI_EXT_CAP_ID_ACS, PCI_ACS_VER, offset,
+ PCI_ACS_SIZEOF);
+ dev->exp.acs_cap = offset;
+
+ if (is_downstream) {
+ /*
+ * Downstream ports must implement SV, TB, RR, CR, UF, and DT (with
+ * caveats on the latter four that we ignore for simplicity).
+ * Endpoints may also implement a subset of ACS capabilities,
+ * but these are optional if the endpoint does not support
+ * peer-to-peer between functions and thus omitted here.
+ */
+ cap_bits = PCI_ACS_SV | PCI_ACS_TB | PCI_ACS_RR |
+ PCI_ACS_CR | PCI_ACS_UF | PCI_ACS_DT;
+ }
+
+ pci_set_word(dev->config + offset + PCI_ACS_CAP, cap_bits);
+ pci_set_word(dev->wmask + offset + PCI_ACS_CTRL, cap_bits);
+}
+
+void pcie_acs_reset(PCIDevice *dev)
+{
+ if (dev->exp.acs_cap) {
+ pci_set_word(dev->config + dev->exp.acs_cap + PCI_ACS_CTRL, 0);
+ }
+}
--
MST
- [Qemu-devel] [PULL 00/26] pci, pc, virtio: features, fixes, cleanups, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 23/26] vhost-user-blk: Add support to get/set inflight buffer, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 26/26] i386, acpi: check acpi_memory_hotplug capacity in pre_plug, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 25/26] gen_pcie_root_port: Add ACS (Access Control Services) capability, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 24/26] pcie: Add a simple PCIe ACS (Access Control Services) helper function,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 21/26] libvhost-user: Introduce vu_queue_map_desc(), Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 22/26] libvhost-user: Support tracking inflight I/O in shared memory, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 19/26] vhost-user: Support transferring inflight buffer between qemu and backend, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 20/26] libvhost-user: Remove unnecessary FD flag check for event file descriptors, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 17/26] nvdimm: use *function* directly instead of allocating it again, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 18/26] nvdimm: use NVDIMM_ACPI_IO_LEN for the proper IO size, Michael S. Tsirkin, 2019/03/12
- [Qemu-devel] [PULL 16/26] nvdimm: fix typo in nvdimm_build_nvdimm_devices argument, Michael S. Tsirkin, 2019/03/12