Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cxlflash: Enable device id for future IBM CXL adapter

This drop enables a future card with a device id of 0x0600 to be
recognized by the cxlflash driver.

As per the design, the Accelerator Function Unit (AFU) for this new IBM
CXL Flash Adapter retains the same host interface as the previous
generation. For the early prototypes of the new card, the driver with
this change behaves exactly as the driver prior to this behaved with the
earlier generation card. Therefore, no card specific programming has
been added. These card specific changes can be staged in later if
needed.

Signed-off-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>
Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Manoj Kumar and committed by
Martin K. Petersen
a2746fb1 b45cdbaf

+5 -2
+3
drivers/scsi/cxlflash/main.c
··· 2309 2309 * Device dependent values 2310 2310 */ 2311 2311 static struct dev_dependent_vals dev_corsa_vals = { CXLFLASH_MAX_SECTORS }; 2312 + static struct dev_dependent_vals dev_flash_gt_vals = { CXLFLASH_MAX_SECTORS }; 2312 2313 2313 2314 /* 2314 2315 * PCI device binding table ··· 2317 2316 static struct pci_device_id cxlflash_pci_table[] = { 2318 2317 {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CORSA, 2319 2318 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_corsa_vals}, 2319 + {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_FLASH_GT, 2320 + PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_flash_gt_vals}, 2320 2321 {} 2321 2322 }; 2322 2323
+2 -2
drivers/scsi/cxlflash/main.h
··· 23 23 #define CXLFLASH_NAME "cxlflash" 24 24 #define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter" 25 25 26 - #define PCI_DEVICE_ID_IBM_CORSA 0x04F0 27 - #define CXLFLASH_SUBS_DEV_ID 0x04F0 26 + #define PCI_DEVICE_ID_IBM_CORSA 0x04F0 27 + #define PCI_DEVICE_ID_IBM_FLASH_GT 0x0600 28 28 29 29 /* Since there is only one target, make it 0 */ 30 30 #define CXLFLASH_TARGET 0