diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-04-23 22:09:56 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-04-23 22:09:56 +0300 |
| commit | 856ef55e7e1fb411cd42b917bac2a7aaf75344ae (patch) | |
| tree | de4edc9c981307267cfeb884a96ee4bf2b4d0211 /drivers/cxl/pci.c | |
| parent | 267214a2319b5692bbc9b128a6514960291dcca8 (diff) | |
| parent | 30a8a105f0ce9f2c83063b289f76833386d4a120 (diff) | |
| download | linux-856ef55e7e1fb411cd42b917bac2a7aaf75344ae.tar.xz | |
Merge branch 'for-6.4/cxl-poison' into for-6.4/cxl
Include the poison list and injection infrastructure from Alison for
v6.4.
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 ea38bd49b0cf..f7a5b8e9c102 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -720,6 +720,10 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (rc) return rc; + rc = cxl_poison_state_init(cxlds); + if (rc) + return rc; + rc = cxl_dev_state_identify(cxlds); if (rc) return rc; |