scsi: cxlflash: Enable OCXL operations

This commit enables the OCXL operations for the OCXL devices.

Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index 8c55fcdc4f4b06428c99e014073710411fde2e27..42a95b762bc01131d7b641d1ab60a1fcce76c5fa 100644 (file)
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -3168,7 +3168,8 @@ static struct dev_dependent_vals dev_corsa_vals = { CXLFLASH_MAX_SECTORS,
 static struct dev_dependent_vals dev_flash_gt_vals = { CXLFLASH_MAX_SECTORS,
                                        CXLFLASH_NOTIFY_SHUTDOWN };
 static struct dev_dependent_vals dev_briard_vals = { CXLFLASH_MAX_SECTORS,
-                                       CXLFLASH_NOTIFY_SHUTDOWN };
+                                       (CXLFLASH_NOTIFY_SHUTDOWN |
+                                       CXLFLASH_OCXL_DEV) };
 
 /*
  * PCI device binding table
@@ -3679,9 +3680,13 @@ static int cxlflash_probe(struct pci_dev *pdev,
 
        cfg->init_state = INIT_STATE_NONE;
        cfg->dev = pdev;
-       cfg->ops = &cxlflash_cxl_ops;
        cfg->cxl_fops = cxlflash_cxl_fops;
 
+       if (ddv->flags & CXLFLASH_OCXL_DEV)
+               cfg->ops = &cxlflash_ocxl_ops;
+       else
+               cfg->ops = &cxlflash_cxl_ops;
+
        /*
         * Promoted LUNs move to the top of the LUN table. The rest stay on
         * the bottom half. The bottom half grows from the end (index = 255),

diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index ba0108a7a9c23abae6fc48432868a1f3329b680c..6f1be621e473b54ad36436039506f80557cb616a 100644 (file)
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -97,6 +97,7 @@ struct dev_dependent_vals {
        u64 flags;
 #define CXLFLASH_NOTIFY_SHUTDOWN       0x0000000000000001ULL
 #define CXLFLASH_WWPN_VPD_REQUIRED     0x0000000000000002ULL
+#define CXLFLASH_OCXL_DEV              0x0000000000000004ULL
 };
 
 struct asyc_intr_info {