Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d5eb57a authored Aug 21, 2023 by Manish Rangankar Committed by Greg Kroah-Hartman Sep 23, 2023

scsi: qla2xxx: Remove unsupported ql2xenabledif option



commit e9105c4b7a9208a21a9bda133707624f12ddabc2 upstream.

User accidently passed module parameter ql2xenabledif=1 which is
unsupported. However, driver still initialized which lead to guard tag
errors during device discovery.

Remove unsupported ql2xenabledif=1 option and validate the user input.

Cc: stable@vger.kernel.org
Signed-off-by: Manish Rangankar <mrangankar@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Link: https://lore.kernel.org/r/20230821130045.34850-7-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>

parent e24bc581

drivers/scsi/qla2xxx/qla_attr.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2864,8 +2864,6 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
		vha->flags.difdix_supported = 1;
		ql_dbg(ql_dbg_user, vha, 0x7082,
		"Registered for DIF/DIX type 1 and 3 protection.\n");
		if (ql2xenabledif == 1)
		prot = SHOST_DIX_TYPE0_PROTECTION;
		scsi_host_set_prot(vha->host,
		prot \| SHOST_DIF_TYPE1_PROTECTION
		\| SHOST_DIF_TYPE2_PROTECTION

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		* \| Queue Command and IO tracing \| 0x3074 \| 0x300b \|
		* \| \| \| 0x3027-0x3028 \|
		* \| \| \| 0x303d-0x3041 \|
		* \| \| \| 0x302d,0x3033 \|
		* \| \| \| 0x302e,0x3033 \|
		* \| \| \| 0x3036,0x3038 \|
		* \| \| \| 0x303a \|
		* \| DPC Thread \| 0x4023 \| 0x4002,0x4013 \|

drivers/scsi/qla2xxx/qla_os.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -3112,6 +3112,13 @@ qla2x00_probe_one(struct pci_dev pdev, const struct pci_device_id id)
		host->max_id = ha->max_fibre_devices;
		host->cmd_per_lun = 3;
		host->unique_id = host->host_no;

		if (ql2xenabledif && ql2xenabledif != 2) {
		ql_log(ql_log_warn, base_vha, 0x302d,
		"Invalid value for ql2xenabledif, resetting it to default (2)\n");
		ql2xenabledif = 2;
		}

		if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif)
		host->max_cmd_len = 32;
		else
		@@ -3343,8 +3350,6 @@ qla2x00_probe_one(struct pci_dev pdev, const struct pci_device_id id)
		base_vha->flags.difdix_supported = 1;
		ql_dbg(ql_dbg_init, base_vha, 0x00f1,
		"Registering for DIF/DIX type 1 and 3 protection.\n");
		if (ql2xenabledif == 1)
		prot = SHOST_DIX_TYPE0_PROTECTION;
		if (ql2xprotmask)
		scsi_host_set_prot(host, ql2xprotmask);
		else