Skip to content

Commit

Permalink
scsi: qla2xxx: Adjust IOCB resource on qpair create
Browse files Browse the repository at this point in the history
commit efa74a6 upstream.

During NVMe queue creation, a new qpair is created. FW resource limit needs
to be re-adjusted to take into account the new qpair. Otherwise, NVMe
command can not go through.  This issue was discovered while
testing/forcing FW execution to fail at load time.

Add call to readjust IOCB and exchange limit.

In addition, get FW state command and require FW to be running. Otherwise,
error is generated.

Cc: stable@vger.kernel.org
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Link: https://lore.kernel.org/r/20230714070104.40052-3-njavali@marvell.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Quinn Tran authored and gregkh committed Sep 19, 2023
1 parent ea834e6 commit 0e2f41d
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 19 deletions.
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_gbl.h
Expand Up @@ -143,6 +143,7 @@ void qla_edif_sess_down(struct scsi_qla_host *vha, struct fc_port *sess);
void qla_edif_clear_appdata(struct scsi_qla_host *vha,
struct fc_port *fcport);
const char *sc_to_str(uint16_t cmd);
void qla_adjust_iocb_limit(scsi_qla_host_t *vha);

/*
* Global Data in qla_os.c source file.
Expand Down
52 changes: 33 additions & 19 deletions drivers/scsi/qla2xxx/qla_init.c
Expand Up @@ -4147,41 +4147,55 @@ qla24xx_detect_sfp(scsi_qla_host_t *vha)
return ha->flags.lr_detected;
}

void qla_init_iocb_limit(scsi_qla_host_t *vha)
static void __qla_adjust_iocb_limit(struct qla_qpair *qpair)
{
u16 i, num_qps;
u32 limit;
struct qla_hw_data *ha = vha->hw;
u8 num_qps;
u16 limit;
struct qla_hw_data *ha = qpair->vha->hw;

num_qps = ha->num_qpairs + 1;
limit = (ha->orig_fw_iocb_count * QLA_IOCB_PCT_LIMIT) / 100;

ha->base_qpair->fwres.iocbs_total = ha->orig_fw_iocb_count;
ha->base_qpair->fwres.iocbs_limit = limit;
ha->base_qpair->fwres.iocbs_qp_limit = limit / num_qps;
ha->base_qpair->fwres.iocbs_used = 0;
qpair->fwres.iocbs_total = ha->orig_fw_iocb_count;
qpair->fwres.iocbs_limit = limit;
qpair->fwres.iocbs_qp_limit = limit / num_qps;

qpair->fwres.exch_total = ha->orig_fw_xcb_count;
qpair->fwres.exch_limit = (ha->orig_fw_xcb_count *
QLA_IOCB_PCT_LIMIT) / 100;
}

void qla_init_iocb_limit(scsi_qla_host_t *vha)
{
u8 i;
struct qla_hw_data *ha = vha->hw;

ha->base_qpair->fwres.exch_total = ha->orig_fw_xcb_count;
ha->base_qpair->fwres.exch_limit = (ha->orig_fw_xcb_count *
QLA_IOCB_PCT_LIMIT) / 100;
__qla_adjust_iocb_limit(ha->base_qpair);
ha->base_qpair->fwres.iocbs_used = 0;
ha->base_qpair->fwres.exch_used = 0;

for (i = 0; i < ha->max_qpairs; i++) {
if (ha->queue_pair_map[i]) {
ha->queue_pair_map[i]->fwres.iocbs_total =
ha->orig_fw_iocb_count;
ha->queue_pair_map[i]->fwres.iocbs_limit = limit;
ha->queue_pair_map[i]->fwres.iocbs_qp_limit =
limit / num_qps;
__qla_adjust_iocb_limit(ha->queue_pair_map[i]);
ha->queue_pair_map[i]->fwres.iocbs_used = 0;
ha->queue_pair_map[i]->fwres.exch_total = ha->orig_fw_xcb_count;
ha->queue_pair_map[i]->fwres.exch_limit =
(ha->orig_fw_xcb_count * QLA_IOCB_PCT_LIMIT) / 100;
ha->queue_pair_map[i]->fwres.exch_used = 0;
}
}
}

void qla_adjust_iocb_limit(scsi_qla_host_t *vha)
{
u8 i;
struct qla_hw_data *ha = vha->hw;

__qla_adjust_iocb_limit(ha->base_qpair);

for (i = 0; i < ha->max_qpairs; i++) {
if (ha->queue_pair_map[i])
__qla_adjust_iocb_limit(ha->queue_pair_map[i]);
}
}

/**
* qla2x00_setup_chip() - Load and start RISC firmware.
* @vha: HA context
Expand Down
3 changes: 3 additions & 0 deletions drivers/scsi/qla2xxx/qla_mbx.c
Expand Up @@ -2213,6 +2213,9 @@ qla2x00_get_firmware_state(scsi_qla_host_t *vha, uint16_t *states)
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1054,
"Entered %s.\n", __func__);

if (!ha->flags.fw_started)
return QLA_FUNCTION_FAILED;

mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
mcp->out_mb = MBX_0;
if (IS_FWI2_CAPABLE(vha->hw))
Expand Down
1 change: 1 addition & 0 deletions drivers/scsi/qla2xxx/qla_nvme.c
Expand Up @@ -132,6 +132,7 @@ static int qla_nvme_alloc_queue(struct nvme_fc_local_port *lport,
"Failed to allocate qpair\n");
return -EINVAL;
}
qla_adjust_iocb_limit(vha);
}
*handle = qpair;

Expand Down

0 comments on commit 0e2f41d

Please sign in to comment.