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

Commit c0f64627 authored Dec 23, 2016 by Himanshu Madhani Committed by Bart Van Assche Jan 17, 2017

qla2xxx: Reset reserved field in firmware options to 0



During NVRAM initialization in target mode, reset reserved
fields in firmware options to Zero (BIT 15)

Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@cavium.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>

parent 2a47c685

drivers/scsi/qla2xxx/qla_target.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -6542,6 +6542,13 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host vha, struct nvram_24xx nv)

		/* Disable Full Login after LIP */
		nv->host_p &= cpu_to_le32(~BIT_10);

		/*
		* clear BIT 15 explicitly as we have seen at least
		* a couple of instances where this was set and this
		* was causing the firmware to not be initialized.
		*/
		nv->firmware_options_1 &= cpu_to_le32(~BIT_15);
		/* Enable target PRLI control */
		nv->firmware_options_2 \|= cpu_to_le32(BIT_14);
		} else {
		@@ -6626,11 +6633,17 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host vha, struct nvram_81xx nv)
		/* Disable ini mode, if requested */
		if (!qla_ini_mode_enabled(vha))
		nv->firmware_options_1 \|= cpu_to_le32(BIT_5);

		/* Disable Full Login after LIP */
		nv->firmware_options_1 &= cpu_to_le32(~BIT_13);
		/* Enable initial LIP */
		nv->firmware_options_1 &= cpu_to_le32(~BIT_9);
		/*
		* clear BIT 15 explicitly as we have seen at
		* least a couple of instances where this was set
		* and this was causing the firmware to not be
		* initialized.
		*/
		nv->firmware_options_1 &= cpu_to_le32(~BIT_15);
		if (ql2xtgt_tape_enable)
		/* Enable FC tape support */
		nv->firmware_options_2 \|= cpu_to_le32(BIT_12);