Commit e9105c4b authored by Manish Rangankar's avatar Manish Rangankar Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Remove unsupported ql2xenabledif option 



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: default avatarManish Rangankar <mrangankar@marvell.com>
Signed-off-by: default avatarNilesh Javali <njavali@marvell.com>
Link: https://lore.kernel.org/r/20230821130045.34850-7-njavali@marvell.com


Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0ba0b018

drivers/scsi/qla2xxx/qla_attr.c

+0 −2
Original line number Diff line number Diff line
@@ -3093,8 +3093,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
@@ -17,7 +17,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
@@ -3289,6 +3289,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
@@ -3525,8 +3532,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