diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2023-05-18 16:38:20 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-05-18 16:43:45 -0700 |
| commit | e764f12208b99ac7892c4e3f6bf88d71ca71036f (patch) | |
| tree | e0cf6e52b69219a1741e73d6eb07e2e543fcc469 /drivers/cxl/pci.c | |
| parent | ce17ad0d54985e2595a3e615fda31df61808a08c (diff) | |
| download | linux-e764f12208b99ac7892c4e3f6bf88d71ca71036f.tar.gz linux-e764f12208b99ac7892c4e3f6bf88d71ca71036f.tar.bz2 linux-e764f12208b99ac7892c4e3f6bf88d71ca71036f.zip | |
cxl: Move cxl_await_media_ready() to before capacity info retrieval
Move cxl_await_media_ready() to cxl_pci probe before driver starts issuing
IDENTIFY and retrieving memory device information to ensure that the
device is ready to provide the information. Allow cxl_pci_probe() to succeed
even if media is not ready. Cache the media failure in cxlds and don't ask
the device for any media information.
The rationale for proceeding in the !media_ready case is to allow for
mailbox operations to interrogate and/or remediate the device. After
media is repaired then rebinding the cxl_pci driver is expected to
restart the capacity scan.
Suggested-by: Dan Williams <dan.j.williams@intel.com>
Fixes: b39cb1052a5c ("cxl/mem: Register CXL memX devices")
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/168445310026.3251520.8124296540679268206.stgit@djiang5-mobl3
[djbw: fixup cxl_test]
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/cxl/pci.c')
| -rw-r--r-- | drivers/cxl/pci.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index f7a5b8e9c102..0872f2233ed0 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -708,6 +708,12 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (rc) dev_dbg(&pdev->dev, "Failed to map RAS capability.\n"); + rc = cxl_await_media_ready(cxlds); + if (rc == 0) + cxlds->media_ready = true; + else + dev_warn(&pdev->dev, "Media not active (%d)\n", rc); + rc = cxl_pci_setup_mailbox(cxlds); if (rc) return rc; |