aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManoj Kumar <manoj@linux.vnet.ibm.com>2015-12-14 16:07:43 -0500
committerMartin K. Petersen <martin.petersen@oracle.com>2016-01-06 20:58:29 -0500
commita2746fb16e41b7c8f02aa4d2605ecce97abbebbd (patch)
tree4809135545bcbb9e0124f8fda301d51aef88303a
parentb45cdbaf9f7f0486847c52f60747fb108724652a (diff)
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>
-rw-r--r--drivers/scsi/cxlflash/main.c3
-rw-r--r--drivers/scsi/cxlflash/main.h4
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 30542ca9415b..f6d90ce8f3b7 100644
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -2309,6 +2309,7 @@ static struct scsi_host_template driver_template = {
2309 * Device dependent values 2309 * Device dependent values
2310 */ 2310 */
2311static struct dev_dependent_vals dev_corsa_vals = { CXLFLASH_MAX_SECTORS }; 2311static struct dev_dependent_vals dev_corsa_vals = { CXLFLASH_MAX_SECTORS };
2312static struct dev_dependent_vals dev_flash_gt_vals = { CXLFLASH_MAX_SECTORS };
2312 2313
2313/* 2314/*
2314 * PCI device binding table 2315 * PCI device binding table
@@ -2316,6 +2317,8 @@ static struct dev_dependent_vals dev_corsa_vals = { CXLFLASH_MAX_SECTORS };
2316static struct pci_device_id cxlflash_pci_table[] = { 2317static struct pci_device_id cxlflash_pci_table[] = {
2317 {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CORSA, 2318 {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CORSA,
2318 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_corsa_vals}, 2319 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_corsa_vals},
2320 {PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_FLASH_GT,
2321 PCI_ANY_ID, PCI_ANY_ID, 0, 0, (kernel_ulong_t)&dev_flash_gt_vals},
2319 {} 2322 {}
2320}; 2323};
2321 2324
diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index 7e2d0e1bb82d..0faed422c7f4 100644
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -23,8 +23,8 @@
23#define CXLFLASH_NAME "cxlflash" 23#define CXLFLASH_NAME "cxlflash"
24#define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter" 24#define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter"
25 25
26#define PCI_DEVICE_ID_IBM_CORSA 0x04F0 26#define PCI_DEVICE_ID_IBM_CORSA 0x04F0
27#define CXLFLASH_SUBS_DEV_ID 0x04F0 27#define PCI_DEVICE_ID_IBM_FLASH_GT 0x0600
28 28
29/* Since there is only one target, make it 0 */ 29/* Since there is only one target, make it 0 */
30#define CXLFLASH_TARGET 0 30#define CXLFLASH_TARGET 0