CXL: Read CDAT and DSMAS data from the device
v7 cover CXL: Read CDAT and DSMAS data from the device
From: Ira Weiny <[email protected]>
Changes from V6:[3]
The big change is the removal of the auxiliary bus code from the PCI layer. The auxiliary bus usage is now in the CXL layer. The PCI layer provides helpers for subsystems to utilize DOE mailboxes by creating a pci_doe_mb object which controls a state machine for that mailbox capability. The CXL layer wraps this object in an auxiliary device and driver which can then be used to determine if the kernel is controlling the capability or it is available to be used by user space. Reads from user space via lspci are allowed. Writes are allowed but flagged via a tainting the kernel.
Feedback from Bjorn, Jonathan, and Dan
Details in each patch
Changes from V5:[0]
Rework the patch set to split PCI vs CXL changes
Also make each change a bit more stand alone for easier review
Add cxl_cdat structure
Put CDAT related data structures in cdat.h
Clarify some device lifetimes with comments
Incorporate feedback from Jonathan, Bjorn and Dan
The bigest change is placing the DOE scanning code into the
pci_doe driver (part of the PCI codre).
Validate the CDAT when it is read rather than before DSMAS
parsing
Do not report DSMAS failure as an error, report a warning and
keep going.
Retry reading the table 1 time.
Update commit messages and this cover letter
CXL drivers need various data which are provided through generic DOE mailboxes as defined in the PCIe 6.0 spec.[1]
One such data is the Coherent Device Atribute Table (CDAT). CDAT data provides coherent information about the various devices in the system. It was developed because systems no longer have a priori knowledge of all coherent devices within a system. CDAT describes the coherent characteristics of the components on the CXL bus separate from system configurations. The OS can then, for example, use this information to form correct interleave sets.
To begin reading the CDAT the OS must have support to access the DOE mailboxes provided by the CXL devices.
Because DOE is not specific to DOE but is provided within the PCI spec, the series adds PCI DOE capability library functions. These functions allow for the iteration of the DOE capabilities on a device as well as creating pci_doe_mb structures which can control the operation of the DOE state machine.
CXL iterates the DOE capabilities creates auxiliary bus devices. These devices are driven by a CXL DOE auxiliary driver which calls into the PCI DOE library functions as appropriate.
The auxiliary bus architecture allows for root users to control which DOE mailboxes are controlled by the kernel and which should be allowed for unrestricted access by user space. One such use case is to allow for CXL Compliance Testing (CXL 2.0 14.16.4 Compliance Mode DOE). By default the kernel controls all mailboxes found.
After the devices are created and the driver attaches, CDAT data is read from the device and DSMAS information parsed from that CDAT blob for use later.
This work was tested using qemu with additional patches.
[0] https://lore.kernel.org/linux-cxl/[email protected]/
[1] https://pcisig.com/specifications
[2] https://lore.kernel.org/qemu-devel/[email protected]/
[3] https://lore.kernel.org/linux-cxl/[email protected]/
Ira Weiny (7):
PCI: Replace magic constant for PCI Sig Vendor ID cxl/pci: Create auxiliary devices for each DOE mailbox cxl/pci: Create DOE auxiliary driver
cxl/pci: Find the DOE mailbox which supports CDAT cxl/cdat: Introduce cxl_cdat_valid()
cxl/mem: Retry reading CDAT on failure cxl/port: Parse out DSMAS data from CDAT table
Jonathan Cameron (3):
PCI: Add vendor ID for the PCI SIG
PCI: Create PCI library functions in support of DOE mailboxes. cxl/mem: Read CDAT table
drivers/cxl/Kconfig | 13 +drivers/cxl/Makefile | 2 +drivers/cxl/cdat.h | 116 +++++++ drivers/cxl/core/memdev.c | 38 +++drivers/cxl/cxl.h | 8 +drivers/cxl/cxlmem.h | 28 ++drivers/cxl/cxlpci.h | 35 ++drivers/cxl/doe.c | 90 +++++drivers/cxl/pci.c | 423 ++++++++++++++++++++++++ drivers/cxl/port.c | 65 ++++drivers/pci/Makefile | 3 +-drivers/pci/pci-doe.c | 603 ++++++++++++++++++++++++++++++++++ drivers/pci/probe.c | 2 +-include/linux/pci-doe.h | 119 +++++++ include/linux/pci_ids.h | 1 + include/uapi/linux/pci_regs.h | 30 +-
16 files changed, 1573 insertions(+), 3 deletions(-)
create mode 100644 drivers/cxl/cdat.h
create mode 100644 drivers/cxl/doe.c
create mode 100644 drivers/pci/pci-doe.c
create mode 100644 include/linux/pci-doe.h
--
2.35.1
PATCH v7 1/10 PCI: Add vendor ID for the PCI SIG
From: Jonathan Cameron <[email protected]>
This ID is used in DOE headers to identify protocols that are defined within the PCI Express Base Specification, PCIe r6.0, sec 6.30.1.1 table 6-32.
--- include/linux/pci_ids.h | 1 + 1 file changed, 1 insertion(+)
include/linux/pci_ids.h +1 -0
@@ -149,6 +149,7 @@#define PCI_CLASS_OTHERS 0xff/* Vendors and devices. Sort key: vendor first, device next. */ +#define PCI_VENDOR_ID_PCI_SIG 0x0001#define PCI_VENDOR_ID_LOONGSON 0x0014
Signature · 1 line
2.35.1
PATCH v7 2/10 PCI: Replace magic constant for PCI Sig Vendor ID
In reply to [email protected]From: Ira Weiny <[email protected]>
Replace the magic value in pci_bus_crs_vendor_id() with PCI_VENDOR_ID_PCI_SIG.
---
Changes from V6
Simplify commit message
--- drivers/pci/probe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/probe.c +1 -1
@@ -2312,7 +2312,7 @@ EXPORT_SYMBOL(pci_alloc_dev);static bool pci_bus_crs_vendor_id (u32 l) { -return (l &0xffff ) ==0x0001 ; +return (l &0xffff ) ==PCI_VENDOR_ID_PCI_SIG ; } static bool pci_bus_wait_crs(struct pci_bus *bus, int devfn, u32 *l,
Signature · 1 line
2.35.1
PATCH v7 3/10 PCI: Create PCI library functions in support of DOE mailboxes.
In reply to [email protected]From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
[1] https://members.pcisig.com/wg/PCI-SIG/document/16609
---
Changes from V6
Clean up signed off by lines
Make this functionality all PCI library functions
Clean up header files
s/pci_doe_irq/pci_doe_irq_handler
Use pci_{request,free}_irq
Remove irq_name (maintained by pci_request_irq)
Fix checks to use an irq
Consistently use u16 for cap_offset
Cleanup kdocs and comments
Create a helper retire_cur_task() to handle locking of the
current task pointer.
Remove devm_ calls from PCI layer.
The devm_ calls do not allow for the pci_doe_mb objects to be tied to an auxiliary device. Leave it to the caller to use devm_ if desired.
From Dan Williams
s/cb/end_task/; Pass pci_doe_task to end_task Clarify exchange/task/request/response.
Merge pci_doe_task and pci_doe_exchange into pci_doe_task which represents a single request/response task for the state machine to process.
Simplify submitting work to the mailbox
Replace pci_doe_exchange_sync() with pci_doe_submit_task() Consumers of the mailbox are now responsible for setting up callbacks within a task object and submitting them to the mailbox to be processed.
Remove WARN_ON when task != NULL and be sure to abort that task. Convert abort/dead to atomic flags s/state_lock/task_lock to better define what the lock is
protecting
Remove all the auxiliary bus code from the PCI layer
The PCI layer provides helpers to use the DOE Mailboxes. Each subsystem can then use the helpers as they see fit. The CXL layer in this series uses aux devices to manage the new pci_doe_mb objects.
From Bjorn
Clarify the fact that DOE mailboxes are capabilities of
the device.
Code clean ups
Cleanup Makefile
Update references to PCI SIG spec v6.0
Move this attribution here:
This code is based on Jonathan's V4 series here:
https://lore.kernel.org/linux-cxl/[email protected]/
Changes from V5
From Bjorn
s/pci_WARN/pci_warn
Add timeout period to print
Trim to 80 chars
Use Tabs for DOE define spacing
Use %#x for clarity
From Jonathan
Addresses concerns about the order of unwinding stuff s/doe/doe_dev in pci_doe_exhcnage_sync
Correct kernel Doc comment
Move pci_doe_task_complete() down in the file. Rework pci_doe_irq()
process STATUS_ERROR first
Return IRQ_NONE if the irq is not processed Use PCI_DOE_STATUS_INT_STATUS explicitly to
clear the irq
Clean up goto label s/err_free_irqs/err_free_irq
use devm_kzalloc for doe struct
clean up error paths in pci_doe_probe s/pci_doe_drv/pci_doe
remove include mutex.h
remove device name and define, move it in the next patch which uses it use devm_kasprintf() for irq_name
use devm_request_irq()
remove pci_doe_unregister()
[get/put]_device() were unneeded and with the use of devm_* this function can be removed completely.
refactor pci_doe_register and s/pci_doe_register/pci_doe_reg_irq
make this function just a registration of the irq and move pci_doe_abort() into pci_doe_probe()
use devm_* to allocate the protocol array
Changes from Jonathan's V4
Move the DOE MB code into the DOE auxiliary driver Remove Task List in favor of a wait queue
Changes from Ben
remove CXL references
propagate rc from pci functions on error
--- drivers/pci/Makefile | 3 +- drivers/pci/pci-doe.c | 603 ++++++++++++++++++++++++++++++++++ include/linux/pci-doe.h | 119 +++++++ include/uapi/linux/pci_regs.h | 29 +- 4 files changed, 752 insertions(+), 2 deletions(-) create mode 100644 drivers/pci/pci-doe.c create mode 100644 include/linux/pci-doe.h
drivers/pci/Makefile +2 -1
@@ -5,7 +5,8 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ remove.o pci.o pci-driver.o search.o \ pci-sysfs.o rom.o setup-res.o irq.o vpd.o \ - setup-bus.o vc.o mmap.o setup-irq.o + setup-bus.o vc.o mmap.o setup-irq.o \ + pci-doe.o obj-$(CONFIG_PCI) += msi/ obj-$(CONFIG_PCI) += pcie/
drivers/pci/pci-doe.c new file +603 -0
603 lines not on this page · raw message
include/linux/pci-doe.h new file +119 -0
119 lines not on this page · raw message
include/uapi/linux/pci_regs.h +28 -1
@@ -736,7 +736,8 @@#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 +#define PCI_EXT_CAP_ID_DOE 0x2E/* Data Object Exchange */ +#define PCI_EXT_CAP_ID_MAX PCI_EXT_CAP_ID_DOE#define PCI_EXT_CAP_DSN_SIZEOF 12#define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40
@@ -1102,4 +1103,30 @@#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK 0x000000F0#define PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT 4 +/* Data Object Exchange */ +#define PCI_DOE_CAP 0x04/* DOE Capabilities Register */ +#define PCI_DOE_CAP_INT 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_IRQ 0x00000ffe/* Interrupt Message Number */ +#define PCI_DOE_CTRL 0x08/* DOE Control Register */ +#define PCI_DOE_CTRL_ABORT 0x00000001/* DOE Abort */ +#define PCI_DOE_CTRL_INT_EN 0x00000002/* DOE Interrupt Enable */ +#define PCI_DOE_CTRL_GO 0x80000000/* DOE Go */ +#define PCI_DOE_STATUS 0x0c/* DOE Status Register */ +#define PCI_DOE_STATUS_BUSY 0x00000001/* DOE Busy */ +#define PCI_DOE_STATUS_INT_STATUS 0x00000002/* DOE Interrupt Status */ +#define PCI_DOE_STATUS_ERROR 0x00000004/* DOE Error */ +#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ +#define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ +#define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ + +/* DOE Data Object - note not actually registers */ +#define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_HEADER_1_TYPE 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff + +#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000 +#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000 +#endif /* LINUX_PCI_REGS_H */
Signature · 1 line
2.35.1
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 9 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Quoted 6 lines
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 14 lines · Christoph Hellwig
Quoted 13 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
Each DOE mailbox must support the DOE discovery protocol in addition to any number of additional protocols.
Define core PCI functionality to manage a single PCI DOE mailbox at a defined config space offset. Functionality includes creating, supported protocol queries, submit tasks to, and destroying the new state objects.
Quoted 5 lines
Quoted 2 lines
If interrupts are desired, interrupts vectors should be allocated prior to asking for irq's when creating a mailbox object.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
I can add a Kconfig.
Thanks for looking,
Ira
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 10 lines · Ira Weiny
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
I can add a
Kconfig.
Ideally, that config option should live in the pcie/ subdirectory, i.e. in drivers/pci/pcie/Kconfig, alongside drivers/pci/pcie/doe.c, as we try to consolidate PCIe-specific features there and reserve core code in drivers/pci/*.c for functionality that also applies to Conventional PCI.
Thanks,
Lukas
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 10 lines · Lukas Wunner
Quoted 9 lines · Ira Weiny
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
Quoted 7 lines
Quoted 1 line
I can add a
Kconfig.Ideally, that config option should live in the pcie/ subdirectory, i.e. in
drivers/pci/pcie/Kconfig, alongsidedrivers/pci/pcie/doe.c, as we try to consolidate PCIe-specific features there and reserve core code indrivers/pci/*.cfor functionality that also applies to Conventional PCI.
Thanks for letting me know about this direction. I was unaware of this.
I'll move the file no problem, thanks,
Ira
Quoted 4 lines
Thanks,
Lukas
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 13 lines · On Tue, 5 Apr 2022 16:22:11 -0700 Ira Weiny <[email protected]> wrote:
Quoted 12 lines · Lukas Wunner
Quoted 10 lines · Ira Weiny
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
I can add a
Kconfig.
Quoted 7 lines
Quoted 5 lines
Ideally, that config option should live in the pcie/ subdirectory, i.e. in
drivers/pci/pcie/Kconfig, alongsidedrivers/pci/pcie/doe.c, as we try to consolidate PCIe-specific features there and reserve core code indrivers/pci/*.cfor functionality that also applies to Conventional PCI.Thanks for letting me know about this direction. I was unaware of this.
We had this in the pcie directory, but Bjorn asked us to move it to the pci directory as there isn't anything specific to PCIe about DOE. You could implement it on pci-x (maybe 2.0?) I think even though it's in the PCIe specification.
https://lore.kernel.org/linux-pci/20210413194927.GA2241331@bjorn-Precision-5520/
Thanks,
Jonathan
Quoted 8 lines
I'll move the file no problem, thanks,
IraQuoted 4 lines
Thanks,
Lukas
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 22 lines · Jonathan Cameron
Quoted 19 lines · On Tue, 5 Apr 2022 16:22:11 -0700 Ira Weiny <[email protected]> wrote:
Quoted 17 lines · Lukas Wunner
Quoted 10 lines · Ira Weiny
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
I can add a
Kconfig.Ideally, that config option should live in the pcie/ subdirectory, i.e. in
drivers/pci/pcie/Kconfig, alongsidedrivers/pci/pcie/doe.c, as we try to consolidate PCIe-specific features there and reserve core code indrivers/pci/*.cfor functionality that also applies to Conventional PCI.
Quoted 7 lines
Quoted 1 line
Thanks for letting me know about this direction. I was unaware of this.
We had this in the pcie directory, but Bjorn asked us to move it to the pci directory as there isn't anything specific to PCIe about DOE. You could implement it on pci-x (maybe 2.0?) I think even though it's in the PCIe specification.
https://lore.kernel.org/linux-pci/20210413194927.GA2241331@bjorn-Precision-5520/
:-/
I'd forgotten that far back.
Bjorn?
Ira
Quoted 15 lines
Thanks,
Jonathan
Quoted 8 lines
I'll move the file no problem, thanks,
IraQuoted 4 lines
Thanks,
Lukas
Re: [PATCH V7 03/10] PCI: Create PCI library functions in support of DOE mailboxes.
Quoted 28 lines · Ira Weiny
Quoted 27 lines · Jonathan Cameron
Quoted 13 lines · On Tue, 5 Apr 2022 16:22:11 -0700 Ira Weiny <[email protected]> wrote:
Quoted 12 lines · Lukas Wunner
Quoted 10 lines · Ira Weiny
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · On Wed, Mar 30, 2022 at 04:59:13PM -0700, [email protected] wrote:
Introduced in a PCI v6.0[1], DOE provides a config space based mailbox with standard protocol discovery. Each mailbox is accessed through a DOE Extended Capability.
I really don't think this should be built unconditionally and bloat every single kernel built with PCI support.
I can add a
Kconfig.Quoted 7 lines
Quoted 5 lines
Ideally, that config option should live in the pcie/ subdirectory, i.e. in
drivers/pci/pcie/Kconfig, alongsidedrivers/pci/pcie/doe.c, as we try to consolidate PCIe-specific features there and reserve core code indrivers/pci/*.cfor functionality that also applies to Conventional PCI.Thanks for letting me know about this direction. I was unaware of this.
We had this in the pcie directory, but Bjorn asked us to move it to the pci directory as there isn't anything specific to PCIe about DOE. You could implement it on pci-x (maybe 2.0?) I think even though it's in the PCIe specification.
Quoted 7 lines
:-/
I'd forgotten that far back.
Bjorn?
I would still prefer it in drivers/pci because I don't think there's enough value to justify the pcie/ subdirectory. We have ats.c, ecam.c, iov.c, pci-pf-stub.c, and vc.c in drivers/pci even though they're PCIe-specific. Other files in drivers/pci like access.c, pci-acpi.c, pci.c, probe.c, etc also have some PCIe content.
Bjorn
PATCH v7 4/10 cxl/pci: Create auxiliary devices for each DOE mailbox
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
---
Changes from V6:
Move all the auxiliary device stuff to the CXL layer
Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.
--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+)
drivers/cxl/Kconfig +1 -0
@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified by
drivers/cxl/cxlpci.h +21 -0
@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h"
@@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */
drivers/cxl/pci.c +135 -0
153 lines not on this page · raw message
Signature · 1 line
2.35.1
Re: [PATCH V7 04/10] cxl/pci: Create auxiliary devices for each DOE mailbox
Quoted 40 lines · On Wed, 30 Mar 2022 16:59:14 -0700 [email protected] wrote:
From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Iterate each DOE mailbox capability and create auxiliary bus devices. Follow on patches will define a driver for the newly created devices.
sysfs shows the devices.
$ ls -l /sys/bus/auxiliary/devices/ total 0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.0 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.1 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.2 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.3 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.4 -> ../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.5 -> ../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.6 -> ../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:47 cxl_pci.doe.7 -> ../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
Quoted 1 line
Signed-off-by Ira Weiny <[email protected]>
Hi Ira,
Noticed something else about the number of irq vectors requested.
Thanks,
Jonathan
Quoted 117 lines
---
Changes from V6:
Move all the auxiliary device stuff to the CXL layerChanges from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.--- drivers/cxl/Kconfig | 1 + drivers/cxl/cxlpci.h | 21 +++++++ drivers/cxl/pci.c | 135 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+)drivers/cxl/Kconfig +1
-0@@ -16,6 +16,7 @@ if CXL_BUS config CXL_PCI tristate "PCI manageability" default CXL_BUS + select AUXILIARY_BUS help The CXL specification defines a "CXL memory device" sub-class in the PCI "memory controller" base class of devices. Device's identified bydrivers/cxl/cxlpci.h +21
-0@@ -2,6 +2,7 @@/* Copyright(c) 2020 Intel Corporation. All rights reserved. */ #ifndef __CXL_PCI_H__#define __CXL_PCI_H__ +#include <linux/auxiliary_bus.h> #include <linux/pci.h> #include "cxl.h" @@ -72,4 +73,24 @@ static inline resource_size_t cxl_regmap_to_base(struct pci_dev *pdev, }int devm_cxl_port_enumerate_dports (struct cxl_port *port); + +/** +* struct cxl_doe_dev - CXL DOE auxiliary bus device +* +* @adev: Auxiliary bus device +* @pdev: PCI device this belongs to +* @cap_offset: Capability offset +* @use_irq: Set if IRQs are to be used with this mailbox +* +* This represents a single DOE mailbox device. CXL devices should create this +* device and register it on the Auxiliary bus for the CXL DOE driver to drive. +*/ +struct cxl_doe_dev { +struct auxiliary_device adev; +struct pci_dev *pdev; +int cap_offset; +bool use_irq; +}; +#define DOE_DEV_NAME "doe" +#endif /* __CXL_PCI_H__ */ drivers/cxl/pci.c +39
-0@@ -8,6 +8,7 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include <linux/io.h> #include "cxlmem.h" #include "cxlpci.h" @@ -545,6 +546,136 @@ static int cxl_dvsec_ranges(struct cxl_dev_state *cxlds)return 0 ; } +static void cxl_pci_free_irq_vectors (void *data) +{ +pci_free_irq_vectors (data); +} + +static DEFINE_IDA (pci_doe_adev_ida); + +static void cxl_pci_doe_dev_release (struct device *dev) +{ +struct auxiliary_device *adev =container_of (dev, + struct auxiliary_device, + dev); + struct cxl_doe_dev *doe_dev = container_of(adev, struct cxl_doe_dev, + adev); + +ida_free (&pci_doe_adev_ida, adev->id); +kfree (doe_dev); +} + +static void cxl_pci_doe_destroy_device (void *ad) +{ +auxiliary_device_delete (ad); +auxiliary_device_uninit (ad); +} + +/** +* cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE +* mailboxes found +* +* @pci_dev: The PCI device to scan for DOE mailboxes +* +* There is no coresponding destroy of these devices. This function associates +* the DOE auxiliary devices created with the pci_dev passed in. That +* association is device managed (devm_*) such that the DOE auxiliary device +* lifetime is always less than or equal to the lifetime of the pci_dev. +* +* RETURNS: 0 on success -ERRNO on failure. +*/
drivers/cxl/pci.c static int cxl_dvsec_ranges(struct cxl_dev_state *cxlds) · line 596
Quoted 10 lines
drivers/cxl/pci.c +10
-0+int cxl_pci_create_doe_devices (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +bool use_irq = true; +int irqs =0 ; +u16 off =0 ; +int rc; + +pci_doe_for_each_off (pdev, off) + irqs++;
I don't think this is sufficient. I think we need something similar to that done to calculate the necessary vectors in portdrv_core.c / pcie_message_numbers()
https://elixir.bootlin.com/linux/latest/source/drivers/pci/pcie/portdrv_core.c#L45
That is we need to ensure that vectors are requested such that we can always cover the vector for the DOE interrupt. To get that we need to read the capability register and then set irqs to one larger than that.
Jonathan
Quoted 96 lines
drivers/cxl/pci.c +86
-0+pci_info (pdev,"Found %d DOE mailbox's\n" , irqs); + +/* +* Allocate enough vectors for the DOE's +*/ + rc =pci_alloc_irq_vectors (pdev, irqs, irqs,PCI_IRQ_MSI | +PCI_IRQ_MSIX ); +if (rc != irqs) { +pci_err (pdev, +"Not enough interrupts for all the DOEs; use polling\n" ); + use_irq = false; +/* Some got allocated; clean them up */ +if (rc >0 ) +cxl_pci_free_irq_vectors (pdev); + }else { +/* +* Enabling bus mastering is require for MSI/MSIx. It could be +* done later within the DOE initialization, but as it +* potentially has other impacts keep it here when setting up +* the IRQ's. +*/ +pci_set_master (pdev); + rc =devm_add_action_or_reset (dev, + cxl_pci_free_irq_vectors, + pdev); +if (rc) +return rc; + } + +pci_doe_for_each_off (pdev, off) { +struct auxiliary_device *adev; +struct cxl_doe_dev *new_dev; +int id; + + new_dev =kzalloc (sizeof (*new_dev),GFP_KERNEL ); +if (!new_dev) +return -ENOMEM ; + + new_dev->pdev = pdev; + new_dev->cap_offset = off; + new_dev->use_irq = use_irq; + +/* Set up struct auxiliary_device */ + adev = &new_dev->adev; + id =ida_alloc (&pci_doe_adev_ida,GFP_KERNEL ); +if (id <0 ) { +kfree (new_dev); +return -ENOMEM ; + } + + adev->id = id; + adev->name =DOE_DEV_NAME ; + adev->dev.release = cxl_pci_doe_dev_release; + adev->dev.parent = dev; + +if (auxiliary_device_init (adev)) { +cxl_pci_doe_dev_release (&adev->dev); +return -EIO ; + } + +if (auxiliary_device_add (adev)) { +auxiliary_device_uninit (adev); +return -EIO ; + } + + rc =devm_add_action_or_reset (dev, cxl_pci_doe_destroy_device, + adev); +if (rc) +return rc; + } + +return 0 ; +} + +static int cxl_setup_doe_devices (struct cxl_dev_state *cxlds) +{ +struct device *dev = cxlds->dev; +struct pci_dev *pdev =to_pci_dev (dev); + +return cxl_pci_create_doe_devices (pdev); +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -611,6 +742,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)if (rc)return rc; + rc =cxl_setup_doe_devices (cxlds); +if (rc) +return rc; + rc =cxl_dvsec_ranges (cxlds);if (rc) dev_warn(&pdev->dev,
PATCH v7 5/10 cxl/pci: Create DOE auxiliary driver
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL kernel drivers optionally need to access DOE mailbox capabilities. Access to mailboxes for things such as CDAT, SPDM, and IDE are needed by the kernel while other access is designed towards user space usage. An example of this is for CXL Compliance Testing (see CXL 2.0 14.16.4 Compliance Mode DOE) which offers a mechanism to set different test modes for a device.
There is no anticipated need for the kernel to share an individual mailbox with user space. Thus developing an interface to marshal access between the kernel and user space for a single mailbox is unnecessary overhead. However, having the kernel relinquish some mailboxes to be controlled by user space is a reasonable compromise to share access to the device.
The auxiliary bus provides an elegant solution for this. Each DOE capability is given its own auxiliary device. This device is controlled by a kernel driver by default which restricts access to the mailbox. Unbinding the driver from a single auxiliary device (DOE mailbox capability) frees the mailbox for user space access. This architecture also allows a clear picture on which mailboxes are kernel controlled vs not.
Create a driver for the DOE auxiliary devices. The driver uses the PCI DOE core to manage the mailbox.
User space must be prevented from unbinding the driver state when the DOE auxiliary driver is being accessed by the kernel. Add a read write lock to the DOE auxiliary device to protect the driver data portion.
Finally, flag the driver module to be preloaded by device creation to ensure the driver is attached when iterating the DOE capabilities.
User space access can be obtained by unbinding the driver from that device. For example:
$ ls -l /sys/bus/auxiliary/drivers total 0 drwxr-xr-x 2 root root 0 Mar 24 10:45 cxl_doe.cxl_doe_drv
$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.4 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
$ echo "cxl_pci.doe.4" > /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/unbind
$ ls -l /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci* lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.0 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.0 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.1 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.1 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.2 -> ../../../../devices/pci0000:35/0000:35:00.0/0000:36:00.0/cxl_pci.doe.2 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.3 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.3 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.5 -> ../../../../devices/pci0000:bf/0000:bf:00.0/0000:c0:00.0/cxl_pci.doe.5 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.6 -> ../../../../devices/pci0000:35/0000:35:01.0/0000:37:00.0/cxl_pci.doe.6 lrwxrwxrwx 1 root root 0 Mar 24 10:53 /sys/bus/auxiliary/drivers/cxl_doe.cxl_doe_drv/cxl_pci.doe.7 -> ../../../../devices/pci0000:bf/0000:bf:01.0/0000:c1:00.0/cxl_pci.doe.7
---
Changes from V6:
The CXL layer now contains the driver for these auxiliary devices.
Changes from V5:
Split the CXL specific stuff off from the PCI DOE create auxiliary device code.
--- drivers/cxl/Kconfig | 12 +++++ drivers/cxl/Makefile | 2 + drivers/cxl/cxlpci.h | 13 +++++ drivers/cxl/doe.c | 90 +++++++++++++++++++++++++++++++++++ drivers/cxl/pci.c | 20 ++++++++ include/uapi/linux/pci_regs.h | 1 + 6 files changed, 138 insertions(+) create mode 100644 drivers/cxl/doe.c
drivers/cxl/Kconfig +12 -0
@@ -104,4 +104,16 @@ config CXL_REGION default CXL_BUS tristate +config CXL_PCI_DOE + tristate "CXL PCI Data Object Exchange (DOE) support" + depends on CXL_PCI + default CXL_BUS + help + Driver for DOE auxiliary devices. + + The DOE capabilities provides a simple mailbox in PCI config space that + is used for a number of different protocols useful to CXL. The CXL PCI + subsystem creates auxiliary devices for each DOE mailbox capability + found. This driver is required for the kernel to use these devices. + endif
drivers/cxl/Makefile +2 -0
@@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_CXL_BUS) += core/ obj-$(CONFIG_CXL_PCI) += cxl_pci.o +obj-$(CONFIG_CXL_PCI_DOE) += cxl_doe.o obj-$(CONFIG_CXL_MEM) += cxl_mem.o obj-$(CONFIG_CXL_ACPI) += cxl_acpi.o obj-$(CONFIG_CXL_PMEM) += cxl_pmem.o
@@ -9,6 +10,7 @@ obj-$(CONFIG_CXL_REGION) += cxl_region.o cxl_mem-y := mem.o cxl_pci-y := pci.o +cxl_doe-y := doe.o cxl_acpi-y := acpi.o cxl_pmem-y := pmem.o cxl_port-y := port.o
drivers/cxl/cxlpci.h +13 -0
@@ -79,6 +79,7 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);* * @adev: Auxiliary bus device * @pdev: PCI device this belongs to +* @driver_access: Lock the driver during access * @cap_offset: Capability offset * @use_irq: Set if IRQs are to be used with this mailbox *
@@ -88,9 +89,21 @@ int devm_cxl_port_enumerate_dports(struct cxl_port *port);struct cxl_doe_dev {struct auxiliary_device adev;struct pci_dev *pdev; +struct rw_semaphore driver_access;int cap_offset;bool use_irq; };#define DOE_DEV_NAME "doe" +/** +* struct cxl_doe_drv_state - state of the DOE Aux driver +* +* @doe_dev: The Auxiliary DOE device +* @doe_mb: PCI DOE mailbox state +*/ +struct cxl_doe_drv_state { +struct cxl_doe_dev *doe_dev; +struct pci_doe_mb *doe_mb; +}; +#endif /* __CXL_PCI_H__ */
drivers/cxl/doe.c new file +90 -0
90 lines not on this page · raw message
drivers/cxl/pci.c +20 -0
@@ -571,6 +571,17 @@ static void cxl_pci_doe_destroy_device(void *ad)auxiliary_device_uninit (ad); } +static struct cxl_doe_drv_state *cxl_pci_doe_get_drv (struct cxl_doe_dev *doe_dev) +{ +down_read (&doe_dev->driver_access); +return auxiliary_get_drvdata (&doe_dev->adev); +} + +static void cxl_pci_doe_put_drv (struct cxl_doe_dev *doe_dev) +{ +up_read (&doe_dev->driver_access); +} +/** * cxl_pci_create_doe_devices - Create auxiliary bus DOE devices for all DOE * mailboxes found
@@ -633,6 +644,7 @@ int cxl_pci_create_doe_devices(struct pci_dev *pdev)return -ENOMEM ; new_dev->pdev = pdev; +init_rwsem (&new_dev->driver_access); new_dev->cap_offset = off; new_dev->use_irq = use_irq;
@@ -663,6 +675,13 @@ int cxl_pci_create_doe_devices(struct pci_dev *pdev) adev);if (rc)return rc; + +if (device_attach (&adev->dev) !=1 ) { +dev_err (&adev->dev, +"Failed to attach a driver to DOE device %d\n" , + adev->id); +return -ENODEV ; + } }return 0 ;
@@ -777,6 +796,7 @@ static struct pci_driver cxl_pci_driver = { }, }; +MODULE_SOFTDEP ("pre: cxl_doe" );MODULE_LICENSE ("GPL v2" );module_pci_driver (cxl_pci_driver);MODULE_IMPORT_NS (CXL );
include/uapi/linux/pci_regs.h +1 -0
@@ -1118,6 +1118,7 @@#define PCI_DOE_STATUS_DATA_OBJECT_READY 0x80000000/* Data Object Ready */ #define PCI_DOE_WRITE 0x10/* DOE Write Data Mailbox Register */ #define PCI_DOE_READ 0x14/* DOE Read Data Mailbox Register */ +#define PCI_DOE_CAP_SIZE (0x14 + 4)/* Size of this register block */ /* DOE Data Object - note not actually registers */ #define PCI_DOE_DATA_OBJECT_HEADER_1_VID 0x0000ffff
Signature · 1 line
2.35.1
PATCH v7 6/10 cxl/pci: Find the DOE mailbox which supports CDAT
In reply to [email protected]From: Ira Weiny <[email protected]>
Each CXL device may have multiple DOE mailbox capabilities and each mailbox may support multiple protocols.
Search the DOE auxiliary devices for one which supports the CDAT protocol. Cache that device to be used for future queries.
---
Changes from V6
Adjust for aux devices being a CXL only concept Update commit msg.
Ensure devices iterated by auxiliary_find_device() are checked
to be DOE devices prior to checking for the CDAT protocol
From Ben
Ensure reference from auxiliary_find_device() is dropped
--- drivers/cxl/cxl.h | 2 ++ drivers/cxl/cxlmem.h | 2 ++ drivers/cxl/pci.c | 68 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 1 deletion(-)
drivers/cxl/cxl.h +2 -0
@@ -153,6 +153,8 @@ static inline bool cxl_is_interleave_granularity_valid(int ig)#define CXLDEV_MBOX_BG_CMD_STATUS_OFFSET 0x18#define CXLDEV_MBOX_PAYLOAD_OFFSET 0x20 +#define CXL_DOE_PROTOCOL_TABLE_ACCESS 2 +/* * Using struct_group() allows for per register-block-type helper routines, * without requiring block-type agnostic code to include the prefix.
drivers/cxl/cxlmem.h +2 -0
@@ -119,6 +119,7 @@ struct cxl_endpoint_dvsec_info {* Currently only memory devices are represented. * * @dev: The device associated with this CXL state +* @cdat_doe: Auxiliary DOE device capabile of reading CDAT * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload
@@ -151,6 +152,7 @@ struct cxl_endpoint_dvsec_info {struct cxl_dev_state {struct device *dev; +struct cxl_doe_dev *cdat_doe;struct cxl_regs regs;int cxl_dvsec;
drivers/cxl/pci.c +67 -1
79 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v7 7/10 cxl/mem: Read CDAT table
In reply to [email protected]From: Jonathan Cameron <[email protected]>
The OS will need CDAT data from CXL devices to properly set up interleave sets. Currently this is supported by a through a DOE mailbox which supports CDAT. But any cxl_mem object can provide this data later if need be, for example for testing.
Cache the CDAT data for later parsing. Provide a sysfs binary attribute to allow dumping of the CDAT.
Binary dumping is modeled on /sys/firmware/ACPI/tables/
The ability to dump this table will be very useful for emulation of real devices once they become available as QEMU CXL type 3 device emulation will be able to load this file in.
This does not support table updates at runtime. It will always provide whatever was there when first cached. Handling of table updates can be implemented later.
Finally create a complete list of DOE defines within cdat.h for code wishing to decode the CDAT table.
---
Changes from V6:
Fix issue with devm use
Move cached cdat data to cxl_dev_state
Use new pci_doe_submit_task()
Ensure the aux driver is locked while processing tasks
Changes from V5:
Add proper guards around cdat.h
Split out finding the CDAT DOE mailbox
Use cxl_cdat to group CDAT data together
Adjust to use auxiliary_find_device() to find the DOE device
which supplies the CDAT protocol.
Rebased to latest
Remove dev_dbg(length)
Remove unneeded DOE Table access defines
Move CXL_DOE_PROTOCOL_TABLE_ACCESS define into this patch where
it is used
Changes from V4:
Split this into it's own patch
Rearchitect this such that the memdev driver calls into the DOE driver via the cxl_mem state object. This allows CDAT data to come from any type of cxl_mem object not just PCI DOE. Rebase on new struct cxl_dev_state
--- drivers/cxl/cdat.h | 97 ++++++++++++++++++++++++ drivers/cxl/core/memdev.c | 38 ++++++++++ drivers/cxl/cxlmem.h | 26 +++++++ drivers/cxl/cxlpci.h | 1 + drivers/cxl/pci.c | 153 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 315 insertions(+) create mode 100644 drivers/cxl/cdat.h
drivers/cxl/cdat.h new file +97 -0
@@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __CXL_CDAT_H__ +#define __CXL_CDAT_H__ + +/* +* Coherent Device Attribute table (CDAT) +* +* Specification available from UEFI.org +* +* Whilst CDAT is defined as a single table, the access via DOE maiboxes is +* done one entry at a time, where the first entry is the header. +*/ + +#define CXL_DOE_TABLE_ACCESS_REQ_CODE 0x000000ff +#define CXL_DOE_TABLE_ACCESS_REQ_CODE_READ 0 +#define CXL_DOE_TABLE_ACCESS_TABLE_TYPE 0x0000ff00 +#define CXL_DOE_TABLE_ACCESS_TABLE_TYPE_CDATA 0 +#define CXL_DOE_TABLE_ACCESS_ENTRY_HANDLE 0xffff0000 + +/* +* CDAT entries are little endian and are read from PCI config space which +* is also little endian. +* As such, on a big endian system these will have been reversed. +* This prevents us from making easy use of packed structures. +* Style form pci_regs.h +*/ + +#define CDAT_HEADER_LENGTH_DW 4 +#define CDAT_HEADER_LENGTH_BYTES (CDAT_HEADER_LENGTH_DW * sizeof(u32)) +#define CDAT_HEADER_DW0_LENGTH 0xffffffff +#define CDAT_HEADER_DW1_REVISION 0x000000ff +#define CDAT_HEADER_DW1_CHECKSUM 0x0000ff00 +/* CDAT_HEADER_DW2_RESERVED */ +#define CDAT_HEADER_DW3_SEQUENCE 0xffffffff + +/* All structures have a common first DW */ +#define CDAT_STRUCTURE_DW0_TYPE 0x000000ff +#define CDAT_STRUCTURE_DW0_TYPE_DSMAS 0 +#define CDAT_STRUCTURE_DW0_TYPE_DSLBIS 1 +#define CDAT_STRUCTURE_DW0_TYPE_DSMSCIS 2 +#define CDAT_STRUCTURE_DW0_TYPE_DSIS 3 +#define CDAT_STRUCTURE_DW0_TYPE_DSEMTS 4 +#define CDAT_STRUCTURE_DW0_TYPE_SSLBIS 5 + +#define CDAT_STRUCTURE_DW0_LENGTH 0xffff0000 + +/* Device Scoped Memory Affinity Structure */ +#define CDAT_DSMAS_DW1_DSMAD_HANDLE 0x000000ff +#define CDAT_DSMAS_DW1_FLAGS 0x0000ff00 +#define CDAT_DSMAS_DPA_OFFSET (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSMAS_DPA_LEN (entry) ((u64)((entry)[5]) << 32 | (entry)[4]) +#define CDAT_DSMAS_NON_VOLATILE (flags) ((flags & 0x04) >> 2) + +/* Device Scoped Latency and Bandwidth Information Structure */ +#define CDAT_DSLBIS_DW1_HANDLE 0x000000ff +#define CDAT_DSLBIS_DW1_FLAGS 0x0000ff00 +#define CDAT_DSLBIS_DW1_DATA_TYPE 0x00ff0000 +#define CDAT_DSLBIS_BASE_UNIT (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSLBIS_DW4_ENTRY_0 0x0000ffff +#define CDAT_DSLBIS_DW4_ENTRY_1 0xffff0000 +#define CDAT_DSLBIS_DW5_ENTRY_2 0x0000ffff + +/* Device Scoped Memory Side Cache Information Structure */ +#define CDAT_DSMSCIS_DW1_HANDLE 0x000000ff +#define CDAT_DSMSCIS_MEMORY_SIDE_CACHE_SIZE (entry) \ + ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSMSCIS_DW4_MEMORY_SIDE_CACHE_ATTRS 0xffffffff + +/* Device Scoped Initiator Structure */ +#define CDAT_DSIS_DW1_FLAGS 0x000000ff +#define CDAT_DSIS_DW1_HANDLE 0x0000ff00 + +/* Device Scoped EFI Memory Type Structure */ +#define CDAT_DSEMTS_DW1_HANDLE 0x000000ff +#define CDAT_DSEMTS_DW1_EFI_MEMORY_TYPE_ATTR 0x0000ff00 +#define CDAT_DSEMTS_DPA_OFFSET (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_DSEMTS_DPA_LENGTH (entry) ((u64)((entry)[5]) << 32 | (entry)[4]) + +/* Switch Scoped Latency and Bandwidth Information Structure */ +#define CDAT_SSLBIS_DW1_DATA_TYPE 0x000000ff +#define CDAT_SSLBIS_BASE_UNIT (entry) ((u64)((entry)[3]) << 32 | (entry)[2]) +#define CDAT_SSLBIS_ENTRY_PORT_X (entry, i) ((entry)[4 + (i) * 2] & 0x0000ffff) +#define CDAT_SSLBIS_ENTRY_PORT_Y (entry, i) (((entry)[4 + (i) * 2] & 0xffff0000) >> 16) +#define CDAT_SSLBIS_ENTRY_LAT_OR_BW (entry, i) ((entry)[4 + (i) * 2 + 1] & 0x0000ffff) + +/** +* struct cxl_cdat - CXL CDAT data +* +* @table: cache of CDAT table +* @length: length of cached CDAT table +*/ +struct cxl_cdat { +void *table; +size_t length; +}; + +#endif /* !__CXL_CDAT_H__ */
drivers/cxl/core/memdev.c +38 -0
@@ -86,6 +86,37 @@ static ssize_t pmem_size_show(struct device *dev, struct device_attribute *attr,return sysfs_emit (buf,"%#llx\n" , len); } +static ssize_t CDAT_read (struct file *filp,struct kobject *kobj, +struct bin_attribute *bin_attr,char *buf, +loff_t offset,size_t count) +{ +struct device *dev =kobj_to_dev (kobj); +struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_dev_state *cxlds = cxlmd->cxlds; + +if (!cxlds->cdat.table) +return 0 ; + +return memory_read_from_buffer (buf, count, &offset, + cxlds->cdat.table, + cxlds->cdat.length); +} + +static BIN_ATTR_RO(CDAT, 0); + +static umode_t cxl_memdev_bin_attr_is_visible (struct kobject *kobj, +struct bin_attribute *attr,int i) +{ +struct device *dev =kobj_to_dev (kobj); +struct cxl_memdev *cxlmd =to_cxl_memdev (dev); +struct cxl_dev_state *cxlds = cxlmd->cxlds; + +if ((attr == &bin_attr_CDAT) && cxlds->cdat.table) +return 0400 ; + +return 0 ; +} +static struct device_attribute dev_attr_pmem_size =__ATTR (size,0444 , pmem_size_show,NULL );
@@ -115,6 +146,11 @@ static struct attribute *cxl_memdev_attributes[] = { NULL, }; +static struct bin_attribute *cxl_memdev_bin_attributes[] = { + &bin_attr_CDAT, +NULL , +}; +static struct attribute *cxl_memdev_pmem_attributes[] = { &dev_attr_pmem_size.attr,NULL ,
@@ -136,6 +172,8 @@ static umode_t cxl_memdev_visible(struct kobject *kobj, struct attribute *a,static struct attribute_group cxl_memdev_attribute_group = { .attrs = cxl_memdev_attributes, .is_visible = cxl_memdev_visible, + .bin_attrs = cxl_memdev_bin_attributes, + .is_bin_visible = cxl_memdev_bin_attr_is_visible, };static struct attribute_group cxl_memdev_ram_attribute_group = {
drivers/cxl/cxlmem.h +26 -0
@@ -5,6 +5,7 @@#include <uapi/linux/cxl_mem.h> #include <linux/cdev.h> #include "cxl.h" +#include "cdat.h" /* CXL 2.0 8.2.8.5.1.1 Memory Device Status Register */ #define CXLMDEV_STATUS_OFFSET 0x0
@@ -120,6 +121,7 @@ struct cxl_endpoint_dvsec_info {* * @dev: The device associated with this CXL state * @cdat_doe: Auxiliary DOE device capabile of reading CDAT +* @cdat: Cached CDAT data * @regs: Parsed register blocks * @cxl_dvsec: Offset to the PCIe device DVSEC * @payload_size: Size of space for payload
@@ -145,6 +147,10 @@ struct cxl_endpoint_dvsec_info {* @serial: PCIe Device Serial Number * @mbox_send: @dev specific transport for transmitting mailbox commands * @wait_media_ready: @dev specific method to await media ready +* @cdat_get_length: @dev specific function for reading the CDAT table length +* returns -errno if CDAT not supported on this device +* @cdat_read_table: @dev specific function for reading the table +* returns -errno if CDAT not supported on this device * * See section 8.2.9.5.2 Capacity Configuration and Label Storage for * details on capacity parameters.
@@ -153,6 +159,7 @@ struct cxl_dev_state {struct device *dev;struct cxl_doe_dev *cdat_doe; +struct cxl_cdat cdat;struct cxl_regs regs;int cxl_dvsec;
@@ -181,6 +188,9 @@ struct cxl_dev_state {int (*mbox_send)(struct cxl_dev_state *cxlds,struct cxl_mbox_cmd *cmd);int (*wait_media_ready)(struct cxl_dev_state *cxlds); +int (*cdat_get_length)(struct cxl_dev_state *cxlds,size_t *length); +int (*cdat_read_table)(struct cxl_dev_state *cxlds, +struct cxl_cdat *cdat); };enum cxl_opcode {
@@ -314,4 +324,20 @@ struct cxl_hdm { struct cxl_decoder *cxld[CXL_DECODER_MAX_INSTANCES]; } decoders; }; + +static inline int cxl_mem_cdat_get_length (struct cxl_dev_state *cxlds,size_t *length) +{ +if (cxlds->cdat_get_length) +return cxlds->cdat_get_length (cxlds, length); +return -EOPNOTSUPP ; +} + +static inline int cxl_mem_cdat_read_table (struct cxl_dev_state *cxlds, +struct cxl_cdat *cdat) +{ +if (cxlds->cdat_read_table) +return cxlds->cdat_read_table (cxlds, cdat); +return -EOPNOTSUPP ; +} +#endif /* __CXL_MEM_H__ */
drivers/cxl/cxlpci.h +1 -0
@@ -4,6 +4,7 @@#define __CXL_PCI_H__#include <linux/auxiliary_bus.h> #include <linux/pci.h> +#include <linux/pci-doe.h> #include "cxl.h" #define CXL_MEMORY_PROGIF 0x10
drivers/cxl/pci.c +153 -0
171 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v7 8/10 cxl/cdat: Introduce cxl_cdat_valid()
In reply to [email protected]From: Ira Weiny <[email protected]>
The CDAT data is protected by a checksum and should be the proper length.
Introduce cxl_cdat_valid() to validate the data. While at it check and store the sequence number.
---
Changes from V6
Change name to cxl_cdat_valid() as this validates all the CDAT
data not just the header
Add error and debug prints
Changes from V5
New patch, split out
Update cdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.
--- drivers/cxl/cdat.h | 2 ++ drivers/cxl/pci.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+)
drivers/cxl/cdat.h +2 -0
@@ -88,10 +88,12 @@* * @table: cache of CDAT table * @length: length of cached CDAT table +* @seq: Last read Sequence number of the CDAT table */ struct cxl_cdat {void *table;size_t length; +u32 seq; };#endif /* !__CXL_CDAT_H__ */
drivers/cxl/pci.c +36 -0
@@ -762,6 +762,40 @@ static int cxl_setup_doe_devices(struct cxl_dev_state *cxlds)return 0 ; } +static bool cxl_cdat_valid (struct device *dev,struct cxl_cdat *cdat) +{ +u32 *table = cdat->table; +u8 *data8 = cdat->table; +u32 length, seq; +u8 check; +int i; + + length =FIELD_GET (CDAT_HEADER_DW0_LENGTH , table[0 ]); +if ((length <CDAT_HEADER_LENGTH_BYTES ) || (length > cdat->length)) { +dev_err (dev,"Invalid length %u (%lu-%lu)\n" , length, +CDAT_HEADER_LENGTH_BYTES , cdat->length); +return false; + } + +for (check =0 , i =0 ; i < length; i++) + check += data8[i]; + +dev_dbg (dev,"CDAT length %u CS %u\n" , length, check); +if (check !=0 ) { +dev_err (dev,"Invalid checksum %u\n" , check); +return false; + } + + seq =FIELD_GET (CDAT_HEADER_DW3_SEQUENCE , table[3 ]); +/* Store the sequence for now. */ +if (cdat->seq != seq) { +dev_info (dev,"CDAT seq change %x -> %x\n" , cdat->seq, seq); + cdat->seq = seq; + } + +return true; +} +#define CDAT_DOE_REQ (entry_handle) \ (FIELD_PREP(CXL_DOE_TABLE_ACCESS_REQ_CODE, \ CXL_DOE_TABLE_ACCESS_REQ_CODE_READ) | \
@@ -873,6 +907,8 @@ static int cxl_cdat_read_table(struct cxl_dev_state *cxlds, release_driver:cxl_pci_doe_put_drv (doe_dev); +if (!rc && !cxl_cdat_valid (cxlds->dev, cdat)) +return -EIO ;return rc; }
Signature · 1 line
2.35.1
PATCH v7 9/10 cxl/mem: Retry reading CDAT on failure
In reply to [email protected]From: Ira Weiny <[email protected]>
The CDAT read may fail for a number of reasons but mainly it is possible to get different parts of a valid state. The checksum in the CDAT table protects against this.
Now that the cdat data is validated issue a retries if the CDAT read fails. For now 5 retries are implemented.
---
Changes from V6
Move to pci.c
Fix retries count
Change to 5 retries
Changes from V5:
New patch -- easy to push off or drop.
--- drivers/cxl/pci.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/cxl/pci.c +17 -4
@@ -921,7 +921,7 @@ static void cxl_initialize_cdat_callbacks(struct cxl_dev_state *cxlds) cxlds->cdat_read_table = cxl_cdat_read_table; } -static int read_cdat_data (struct cxl_dev_state *cxlds) +static int __read_cdat_data (struct cxl_dev_state *cxlds) {struct device *dev = cxlds->dev;size_t cdat_length;
@@ -943,6 +943,21 @@ static int read_cdat_data(struct cxl_dev_state *cxlds)return ret; } +static void read_cdat_data (struct cxl_dev_state *cxlds) +{ +int retries =5 ; +int rc; + +while (retries--) { + rc =__read_cdat_data (cxlds); +if (!rc) +break ; +dev_err (cxlds->dev, +"CDAT data read error rc=%d (retries %d)\n" , + rc, retries); + } +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;
@@ -1016,9 +1031,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)cxl_initialize_cdat_callbacks (cxlds);/* Cache the data early to ensure is_visible() works */ - rc =read_cdat_data (cxlds); -if (rc) -dev_err (&pdev->dev,"CDAT data read error (%d)\n" , rc); +read_cdat_data (cxlds); rc =cxl_dvsec_ranges (cxlds);if (rc)
Signature · 1 line
2.35.1
PATCH v7 10/10 cxl/port: Parse out DSMAS data from CDAT table
In reply to [email protected]From: Ira Weiny <[email protected]>
CXL Ports with memory devices attached need the information from the Device Scoped Memory Affinity Structure (DSMAS). This information is contained within the CDAT table buffer which is previously read and cached in the device state.
If CDAT data is available, parse and cache DSMAS data from the table. Store this data in unmarshaled struct dsmas data structures for ease of use.
---
Changes from V6
Move to port.c
It is not an error if no DSMAS data is found
Changes from V5
Fix up sparse warnings
Split out cdat_hdr_valid()
Update cdat_hdr_valid()
Remove revision and cs field parsing
There is no point in these
Add seq check and debug print.
From Jonathan
Add spaces around '+' and '/' use devm_krealloc() for dmas_ary
--- drivers/cxl/cdat.h | 17 ++++++++++++ drivers/cxl/cxl.h | 6 +++++ drivers/cxl/port.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+)
drivers/cxl/cdat.h +17 -0
@@ -83,6 +83,23 @@#define CDAT_SSLBIS_ENTRY_PORT_Y (entry, i) (((entry)[4 + (i) * 2] & 0xffff0000) >> 16)#define CDAT_SSLBIS_ENTRY_LAT_OR_BW (entry, i) ((entry)[4 + (i) * 2 + 1] & 0x0000ffff) +/** +* struct cxl_dsmas - host unmarshaled version of DSMAS data +* +* As defined in the Coherent Device Attribute Table (CDAT) specification this +* represents a single DSMAS entry in that table. +* +* @dpa_base: The lowest Device Physical Address associated with this DSMAD +* @length: Length in bytes of this DSMAD +* @non_volatile: If set, the memory region represents Non-Volatile memory +*/ +struct cxl_dsmas { +u64 dpa_base; +u64 length; +/* Flags */ +u8 non_volatile:1 ; +}; +/** * struct cxl_cdat - CXL CDAT data *
drivers/cxl/cxl.h +6 -0
@@ -9,6 +9,8 @@#include <linux/bitops.h> #include <linux/io.h> +#include "cdat.h" +/** * DOC: cxl objects *
@@ -343,6 +345,8 @@ struct cxl_nvdimm {* @component_reg_phys: component register capability base address (optional) * @dead: last ep has been removed, force port re-creation * @depth: How deep this port is relative to the root. depth 0 is the root. +* @dsmas_ary: Array of DSMAS entries as parsed from the CDAT table +* @nr_dsmas: Number of entries in dsmas_ary */ struct cxl_port {struct device dev;
@@ -354,6 +358,8 @@ struct cxl_port {resource_size_t component_reg_phys;bool dead;unsigned int depth; +struct cxl_dsmas *dsmas_ary; +int nr_dsmas; };/**
drivers/cxl/port.c +65 -0
77 lines not on this page · raw message
Signature · 1 line
2.35.1