CXL: Read CDAT
Subsystems (4)
v16 cover CXL: Read CDAT
From: Ira Weiny <[email protected]>
Details of changes are in the individual patches.
Major changes from V14:[11]
Pick up Dan's V15 version of the CDAT patch
Fix up 3/7 with Jonathans cleanups
Drop valid check patch and deffer to ACPI vailidation later
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 Attribute 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.
For now the iteration of and storage of the DOE mailboxes is done on memdev objects within the CXL stack. When this is needed in more generic code this can be lifted later.
This work was tested using qemu.
[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]/
[4] https://lore.kernel.org/linux-cxl/[email protected]/
[5] https://lore.kernel.org/linux-cxl/[email protected]/
[6] https://lore.kernel.org/linux-cxl/[email protected]/
[7] https://lore.kernel.org/linux-cxl/[email protected]/
[8] https://lore.kernel.org/linux-cxl/[email protected]/
[9] https://lore.kernel.org/linux-cxl/[email protected]/
[10] https://lore.kernel.org/linux-cxl/[email protected]/
[11] https://lore.kernel.org/linux-cxl/[email protected]/
Previous changes
================
Major changes from V13:[10]
Dan minor updates
Willy's suggestion of documentation is good but I'm deferring it until we get the location of the PCI mailboxes settled.
Drop retry CDAT patch
Drop DSMAS patch
Rebased on latest cxl-pending
Changes from V12:[9]
A couple of bug fixes in the new XArray stuff
Remove the IRQ support because I did not realize how that worked and it was complicating things.
Remove busy retries and replace with an error as there is no good way to ensure it will work.
Other code clean ups mentioned in the individual patches.
Changes from V11:[8]
The major change in this version is to remove the workqueue from the internal implementation of the state machine. A single ordered workqueue within each mailbox processes tasks submitted. This workqueue takes care of all locking and guarantees that tasks are completed in the order submitted. Any synchronization which is required between tasks will need to be handled by the user of the mailbox. However, the user can depend on work items being completed in the order they are submitted. So a single thread submitter is guaranteed to get all work items completed in order. This also aids in the support of a single mailbox supporting multiple protocols. Each protocol could have a separate thread submitting tasks for that protocol. The mailbox object will ensure that each protocol task is complete before another task starts. But multiple user threads can be submitting tasks for different protocols all at the same time without regard to other protocols being used.
XArrays are used throughout the series.
Other minor changes are noted in the individual patches.
Changes from V10:[7]
Address Ben Widawsky's comments
Protect against potentially malicious devices. Fix ownership issue of cdat_mb
Changes from V9:[6]
Address feedback from
Lukas Wunner, Davidlohr Bueso, Jonathan Cameron, Alison Schofield, and Ben Widawsky Details in each individual patch.
Changes from V8:[5]
For this version I've punted a bit to get it out and drop the auxiliary bus functionality. I like where Jonathan is going with the port driver idea. I think eventually the irq/mailbox creation will need to be more generic in a PCI port driver. I've modeled this version on such an architecture but used the CXL port for the time being.
From Dan
Drop the auxiliary bus/device
From Jonathan
Cleanups
From Bjorn
Clean up commit messages
move pci-doe.c to doe.c
Clean up PCI spec references
Ensure all messages use pci_*()
Add offset to error messages to distinguish mailboxes
use hex for DOE offsets
Print 4 nibbles for Vendor ID and 2 for type. s/irq/IRQ in comments
Fix long lines
Fix typos
Changes from V7:[4]
Avoid code bloat by making pci-doe.c conditional on CONFIG_PCI_DOE
which is auto selected by the CXL_PCI config option.
Minor code clean ups
Fix bug in pci_doe_supports_prot()
Rebase to cxl-pending
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
Ira Weiny (4):
PCI: Replace magic constant for PCI Sig Vendor ID cxl/pci: Create PCI DOE mailbox's for memory devices
driver-core: Introduce BIN_ATTR_ADMIN_{RO,RW} cxl/port: Read CDAT table
Jonathan Cameron (2):
PCI: Add vendor ID for the PCI SIG
PCI/DOE: Add DOE mailbox support functions
.clang-format | 1 + Documentation/ABI/testing/sysfs-bus-cxl | 10 + drivers/cxl/Kconfig | 1 + drivers/cxl/core/pci.c | 173 ++++++++ drivers/cxl/cxl.h | 7 + drivers/cxl/cxlmem.h | 3 + drivers/cxl/cxlpci.h | 1 + drivers/cxl/pci.c | 44 ++ drivers/cxl/port.c | 53 +++ drivers/pci/Kconfig | 3 + drivers/pci/Makefile | 1 + drivers/pci/doe.c | 536 ++++++++++++++++++++++++ drivers/pci/probe.c | 2 +- include/linux/pci-doe.h | 77 ++++ include/linux/pci_ids.h | 1 + include/linux/sysfs.h | 16 + include/uapi/linux/pci_regs.h | 29 +- 17 files changed, 956 insertions(+), 2 deletions(-) create mode 100644 drivers/pci/doe.c create mode 100644 include/linux/pci-doe.h
base-commit: b060edfd8cdd52bc8648392500bf152a8dd6d4c5
Signature · 1 line
2.35.3
PATCH v16 1/6 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
@@ -151,6 +151,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.3
PATCH v16 2/6 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.3
PATCH v16 3/6 PCI/DOE: Add DOE mailbox support functions
In reply to [email protected]From: Jonathan Cameron <[email protected]>
Introduced in a PCIe r6.0, sec 6.30, 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 PCIe functionality to manage a single PCIe DOE mailbox at a defined config space offset. Functionality includes iterating, creating, query of supported protocol, and task submission. Destruction of the mailboxes is device managed.
---
Changes from V14
Jonathan:
Drop unused PCI_DOE_BUSY_MAX_RETRIES Fix grammatical error
Remove unneeded comment removed unneeded line break remove unneeded include remove unneeded wait
Changes from V13.1
Clean up docs
Dan:
pass up pci_doe_wait() error
use dev_err_ratelimited
Remove extra '{'
pass up xa_insert() return code
Use pci_name() and dev_driver_string() to name WQ
Changes from V13
Bjorn:
Update commit message
Put fmt strings on same line as pci_err s/successful/successfully Clean up line wrap on comments
Matthew:
Fix up shifting in xa_mk_value()
Changes from V12
Remove busy retries
s/pci_doe_xa_entry/pci_doe_xa_prot_entry
Open code pci_doe_abort call
s/ABORT/CANCEL
Clarify canceling a task by using a cancel flag instead
of 'abort' flag
Clean up comments
Jonathan:
use xa_mk_value() for XArray value
spaces around '-' operator
s/possitive/positive
s/pci_doe_issue_abort/pci_doe_abort
Remove pci_doe_free_mb() and use devm_* exclusively in pci_doe_create_mb() s/ret/rc to be consistent
Remove irq support.
Clean up timeout values and ensure waits values are correct Remove unnecessary arm_wait function
Changes from V11
Bjorn: s/PCI/PCIe
use dev_fmt
move cap_offset in struct pci_doe_mb
use break and return from a central place fix interrupt prints s/PCI_DOE_CAP_IRQ/PCI_DOE_CAP_INT_MSG_NUM s/irq_msg_num/int_msg_num
when the value is not an irq but rather the interrupt message number for the DOE
s/irq/IRQ in comments
Clarify request and response payload size units
In addition clarify the rv units Check for invalid response payload size (must be at least 1 DW)
Dan: s/EOPNOTSUPP/ENXIO/
Add pci_doe_for_each_off to .clang-format use xarray for supported protocols s/pci_doe_create_mb/pcim_doe_create_mb/
Remove pci_doe_destroy_mb
Dan: Convert the statemachine to process tasks as work items
Define pci_doe_write_ctrl()
Introduce pci_doe_irq_enabled()
issue a stand alone abort
Don't go through the state machine for the abort. Just poll/irq until the response comes back.
Remove Wait Abort state
A wait abort can just be triggered from outside and stop the state machine from whatever loop it may be in. Let the state machine issue the abort itself and wait for it to return or not.
Remove Wait abort on error
Issue the abort directly before returning. Abort failure will flag the MB dead.
Remove workqueue processing from state machine clean up function locations in the file
Move abort flag/document it
React to an abort while aborting and bail. This will mark the mailbox dead.
Convert task to a work item
Create a workqueue in the mailbox. Remove cur_task and locking. Set DEAD when taking mailbox down.
print error on marking mailbox dead
Introduce signal_task_abort
flatten out the state machine
Changes from V9
Lukas Wunner
Update comments
Move private doe structures and defines from pci-doe.h to doe.c check Data Obj Ready prior to last ack
Davidlohr
make task_lock a spinlock
Lukas/Jonathan
Remove special case of error in irq handler
Fix potential race with the scheduling of a task when one is ending.
The current task can't be retired until the state machine is idle. Otherwise a new task work item may run and the state machine would be out of sync.
Changes from V8
Remove Bjorn's ack
Expose a function to find the irq number for a mailbox based on offset. This is the code Jonathan proposed for finding the irq number here:
https://lore.kernel.org/linux-cxl/[email protected]/
This removes funky bool parameter to create.
Move pci_set_master() within the pci_doe_enable_irq() Per Bjorn
Clean up commit messages
move pci-doe.c to doe.c
Clean up PCI spec references
Ensure all messages use pci_*()
Add offset to error messages to distinguish mailboxes
use hex for DOE offsets
Print 4 nibbles for Vendor ID and 2 for type. s/irq/IRQ in comments
Fix long lines
Fix typos
Changes from V7
Add a Kconfig for this functionality
Fix bug in pci_doe_supports_prot()
Rebased on cxl-pending
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
--- .clang-format | 1 + drivers/pci/Kconfig | 3 + drivers/pci/Makefile | 1 + drivers/pci/doe.c | 536 ++++++++++++++++++++++++++++++++++ include/linux/pci-doe.h | 77 +++++ include/uapi/linux/pci_regs.h | 29 +- 6 files changed, 646 insertions(+), 1 deletion(-) create mode 100644 drivers/pci/doe.c create mode 100644 include/linux/pci-doe.h
.clang-format +1 -0
@@ -516,6 +516,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_doe_for_each_off' - 'pcl_for_each_chunk' - 'pcl_for_each_segment' - 'pcm_for_each_format'
drivers/pci/Kconfig +3 -0
@@ -121,6 +121,9 @@ config XEN_PCIDEV_FRONTEND config PCI_ATS bool +config PCI_DOE + bool + config PCI_ECAM bool
drivers/pci/Makefile +1 -0
@@ -31,6 +31,7 @@ obj-$(CONFIG_PCI_ECAM) += ecam.o obj-$(CONFIG_PCI_P2PDMA) += p2pdma.o obj-$(CONFIG_XEN_PCIDEV_FRONTEND) += xen-pcifront.o obj-$(CONFIG_VGA_ARB) += vgaarb.o +obj-$(CONFIG_PCI_DOE) += doe.o # Endpoint library must be initialized before its users obj-$(CONFIG_PCI_ENDPOINT) += endpoint/
drivers/pci/doe.c new file +536 -0
536 lines not on this page · raw message
include/linux/pci-doe.h new file +77 -0
77 lines not on this page · raw message
include/uapi/linux/pci_regs.h +28 -1
@@ -737,7 +737,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
@@ -1103,4 +1104,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_SUP 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_INT_MSG_NUM 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.3
Re: [PATCH V16 3/6] PCI/DOE: Add DOE mailbox support functions
Quoted 53 lines · On 7/20/2022 4:52 AM, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCIe r6.0, sec 6.30, 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 PCIe functionality to manage a single PCIe DOE mailbox at a defined config space offset. Functionality includes iterating, creating, query of supported protocol, and task submission. Destruction of the mailboxes is device managed.
Cc "Li, Ming" <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Matthew Wilcox <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>---
drivers/pci/doe.c new file +29
-0+/** +* pci_doe_submit_task() - Submit a task to be processed by the state machine +* +* @doe_mb: DOE mailbox capability to submit to +* @task: task to be queued +* +* Submit a DOE task (request/response) to the DOE mailbox to be processed. +* Returns upon queueing the task object. If the queue is full this function +* will sleep until there is room in the queue. +* +* task->complete will be called when the state machine is done processing this +* task. +* +* Excess data will be discarded. +* +* RETURNS: 0 when task has been successfully queued, -ERRNO on error +*/ +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* +* DOE requests must be a whole number of DW and the response needs to +* be big enough for at least 1 DW +*/ +if (task->request_pl_sz %sizeof (u32) || + task->response_pl_sz <sizeof (u32)) +return -EINVAL ;
drivers/pci/doe.c line 536
Quoted 10 lines
drivers/pci/doe.c new file +10
-0+ +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + + task->doe_mb = doe_mb; +INIT_WORK (&task->work, doe_statemachine_work); +queue_work (doe_mb->work_queue, &task->work); +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task);
I'm curious why there is not a sychronous function for DOE users. I think some protocols over DOE need a DOE sychrounous interface(e.g. SPDM, TDISP, IDE...). These protocols have to implement an sychronous function over pci_doe_submit_task() by themselves, maybe we can implement an generic sychronous function in PCI/DOE for these DOE users.
Thanks
Ming
Quoted 128 lines
include/linux/pci-doe.h new file +77
-0@@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Data Object Exchange +* PCIe r6.0, sec 6.30 DOE +* +* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#ifndef LINUX_PCI_DOE_H +#define LINUX_PCI_DOE_H + +struct pci_doe_protocol { +u16 vid; +u8 type; +}; + +struct pci_doe_mb ; + +/** +* struct pci_doe_task - represents a single query/response +* +* @prot: DOE Protocol +* @request_pl: The request payload +* @request_pl_sz: Size of the request payload (bytes) +* @response_pl: The response payload +* @response_pl_sz: Size of the response payload (bytes) +* @rv: Return value. Length of received response or error (bytes) +* @complete: Called when task is complete +* @private: Private data for the consumer +* @work: Used internally by the mailbox +* @doe_mb: Used internally by the mailbox +* +* The payload sizes and rv are specified in bytes with the following +* restrictions concerning the protocol. +* +* 1) The request_pl_sz must be a multiple of double words (4 bytes) +* 2) The response_pl_sz must be >= a single double word (4 bytes) +* 3) rv is returned as bytes but it will be a multiple of double words +* +* NOTE there is no need for the caller to initialize work or doe_mb. +*/ +struct pci_doe_task { +struct pci_doe_protocol prot; +u32 *request_pl; +size_t request_pl_sz; +u32 *response_pl; +size_t response_pl_sz; +int rv; +void (*complete)(struct pci_doe_task *task); +void *private; + +/* No need for the user to initialize these fields */ +struct work_struct work; +struct pci_doe_mb *doe_mb; +}; + +/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \ + for (off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE); \ + off > 0; \ + off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE)) + +struct pci_doe_mb *pcim_doe_create_mb (struct pci_dev *pdev,u16 cap_offset); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type); +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task); + +#endif include/uapi/linux/pci_regs.h +28
-1@@ -737,7 +737,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@@ -1103,4 +1104,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_SUP 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_INT_MSG_NUM 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 */
Re: [PATCH V16 3/6] PCI/DOE: Add DOE mailbox support functions
Quoted 66 lines · Ming
Quoted 53 lines · On 7/20/2022 4:52 AM, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCIe r6.0, sec 6.30, 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 PCIe functionality to manage a single PCIe DOE mailbox at a defined config space offset. Functionality includes iterating, creating, query of supported protocol, and task submission. Destruction of the mailboxes is device managed.
Cc "Li, Ming" <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Matthew Wilcox <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>---
drivers/pci/doe.c new file +29
-0+/** +* pci_doe_submit_task() - Submit a task to be processed by the state machine +* +* @doe_mb: DOE mailbox capability to submit to +* @task: task to be queued +* +* Submit a DOE task (request/response) to the DOE mailbox to be processed. +* Returns upon queueing the task object. If the queue is full this function +* will sleep until there is room in the queue. +* +* task->complete will be called when the state machine is done processing this +* task. +* +* Excess data will be discarded. +* +* RETURNS: 0 when task has been successfully queued, -ERRNO on error +*/ +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* +* DOE requests must be a whole number of DW and the response needs to +* be big enough for at least 1 DW +*/ +if (task->request_pl_sz %sizeof (u32) || + task->response_pl_sz <sizeof (u32)) +return -EINVAL ;drivers/pci/doe.c line 536
Quoted 10 lines
drivers/pci/doe.c new file +10
-0+ +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + + task->doe_mb = doe_mb; +INIT_WORK (&task->work, doe_statemachine_work); +queue_work (doe_mb->work_queue, &task->work); +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task);
Quoted 6 lines
I'm curious why there is not a sychronous function for DOE users. I think some protocols over DOE need a DOE sychrounous interface(e.g. SPDM, TDISP, IDE...). These protocols have to implement an sychronous function over
pci_doe_submit_task()by themselves, maybe we can implement an generic sychronous function in PCI/DOE for these DOE users.
This came up during discussions of earlier versions of the series. IIRC we decided to postpone adding a synchronous wrapper function until there were more use cases.
So if it is useful to you, go ahead and propose it as part of a patch series supporting one of those protocols you reference.
Note there are a bunch of other changes that will be necessary in this code to make it more generic anyway. The plan is to make those as and when they are useful. E.g. interrupt support, coupling some of the infrastructure more closely to the PCI core, probably a few other things I've forgotten.
Jonathan
Quoted 133 lines
Thanks
MingQuoted 128 lines
include/linux/pci-doe.h new file +77
-0@@ -0,0 +1,77 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Data Object Exchange +* PCIe r6.0, sec 6.30 DOE +* +* Copyright (C) 2021 Huawei +* Jonathan Cameron <[email protected]> +* +* Copyright (C) 2022 Intel Corporation +* Ira Weiny <[email protected]> +*/ + +#ifndef LINUX_PCI_DOE_H +#define LINUX_PCI_DOE_H + +struct pci_doe_protocol { +u16 vid; +u8 type; +}; + +struct pci_doe_mb ; + +/** +* struct pci_doe_task - represents a single query/response +* +* @prot: DOE Protocol +* @request_pl: The request payload +* @request_pl_sz: Size of the request payload (bytes) +* @response_pl: The response payload +* @response_pl_sz: Size of the response payload (bytes) +* @rv: Return value. Length of received response or error (bytes) +* @complete: Called when task is complete +* @private: Private data for the consumer +* @work: Used internally by the mailbox +* @doe_mb: Used internally by the mailbox +* +* The payload sizes and rv are specified in bytes with the following +* restrictions concerning the protocol. +* +* 1) The request_pl_sz must be a multiple of double words (4 bytes) +* 2) The response_pl_sz must be >= a single double word (4 bytes) +* 3) rv is returned as bytes but it will be a multiple of double words +* +* NOTE there is no need for the caller to initialize work or doe_mb. +*/ +struct pci_doe_task { +struct pci_doe_protocol prot; +u32 *request_pl; +size_t request_pl_sz; +u32 *response_pl; +size_t response_pl_sz; +int rv; +void (*complete)(struct pci_doe_task *task); +void *private; + +/* No need for the user to initialize these fields */ +struct work_struct work; +struct pci_doe_mb *doe_mb; +}; + +/** +* pci_doe_for_each_off - Iterate each DOE capability +* @pdev: struct pci_dev to iterate +* @off: u16 of config space offset of each mailbox capability found +*/ +#define pci_doe_for_each_off (pdev, off) \ + for (off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE); \ + off > 0; \ + off = pci_find_next_ext_capability(pdev, off, \ + PCI_EXT_CAP_ID_DOE)) + +struct pci_doe_mb *pcim_doe_create_mb (struct pci_dev *pdev,u16 cap_offset); +bool pci_doe_supports_prot (struct pci_doe_mb *doe_mb,u16 vid,u8 type); +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task); + +#endif include/uapi/linux/pci_regs.h +28
-1@@ -737,7 +737,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@@ -1103,4 +1104,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_SUP 0x00000001/* Interrupt Support */ +#define PCI_DOE_CAP_INT_MSG_NUM 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 */
Re: [PATCH V16 3/6] PCI/DOE: Add DOE mailbox support functions
Quoted 76 lines · Jonathan Cameron
Quoted 66 lines · Ming
Quoted 53 lines · On 7/20/2022 4:52 AM, [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCIe r6.0, sec 6.30, 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 PCIe functionality to manage a single PCIe DOE mailbox at a defined config space offset. Functionality includes iterating, creating, query of supported protocol, and task submission. Destruction of the mailboxes is device managed.
Cc "Li, Ming" <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Matthew Wilcox <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>---
drivers/pci/doe.c new file +29
-0+/** +* pci_doe_submit_task() - Submit a task to be processed by the state machine +* +* @doe_mb: DOE mailbox capability to submit to +* @task: task to be queued +* +* Submit a DOE task (request/response) to the DOE mailbox to be processed. +* Returns upon queueing the task object. If the queue is full this function +* will sleep until there is room in the queue. +* +* task->complete will be called when the state machine is done processing this +* task. +* +* Excess data will be discarded. +* +* RETURNS: 0 when task has been successfully queued, -ERRNO on error +*/ +int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* +* DOE requests must be a whole number of DW and the response needs to +* be big enough for at least 1 DW +*/ +if (task->request_pl_sz %sizeof (u32) || + task->response_pl_sz <sizeof (u32)) +return -EINVAL ;drivers/pci/doe.c line 536
Quoted 10 lines
drivers/pci/doe.c new file +10
-0+ +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + + task->doe_mb = doe_mb; +INIT_WORK (&task->work, doe_statemachine_work); +queue_work (doe_mb->work_queue, &task->work); +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task);Quoted 6 lines
I'm curious why there is not a sychronous function for DOE users. I think some protocols over DOE need a DOE sychrounous interface(e.g. SPDM, TDISP, IDE...). These protocols have to implement an sychronous function over
pci_doe_submit_task()by themselves, maybe we can implement an generic sychronous function in PCI/DOE for these DOE users.
Quoted 3 lines
This came up during discussions of earlier versions of the series. IIRC we decided to postpone adding a synchronous wrapper function until there were more use cases.
Note that as far as I can see TDISP makes no requirement of the VMM nor TVM (trusted VM) to drive an SPDM session. All of that is handled by the TSM (TEE / Platform Security Manager) where the VMM is outside the trust boundary. The TVM only validates the contents of a GET_DEVICE_INTERFACE_REPORT which the TSM had negotiated with the DSM (Device Security Manager).
All this to say its not clear that Linux needs to grow the capabilities listed above when it is expected to be outside the Trusted Compute Boundary.
Re: [PATCH V16 3/6] PCI/DOE: Add DOE mailbox support functions
In reply to [email protected]Quoted 14 lines · On Tue, 19 Jul 2022 13:52:46 -0700 [email protected] wrote:
From: Jonathan Cameron <[email protected]>
Introduced in a PCIe r6.0, sec 6.30, 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 PCIe functionality to manage a single PCIe DOE mailbox at a defined config space offset. Functionality includes iterating, creating, query of supported protocol, and task submission. Destruction of the mailboxes is device managed.
Quoted 7 lines
Cc "Li, Ming" <[email protected]>Cc Bjorn Helgaas <[email protected]>Cc Matthew Wilcox <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>Co-developed-by Ira Weiny <[email protected]>Signed-off-by Ira Weiny <[email protected]>
FYI. Gregory Price reported an an issue that I think
is related to calling INIT_WORK() rather than INIT_WORK_ONSTACK() and associated debug options in his build.
https://lore.kernel.org/linux-cxl/[email protected]/T/#m88a7f50dcce52f30c8bf5c3dcc06fa9843b54a2d
I've highlighted one path to this below.
Quoted 15 lines
drivers/pci/doe.c new file +7
-0@@ -0,0 +1,536 @@ +static int pci_doe_discovery (struct pci_doe_mb *doe_mb,u8 *index,u16 *vid, +u8 *protocol) +{ +u32 request_pl =FIELD_PREP (PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX , + *index); +u32 response_pl; +DECLARE_COMPLETION_ONSTACK (c);
drivers/pci/doe.c line 319
Quoted 10 lines
drivers/pci/doe.c new file +10
-0+struct pci_doe_task task = { + .prot.vid =PCI_VENDOR_ID_PCI_SIG , + .prot.type =PCI_DOE_PROTOCOL_DISCOVERY , + .request_pl = &request_pl, + .request_pl_sz =sizeof (request_pl), + .response_pl = &response_pl, + .response_pl_sz =sizeof (response_pl), + .complete = pci_doe_task_complete, + .private = &c, + };
This structure contains a work_struct and is on the stack. However...
Quoted 19 lines
drivers/pci/doe.c new file +19
-0+int rc; + + rc =pci_doe_submit_task (doe_mb, &task); +if (rc <0 ) +return rc; + +wait_for_completion (&c); + +if (task.rv !=sizeof (response_pl)) +return -EIO ; + + *vid =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID , response_pl); + *protocol =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL , + response_pl); + *index =FIELD_GET (PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX , + response_pl); + +return 0 ; +}
...
Quoted 8 lines
drivers/pci/doe.c new file +8
-0+int pci_doe_submit_task (struct pci_doe_mb *doe_mb,struct pci_doe_task *task) +{ +if (!pci_doe_supports_prot (doe_mb, task->prot.vid, task->prot.type)) +return -EINVAL ; + +/* +* DOE requests must be a whole number of DW and the response needs to +* be big enough for at least 1 DW
drivers/pci/doe.c line 532
Quoted 10 lines
drivers/pci/doe.c new file +10
-0+*/ +if (task->request_pl_sz %sizeof (u32) || + task->response_pl_sz <sizeof (u32)) +return -EINVAL ; + +if (test_bit (PCI_DOE_FLAG_DEAD , &doe_mb->flags)) +return -EIO ; + + task->doe_mb = doe_mb; +INIT_WORK (&task->work, doe_statemachine_work);
Here we don't call the INIT_WORK_ONSTACK() Variant.
Quoted 4 lines
drivers/pci/doe.c new file +4
-0+queue_work (doe_mb->work_queue, &task->work); +return 0 ; +} +EXPORT_SYMBOL_GPL (pci_doe_submit_task);
PATCH v16 4/6 cxl/pci: Create PCI DOE mailbox's for memory devices
In reply to [email protected]From: Ira Weiny <[email protected]>
DOE mailbox objects will be needed for various mailbox communications with each memory device.
Iterate each DOE mailbox capability and create PCI DOE mailbox objects as found.
It is not anticipated that this is the final resting place for the iteration of the DOE devices. The support of switch ports will drive this code into the PCIe side. In this imagined architecture the CXL port driver would then query into the PCI device for the DOE mailbox array.
For now creating the mailboxes in the CXL port is good enough for the endpoints. Later PCIe ports will need to support this to support switch ports more generically.
---
Changes from V13:
Dan:
s/pci_err/dev_err
s/pci_dbg/dev_dbg
Move xa_init() into devm_cxl_pci_create_doe()
Changes from V12:
remove irq param from CXL
Jonathan:
remove xa local variable
clarify MB creation as best effort
But ensure pci_err() if they fail Check devm_add_action() return for failure
Davidlohr and Jonathan:
Return error ...
Changes from V11:
Drop review from: Ben Widawsky <[email protected]> Remove irq code for now
Adjust for pci_doe_get_int_msg_num() Adjust for pcim_doe_create_mb()
(No longer need to handle the destroy.)
Use xarray for DOE mailbox array
Changes from V9:
Bug fix: ensure DOE mailboxes are iterated before memdev add Ben Widawsky
Set use_irq to false and just return on error. Don't return a value from devm_cxl_pci_create_doe() Skip allocating doe_mb array if there are no mailboxes Skip requesting irqs if none found.
Ben/Jonathan Cameron
s/num_irqs/max_irqs
Changes from V8:
Move PCI_DOE selection to CXL_BUS to support future patches which move queries into the port code.
Remove Auxiliary device arch
Squash the functionality of the auxiliary driver into this patch.
Split out the irq handling a bit.
Changes from V7:
Minor code clean ups
Rebased on cxl-pending
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/cxlmem.h | 3 +++ drivers/cxl/pci.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+)
drivers/cxl/Kconfig +1 -0
@@ -2,6 +2,7 @@ menuconfig CXL_BUS tristate "CXL (Compute Express Link) Devices Support" depends on PCI + select PCI_DOE help CXL is a bus that is electrically compatible with PCI Express, but layers three protocols on that signalling (CXL.io, CXL.cache, and
drivers/cxl/cxlmem.h +3 -0
@@ -192,6 +192,7 @@ struct cxl_endpoint_dvsec_info {* @component_reg_phys: register base of component registers * @info: Cached DVSEC information about the device. * @serial: PCIe Device Serial Number +* @doe_mbs: PCI DOE mailbox array * @mbox_send: @dev specific transport for transmitting mailbox commands * * See section 8.2.9.5.2 Capacity Configuration and Label Storage for
@@ -226,6 +227,8 @@ struct cxl_dev_state {resource_size_t component_reg_phys;u64 serial; +struct xarray doe_mbs; +int (*mbox_send)(struct cxl_dev_state *cxlds,struct cxl_mbox_cmd *cmd); };
drivers/cxl/pci.c +44 -0
62 lines not on this page · raw message
Signature · 1 line
2.35.3
Re: [PATCH V16 4/6] cxl/pci: Create PCI DOE mailbox's for memory devices
In subject, s/mailbox's/mailboxes/
Quoted 18 lines · On Tue, Jul 19, 2022 at 01:52:47PM -0700, [email protected] wrote:
From: Ira Weiny <[email protected]>
DOE mailbox objects will be needed for various mailbox communications with each memory device.
Iterate each DOE mailbox capability and create PCI DOE mailbox objects as found.
It is not anticipated that this is the final resting place for the iteration of the DOE devices. The support of switch ports will drive this code into the PCIe side. In this imagined architecture the CXL port driver would then query into the PCI device for the DOE mailbox array.
For now creating the mailboxes in the CXL port is good enough for the endpoints. Later PCIe ports will need to support this to support switch ports more generically.
drivers/cxl/pci.c static int cxl_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, · line 403
Quoted 9 lines
drivers/cxl/pci.c +9
-0+static void devm_cxl_pci_create_doe (struct cxl_dev_state *cxlds) +{ +struct device *dev = cxlds->dev; +struct pci_dev *pdev =to_pci_dev (dev); +u16 off =0 ; + +xa_init (&cxlds->doe_mbs); +if (devm_add_action (&pdev->dev, cxl_pci_destroy_doe, &cxlds->doe_mbs)) { +dev_err (dev,"Failed to create XArray for DOE's\n" );
s/DOE's/DOEs/
drivers/cxl/pci.c static int cxl_setup_regs(struct pci_dev *pdev, enum cxl_regloc_type type, · line 416
Quoted 13 lines
drivers/cxl/pci.c +13
-0+return ; + } + +/* +* Mailbox creation is best effort. Higher layers must determine if +* the lack of a mailbox for their protocol is a device failure or not. +*/ +pci_doe_for_each_off (pdev, off) { +struct pci_doe_mb *doe_mb; + + doe_mb =pcim_doe_create_mb (pdev, off); +if (IS_ERR (doe_mb)) { + dev_err(dev, "Failed to create MB object for MB @ %x\n",
Maybe "%#x" to avoid ambiguity? Also below.
Quoted 29 lines
drivers/cxl/pci.c +16
-0+ off); +continue ; + } + +if (xa_insert (&cxlds->doe_mbs, off, doe_mb,GFP_KERNEL )) { +dev_err (dev,"xa_insert failed to insert MB @ %x\n" , + off); +continue ; + } + +dev_dbg (dev,"Created DOE mailbox @%x\n" , off); + } +} +static int cxl_pci_probe (struct pci_dev *pdev,const struct pci_device_id *id) {struct cxl_register_map map;@@ -434,6 +476,8 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) cxlds->component_reg_phys =cxl_regmap_to_base (pdev, &map); +devm_cxl_pci_create_doe (cxlds); + rc =cxl_pci_setup_mailbox (cxlds);if (rc)return rc;Signature · 1 line
2.35.3
PATCH v16 5/6 driver-core: Introduce BIN_ATTR_ADMIN_{RO,RW}
In reply to [email protected]From: Ira Weiny <[email protected]>
Many binary attributes need to limit access to CAP_SYS_ADMIN only; ie many binary attributes specify is_visible with 0400 or 0600.
Make setting the permissions of such attributes more explicit by defining BIN_ATTR_ADMIN_{RO,RW}.
---
Changes from V12:
Pick up review tag
Bjorn:
NOTE: this has a lot of similarities to
https://lore.kernel.org/all/[email protected]/
I'm not sure why that patch was not picked up. But I've added Krzysztof as a suggested by if that is ok?
Changes from V11:
New Patch
--- include/linux/sysfs.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/linux/sysfs.h +16 -0
@@ -235,6 +235,22 @@ struct bin_attribute bin_attr_##_name = __BIN_ATTR_WO(_name, _size)#define BIN_ATTR_RW (_name, _size) \ struct bin_attribute bin_attr_##_name = __BIN_ATTR_RW(_name, _size) + +#define __BIN_ATTR_ADMIN_RO (_name, _size) { \ + .attr = { .name = __stringify(_name), .mode = 0400 }, \ + .read = _name##_read, \ + .size = _size, \ +} + +#define __BIN_ATTR_ADMIN_RW (_name, _size) \ + __BIN_ATTR(_name, 0600, _name##_read, _name##_write, _size) + +#define BIN_ATTR_ADMIN_RO (_name, _size) \ +struct bin_attribute bin_attr_##_name = __BIN_ATTR_ADMIN_RO(_name, _size) + +#define BIN_ATTR_ADMIN_RW (_name, _size) \ +struct bin_attribute bin_attr_##_name = __BIN_ATTR_ADMIN_RW(_name, _size) +struct sysfs_ops {ssize_t (*show)(struct kobject *,struct attribute *,char *);ssize_t (*store)(struct kobject *,struct attribute *,const char *,size_t );
Signature · 1 line
2.35.3
PATCH v16 6/6 cxl/port: Read CDAT table
In reply to [email protected]From: Ira Weiny <[email protected]>
The per-device CDAT data provides performance data that is relevant for mapping which CXL devices can participate in which CXL ranges by QTG (QoS Throttling Group) (per ECN: CXL 2.0 CEDT CFMWS & QTG_DSM) [1]. The QTG association specified in the ECN is advisory. Until the cxl_acpi driver grows support for invoking the QTG _DSM method the CDAT data is only of interest to userspace that may need it for debug purposes.
Search the DOE mailboxes available, query CDAT data, cache the data and make it available via a sysfs binary attribute per endpoint at:
/sys/bus/cxl/devices/endpointX/CDAT
...similar to other ACPI-structured table data in /sys/firmware/ACPI/tables. The CDAT is relative to 'struct cxl_port' objects since switches in addition to endpoints can host a CDAT instance. Switch CDAT support is not implemented.
This does not support table updates at runtime. It will always provide whatever was there when first cached. It is also the case that table updates are not expected outside of explicit DPA address map affecting commands like Set Partition with the immediate flag set. Given that the driver does not support Set Partition with the immediate flag set there is no current need for update support.
--- Documentation/ABI/testing/sysfs-bus-cxl | 10 ++ drivers/cxl/core/pci.c | 173 ++++++++++++++++++++++++ drivers/cxl/cxl.h | 7 + drivers/cxl/cxlpci.h | 1 + drivers/cxl/port.c | 53 ++++++++ 5 files changed, 244 insertions(+)
Documentation/ABI/testing/sysfs-bus-cxl +10 -0
@@ -164,3 +164,13 @@ Description: expander memory (type-3). The 'target_type' attribute indicates the current setting which may dynamically change based on what memory regions are activated in this decode hierarchy. + +What: /sys/bus/cxl/devices/endpointX/CDAT +Date: July, 2022 +KernelVersion: v5.20 +Contact: [email protected] +Description: + (RO) If this sysfs entry is not present no DOE mailbox was + found to support CDAT data. If it is present and the length of + the data is 0 reading the CDAT data failed. Otherwise the CDAT + data is reported.
drivers/cxl/core/pci.c +173 -0
182 lines not on this page · raw message
drivers/cxl/cxl.h +7 -0
@@ -289,6 +289,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. +* @cdat: Cached CDAT data +* @cdat_available: Should a CDAT attribute be available in sysfs */ struct cxl_port {struct device dev;
@@ -301,6 +303,11 @@ struct cxl_port {resource_size_t component_reg_phys;bool dead;unsigned int depth; +struct cxl_cdat { +void *table; +size_t length; + } cdat; +bool cdat_available; };/**
drivers/cxl/cxlpci.h +1 -0
@@ -74,4 +74,5 @@ 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_dev_state ;int cxl_hdm_decode_init (struct cxl_dev_state *cxlds,struct cxl_hdm *cxlhdm); +void read_cdat_data (struct cxl_port *port);#endif /* __CXL_PCI_H__ */
drivers/cxl/port.c +53 -0
69 lines not on this page · raw message
Signature · 1 line
2.35.3
Quoted 28 lines · ira.weiny@ wrote:
From: Ira Weiny <[email protected]>
Details of changes are in the individual patches.
Major changes from V14:[11]
Pick up Dan's V15 version of the CDAT patch
Fix up 3/7 with Jonathans cleanups
Drop valid check patch and deffer to ACPI vailidation laterCXL 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 Attribute 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_mbstructures which can control the operation of the DOE state machine.
Quoted 5 lines
For now the iteration of and storage of the DOE mailboxes is done on memdev objects within the CXL stack. When this is needed in more generic code this can be lifted later.
This work was tested using qemu.
Looks good Ira, thanks for sticking with it, thanks Jonathan for getting it started and all the review plus test environment, and thanks Bjorn for the help steering this away from an aux-bus mistake. All applied and soaking on cxl/pending, but will move to cxl/next shortly.