PCI: Add basic Compute eXpress Link DVSEC decode
v3 cover PCI: Add basic Compute eXpress Link DVSEC decode
Changes since v2 [1]:
- Provide comment about what PCI_CXL_LOCK does.
- Use "cxl" in place of "pos" where appropriate to make code more descriptive.
- Remove unnecessary extra check for pci_is_pcie(dev).
- Remove reshuffling of pci_read_config_word() and put them in the right place when first added.
- Make inline stubs consistent in format locally.
(Bjorn Helgaas)
- Add return to inline stubs to fix warning.
- Refreshed David's patch (V2)
[1] https://lore.kernel.org/linux-pci/[email protected]/
This patch series implements basic Designated Vendor-Specific Extended Capabilities (DVSEC) decode for Compute eXpress Link devices, a new CPU interconnect building upon PCIe. As a basis for the CXL support it provides PCI init handling for detection, decode, and caching of CXL device capabilities. Moreover, it makes use of the DVSEC Vendor ID and DVSEC ID so as to identify a CXL capable device. (PCIe r5.0, sec 7.9.6.2)
DocLink: https://www.computeexpresslink.org/
For your reference, a parallel series of patches have been submitted to enable lspci decode of CXL DVSEC and may be tracked.
This patch makes use of pending DVSEC related header additions and the first patch of that series is included here. It can be sorted out when the upstream merge is done.
Sample dmesg output of a CXL Type 3 device (CXL.io, CXL.mem):
[ 2.997177] pci 0000:6b:00.0: CXL: Cache- IO+ Mem+ Viral- HDMCount 1 [ 2.997188] pci 0000:6b:00.0: CXL: cap ctrl status ctrl2 status2 lock [ 2.997201] pci 0000:6b:00.0: CXL: 001e 0002 0000 0000 0000 0000
David E. Box (1):
PCI: Add defines for Designated Vendor-Specific Capability
Sean V Kelley (2):
PCI: Add basic Compute eXpress Link DVSEC decode
PCI: Add helpers to enable/disable CXL.mem and CXL.cache
drivers/pci/Kconfig | 9 ++ drivers/pci/Makefile | 1 + drivers/pci/cxl.c | 176 ++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 15 +++ drivers/pci/probe.c | 1 + include/linux/pci.h | 3 + include/uapi/linux/pci_regs.h | 5 + 7 files changed, 210 insertions(+) create mode 100644 drivers/pci/cxl.c
--
2.26.2
PATCH v3 2/3 PCI: Add basic Compute eXpress Link DVSEC decode
Compute eXpress Link is a new CPU interconnect created with workload accelerators in mind. The interconnect relies on PCIe Electrical and Physical interconnect for communication. CXL devices enumerate to the OS as an ACPI-described PCIe Root Complex Integrated Endpoint.
This patch introduces the bare minimum support by simply looking for and caching the DVSEC CXL Extended Capability. Currently, only CXL.io (which is mandatory to be configured by BIOS) is enabled. In future, we will also add support for CXL.cache and CXL.mem.
DocLink: https://www.computeexpresslink.org/
--- drivers/pci/Kconfig | 9 +++++ drivers/pci/Makefile | 1 + drivers/pci/cxl.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 7 ++++ drivers/pci/probe.c | 1 + include/linux/pci.h | 3 ++ 6 files changed, 113 insertions(+) create mode 100644 drivers/pci/cxl.c
drivers/pci/Kconfig +9 -0
@@ -115,6 +115,15 @@ config XEN_PCIDEV_FRONTEND The PCI device frontend driver allows the kernel to import arbitrary PCI devices from a PCI backend to support PCI driver domains. +config PCI_CXL + bool "Enable PCI Compute eXpress Link" + depends on PCI + help + Say Y here if you want the PCI core to detect CXL devices, decode, and + cache the DVSEC CXL Extended Capability as configured by BIOS. + + When in doubt, say N. + config PCI_ATS bool
drivers/pci/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_PCI_PF_STUB) += pci-pf-stub.o obj-$(CONFIG_PCI_ECAM) += ecam.o obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o +obj-$(CONFIG_PCI_CXL) += cxl.o # Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
drivers/pci/cxl.c new file +92 -0
92 lines not on this page · raw message
drivers/pci/pci.h +7 -0
@@ -469,6 +469,13 @@ static inline void pci_ats_init(struct pci_dev *d) { }static inline void pci_restore_ats_state (struct pci_dev *dev) { }#endif /* CONFIG_PCI_ATS */ +#ifdef CONFIG_PCI_CXL +/* Compute eXpress Link */ +void pci_cxl_init (struct pci_dev *dev); +#else +static inline void pci_cxl_init (struct pci_dev *dev) { } +#endif +#ifdef CONFIG_PCI_PRI void pci_pri_init (struct pci_dev *dev);void pci_restore_pri_state (struct pci_dev *pdev);
drivers/pci/probe.c +1 -0
@@ -2371,6 +2371,7 @@ static void pci_init_capabilities(struct pci_dev *dev)pci_ptm_init (dev);/* Precision Time Measurement */ pci_aer_init (dev);/* Advanced Error Reporting */ pci_dpc_init (dev);/* Downstream Port Containment */ +pci_cxl_init (dev);/* Compute eXpress Link */ pcie_report_downtraining (dev);
include/linux/pci.h +3 -0
@@ -314,6 +314,9 @@ struct pci_dev {#ifdef CONFIG_PCIEAER u16 aer_cap;/* AER capability offset */ struct aer_stats *aer_stats;/* AER stats for this device */ +#endif +#ifdef CONFIG_PCI_CXL +u16 cxl_cap;/* CXL capability offset */ #endif u8 pcie_cap;/* PCIe capability offset */ u8 msi_cap;/* MSI capability offset */
Signature · 1 line
2.26.2
PATCH v3 3/3 PCI: Add helpers to enable/disable CXL.mem and CXL.cache
In reply to Sean V KelleyWith these helpers, a device driver can enable/disable access to CXL.mem and CXL.cache. Note that the device driver is responsible for managing the memory area.
--- drivers/pci/cxl.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/pci/pci.h | 8 +++++ 2 files changed, 92 insertions(+)
drivers/pci/cxl.c +84 -0
@@ -24,6 +24,90 @@#define PCI_CXL_HDM_COUNT (reg) (((reg) & (3 << 4)) >> 4)#define PCI_CXL_VIRAL BIT(14) +#define PCI_CXL_CONFIG_LOCK BIT(0) + +static void pci_cxl_unlock (struct pci_dev *dev) +{ +int cxl = dev->cxl_cap; +u16 lock; + +pci_read_config_word (dev, cxl +PCI_CXL_LOCK , &lock); + lock &= ~PCI_CXL_CONFIG_LOCK ; +pci_write_config_word (dev, cxl +PCI_CXL_LOCK , lock); +} + +static void pci_cxl_lock (struct pci_dev *dev) +{ +int cxl = dev->cxl_cap; +u16 lock; + +pci_read_config_word (dev, cxl +PCI_CXL_LOCK , &lock); + lock |=PCI_CXL_CONFIG_LOCK ; +pci_write_config_word (dev, cxl +PCI_CXL_LOCK , lock); +} + +/* +* CXL DVSEC CTRL registers have Read-Write-Lockable attributes. +* PCI_CXL_CONFIG_LOCK locks these CTRL registers by making them RO. +* This lock prevents future changes to configuration and is not intended +* for enforcing mutual exclusion. See CXL 1.1, sec 7.1.1.6 +*/ +static int pci_cxl_enable_disable_feature (struct pci_dev *dev,int enable, +u16 feature) +{ +int cxl = dev->cxl_cap; +int ret; +u16 reg; + +if (!dev->cxl_cap) +return -EINVAL ; + +/* Only for Device 0 Function 0, Root Complex Integrated Endpoints */ +if (dev->devfn !=0 || (pci_pcie_type (dev) !=PCI_EXP_TYPE_RC_END )) +return -EINVAL ; + +pci_cxl_unlock (dev); + ret =pci_read_config_word (dev, cxl +PCI_CXL_CTRL , ®); +if (ret) + goto lock; + +if (enable) + reg |= feature; +else + reg &= ~feature; + + ret =pci_write_config_word (dev, cxl +PCI_CXL_CTRL , reg); + +lock: +pci_cxl_lock (dev); + +return ret; +} + +int pci_cxl_mem_enable (struct pci_dev *dev) +{ +return pci_cxl_enable_disable_feature (dev, true,PCI_CXL_MEM ); +} +EXPORT_SYMBOL_GPL (pci_cxl_mem_enable); + +void pci_cxl_mem_disable (struct pci_dev *dev) +{ +pci_cxl_enable_disable_feature (dev, false,PCI_CXL_MEM ); +} +EXPORT_SYMBOL_GPL (pci_cxl_mem_disable); + +int pci_cxl_cache_enable (struct pci_dev *dev) +{ +return pci_cxl_enable_disable_feature (dev, true,PCI_CXL_CACHE ); +} +EXPORT_SYMBOL_GPL (pci_cxl_cache_enable); + +void pci_cxl_cache_disable (struct pci_dev *dev) +{ +pci_cxl_enable_disable_feature (dev, false,PCI_CXL_CACHE ); +} +EXPORT_SYMBOL_GPL (pci_cxl_cache_disable); +/* * pci_find_cxl_capability - Identify and return offset to Vendor-Specific * capabilities.
drivers/pci/pci.h +8 -0
@@ -472,8 +472,16 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) { }#ifdef CONFIG_PCI_CXL /* Compute eXpress Link */ void pci_cxl_init (struct pci_dev *dev); +int pci_cxl_mem_enable (struct pci_dev *dev); +void pci_cxl_mem_disable (struct pci_dev *dev); +int pci_cxl_cache_enable (struct pci_dev *dev); +void pci_cxl_cache_disable (struct pci_dev *dev);#else static inline void pci_cxl_init (struct pci_dev *dev) { } +static inline int pci_cxl_mem_enable (struct pci_dev *dev) {return 0 ; } +static inline void pci_cxl_mem_disable (struct pci_dev *dev) { } +static inline int pci_cxl_cache_enable (struct pci_dev *dev) {return 0 ; } +static inline void pci_cxl_cache_disable (struct pci_dev *dev) { }#endif #ifdef CONFIG_PCI_PRI
Signature · 1 line
2.26.2
PATCH v3 1/3 PCI: Add defines for Designated Vendor-Specific Capability
In reply to Sean V KelleyFrom: "David E. Box" <[email protected]>
Add PCIe DVSEC extended capability ID and defines for the header offsets. Defined in PCIe r5.0, sec 7.9.6.
--- include/uapi/linux/pci_regs.h | 5 +++++ 1 file changed, 5 insertions(+)
include/uapi/linux/pci_regs.h +5 -0
@@ -720,6 +720,7 @@#define PCI_EXT_CAP_ID_DPC 0x1D/* Downstream Port Containment */ #define PCI_EXT_CAP_ID_L1SS 0x1E/* L1 PM Substates */ #define PCI_EXT_CAP_ID_PTM 0x1F/* Precision Time Measurement */ +#define PCI_EXT_CAP_ID_DVSEC 0x23/* Designated Vendor-Specific */ #define PCI_EXT_CAP_ID_DLF 0x25/* Data Link Feature */ #define PCI_EXT_CAP_ID_PL_16GT 0x26/* Physical Layer 16.0 GT/s */ #define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_PL_16GT
@@ -1062,6 +1063,10 @@#define PCI_L1SS_CTL1_LTR_L12_TH_SCALE 0xe0000000/* LTR_L1.2_THRESHOLD_Scale */ #define PCI_L1SS_CTL2 0x0c/* Control 2 Register */ +/* Designated Vendor-Specific (DVSEC, PCI_EXT_CAP_ID_DVSEC) */ +#define PCI_DVSEC_HEADER1 0x4/* Vendor-Specific Header1 */ +#define PCI_DVSEC_HEADER2 0x8/* Vendor-Specific Header2 */ +/* Data Link Feature */ #define PCI_DLF_CAP 0x04/* Capabilities Register */ #define PCI_DLF_EXCHANGE_ENABLE 0x80000000/* Data Link Feature Exchange Enable */
Signature · 1 line
2.26.2