Commit 21038b09 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Fix endianness annotations in header files 

Annotate members of FC protocol and firmware dump data structures as big
endian. Annotate members of RISC control structures as little endian.
Annotate mailbox registers as little endian. Annotate the mb[] arrays as
CPU-endian because communication of the mb[] values with the hardware
happens through the readw() and writew() functions. readw() converts from
__le16 to u16 and writew() converts from u16 to __le16. Annotate 'handles'
as CPU-endian because for the firmware these are opaque values.

Link: https://lore.kernel.org/r/20200518211712.11395-15-bvanassche@acm.org


CC: Hannes Reinecke <hare@suse.de>
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Quinn Tran <qutran@marvell.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2a4b684a

drivers/scsi/qla2xxx/qla_dbg.h

+222 −222
Original line number Diff line number Diff line
@@ -12,205 +12,205 @@ 
 */



struct qla2300_fw_dump {

	uint16_t hccr;

	uint16_t pbiu_reg[8];

	uint16_t risc_host_reg[8];

	uint16_t mailbox_reg[32];

	uint16_t resp_dma_reg[32];

	uint16_t dma_reg[48];

	uint16_t risc_hdw_reg[16];

	uint16_t risc_gp0_reg[16];

	uint16_t risc_gp1_reg[16];

	uint16_t risc_gp2_reg[16];

	uint16_t risc_gp3_reg[16];

	uint16_t risc_gp4_reg[16];

	uint16_t risc_gp5_reg[16];

	uint16_t risc_gp6_reg[16];

	uint16_t risc_gp7_reg[16];

	uint16_t frame_buf_hdw_reg[64];

	uint16_t fpm_b0_reg[64];

	uint16_t fpm_b1_reg[64];

	uint16_t risc_ram[0xf800];

	uint16_t stack_ram[0x1000];

	uint16_t data_ram[1];

	__be16 hccr;

	__be16 pbiu_reg[8];

	__be16 risc_host_reg[8];

	__be16 mailbox_reg[32];

	__be16 resp_dma_reg[32];

	__be16 dma_reg[48];

	__be16 risc_hdw_reg[16];

	__be16 risc_gp0_reg[16];

	__be16 risc_gp1_reg[16];

	__be16 risc_gp2_reg[16];

	__be16 risc_gp3_reg[16];

	__be16 risc_gp4_reg[16];

	__be16 risc_gp5_reg[16];

	__be16 risc_gp6_reg[16];

	__be16 risc_gp7_reg[16];

	__be16 frame_buf_hdw_reg[64];

	__be16 fpm_b0_reg[64];

	__be16 fpm_b1_reg[64];

	__be16 risc_ram[0xf800];

	__be16 stack_ram[0x1000];

	__be16 data_ram[1];

};



struct qla2100_fw_dump {

	uint16_t hccr;

	uint16_t pbiu_reg[8];

	uint16_t mailbox_reg[32];

	uint16_t dma_reg[48];

	uint16_t risc_hdw_reg[16];

	uint16_t risc_gp0_reg[16];

	uint16_t risc_gp1_reg[16];

	uint16_t risc_gp2_reg[16];

	uint16_t risc_gp3_reg[16];

	uint16_t risc_gp4_reg[16];

	uint16_t risc_gp5_reg[16];

	uint16_t risc_gp6_reg[16];

	uint16_t risc_gp7_reg[16];

	uint16_t frame_buf_hdw_reg[16];

	uint16_t fpm_b0_reg[64];

	uint16_t fpm_b1_reg[64];

	uint16_t risc_ram[0xf000];

	__be16 hccr;

	__be16 pbiu_reg[8];

	__be16 mailbox_reg[32];

	__be16 dma_reg[48];

	__be16 risc_hdw_reg[16];

	__be16 risc_gp0_reg[16];

	__be16 risc_gp1_reg[16];

	__be16 risc_gp2_reg[16];

	__be16 risc_gp3_reg[16];

	__be16 risc_gp4_reg[16];

	__be16 risc_gp5_reg[16];

	__be16 risc_gp6_reg[16];

	__be16 risc_gp7_reg[16];

	__be16 frame_buf_hdw_reg[16];

	__be16 fpm_b0_reg[64];

	__be16 fpm_b1_reg[64];

	__be16 risc_ram[0xf000];

};



struct qla24xx_fw_dump {

	uint32_t host_status;

	uint32_t host_reg[32];

	uint32_t shadow_reg[7];

	uint16_t mailbox_reg[32];

	uint32_t xseq_gp_reg[128];

	uint32_t xseq_0_reg[16];

	uint32_t xseq_1_reg[16];

	uint32_t rseq_gp_reg[128];

	uint32_t rseq_0_reg[16];

	uint32_t rseq_1_reg[16];

	uint32_t rseq_2_reg[16];

	uint32_t cmd_dma_reg[16];

	uint32_t req0_dma_reg[15];

	uint32_t resp0_dma_reg[15];

	uint32_t req1_dma_reg[15];

	uint32_t xmt0_dma_reg[32];

	uint32_t xmt1_dma_reg[32];

	uint32_t xmt2_dma_reg[32];

	uint32_t xmt3_dma_reg[32];

	uint32_t xmt4_dma_reg[32];

	uint32_t xmt_data_dma_reg[16];

	uint32_t rcvt0_data_dma_reg[32];

	uint32_t rcvt1_data_dma_reg[32];

	uint32_t risc_gp_reg[128];

	uint32_t lmc_reg[112];

	uint32_t fpm_hdw_reg[192];

	uint32_t fb_hdw_reg[176];

	uint32_t code_ram[0x2000];

	uint32_t ext_mem[1];

	__be32	host_status;

	__be32	host_reg[32];

	__be32	shadow_reg[7];

	__be16	mailbox_reg[32];

	__be32	xseq_gp_reg[128];

	__be32	xseq_0_reg[16];

	__be32	xseq_1_reg[16];

	__be32	rseq_gp_reg[128];

	__be32	rseq_0_reg[16];

	__be32	rseq_1_reg[16];

	__be32	rseq_2_reg[16];

	__be32	cmd_dma_reg[16];

	__be32	req0_dma_reg[15];

	__be32	resp0_dma_reg[15];

	__be32	req1_dma_reg[15];

	__be32	xmt0_dma_reg[32];

	__be32	xmt1_dma_reg[32];

	__be32	xmt2_dma_reg[32];

	__be32	xmt3_dma_reg[32];

	__be32	xmt4_dma_reg[32];

	__be32	xmt_data_dma_reg[16];

	__be32	rcvt0_data_dma_reg[32];

	__be32	rcvt1_data_dma_reg[32];

	__be32	risc_gp_reg[128];

	__be32	lmc_reg[112];

	__be32	fpm_hdw_reg[192];

	__be32	fb_hdw_reg[176];

	__be32	code_ram[0x2000];

	__be32	ext_mem[1];

};



struct qla25xx_fw_dump {

	uint32_t host_status;

	uint32_t host_risc_reg[32];

	uint32_t pcie_regs[4];

	uint32_t host_reg[32];

	uint32_t shadow_reg[11];

	uint32_t risc_io_reg;

	uint16_t mailbox_reg[32];

	uint32_t xseq_gp_reg[128];

	uint32_t xseq_0_reg[48];

	uint32_t xseq_1_reg[16];

	uint32_t rseq_gp_reg[128];

	uint32_t rseq_0_reg[32];

	uint32_t rseq_1_reg[16];

	uint32_t rseq_2_reg[16];

	uint32_t aseq_gp_reg[128];

	uint32_t aseq_0_reg[32];

	uint32_t aseq_1_reg[16];

	uint32_t aseq_2_reg[16];

	uint32_t cmd_dma_reg[16];

	uint32_t req0_dma_reg[15];

	uint32_t resp0_dma_reg[15];

	uint32_t req1_dma_reg[15];

	uint32_t xmt0_dma_reg[32];

	uint32_t xmt1_dma_reg[32];

	uint32_t xmt2_dma_reg[32];

	uint32_t xmt3_dma_reg[32];

	uint32_t xmt4_dma_reg[32];

	uint32_t xmt_data_dma_reg[16];

	uint32_t rcvt0_data_dma_reg[32];

	uint32_t rcvt1_data_dma_reg[32];

	uint32_t risc_gp_reg[128];

	uint32_t lmc_reg[128];

	uint32_t fpm_hdw_reg[192];

	uint32_t fb_hdw_reg[192];

	uint32_t code_ram[0x2000];

	uint32_t ext_mem[1];

	__be32	host_status;

	__be32	host_risc_reg[32];

	__be32	pcie_regs[4];

	__be32	host_reg[32];

	__be32	shadow_reg[11];

	__be32	risc_io_reg;

	__be16	mailbox_reg[32];

	__be32	xseq_gp_reg[128];

	__be32	xseq_0_reg[48];

	__be32	xseq_1_reg[16];

	__be32	rseq_gp_reg[128];

	__be32	rseq_0_reg[32];

	__be32	rseq_1_reg[16];

	__be32	rseq_2_reg[16];

	__be32	aseq_gp_reg[128];

	__be32	aseq_0_reg[32];

	__be32	aseq_1_reg[16];

	__be32	aseq_2_reg[16];

	__be32	cmd_dma_reg[16];

	__be32	req0_dma_reg[15];

	__be32	resp0_dma_reg[15];

	__be32	req1_dma_reg[15];

	__be32	xmt0_dma_reg[32];

	__be32	xmt1_dma_reg[32];

	__be32	xmt2_dma_reg[32];

	__be32	xmt3_dma_reg[32];

	__be32	xmt4_dma_reg[32];

	__be32	xmt_data_dma_reg[16];

	__be32	rcvt0_data_dma_reg[32];

	__be32	rcvt1_data_dma_reg[32];

	__be32	risc_gp_reg[128];

	__be32	lmc_reg[128];

	__be32	fpm_hdw_reg[192];

	__be32	fb_hdw_reg[192];

	__be32	code_ram[0x2000];

	__be32	ext_mem[1];

};



struct qla81xx_fw_dump {

	uint32_t host_status;

	uint32_t host_risc_reg[32];

	uint32_t pcie_regs[4];

	uint32_t host_reg[32];

	uint32_t shadow_reg[11];

	uint32_t risc_io_reg;

	uint16_t mailbox_reg[32];

	uint32_t xseq_gp_reg[128];

	uint32_t xseq_0_reg[48];

	uint32_t xseq_1_reg[16];

	uint32_t rseq_gp_reg[128];

	uint32_t rseq_0_reg[32];

	uint32_t rseq_1_reg[16];

	uint32_t rseq_2_reg[16];

	uint32_t aseq_gp_reg[128];

	uint32_t aseq_0_reg[32];

	uint32_t aseq_1_reg[16];

	uint32_t aseq_2_reg[16];

	uint32_t cmd_dma_reg[16];

	uint32_t req0_dma_reg[15];

	uint32_t resp0_dma_reg[15];

	uint32_t req1_dma_reg[15];

	uint32_t xmt0_dma_reg[32];

	uint32_t xmt1_dma_reg[32];

	uint32_t xmt2_dma_reg[32];

	uint32_t xmt3_dma_reg[32];

	uint32_t xmt4_dma_reg[32];

	uint32_t xmt_data_dma_reg[16];

	uint32_t rcvt0_data_dma_reg[32];

	uint32_t rcvt1_data_dma_reg[32];

	uint32_t risc_gp_reg[128];

	uint32_t lmc_reg[128];

	uint32_t fpm_hdw_reg[224];

	uint32_t fb_hdw_reg[208];

	uint32_t code_ram[0x2000];

	uint32_t ext_mem[1];

	__be32	host_status;

	__be32	host_risc_reg[32];

	__be32	pcie_regs[4];

	__be32	host_reg[32];

	__be32	shadow_reg[11];

	__be32	risc_io_reg;

	__be16	mailbox_reg[32];

	__be32	xseq_gp_reg[128];

	__be32	xseq_0_reg[48];

	__be32	xseq_1_reg[16];

	__be32	rseq_gp_reg[128];

	__be32	rseq_0_reg[32];

	__be32	rseq_1_reg[16];

	__be32	rseq_2_reg[16];

	__be32	aseq_gp_reg[128];

	__be32	aseq_0_reg[32];

	__be32	aseq_1_reg[16];

	__be32	aseq_2_reg[16];

	__be32	cmd_dma_reg[16];

	__be32	req0_dma_reg[15];

	__be32	resp0_dma_reg[15];

	__be32	req1_dma_reg[15];

	__be32	xmt0_dma_reg[32];

	__be32	xmt1_dma_reg[32];

	__be32	xmt2_dma_reg[32];

	__be32	xmt3_dma_reg[32];

	__be32	xmt4_dma_reg[32];

	__be32	xmt_data_dma_reg[16];

	__be32	rcvt0_data_dma_reg[32];

	__be32	rcvt1_data_dma_reg[32];

	__be32	risc_gp_reg[128];

	__be32	lmc_reg[128];

	__be32	fpm_hdw_reg[224];

	__be32	fb_hdw_reg[208];

	__be32	code_ram[0x2000];

	__be32	ext_mem[1];

};



struct qla83xx_fw_dump {

	uint32_t host_status;

	uint32_t host_risc_reg[48];

	uint32_t pcie_regs[4];

	uint32_t host_reg[32];

	uint32_t shadow_reg[11];

	uint32_t risc_io_reg;

	uint16_t mailbox_reg[32];

	uint32_t xseq_gp_reg[256];

	uint32_t xseq_0_reg[48];

	uint32_t xseq_1_reg[16];

	uint32_t xseq_2_reg[16];

	uint32_t rseq_gp_reg[256];

	uint32_t rseq_0_reg[32];

	uint32_t rseq_1_reg[16];

	uint32_t rseq_2_reg[16];

	uint32_t rseq_3_reg[16];

	uint32_t aseq_gp_reg[256];

	uint32_t aseq_0_reg[32];

	uint32_t aseq_1_reg[16];

	uint32_t aseq_2_reg[16];

	uint32_t aseq_3_reg[16];

	uint32_t cmd_dma_reg[64];

	uint32_t req0_dma_reg[15];

	uint32_t resp0_dma_reg[15];

	uint32_t req1_dma_reg[15];

	uint32_t xmt0_dma_reg[32];

	uint32_t xmt1_dma_reg[32];

	uint32_t xmt2_dma_reg[32];

	uint32_t xmt3_dma_reg[32];

	uint32_t xmt4_dma_reg[32];

	uint32_t xmt_data_dma_reg[16];

	uint32_t rcvt0_data_dma_reg[32];

	uint32_t rcvt1_data_dma_reg[32];

	uint32_t risc_gp_reg[128];

	uint32_t lmc_reg[128];

	uint32_t fpm_hdw_reg[256];

	uint32_t rq0_array_reg[256];

	uint32_t rq1_array_reg[256];

	uint32_t rp0_array_reg[256];

	uint32_t rp1_array_reg[256];

	uint32_t queue_control_reg[16];

	uint32_t fb_hdw_reg[432];

	uint32_t at0_array_reg[128];

	uint32_t code_ram[0x2400];

	uint32_t ext_mem[1];

	__be32	host_status;

	__be32	host_risc_reg[48];

	__be32	pcie_regs[4];

	__be32	host_reg[32];

	__be32	shadow_reg[11];

	__be32	risc_io_reg;

	__be16	mailbox_reg[32];

	__be32	xseq_gp_reg[256];

	__be32	xseq_0_reg[48];

	__be32	xseq_1_reg[16];

	__be32	xseq_2_reg[16];

	__be32	rseq_gp_reg[256];

	__be32	rseq_0_reg[32];

	__be32	rseq_1_reg[16];

	__be32	rseq_2_reg[16];

	__be32	rseq_3_reg[16];

	__be32	aseq_gp_reg[256];

	__be32	aseq_0_reg[32];

	__be32	aseq_1_reg[16];

	__be32	aseq_2_reg[16];

	__be32	aseq_3_reg[16];

	__be32	cmd_dma_reg[64];

	__be32	req0_dma_reg[15];

	__be32	resp0_dma_reg[15];

	__be32	req1_dma_reg[15];

	__be32	xmt0_dma_reg[32];

	__be32	xmt1_dma_reg[32];

	__be32	xmt2_dma_reg[32];

	__be32	xmt3_dma_reg[32];

	__be32	xmt4_dma_reg[32];

	__be32	xmt_data_dma_reg[16];

	__be32	rcvt0_data_dma_reg[32];

	__be32	rcvt1_data_dma_reg[32];

	__be32	risc_gp_reg[128];

	__be32	lmc_reg[128];

	__be32	fpm_hdw_reg[256];

	__be32	rq0_array_reg[256];

	__be32	rq1_array_reg[256];

	__be32	rp0_array_reg[256];

	__be32	rp1_array_reg[256];

	__be32	queue_control_reg[16];

	__be32	fb_hdw_reg[432];

	__be32	at0_array_reg[128];

	__be32	code_ram[0x2400];

	__be32	ext_mem[1];

};



#define EFT_NUM_BUFFERS		4
@@ -223,45 +223,45 @@ struct qla83xx_fw_dump { 
#define fce_calc_size(b)	((FCE_BYTES_PER_BUFFER) * (b))



struct qla2xxx_fce_chain {

	uint32_t type;

	uint32_t chain_size;

	__be32	type;

	__be32	chain_size;



	uint32_t size;

	uint32_t addr_l;

	uint32_t addr_h;

	uint32_t eregs[8];

	__be32	size;

	__be32	addr_l;

	__be32	addr_h;

	__be32	eregs[8];

};



/* used by exchange off load and extended login offload */

struct qla2xxx_offld_chain {

	uint32_t type;

	uint32_t chain_size;

	__be32	type;

	__be32	chain_size;



	uint32_t size;

	uint32_t reserved;

	u64	 addr;

	__be32	size;

	__be32	reserved;

	__be64	addr;

};



struct qla2xxx_mq_chain {

	uint32_t type;

	uint32_t chain_size;

	__be32	type;

	__be32	chain_size;



	uint32_t count;

	uint32_t qregs[4 * QLA_MQ_SIZE];

	__be32	count;

	__be32	qregs[4 * QLA_MQ_SIZE];

};



struct qla2xxx_mqueue_header {

	uint32_t queue;

	__be32	queue;

#define TYPE_REQUEST_QUEUE	0x1

#define TYPE_RESPONSE_QUEUE	0x2

#define TYPE_ATIO_QUEUE		0x3

	uint32_t number;

	uint32_t size;

	__be32	number;

	__be32	size;

};



struct qla2xxx_mqueue_chain {

	uint32_t type;

	uint32_t chain_size;

	__be32	type;

	__be32	chain_size;

};



#define DUMP_CHAIN_VARIANT	0x80000000
@@ -274,28 +274,28 @@ struct qla2xxx_mqueue_chain { 


struct qla2xxx_fw_dump {

	uint8_t signature[4];

	uint32_t version;

	__be32	version;



	uint32_t fw_major_version;

	uint32_t fw_minor_version;

	uint32_t fw_subminor_version;

	uint32_t fw_attributes;

	__be32 fw_major_version;

	__be32 fw_minor_version;

	__be32 fw_subminor_version;

	__be32 fw_attributes;



	uint32_t vendor;

	uint32_t device;

	uint32_t subsystem_vendor;

	uint32_t subsystem_device;

	__be32 vendor;

	__be32 device;

	__be32 subsystem_vendor;

	__be32 subsystem_device;



	uint32_t fixed_size;

	uint32_t mem_size;

	uint32_t req_q_size;

	uint32_t rsp_q_size;

	__be32	fixed_size;

	__be32	mem_size;

	__be32	req_q_size;

	__be32	rsp_q_size;



	uint32_t eft_size;

	uint32_t eft_addr_l;

	uint32_t eft_addr_h;

	__be32	eft_size;

	__be32	eft_addr_l;

	__be32	eft_addr_h;



	uint32_t header_size;

	__be32	header_size;



	union {

		struct qla2100_fw_dump isp21;
@@ -370,7 +370,7 @@ ql_log_qp(uint32_t, struct qla_qpair *, int32_t, const char *fmt, ...); 


extern int qla27xx_dump_mpi_ram(struct qla_hw_data *, uint32_t, uint32_t *,

	uint32_t, void **);

extern int qla24xx_dump_ram(struct qla_hw_data *, uint32_t, uint32_t *,

extern int qla24xx_dump_ram(struct qla_hw_data *, uint32_t, __be32 *,

	uint32_t, void **);

extern void qla24xx_pause_risc(struct device_reg_24xx __iomem *,

	struct qla_hw_data *);

drivers/scsi/qla2xxx/qla_def.h

+326 −326

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla2xxx/qla_fw.h

+380 −380

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/qla2xxx/qla_inline.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ qla24xx_calc_iocbs(scsi_qla_host_t *vha, uint16_t dsds) 
 *      register value.

 */

static __inline__ uint16_t

qla2x00_debounce_register(volatile uint16_t __iomem *addr)

qla2x00_debounce_register(volatile __le16 __iomem *addr)

{

	volatile uint16_t first;

	volatile uint16_t second;

drivers/scsi/qla2xxx/qla_mr.h

+4 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct tsk_mgmt_entry_fx00 { 
	uint8_t sys_define;

	uint8_t entry_status;		/* Entry Status. */



	__le32 handle;		/* System handle. */

	uint32_t handle;		/* System handle. */



	uint32_t reserved_0;
@@ -121,13 +121,13 @@ struct abort_iocb_entry_fx00 { 
	uint8_t sys_define;		/* System defined. */

	uint8_t entry_status;		/* Entry Status. */



	__le32 handle;		/* System handle. */

	uint32_t handle;		/* System handle. */

	__le32 reserved_0;



	__le16 tgt_id_sts;		/* Completion status. */

	__le16 options;



	__le32 abort_handle;		/* System handle. */

	uint32_t abort_handle;		/* System handle. */

	__le32 reserved_2;



	__le16 req_que_no;
@@ -166,7 +166,7 @@ struct fxdisc_entry_fx00 { 
	uint8_t sys_define;		/* System Defined. */

	uint8_t entry_status;		/* Entry Status. */



	__le32 handle;		/* System handle. */

	uint32_t handle;		/* System handle. */

	__le32 reserved_0;		/* System handle. */



	__le16 func_num;