diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 16:12:26 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 16:12:26 -0700 |
| commit | 867eab655d3b38740d8d6c24705af25e0b1dbdb6 (patch) | |
| tree | e2894445ab04d4b13c834da690090688d046f457 /drivers/cxl/pci.c | |
| parent | dcfb70610d40704d929d824db36b1444c8f37f7a (diff) | |
| parent | f6448cb5f2f378c70d280581590e062f13ff52b3 (diff) | |
| download | linux-867eab655d3b38740d8d6c24705af25e0b1dbdb6.tar.gz linux-867eab655d3b38740d8d6c24705af25e0b1dbdb6.tar.bz2 linux-867eab655d3b38740d8d6c24705af25e0b1dbdb6.zip | |
Merge branch 'for-6.5/cxl-fwupd' into for-6.5/cxl
Add the first typical (non-sanitization) consumer of the new background
command infrastructure, firmware update. Given both firmware-update and
sanitization were developed in parallel from the common
background-command baseline, resolve some minor context conflicts.
Diffstat (limited to 'drivers/cxl/pci.c')
| -rw-r--r-- | drivers/cxl/pci.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 8bc19cae0850..4468f53ba5a8 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -921,6 +921,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); + rc = cxl_memdev_setup_fw_upload(cxlds); + if (rc) + return rc; + rc = cxl_event_config(host_bridge, cxlds); if (rc) return rc; |