diff options
author | Dan Williams <dan.j.williams@intel.com> | 2023-10-31 18:59:00 +0100 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2023-10-31 18:59:00 +0100 |
commit | 7f946e6d830fbdf411cd0641314edf11831efc88 (patch) | |
tree | 4e3cfe2157e52e0d5aba6c548cd643f297a393c7 /drivers/scsi/scsi.c | |
parent | tools/testing/cxl: Slow down the mock firmware transfer (diff) | |
parent | cxl/core/regs: Rework cxl_map_pmu_regs() to use map->dev for devm (diff) | |
download | linux-7f946e6d830fbdf411cd0641314edf11831efc88.tar.xz linux-7f946e6d830fbdf411cd0641314edf11831efc88.zip |
Merge branch 'for-6.7/cxl-rch-eh' into cxl/next
Restricted CXL Host (RCH) Error Handling undoes the topology munging of
CXL 1.1 to enabled some AER recovery, and lands some base infrastructure
for handling Root-Complex-Event-Collectors (RCECs) with CXL. Include
this long running series finally for v6.7.
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r-- | drivers/scsi/scsi.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index d0911bc28663..89367c4bf0ef 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -613,6 +613,17 @@ void scsi_cdl_check(struct scsi_device *sdev) bool cdl_supported; unsigned char *buf; + /* + * Support for CDL was defined in SPC-5. Ignore devices reporting an + * lower SPC version. This also avoids problems with old drives choking + * on MAINTENANCE_IN / MI_REPORT_SUPPORTED_OPERATION_CODES with a + * service action specified, as done in scsi_cdl_check_cmd(). + */ + if (sdev->scsi_level < SCSI_SPC_5) { + sdev->cdl_supported = 0; + return; + } + buf = kmalloc(SCSI_CDL_CHECK_BUF_LEN, GFP_KERNEL); if (!buf) { sdev->cdl_supported = 0; |