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

Commit 98aee70d authored Sep 25, 2014 by Joe Carnuccio Committed by Christoph Hellwig Sep 25, 2014

qla2xxx: Add endianizer to max_payload_size modifier.



Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 420854b3

drivers/scsi/qla2xxx/qla_fw.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@ struct nvram_24xx {
		/* Firmware Initialization Control Block. */
		uint16_t version;
		uint16_t reserved_1;
		uint16_t frame_payload_size;
		__le16 frame_payload_size;
		uint16_t execution_throttle;
		uint16_t exchange_count;
		uint16_t hard_address;

drivers/scsi/qla2xxx/qla_init.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -2596,18 +2596,18 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
		nv->firmware_options[1] = BIT_7 \| BIT_5;
		nv->add_firmware_options[0] = BIT_5;
		nv->add_firmware_options[1] = BIT_5 \| BIT_4;
		nv->frame_payload_size = __constant_cpu_to_le16(2048);
		nv->frame_payload_size = 2048;
		nv->special_options[1] = BIT_7;
		} else if (IS_QLA2200(ha)) {
		nv->firmware_options[0] = BIT_2 \| BIT_1;
		nv->firmware_options[1] = BIT_7 \| BIT_5;
		nv->add_firmware_options[0] = BIT_5;
		nv->add_firmware_options[1] = BIT_5 \| BIT_4;
		nv->frame_payload_size = __constant_cpu_to_le16(1024);
		nv->frame_payload_size = 1024;
		} else if (IS_QLA2100(ha)) {
		nv->firmware_options[0] = BIT_3 \| BIT_1;
		nv->firmware_options[1] = BIT_5;
		nv->frame_payload_size = __constant_cpu_to_le16(1024);
		nv->frame_payload_size = 1024;
		}

		nv->max_iocb_allocation = __constant_cpu_to_le16(256);
		@@ -2643,7 +2643,7 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
		* are valid.
		*/
		if (ia64_platform_is("sn2")) {
		nv->frame_payload_size = __constant_cpu_to_le16(2048);
		nv->frame_payload_size = 2048;
		if (IS_QLA23XX(ha))
		nv->special_options[1] = BIT_7;
		}
		@@ -4958,7 +4958,7 @@ qla24xx_nvram_config(scsi_qla_host_t *vha)
		memset(nv, 0, ha->nvram_size);
		nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
		nv->version = __constant_cpu_to_le16(ICB_VERSION);
		nv->frame_payload_size = __constant_cpu_to_le16(2048);
		nv->frame_payload_size = 2048;
		nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
		nv->exchange_count = __constant_cpu_to_le16(0);
		nv->hard_address = __constant_cpu_to_le16(124);
		@@ -5905,7 +5905,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)
		memset(nv, 0, ha->nvram_size);
		nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
		nv->version = __constant_cpu_to_le16(ICB_VERSION);
		nv->frame_payload_size = __constant_cpu_to_le16(2048);
		nv->frame_payload_size = 2048;
		nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
		nv->exchange_count = __constant_cpu_to_le16(0);
		nv->port_name[0] = 0x21;