Commit 3648bcf1 authored by Shreyas Deodhar's avatar Shreyas Deodhar Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Increase max limit of ql2xnvme_queues 

Increase max limit of ql2xnvme_queues to (max_qpair - 1).

Link: https://lore.kernel.org/r/20220310092604.22950-13-njavali@marvell.com


Fixes: 65120de2 ("scsi: qla2xxx: Add ql2xnvme_queues module param to configure number of NVMe queues")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarShreyas Deodhar <sdeodhar@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a7e05f7a

drivers/scsi/qla2xxx/qla_nvme.c

+10 −5
Original line number Diff line number Diff line
@@ -799,17 +799,22 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha) 
	ha = vha->hw;

	tmpl = &qla_nvme_fc_transport;



	if (ql2xnvme_queues < MIN_NVME_HW_QUEUES || ql2xnvme_queues > MAX_NVME_HW_QUEUES) {

	if (ql2xnvme_queues < MIN_NVME_HW_QUEUES) {

		ql_log(ql_log_warn, vha, 0xfffd,

		    "ql2xnvme_queues=%d is out of range(MIN:%d - MAX:%d). Resetting ql2xnvme_queues to:%d\n",

		    ql2xnvme_queues, MIN_NVME_HW_QUEUES, MAX_NVME_HW_QUEUES,

		    DEF_NVME_HW_QUEUES);

		    "ql2xnvme_queues=%d is lower than minimum queues: %d. Resetting ql2xnvme_queues to:%d\n",

		    ql2xnvme_queues, MIN_NVME_HW_QUEUES, DEF_NVME_HW_QUEUES);

		ql2xnvme_queues = DEF_NVME_HW_QUEUES;

	} else if (ql2xnvme_queues > (ha->max_qpairs - 1)) {

		ql_log(ql_log_warn, vha, 0xfffd,

		       "ql2xnvme_queues=%d is greater than available IRQs: %d. Resetting ql2xnvme_queues to: %d\n",

		       ql2xnvme_queues, (ha->max_qpairs - 1),

		       (ha->max_qpairs - 1));

		ql2xnvme_queues = ((ha->max_qpairs - 1));

	}



	qla_nvme_fc_transport.max_hw_queues =

	    min((uint8_t)(ql2xnvme_queues),

		(uint8_t)(ha->max_qpairs ? ha->max_qpairs : 1));

		(uint8_t)((ha->max_qpairs - 1) ? (ha->max_qpairs - 1) : 1));



	ql_log(ql_log_info, vha, 0xfffb,

	       "Number of NVME queues used for this port: %d\n",

drivers/scsi/qla2xxx/qla_nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "qla_dsd.h"



#define MIN_NVME_HW_QUEUES 1

#define MAX_NVME_HW_QUEUES 128

#define DEF_NVME_HW_QUEUES 8



#define NVME_ATIO_CMD_OFF 32

drivers/scsi/qla2xxx/qla_os.c

+0 −1
Original line number Diff line number Diff line
@@ -344,7 +344,6 @@ MODULE_PARM_DESC(ql2xnvme_queues, 
	"Number of NVMe Queues that can be configured.\n"

	"Final value will be min(ql2xnvme_queues, num_cpus,num_chip_queues)\n"

	"1 - Minimum number of queues supported\n"

	"128 - Maximum number of queues supported\n"

	"8 - Default value");



static struct scsi_transport_template *qla2xxx_transport_template = NULL;