tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[SCSI] qla4xxx: masking required bits of add_fw_options during initialization

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Prasanna Mumbai <prasanna.mumbai@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

authored by Prasanna Mumbai and committed by James Bottomley d32cee3c 2d7924e6

+6
unified split
+1
drivers/scsi/qla4xxx/ql4_fw.h
··· 455 uint8_t res0; /* 07 */ 456 uint16_t eth_mtu_size; /* 08-09 */ 457 uint16_t add_fw_options; /* 0A-0B */ 458 459 uint8_t hb_interval; /* 0C */ 460 uint8_t inst_num; /* 0D */
··· 455 uint8_t res0; /* 07 */ 456 uint16_t eth_mtu_size; /* 08-09 */ 457 uint16_t add_fw_options; /* 0A-0B */ 458 + #define SERIALIZE_TASK_MGMT 0x0400 459 460 uint8_t hb_interval; /* 0C */ 461 uint8_t inst_num; /* 0D */
+5
drivers/scsi/qla4xxx/ql4_mbx.c
··· 476 477 init_fw_cb->fw_options &= __constant_cpu_to_le16(~FWOPT_TARGET_MODE); 478 479 if (qla4xxx_set_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma) 480 != QLA_SUCCESS) { 481 DEBUG2(printk(KERN_WARNING
··· 476 477 init_fw_cb->fw_options &= __constant_cpu_to_le16(~FWOPT_TARGET_MODE); 478 479 + /* Set bit for "serialize task mgmt" all other bits need to be zero */ 480 + init_fw_cb->add_fw_options = 0; 481 + init_fw_cb->add_fw_options |= 482 + __constant_cpu_to_le16(SERIALIZE_TASK_MGMT); 483 + 484 if (qla4xxx_set_ifcb(ha, &mbox_cmd[0], &mbox_sts[0], init_fw_cb_dma) 485 != QLA_SUCCESS) { 486 DEBUG2(printk(KERN_WARNING