scsi: cxlflash: Preserve number of interrupts for master contexts

The number of interrupts requested for user contexts are stored in the context
specific structures and utilized to manage the interrupts. For the master
contexts, this number is only used once and therefore not saved.

To prepare for future commits where the number of interrupts will be required
in more than one place, preserve the value in the master context structure.

[mkp: typo in comment]

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/common.h b/drivers/scsi/cxlflash/common.h
index 102fd26ca886ecf0947c14d7c4e94eea6f6d883f..715c63c088922c276709fb375a1797ab51cad34e 100644 (file)
--- a/drivers/scsi/cxlflash/common.h
+++ b/drivers/scsi/cxlflash/common.h
@@ -211,6 +211,7 @@ struct hwq {
        struct sisl_ctrl_map __iomem *ctrl_map;         /* MC control map */
        ctx_hndl_t ctx_hndl;    /* master's context handle */
        u32 index;              /* Index of this hwq */
+       int num_irqs;           /* Number of interrupts requested for context */
        struct list_head pending_cmds;  /* Commands pending completion */
 
        atomic_t hsq_credits;

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index d8fe7ab870b8660474f7d7af24a5441500579b86..3d3e0032bc2ac1df5dbd706c68942892370058db 100644 (file)
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -1911,7 +1911,7 @@ static enum undo_level init_intr(struct cxlflash_cfg *cfg,
        int rc = 0;
        enum undo_level level = UNDO_NOOP;
        bool is_primary_hwq = (hwq->index == PRIMARY_HWQ);
-       int num_irqs = is_primary_hwq ? 3 : 2;
+       int num_irqs = hwq->num_irqs;
 
        rc = cfg->ops->allocate_afu_irqs(ctx, num_irqs);
        if (unlikely(rc)) {
@@ -1965,16 +1965,20 @@ static int init_mc(struct cxlflash_cfg *cfg, u32 index)
        struct device *dev = &cfg->dev->dev;
        struct hwq *hwq = get_hwq(cfg->afu, index);
        int rc = 0;
+       int num_irqs;
        enum undo_level level;
 
        hwq->afu = cfg->afu;
        hwq->index = index;
        INIT_LIST_HEAD(&hwq->pending_cmds);
 
-       if (index == PRIMARY_HWQ)
+       if (index == PRIMARY_HWQ) {
                ctx = cfg->ops->get_context(cfg->dev, cfg->afu_cookie);
-       else
+               num_irqs = 3;
+       } else {
                ctx = cfg->ops->dev_context_init(cfg->dev, cfg->afu_cookie);
+               num_irqs = 2;
+       }
        if (IS_ERR_OR_NULL(ctx)) {
                rc = -ENOMEM;
                goto err1;
@@ -1982,6 +1986,7 @@ static int init_mc(struct cxlflash_cfg *cfg, u32 index)
 
        WARN_ON(hwq->ctx_cookie);
        hwq->ctx_cookie = ctx;
+       hwq->num_irqs = num_irqs;
 
        /* Set it up as a master with the CXL */
        cfg->ops->set_master(ctx);