Fix qla2xxx endianness annotations
Subsystems (2)
cover Fix qla2xxx endianness annotations
Hi Martin,
This patch series fixes the endianness annotations in the qla2xxx driver. Please consider this patch series for the v5.7 kernel.
Thanks,
Bart.
Bart Van Assche (4):
qla2xxx: Use raw_smp_processor_id() where appropriate
qla2xxx: Fix endianness annotations in header files
qla2xxx: Fix endianness annotations in source files
qla2xxx: Fix the code that reads from mailbox registers
drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 90 ++-- drivers/scsi/qla2xxx/qla_dbg.h | 442 ++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 699 ++++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 ++++++++++++++--------------- drivers/scsi/qla2xxx/qla_init.c | 88 ++-- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_iocb.c | 59 +-- drivers/scsi/qla2xxx/qla_isr.c | 93 ++-- drivers/scsi/qla2xxx/qla_mbx.c | 37 +- drivers/scsi/qla2xxx/qla_mr.c | 35 +- drivers/scsi/qla2xxx/qla_mr.h | 8 +- drivers/scsi/qla2xxx/qla_nvme.c | 8 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.c | 93 ++-- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_os.c | 26 +- drivers/scsi/qla2xxx/qla_sup.c | 73 +-- drivers/scsi/qla2xxx/qla_target.c | 76 +-- drivers/scsi/qla2xxx/qla_target.h | 208 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 4 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +- 23 files changed, 1455 insertions(+), 1417 deletions(-)
PATCH 1/4 qla2xxx: Use raw_smp_processor_id() where appropriate
This patch fixes e.g. the following kernel complaint:
BUG: using smp_processor_id() in preemptible [00000000] code: modprobe/844 caller is qla2xxx_create_qpair+0x698/0xab0 [qla2xxx] CPU: 7 PID: 844 Comm: modprobe Not tainted 5.5.0-rc2-dbg+ #6 Call Trace: dump_stack+0xa5/0xe6 debug_smp_processor_id.cold+0x59/0x5e qla2xxx_create_qpair+0x698/0xab0 [qla2xxx] qla2x00_probe_one+0x1a67/0x4820 [qla2xxx] local_pci_probe+0x7c/0xc0 pci_device_probe+0x25d/0x390 really_probe+0x170/0x510 driver_probe_device+0x127/0x190 device_driver_attach+0x98/0xa0 __driver_attach+0xb6/0x1a0 bus_for_each_dev+0x100/0x150 driver_attach+0x31/0x40 bus_add_driver+0x246/0x300 driver_register+0xe0/0x170 __pci_register_driver+0xd2/0xe0 qla2x00_module_init+0x1db/0x247 [qla2xxx] do_one_initcall+0xda/0x480 do_init_module+0x10a/0x3b0 load_module+0x4318/0x47c0 __do_sys_finit_module+0x134/0x1d0 __x64_sys_finit_module+0x47/0x50 do_syscall_64+0x6f/0x2f0 entry_SYSCALL_64_after_hwframe+0x49/0xbe
--- drivers/scsi/qla2xxx/qla_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- drivers/scsi/qla2xxx/qla_target.c | 2 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +1 -1
@@ -8992,7 +8992,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, qpair->rsp->req = qpair->req; qpair->rsp->qpair = qpair;/* init qpair to this cpu. Will adjust at run time. */ -qla_cpu_update (qpair,smp_processor_id ()); +qla_cpu_update (qpair,raw_smp_processor_id ());if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) {if (ha->fw_attributes &BIT_4 )
drivers/scsi/qla2xxx/qla_isr.c +2 -2
@@ -3217,8 +3217,8 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,if (!ha->flags.fw_started)return ; -if (rsp->qpair->cpuid !=smp_processor_id ()) -qla_cpu_update (rsp->qpair,smp_processor_id ()); +if (rsp->qpair->cpuid !=raw_smp_processor_id ()) +qla_cpu_update (rsp->qpair,raw_smp_processor_id ());while (rsp->ring_ptr->signature !=RESPONSE_PROCESSED ) { pkt = (struct sts_entry_24xx *)rsp->ring_ptr;
drivers/scsi/qla2xxx/qla_target.c +1 -1
@@ -4368,7 +4368,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,queue_work_on (cmd->se_cmd.cpuid, qla_tgt_wq, &cmd->work); }else if (ha->msix_count) {if (cmd->atio.u.isp24.fcp_cmnd.rddata) -queue_work_on (smp_processor_id (), qla_tgt_wq, +queue_work_on (raw_smp_processor_id (), qla_tgt_wq, &cmd->work);else queue_work_on(cmd->se_cmd.cpuid, qla_tgt_wq,
drivers/scsi/qla2xxx/tcm_qla2xxx.c +2 -2
@@ -305,7 +305,7 @@ static void tcm_qla2xxx_free_cmd(struct qla_tgt_cmd *cmd) cmd->trc_flags |=TRC_CMD_DONE ;INIT_WORK (&cmd->work, tcm_qla2xxx_complete_free); -queue_work_on (smp_processor_id (), tcm_qla2xxx_free_wq, &cmd->work); +queue_work_on (raw_smp_processor_id (), tcm_qla2xxx_free_wq, &cmd->work); }/*
@@ -543,7 +543,7 @@ static void tcm_qla2xxx_handle_data(struct qla_tgt_cmd *cmd) cmd->trc_flags |=TRC_DATA_IN ; cmd->cmd_in_wq =1 ;INIT_WORK (&cmd->work, tcm_qla2xxx_handle_data_work); -queue_work_on (smp_processor_id (), tcm_qla2xxx_free_wq, &cmd->work); +queue_work_on (raw_smp_processor_id (), tcm_qla2xxx_free_wq, &cmd->work); }static int tcm_qla2xxx_chk_dif_tags (uint32_t tag)
Re: [PATCH 1/4] qla2xxx: Use raw_smp_processor_id() where appropriate
Hi Bart,
Quoted 1 line · Bart Van Assche
This patch fixes e.g. the following kernel complaint:
[...]
drivers/scsi/qla2xxx/qla_init.c struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, · line 8995
Quoted 10 lines
drivers/scsi/qla2xxx/qla_init.c +1
-1@@ -8992,7 +8992,7 @@ struct qla_qpair *qla2xxx_create_qpair(struct scsi_qla_host *vha, int qos, qpair->rsp->req = qpair->req; qpair->rsp->qpair = qpair;/* init qpair to this cpu. Will adjust at run time. */ -qla_cpu_update (qpair,smp_processor_id ()); +qla_cpu_update (qpair,raw_smp_processor_id ());
When this is updated later anway, why not inializing with a invalid id from beginning? Because using raw_smp_processor_id() is just silencing the report without addressing the problem.
Quoted 7 lines
drivers/scsi/qla2xxx/qla_init.c +0
-0if (IS_T10_PI_CAPABLE (ha) && ql2xenabledif) {if (ha->fw_attributes &BIT_4 )drivers/scsi/qla2xxx/qla_isr.c +0
-0
drivers/scsi/qla2xxx/qla_isr.c void qla24xx_process_response_queue(struct scsi_qla_host *vha, · line 3221
Quoted 7 lines
drivers/scsi/qla2xxx/qla_isr.c +2
-2@@ -3217,8 +3217,8 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,if (!ha->flags.fw_started)return ; -if (rsp->qpair->cpuid !=smp_processor_id ()) -qla_cpu_update (rsp->qpair,smp_processor_id ()); +if (rsp->qpair->cpuid !=raw_smp_processor_id ()) +qla_cpu_update (rsp->qpair,raw_smp_processor_id ());
If I read it correctly, qla24xx_processor_response_queue() can be called from either IRQ context or from a threading context. So that means complaint that smp_processor_id() is used in preemptable context is correct. So again this is just silencing it.
drivers/scsi/qla2xxx/qla_target.c static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha, · line 4371
Quoted 13 lines
drivers/scsi/qla2xxx/qla_isr.c +0
-0while (rsp->ring_ptr->signature !=RESPONSE_PROCESSED ) { pkt = (struct sts_entry_24xx *)rsp->ring_ptr;drivers/scsi/qla2xxx/qla_target.c +1
-1@@ -4368,7 +4368,7 @@ static int qlt_handle_cmd_for_atio(struct scsi_qla_host *vha,queue_work_on (cmd->se_cmd.cpuid, qla_tgt_wq, &cmd->work); }else if (ha->msix_count) {if (cmd->atio.u.isp24.fcp_cmnd.rddata) - queue_work_on(smp_processor_id(), qla_tgt_wq, + queue_work_on(raw_smp_processor_id(), qla_tgt_wq,
As I understand the code this is the main reason why the code tries to figure out on which CPU it is running. The first part of the processing happens either in IRQ context or in the threading context in which qla24xx_process_response_queue() runs and now the second part of the processing happens in the work queue. And this code tries to stick the processing context on the same CPU to avoid cash trashing.
At creation time of the qpair queues, the CPU on which they should be processed should be noted. And in this code path we just would look up on which queue we are and which CPU should be used.
This would also avoid the qla_cpu_update() call in qla24xx_process_response_queue().
So far the theory, I tried to figure out how to implement this scheme but I'm still strungling with the code base.
Thanks,
Daniel
PATCH 2/4 qla2xxx: Fix endianness annotations in header files
In reply to Bart Van AsscheAnnotate 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.
--- drivers/scsi/qla2xxx/qla_dbg.h | 442 +++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 646 +++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 +++++++++++++++--------------- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_mr.h | 8 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_target.h | 208 ++++----- 8 files changed, 1063 insertions(+), 1063 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.h +221 -221
@@ -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,44 +223,44 @@ 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; -u64 addr; +__be32 size; +__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
@@ -273,28 +273,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;
@@ -369,7 +369,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 +323 -323
1,038 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_fw.h +369 -369
1,444 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +1 -1
@@ -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
@@ -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. */
Lines of this file are not shown. View the raw message.
drivers/scsi/qla2xxx/qla_nvme.h +23 -23
46 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_target.h +104 -104
208 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
Re: [PATCH 2/4] qla2xxx: Fix endianness annotations in header files
Hi Bart,
Quoted 13 lines · Bart Van Assche
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()andwritew()functions.readw()converts from__le16to u16 andwritew()converts from u16 to__le16.Cc Himanshu Madhani <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Daniel Wagner <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Quoted 10 lines
--- drivers/scsi/qla2xxx/qla_dbg.h | 442 +++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 646 +++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 +++++++++++++++--------------- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_mr.h | 8 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_target.h | 208 ++++----- 8 files changed, 1063 insertions(+), 1063 deletions(-)
I've tried to make sure the new variable type has correct length. I suspect our tooling will complain if the endian doesn't fit. Looks good.
Just one nitpick: Sometimes there is an additianol space added between the type and the variable name, e.g.
drivers/scsi/qla2xxx/qla_target.h struct abts_resp_from_24xx_fw { · line 641
Quoted 4 lines
drivers/scsi/qla2xxx/qla_target.h +2
-2-uint16_t nport_handle; -uint16_t reserved_1; +__le16 nport_handle; +__le16 reserved_1;
and as result the ovarall aligment in the context is not consistent anymore. Not how much we care about this.
Thanks,
Daniel
PATCH 3/4 qla2xxx: Fix endianness annotations in source files
In reply to Bart Van AsscheFix all endianness complaints reported by sparse (C=2).
--- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 90 +++++++++++++++---------------- drivers/scsi/qla2xxx/qla_init.c | 80 ++++++++++++++------------- drivers/scsi/qla2xxx/qla_iocb.c | 57 ++++++++++---------- drivers/scsi/qla2xxx/qla_isr.c | 85 ++++++++++++++--------------- drivers/scsi/qla2xxx/qla_mbx.c | 35 ++++++------ drivers/scsi/qla2xxx/qla_mr.c | 9 ++-- drivers/scsi/qla2xxx/qla_nvme.c | 8 +-- drivers/scsi/qla2xxx/qla_nx.c | 89 +++++++++++++++--------------- drivers/scsi/qla2xxx/qla_os.c | 24 ++++----- drivers/scsi/qla2xxx/qla_sup.c | 73 +++++++++++++------------ drivers/scsi/qla2xxx/qla_target.c | 74 ++++++++++++------------- drivers/scsi/qla2xxx/qla_tmpl.c | 4 +- 14 files changed, 319 insertions(+), 316 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +1 -2
@@ -207,10 +207,9 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj,/* Checksum NVRAM. */ if (IS_FWI2_CAPABLE (ha)) { -uint32_t *iter; +__le32 *iter = (__force __le32 *)buf;uint32_t chksum; - iter = (uint32_t *)buf; chksum =0 ;for (cnt =0 ; cnt < ((count >>2 ) -1 ); cnt++, iter++) chksum +=le32_to_cpu (*iter);
drivers/scsi/qla2xxx/qla_bsg.c +2 -2
@@ -490,7 +490,7 @@ qla2x00_process_ct(struct bsg_job *bsg_job) >> 24;switch (loop_id) {case 0xFC : - loop_id =cpu_to_le16 (NPH_SNS ); + loop_id =NPH_SNS ;break ;case 0xFA : loop_id = vha->mgmt_svr_loop_id;
@@ -2042,7 +2042,7 @@ qlafx00_mgmt_cmd(struct bsg_job *bsg_job)/* Initialize all required fields of fcport */ fcport->vha = vha; - fcport->loop_id = piocb_rqst->dataword; + fcport->loop_id =le32_to_cpu (piocb_rqst->dataword); sp->type =SRB_FXIOCB_BCMD ; sp->name ="bsg_fx_mgmt" ;
drivers/scsi/qla2xxx/qla_dbg.c +45 -45
251 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +42 -38
281 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +29 -28
168 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +41 -44
251 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mbx.c +17 -18
@@ -208,11 +208,11 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)/* Load mailbox registers. */ if (IS_P3P_TYPE (ha)) - optr = (uint16_t __iomem *)®->isp82.mailbox_in[0 ]; + optr = ®->isp82.mailbox_in[0 ];else if (IS_FWI2_CAPABLE (ha) && !(IS_P3P_TYPE (ha))) - optr = (uint16_t __iomem *)®->isp24.mailbox0; + optr = ®->isp24.mailbox0;else - optr = (uint16_t __iomem *)MAILBOX_REG (ha, ®->isp,0 ); + optr =MAILBOX_REG (ha, ®->isp,0 ); iptr = mcp->mb; command = mcp->mb[0 ];
@@ -222,8 +222,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) "Mailbox registers (OUT):\n");for (cnt =0 ; cnt < ha->mbx_count; cnt++) {if (IS_QLA2200 (ha) && cnt ==8 ) - optr = - (uint16_t __iomem *)MAILBOX_REG (ha, ®->isp,8 ); + optr =MAILBOX_REG (ha, ®->isp,8 );if (mboxes &BIT_0 ) {ql_dbg (ql_dbg_mbx, vha,0x1112 ,"mbox[%d]<-0x%04x\n" , cnt, *iptr);
@@ -3110,8 +3109,8 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats, mc.mb[6 ] =MSW (MSD (stats_dma)); mc.mb[7 ] =LSW (MSD (stats_dma)); mc.mb[8 ] = dwords; - mc.mb[9 ] =cpu_to_le16 (vha->vp_idx); - mc.mb[10 ] =cpu_to_le16 (options); + mc.mb[9 ] = vha->vp_idx; + mc.mb[10 ] = options; rval =qla24xx_send_mb_cmd (vha, &mc);
@@ -3204,7 +3203,7 @@ qla24xx_abort_command(srb_t *sp)ql_dbg (ql_dbg_mbx, vha,0x1090 ,"Failed to complete IOCB -- completion status (%x).\n" ,le16_to_cpu (abt->nport_handle)); -if (abt->nport_handle ==CS_IOCB_ERROR ) +if (abt->nport_handle ==cpu_to_le16 (CS_IOCB_ERROR )) rval =QLA_FUNCTION_PARAMETER_ERROR ;else rval =QLA_FUNCTION_FAILED ;
@@ -4727,7 +4726,7 @@ qla82xx_set_driver_version(scsi_qla_host_t *vha, char *version)mbx_cmd_t *mcp = &mc;int i;int len; -uint16_t *str; +__le16 *str;struct qla_hw_data *ha = vha->hw;if (!IS_P3P_TYPE (ha))
@@ -4743,7 +4742,7 @@ qla82xx_set_driver_version(scsi_qla_host_t *vha, char *version) mcp->mb[1 ] =RNID_TYPE_SET_VERSION <<8 ; mcp->out_mb =MBX_1 |MBX_0 ;for (i =4 ; i <16 && len; i++, str++, len -=2 ) { - mcp->mb[i] =cpu_to_le16p (str); + mcp->mb[i] =le16_to_cpup (str); mcp->out_mb |=1 <<i; }for (; i <16 ; i++) {
@@ -4861,7 +4860,7 @@ qla24xx_get_port_login_templ(scsi_qla_host_t *vha, dma_addr_t buf_dma, "Done %s.\n", __func__); bp = (uint32_t *) buf;for (i =0 ; i < (bufsiz-4 )/4 ; i++, bp++) - *bp =le32_to_cpu (*bp); + *bp =le32_to_cpu ((__force __le32)*bp); }return rval;
@@ -6472,13 +6471,13 @@ int qla24xx_gpdb_wait(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt)memset (&mc,0 ,sizeof (mc)); mc.mb[0 ] =MBC_GET_PORT_DATABASE ; - mc.mb[1 ] =cpu_to_le16 (fcport->loop_id); + mc.mb[1 ] = fcport->loop_id; mc.mb[2 ] =MSW (pd_dma); mc.mb[3 ] =LSW (pd_dma); mc.mb[6 ] =MSW (MSD (pd_dma)); mc.mb[7 ] =LSW (MSD (pd_dma)); - mc.mb[9 ] =cpu_to_le16 (vha->vp_idx); - mc.mb[10 ] =cpu_to_le16 ((uint16_t )opt); + mc.mb[9 ] = vha->vp_idx; + mc.mb[10 ] = opt; rval =qla24xx_send_mb_cmd (vha, &mc);if (rval !=QLA_SUCCESS ) {
@@ -6589,7 +6588,7 @@ int qla24xx_gidlist_wait(struct scsi_qla_host *vha, mc.mb[6 ] =MSW (MSD (id_list_dma)); mc.mb[7 ] =LSW (MSD (id_list_dma)); mc.mb[8 ] =0 ; - mc.mb[9 ] =cpu_to_le16 (vha->vp_idx); + mc.mb[9 ] = vha->vp_idx; rval =qla24xx_send_mb_cmd (vha, &mc);if (rval !=QLA_SUCCESS ) {
@@ -6615,8 +6614,8 @@ int qla27xx_set_zio_threshold(scsi_qla_host_t *vha, uint16_t value)memset (mcp->mb,0 ,sizeof (mcp->mb)); mcp->mb[0 ] =MBC_GET_SET_ZIO_THRESHOLD ; - mcp->mb[1 ] =cpu_to_le16 (1 ); - mcp->mb[2 ] =cpu_to_le16 (value); + mcp->mb[1 ] =1 ; + mcp->mb[2 ] = value; mcp->out_mb =MBX_2 |MBX_1 |MBX_0 ; mcp->in_mb =MBX_2 |MBX_0 ; mcp->tov =MBX_TOV_SECONDS ;
@@ -6641,7 +6640,7 @@ int qla27xx_get_zio_threshold(scsi_qla_host_t *vha, uint16_t *value)memset (mcp->mb,0 ,sizeof (mcp->mb)); mcp->mb[0 ] =MBC_GET_SET_ZIO_THRESHOLD ; - mcp->mb[1 ] =cpu_to_le16 (0 ); + mcp->mb[1 ] =0 ; mcp->out_mb =MBX_1 |MBX_0 ; mcp->in_mb =MBX_2 |MBX_0 ; mcp->tov =MBX_TOV_SECONDS ;
drivers/scsi/qla2xxx/qla_mr.c +4 -5
@@ -3205,7 +3205,7 @@ qlafx00_tm_iocb(srb_t *sp, struct tsk_mgmt_entry_fx00 *ptm_iocb)memset (&tm_iocb,0 ,sizeof (struct tsk_mgmt_entry_fx00 )); tm_iocb.entry_type =TSK_MGMT_IOCB_TYPE_FX00 ; tm_iocb.entry_count =1 ; - tm_iocb.handle =cpu_to_le32 (make_handle (req->id, sp->handle)); + tm_iocb.handle =make_handle (req->id, sp->handle); tm_iocb.reserved_0 =0 ; tm_iocb.tgt_id =cpu_to_le16 (sp->fcport->tgt_id); tm_iocb.control_flags =cpu_to_le32 (fxio->u.tmf.flags);
@@ -3231,9 +3231,8 @@ qlafx00_abort_iocb(srb_t *sp, struct abort_iocb_entry_fx00 *pabt_iocb)memset (&abt_iocb,0 ,sizeof (struct abort_iocb_entry_fx00 )); abt_iocb.entry_type =ABORT_IOCB_TYPE_FX00 ; abt_iocb.entry_count =1 ; - abt_iocb.handle =cpu_to_le32 (make_handle (req->id, sp->handle)); - abt_iocb.abort_handle = -cpu_to_le32 (make_handle (req->id, fxio->u.abt.cmd_hndl)); + abt_iocb.handle =make_handle (req->id, sp->handle); + abt_iocb.abort_handle =make_handle (req->id, fxio->u.abt.cmd_hndl); abt_iocb.tgt_id_sts =cpu_to_le16 (sp->fcport->tgt_id); abt_iocb.req_que_no =cpu_to_le16 (req->id);
@@ -3254,7 +3253,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)memset (&fx_iocb,0 ,sizeof (struct fxdisc_entry_fx00 )); fx_iocb.entry_type =FX00_IOCB_TYPE ; - fx_iocb.handle =cpu_to_le32 (sp->handle); + fx_iocb.handle = sp->handle; fx_iocb.entry_count = entry_cnt;if (sp->type ==SRB_FXIOCB_DCMD ) {
drivers/scsi/qla2xxx/qla_nvme.c +4 -4
@@ -138,7 +138,7 @@ static void qla_nvme_release_fcp_cmd_kref(struct kref *kref) priv->sp =NULL ; sp->priv =NULL ;if (priv->comp_status ==QLA_SUCCESS ) { - fd->rcv_rsplen = nvme->u.nvme.rsp_pyld_len; + fd->rcv_rsplen =le16_to_cpu (nvme->u.nvme.rsp_pyld_len); }else { fd->rcv_rsplen =0 ; fd->transferred_length =0 ;
@@ -426,11 +426,11 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)/* No data transfer how do we check buffer len == 0?? */ if (fd->io_dir ==NVMEFC_FCP_READ ) { - cmd_pkt->control_flags =CF_READ_DATA ; + cmd_pkt->control_flags =cpu_to_le16 (CF_READ_DATA ); vha->qla_stats.input_bytes += fd->payload_length; vha->qla_stats.input_requests++; }else if (fd->io_dir ==NVMEFC_FCP_WRITE ) { - cmd_pkt->control_flags =CF_WRITE_DATA ; + cmd_pkt->control_flags =cpu_to_le16 (CF_WRITE_DATA );if ((vha->flags.nvme_first_burst) && (sp->fcport->nvme_prli_service_param &NVME_PRLI_SP_FIRST_BURST )) {
@@ -438,7 +438,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) sp->fcport->nvme_first_burst_size) || (sp->fcport->nvme_first_burst_size == 0)) cmd_pkt->control_flags |= -CF_NVME_FIRST_BURST_ENABLE ; +cpu_to_le16 (CF_NVME_FIRST_BURST_ENABLE ); } vha->qla_stats.output_bytes += fd->payload_length; vha->qla_stats.output_requests++;
drivers/scsi/qla2xxx/qla_nx.c +45 -44
270 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_os.c +12 -12
@@ -5974,7 +5974,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) rsp_els->entry_status =0 ; rsp_els->handle =0 ; rsp_els->nport_handle = purex->nport_handle; - rsp_els->tx_dsd_count =1 ; + rsp_els->tx_dsd_count =cpu_to_le16 (1 ); rsp_els->vp_index = purex->vp_idx; rsp_els->sof_type =EST_SOFI3 ; rsp_els->rx_xchg_address = purex->rx_xchg_addr;
@@ -5985,7 +5985,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) rsp_els->d_id[1 ] = purex->s_id[1 ]; rsp_els->d_id[2 ] = purex->s_id[2 ]; - rsp_els->control_flags =EPD_ELS_ACC ; + rsp_els->control_flags =cpu_to_le16 (EPD_ELS_ACC ); rsp_els->rx_byte_count =0 ; rsp_els->tx_byte_count =cpu_to_le32 (rsp_payload_length);
@@ -5997,8 +5997,8 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)/* Prepare Response Payload */ rsp_payload->hdr.cmd =cpu_to_be32 (0x2 <<24 );/* LS_ACC */ - rsp_payload->hdr.len =cpu_to_be32 ( - rsp_els->tx_byte_count -sizeof (rsp_payload->hdr)); + rsp_payload->hdr.len =cpu_to_be32 (le32_to_cpu (rsp_els->tx_byte_count) - +sizeof (rsp_payload->hdr));/* Link service Request Info Descriptor */ rsp_payload->ls_req_info_desc.desc_tag =cpu_to_be32 (0x1 );
@@ -6048,7 +6048,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)memset (sfp,0 ,SFP_RTDI_LEN ); rval =qla2x00_read_sfp (vha, sfp_dma, sfp,0xa2 ,0x60 ,10 ,0 );if (!rval) { -uint16_t *trx = (void *)sfp;/* already be16 */ +__be16 *trx = (__force __be16 *)sfp;/* already be16 */ rsp_payload->sfp_diag_desc.temperature = trx[0 ]; rsp_payload->sfp_diag_desc.vcc = trx[1 ]; rsp_payload->sfp_diag_desc.tx_bias = trx[2 ];
@@ -6075,17 +6075,17 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt) rval =qla24xx_get_isp_stats (vha, stat, stat_dma,0 );if (!rval) { rsp_payload->ls_err_desc.link_fail_cnt = -cpu_to_be32 (stat->link_fail_cnt); +cpu_to_be32 (le32_to_cpu (stat->link_fail_cnt)); rsp_payload->ls_err_desc.loss_sync_cnt = -cpu_to_be32 (stat->loss_sync_cnt); +cpu_to_be32 (le32_to_cpu (stat->loss_sync_cnt)); rsp_payload->ls_err_desc.loss_sig_cnt = -cpu_to_be32 (stat->loss_sig_cnt); +cpu_to_be32 (le32_to_cpu (stat->loss_sig_cnt)); rsp_payload->ls_err_desc.prim_seq_err_cnt = -cpu_to_be32 (stat->prim_seq_err_cnt); +cpu_to_be32 (le32_to_cpu (stat->prim_seq_err_cnt)); rsp_payload->ls_err_desc.inval_xmit_word_cnt = -cpu_to_be32 (stat->inval_xmit_word_cnt); +cpu_to_be32 (le32_to_cpu (stat->inval_xmit_word_cnt)); rsp_payload->ls_err_desc.inval_crc_cnt = -cpu_to_be32 (stat->inval_crc_cnt); +cpu_to_be32 (le32_to_cpu (stat->inval_crc_cnt)); rsp_payload->ls_err_desc.pn_port_phy_type |=BIT_6 ; } }
@@ -6157,7 +6157,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)memset (sfp,0 ,SFP_RTDI_LEN ); rval =qla2x00_read_sfp (vha, sfp_dma, sfp,0xa2 ,0 ,64 ,0 );if (!rval) { -uint16_t *trx = (void *)sfp;/* already be16 */ +__be16 *trx = (__force __be16 *)sfp;/* already be16 */ /* Optical Element Descriptor, Temperature */ rsp_payload->optical_elmt_desc[0 ].high_alarm = trx[0 ];
drivers/scsi/qla2xxx/qla_sup.c +38 -35
255 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_target.c +37 -37
233 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_tmpl.c +2 -2
@@ -895,9 +895,9 @@ qla27xx_firmware_info(struct scsi_qla_host *vha, tmp->firmware_version[0 ] = vha->hw->fw_major_version; tmp->firmware_version[1 ] = vha->hw->fw_minor_version; tmp->firmware_version[2 ] = vha->hw->fw_subminor_version; - tmp->firmware_version[3 ] =cpu_to_le32 ( + tmp->firmware_version[3 ] = (__force u32 )cpu_to_le32 ( vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes); - tmp->firmware_version[4 ] =cpu_to_le32 ( + tmp->firmware_version[4 ] = (__force u32 )cpu_to_le32 ( vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]); }
Re: [PATCH 3/4] qla2xxx: Fix endianness annotations in source files
Quoted 1 line · Bart Van Assche
Fix all endianness complaints reported by sparse (C=2).
[...]
Quoted 15 lines
int
drivers/scsi/qla2xxx/qla_dbg.c +3
-3-qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, - uint32_t ram_dwords, void **nxt) +qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram, + uint32_t ram_dwords, void **nxt) { int rval = QLA_FUNCTION_FAILED;struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;dma_addr_t dump_dma = ha->gid_list_dma; -uint32_t *chunk = (void *)ha->gid_list; +uint32_t *chunk = (uint32_t *)ha->gid_list;uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ;
drivers/scsi/qla2xxx/qla_dbg.c qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, · line 257
Quoted 9 lines
drivers/scsi/qla2xxx/qla_dbg.c +3
-3@@ -252,9 +252,9 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,return rval; }for (j =0 ; j < dwords; j++) { - ram[i + j] = - (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? - chunk[j] :swab32 (chunk[j]); + ram[i + j] = (__force __be32) + ((IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? + chunk[j] :swab32 (chunk[j]));
Isn't this assuming the host runs in little endian mode? Because later down...
Quoted 48 lines
drivers/scsi/qla2xxx/qla_dbg.c +7
-7} }@@ -263,8 +263,8 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, }static int -qla24xx_dump_memory (struct qla_hw_data *ha,uint32_t *code_ram, -uint32_t cram_size,void **nxt) +qla24xx_dump_memory (struct qla_hw_data *ha,__be32 *code_ram, +uint32_t cram_size,void **nxt) {int rval;@@ -284,11 +284,11 @@ qla24xx_dump_memory(struct qla_hw_data *ha, uint32_t *code_ram,return rval; } -static uint32_t * +static __be32 *qla24xx_read_window (struct device_reg_24xx __iomem *reg,uint32_t iobase, -uint32_t count,uint32_t *buf) +uint32_t count,__be32 *buf) { -uint32_t __iomem *dmp_reg; +__le32 __iomem *dmp_reg;WRT_REG_DWORD (®->iobase_addr, iobase); dmp_reg = ®->iobase_window;@@ -366,7 +366,7 @@ qla24xx_soft_reset(struct qla_hw_data *ha) }static int -qla2xxx_dump_ram (struct qla_hw_data *ha,uint32_t addr,uint16_t *ram, +qla2xxx_dump_ram (struct qla_hw_data *ha,uint32_t addr,__be16 *ram,uint32_t ram_words,void **nxt) {int rval;@@ -374,7 +374,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,uint16_t mb0;struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;dma_addr_t dump_dma = ha->gid_list_dma; -uint16_t *dump = (uint16_t *)ha->gid_list; +__le16 *dump = (__force __le16 *)ha->gid_list; rval =QLA_SUCCESS ; mb0 =0 ;
drivers/scsi/qla2xxx/qla_dbg.c qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, · line 442
Quoted 5 lines
drivers/scsi/qla2xxx/qla_dbg.c +1
-1@@ -439,7 +439,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,if (test_and_clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags)) { rval = mb0 &MBS_MASK ;for (idx =0 ; idx < words; idx++) - ram[cnt + idx] =swab16 (dump[idx]); + ram[cnt + idx] =cpu_to_be16 (le16_to_cpu (dump[idx]));
... cpu_to_be16() is used.
Quoted 20 lines
drivers/scsi/qla2xxx/qla_init.c +2
-2@@ -7705,7 +7707,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,ql_dbg (ql_dbg_init, vha,0x008b ,"FW: Loading firmware from flash (%x).\n" , faddr); - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring;qla24xx_read_flash_data (vha, dcode, faddr,8 );if (qla24xx_risc_firmware_invalid (dcode)) { ql_log(ql_log_fatal, vha, 0x008c,@@ -7718,18 +7720,18 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,return QLA_FUNCTION_FAILED ; } - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring; *srisc_addr =0 ; segments =FA_RISC_CODE_SEGMENTS ;for (j =0 ; j < segments; j++) {ql_dbg (ql_dbg_init, vha,0x008d ,"-> Loading segment %u...\n" , j);
drivers/scsi/qla2xxx/qla_init.c qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, · line 7735
Quoted 10 lines
drivers/scsi/qla2xxx/qla_init.c +3
-3qla24xx_read_flash_data (vha, dcode, faddr,10 ); - risc_addr =be32_to_cpu (dcode[2 ]); - risc_size =be32_to_cpu (dcode[3 ]); + risc_addr =swab32 (dcode[2 ]); + risc_size =swab32 (dcode[3 ]);if (!*srisc_addr) { *srisc_addr = risc_addr; - risc_attr =be32_to_cpu (dcode[9 ]); + risc_attr =swab32 (dcode[9 ]); }
also here, this looks like hardcoded endianess.
drivers/scsi/qla2xxx/qla_init.c qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, · line 7777
Quoted 9 lines
drivers/scsi/qla2xxx/qla_init.c +2
-2@@ -7769,9 +7772,9 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, fwdt->template =NULL ; fwdt->length =0 ; - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring;qla24xx_read_flash_data (vha, dcode, faddr,7 ); - risc_size =be32_to_cpu (dcode[2 ]); + risc_size =swab32 (dcode[2 ]);
dito.
Quoted 23 lines
drivers/scsi/qla2xxx/qla_init.c +3
-2ql_dbg (ql_dbg_init, vha,0x0161 ,"-> fwdt%u template array at %#x (%#x dwords)\n" , j, faddr, risc_size);@@ -7840,7 +7843,8 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) {int rval;int i, fragment; -uint16_t *wcode, *fwcode; +uint16_t *wcode; +__be16 *fwcode;uint32_t risc_addr, risc_size, fwclen, wlen, *seg;struct fw_blob *blob;struct qla_hw_data *ha = vha->hw;@@ -7860,7 +7864,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) wcode = (uint16_t *)req->ring; *srisc_addr =0 ; - fwcode = (uint16_t *)blob->fw->data; + fwcode = (__force __be16 *)blob->fw->data; fwclen =0 ;/* Validate firmware image by checking version. */
drivers/scsi/qla2xxx/qla_init.c qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) · line 7915
Quoted 5 lines
drivers/scsi/qla2xxx/qla_init.c +1
-1@@ -7908,7 +7912,7 @@ qla2x00_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr) "words 0x%x.\n", risc_addr, wlen);for (i =0 ; i < wlen; i++) - wcode[i] =swab16 (fwcode[i]); + wcode[i] =swab16 ((__force u32 )fwcode[i]);
dito.
Quoted 10 lines
drivers/scsi/qla2xxx/qla_iocb.c +1
-1@@ -3216,7 +3217,7 @@ qla82xx_start_scsi(srb_t *sp)uint16_t tot_dsds;struct device_reg_82xx __iomem *reg;uint32_t dbval; -uint32_t *fcp_dl; +__be32 *fcp_dl;uint8_t additional_cdb_len;struct ct6_dsd *ctx;struct scsi_qla_host *vha = sp->vha;
drivers/scsi/qla2xxx/qla_iocb.c qla82xx_start_scsi(srb_t *sp) · line 3403
Quoted 6 lines
drivers/scsi/qla2xxx/qla_iocb.c +1
-1@@ -3398,7 +3399,7 @@ qla82xx_start_scsi(srb_t *sp)memcpy (ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len); - fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb +16 + + fcp_dl = (void *)(ctx->fcp_cmnd->cdb +16 + additional_cdb_len);
Shouldn't this be (__be32*)?
drivers/scsi/qla2xxx/qla_iocb.c qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf) · line 3546
Quoted 13 lines
drivers/scsi/qla2xxx/qla_iocb.c +1
-1*fcp_dl =htonl ((uint32_t )scsi_bufflen (cmd));@@ -3537,7 +3540,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf) }for (i =0 ; i <4 ; i++) - ha->gold_fw_version[i] =be32_to_cpu (dcode[4 +i]); + ha->gold_fw_version[i] =swab32 (dcode[4 +i]);return ret; }
Here again why the swab32() call.
Thanks,
Daniel
/me brain hurts now
Re: [PATCH 3/4] qla2xxx: Fix endianness annotations in source files
Quoted 23 lines · Daniel Wagner
Quoted 1 line · Bart Van Assche
Fix all endianness complaints reported by sparse (C=2).
[...]
Quoted 18 lines
int
drivers/scsi/qla2xxx/qla_dbg.c +3
-3-qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, - uint32_t ram_dwords, void **nxt) +qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram, + uint32_t ram_dwords, void **nxt) { int rval = QLA_FUNCTION_FAILED;struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;dma_addr_t dump_dma = ha->gid_list_dma; -uint32_t *chunk = (void *)ha->gid_list; +uint32_t *chunk = (uint32_t *)ha->gid_list;uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ;@@ -252,9 +252,9 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,return rval; }for (j =0 ; j < dwords; j++) {
Quoted 8 lines
drivers/scsi/qla2xxx/qla_dbg.c qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, · line 257
Quoted 6 lines
drivers/scsi/qla2xxx/qla_dbg.c +3
-3- ram[i + j] = - (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? - chunk[j] :swab32 (chunk[j]); + ram[i + j] = (__force __be32) + ((IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? + chunk[j] :swab32 (chunk[j]));Isn't this assuming the host runs in little endian mode? Because later down...
My goal was not to change the behavior of the code on x86. Bugs on big endian systems can be fixed later on (my guess is that this driver does not work reliably on big endian), and searching through the code for __force casts probably provides some good starting points.
Quoted 8 lines
drivers/scsi/qla2xxx/qla_dbg.c qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, · line 442
Quoted 6 lines
drivers/scsi/qla2xxx/qla_dbg.c +1
-1@@ -439,7 +439,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,if (test_and_clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags)) { rval = mb0 &MBS_MASK ;for (idx =0 ; idx < words; idx++) - ram[cnt + idx] =swab16 (dump[idx]); + ram[cnt + idx] =cpu_to_be16 (le16_to_cpu (dump[idx]));...
cpu_to_be16()is used.
The above code implements swab16() but without triggering sparse endianness warnings.
Quoted 7 lines
Quoted 5 lines
drivers/scsi/qla2xxx/qla_init.c +1
-1if (!*srisc_addr) { *srisc_addr = risc_addr; - risc_attr =be32_to_cpu (dcode[9 ]); + risc_attr =swab32 (dcode[9 ]);}
also here, this looks like hardcoded endianess.
It was not clear to me whether the purpose of the code was to convert from __be32 to CPU endianness or from __be32 to __le32.
Quoted 9 lines
drivers/scsi/qla2xxx/qla_iocb.c qla82xx_start_scsi(srb_t *sp) · line 3403
Quoted 7 lines
drivers/scsi/qla2xxx/qla_iocb.c +1
-1@@ -3398,7 +3399,7 @@ qla82xx_start_scsi(srb_t *sp)memcpy (ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len); - fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb +16 + + fcp_dl = (void *)(ctx->fcp_cmnd->cdb +16 + additional_cdb_len);Shouldn't this be (__be32*)?
Good catch. I will change the cast.
Quoted 11 lines
drivers/scsi/qla2xxx/qla_sup.c qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf) · line 3546
Quoted 9 lines
drivers/scsi/qla2xxx/qla_sup.c +1
-1@@ -3537,7 +3540,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf) }for (i =0 ; i <4 ; i++) - ha->gold_fw_version[i] =be32_to_cpu (dcode[4 +i]); + ha->gold_fw_version[i] =swab32 (dcode[4 +i]);return ret; }Here again why the
swab32()call.
I will restore the be32_to_cpu() call.
Bart.
Re: [PATCH 3/4] qla2xxx: Fix endianness annotations in source files
Quoted 33 lines · Bart Van Assche
Quoted 23 lines · Daniel Wagner
Quoted 1 line · Bart Van Assche
Fix all endianness complaints reported by sparse (C=2).
[...]
Quoted 18 lines
int
drivers/scsi/qla2xxx/qla_dbg.c +3
-3-qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, - uint32_t ram_dwords, void **nxt) +qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram, + uint32_t ram_dwords, void **nxt) { int rval = QLA_FUNCTION_FAILED;struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;dma_addr_t dump_dma = ha->gid_list_dma; -uint32_t *chunk = (void *)ha->gid_list; +uint32_t *chunk = (uint32_t *)ha->gid_list;uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ;@@ -252,9 +252,9 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,return rval; }for (j =0 ; j < dwords; j++) {Quoted 8 lines
drivers/scsi/qla2xxx/qla_dbg.c qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, · line 257
Quoted 6 lines
drivers/scsi/qla2xxx/qla_dbg.c +3
-3- ram[i + j] = - (IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? - chunk[j] :swab32 (chunk[j]); + ram[i + j] = (__force __be32) + ((IS_QLA27XX (ha) ||IS_QLA28XX (ha)) ? + chunk[j] :swab32 (chunk[j]));Isn't this assuming the host runs in little endian mode? Because later down...
Quoted 4 lines
My goal was not to change the behavior of the code on x86. Bugs on big endian systems can be fixed later on (my guess is that this driver does not work reliably on big endian), and searching through the code for
__forcecasts probably provides some good starting points.
Got it. I was just a bit confused that you are going through the pain to fix many endianess problems and than leave these ones out. But you are right, we should fix them later and trying to avoid introducing regressions in this big patch.
Thans,
Daniel
Re: [PATCH 3/4] qla2xxx: Fix endianness annotations in source files
In reply to Bart Van AsscheHi Bart/Daniel,
On 3/3/20, 12:36 AM, "[email protected] on behalf of Bart Van Assche" <[email protected] on behalf of [email protected]> wrote:
On 2020-03-02 10:40, Daniel Wagner wrote:
> On Sun, Mar 01, 2020 at 07:30:22PM -0800, Bart Van Assche wrote:
>> Fix all endianness complaints reported by sparse (C=2).
>
> [...]
>
>> int
>> -qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,
>> - uint32_t ram_dwords, void **nxt)
>> +qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,
>> + uint32_t ram_dwords, void **nxt)
>> {
>> int rval = QLA_FUNCTION_FAILED;
>> struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
>> dma_addr_t dump_dma = ha->gid_list_dma;
>> - uint32_t *chunk = (void *)ha->gid_list;
>> + uint32_t *chunk = (uint32_t *)ha->gid_list;
>> uint32_t dwords = qla2x00_gid_list_size(ha) / 4;
>> uint32_t stat;
>> ulong i, j, timer = 6000000;
>> @@ -252,9 +252,9 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,
>> return rval;
>> }
>> for (j = 0; j < dwords; j++) {
>> - ram[i + j] =
>> - (IS_QLA27XX(ha) || IS_QLA28XX(ha)) ?
>> - chunk[j] : swab32(chunk[j]);
>> + ram[i + j] = (__force __be32)
>> + ((IS_QLA27XX(ha) || IS_QLA28XX(ha)) ?
>> + chunk[j] : swab32(chunk[j]));
>
> Isn't this assuming the host runs in little endian mode? Because later down...
My goal was not to change the behavior of the code on x86. Bugs on big
endian systems can be fixed later on (my guess is that this driver does
not work reliably on big endian), and searching through the code for
__force casts probably provides some good starting points.We had made sure driver works on big endian system and the reason these were not changed was to make sure it does not break big endian architecture. It's been a few years since I verified big endian compatibility with the driver, but I am hesitant to go change things without making sure it works on big endian systems. We are taking big risk of blindly changing things.
I'll ask our testing folks to test this out and see if we discover issue with these changes. Until then I'll hold off on Accepting changes.
Quoted 8 lines
drivers/scsi/qla2xxx/qla_dbg.c qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, · line 442
Quoted 6 lines
drivers/scsi/qla2xxx/qla_dbg.c +1
-1@@ -439,7 +439,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram,if (test_and_clear_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags)) { rval = mb0 &MBS_MASK ;for (idx =0 ; idx < words; idx++) - ram[cnt + idx] =swab16 (dump[idx]); + ram[cnt + idx] =cpu_to_be16 (le16_to_cpu (dump[idx]));...
cpu_to_be16()is used.
The above code implements swab16() but without triggering sparse
endianness warnings.
>> if (!*srisc_addr) {
>> *srisc_addr = risc_addr;
>> - risc_attr = be32_to_cpu(dcode[9]);
>> + risc_attr = swab32(dcode[9]);
>> }
>
> also here, this looks like hardcoded endianess.
It was not clear to me whether the purpose of the code was to convert
from __be32 to CPU endianness or from __be32 to __le32.
>> @@ -3398,7 +3399,7 @@ qla82xx_start_scsi(srb_t *sp)
>>
>> memcpy(ctx->fcp_cmnd->cdb, cmd->cmnd, cmd->cmd_len);
>>
>> - fcp_dl = (uint32_t *)(ctx->fcp_cmnd->cdb + 16 +
>> + fcp_dl = (void *)(ctx->fcp_cmnd->cdb + 16 +
>> additional_cdb_len);
>
> Shouldn't this be (__be32*)?
Good catch. I will change the cast.
>> @@ -3537,7 +3540,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)
>> }
>>
>> for (i = 0; i < 4; i++)
>> - ha->gold_fw_version[i] = be32_to_cpu(dcode[4+i]);
>> + ha->gold_fw_version[i] = swab32(dcode[4+i]);
>>
>> return ret;
>> }
>
> Here again why the swab32() call.
I will restore the be32_to_cpu() call.
Bart.Re: [PATCH 3/4] qla2xxx: Fix endianness annotations in source files
Quoted 4 lines · Himanshu Madhani
On 3/3/20, 12:36 AM, "[email protected] on behalf of Bart Van Assche" <[email protected] on behalf of [email protected]> wrote:
On 2020-03-02 10:40, Daniel Wagner wrote:
> Isn't this assuming the host runs in little endian mode? Because later down...
Quoted 8 lines
My goal was not to change the behavior of the code on x86. Bugs on big endian systems can be fixed later on (my guess is that this driver does not work reliably on big endian), and searching through the code for
__forcecasts probably provides some good starting points.We had made sure driver works on big endian system and the reason these were not changed was to make sure it does not break big endian architecture. It's been a few years since I verified big endian compatibility with the driver, but I am hesitant to go change things without making sure it works on big endian systems. We are taking big risk of blindly changing things.
I'll ask our testing folks to test this out and see if we discover issue with these changes. Until then I'll hold off on Accepting changes.
Thanks Himanshu for having offered to test this series. Please use v2 of this series as the basis for any tests.
Bart.
PATCH 4/4 qla2xxx: Fix the code that reads from mailbox registers
In reply to Bart Van AsscheMake the MMIO accessors stronly typed such that the compiler checks whether the accessor function is used that matches the register width. Fix those MMIO reads where another number of bits was read or written than the size of the register.
--- drivers/scsi/qla2xxx/qla_def.h | 53 +++++++++++++++++++++++++++------ drivers/scsi/qla2xxx/qla_init.c | 6 ++-- drivers/scsi/qla2xxx/qla_iocb.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 4 +-- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_mr.c | 26 ++++++++-------- drivers/scsi/qla2xxx/qla_nx.c | 4 +-- drivers/scsi/qla2xxx/qla_os.c | 2 +- 8 files changed, 67 insertions(+), 32 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +44 -9
@@ -128,15 +128,50 @@ static inline uint32_t make_handle(uint16_t x, uint16_t y)* I/O register */ -#define RD_REG_BYTE (addr) readb(addr) -#define RD_REG_WORD (addr) readw(addr) -#define RD_REG_DWORD (addr) readl(addr) -#define RD_REG_BYTE_RELAXED (addr) readb_relaxed(addr) -#define RD_REG_WORD_RELAXED (addr) readw_relaxed(addr) -#define RD_REG_DWORD_RELAXED (addr) readl_relaxed(addr) -#define WRT_REG_BYTE (addr, data) writeb(data, addr) -#define WRT_REG_WORD (addr, data) writew(data, addr) -#define WRT_REG_DWORD (addr, data) writel(data, addr) +static inline u8 RD_REG_BYTE (const volatile u8 __iomem *addr) +{ +return readb (addr); +} + +static inline u16 RD_REG_WORD (const volatile __le16 __iomem *addr) +{ +return readw (addr); +} + +static inline u32 RD_REG_DWORD (const volatile __le32 __iomem *addr) +{ +return readl (addr); +} + +static inline u8 RD_REG_BYTE_RELAXED (const volatile u8 __iomem *addr) +{ +return readb_relaxed (addr); +} + +static inline u16 RD_REG_WORD_RELAXED (const volatile __le16 __iomem *addr) +{ +return readw_relaxed (addr); +} + +static inline u32 RD_REG_DWORD_RELAXED (const volatile __le32 __iomem *addr) +{ +return readl_relaxed (addr); +} + +static inline void WRT_REG_BYTE (volatile u8 __iomem *addr,u8 data) +{ +return writeb (data, addr); +} + +static inline void WRT_REG_WORD (volatile __le16 __iomem *addr,u16 data) +{ +return writew (data, addr); +} + +static inline void WRT_REG_DWORD (volatile __le32 __iomem *addr,u32 data) +{ +return writel (data, addr); +}/* * ISP83XX specific remote register addresses
drivers/scsi/qla2xxx/qla_init.c +3 -3
@@ -2219,7 +2219,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)/* Check for secure flash support */ if (IS_QLA28XX (ha)) { -if (RD_REG_DWORD (®->mailbox12) &BIT_0 ) +if (RD_REG_WORD (®->mailbox12) &BIT_0 ) ha->flags.secure_adapter =1 ;ql_log (ql_log_info, vha,0xffff ,"Secure Adapter: %s\n" , (ha->flags.secure_adapter) ?"Yes" :"No" );
@@ -2780,7 +2780,7 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)ql_dbg (ql_dbg_init + ql_dbg_verbose, vha,0x017f ,"HCCR: 0x%x, MailBox0 Status 0x%x\n" ,RD_REG_DWORD (®->hccr), -RD_REG_DWORD (®->mailbox0)); +RD_REG_WORD (®->mailbox0));/* Wait for soft-reset to complete. */ RD_REG_DWORD (®->ctrl_status);
@@ -4096,7 +4096,7 @@ qla24xx_config_rings(struct scsi_qla_host *vha) }/* PCI posting */ -RD_REG_DWORD (&ioreg->hccr); +RD_REG_WORD (&ioreg->hccr); }/**
drivers/scsi/qla2xxx/qla_iocb.c +1 -1
@@ -2268,7 +2268,7 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp) IS_QLA28XX(ha)) cnt =RD_REG_DWORD (®->isp25mq.req_q_out); else if (IS_P3P_TYPE(ha)) - cnt =RD_REG_DWORD (®->isp82.req_q_out); + cnt =RD_REG_DWORD (reg->isp82.req_q_out); else if (IS_FWI2_CAPABLE(ha)) cnt =RD_REG_DWORD (®->isp24.req_q_out); else if (IS_QLAFX00(ha))
drivers/scsi/qla2xxx/qla_isr.c +2 -2
@@ -452,7 +452,7 @@ qla81xx_idc_event(scsi_qla_host_t *vha, uint16_t aen, uint16_t descr)int rval;struct device_reg_24xx __iomem *reg24 = &vha->hw->iobase->isp24;struct device_reg_82xx __iomem *reg82 = &vha->hw->iobase->isp82; -uint16_t __iomem *wptr; +__le16 __iomem *wptr;uint16_t cnt, timeout, mb[QLA_IDC_ACK_REGS ];/* Seed data -- mailbox1 -> mailbox7. */
@@ -3141,7 +3141,7 @@ qla24xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) {uint16_t cnt;uint32_t mboxes; -uint16_t __iomem *wptr; +__le16 __iomem *wptr;struct qla_hw_data *ha = vha->hw;struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;
drivers/scsi/qla2xxx/qla_mbx.c +1 -1
@@ -106,7 +106,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)uint8_t io_lock_on;uint16_t command =0 ;uint16_t *iptr; -uint16_t __iomem *optr; +__le16 __iomem *optr;uint32_t cnt;uint32_t mboxes;unsigned long wait_time;
drivers/scsi/qla2xxx/qla_mr.c +13 -13
@@ -46,7 +46,7 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)uint8_t io_lock_on;uint16_t command =0 ;uint32_t *iptr; -uint32_t __iomem *optr; +__le32 __iomem *optr;uint32_t cnt;uint32_t mboxes;unsigned long wait_time;
@@ -109,7 +109,7 @@ qlafx00_mailbox_command(scsi_qla_host_t *vha, struct mbx_cmd_32 *mcp)spin_lock_irqsave (&ha->hardware_lock, flags);/* Load mailbox registers. */ - optr = (uint32_t __iomem *)®->ispfx00.mailbox0; + optr = ®->ispfx00.mailbox0; iptr = mcp->mb; command = mcp->mb[0 ];
@@ -2846,13 +2846,13 @@ qlafx00_async_event(scsi_qla_host_t *vha)break ;default : - ha->aenmb[1 ] =RD_REG_WORD (®->aenmailbox1); - ha->aenmb[2 ] =RD_REG_WORD (®->aenmailbox2); - ha->aenmb[3 ] =RD_REG_WORD (®->aenmailbox3); - ha->aenmb[4 ] =RD_REG_WORD (®->aenmailbox4); - ha->aenmb[5 ] =RD_REG_WORD (®->aenmailbox5); - ha->aenmb[6 ] =RD_REG_WORD (®->aenmailbox6); - ha->aenmb[7 ] =RD_REG_WORD (®->aenmailbox7); + ha->aenmb[1 ] =RD_REG_DWORD (®->aenmailbox1); + ha->aenmb[2 ] =RD_REG_DWORD (®->aenmailbox2); + ha->aenmb[3 ] =RD_REG_DWORD (®->aenmailbox3); + ha->aenmb[4 ] =RD_REG_DWORD (®->aenmailbox4); + ha->aenmb[5 ] =RD_REG_DWORD (®->aenmailbox5); + ha->aenmb[6 ] =RD_REG_DWORD (®->aenmailbox6); + ha->aenmb[7 ] =RD_REG_DWORD (®->aenmailbox7); ql_dbg(ql_dbg_async, vha, 0x5078, "AEN:%04x %04x %04x %04x :%04x %04x %04x %04x\n", ha->aenmb[0], ha->aenmb[1], ha->aenmb[2], ha->aenmb[3],
@@ -2872,7 +2872,7 @@ static void qlafx00_mbx_completion(scsi_qla_host_t *vha, uint32_t mb0) {uint16_t cnt; -uint32_t __iomem *wptr; +__le32 __iomem *wptr;struct qla_hw_data *ha = vha->hw;struct device_reg_fx00 __iomem *reg = &ha->iobase->ispfx00;
@@ -2882,7 +2882,7 @@ qlafx00_mbx_completion(scsi_qla_host_t *vha, uint32_t mb0)/* Load return mailbox registers. */ ha->flags.mbox_int =1 ; ha->mailbox_out32[0 ] = mb0; - wptr = (uint32_t __iomem *)®->mailbox17; + wptr = ®->mailbox17;for (cnt =1 ; cnt < ha->mbx_count; cnt++) { ha->mailbox_out32[cnt] =RD_REG_DWORD (wptr);
@@ -2939,13 +2939,13 @@ qlafx00_intr_handler(int irq, void *dev_id)break ;if (stat &QLAFX00_INTR_MB_CMPLT ) { - mb[0 ] =RD_REG_WORD (®->mailbox16); + mb[0 ] =RD_REG_DWORD (®->mailbox16);qlafx00_mbx_completion (vha, mb[0 ]); status |=MBX_INTERRUPT ; clr_intr |=QLAFX00_INTR_MB_CMPLT ; }if (intr_stat &QLAFX00_INTR_ASYNC_CMPLT ) { - ha->aenmb[0 ] =RD_REG_WORD (®->aenmailbox0); + ha->aenmb[0 ] =RD_REG_DWORD (®->aenmailbox0);qlafx00_async_event (vha); clr_intr |=QLAFX00_INTR_ASYNC_CMPLT ; }
drivers/scsi/qla2xxx/qla_nx.c +2 -2
@@ -1997,11 +1997,11 @@ void qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) {uint16_t cnt; -uint16_t __iomem *wptr; +__le16 __iomem *wptr;struct qla_hw_data *ha = vha->hw;struct device_reg_82xx __iomem *reg = &ha->iobase->isp82; - wptr = (uint16_t __iomem *)®->mailbox_out[1 ]; + wptr = ®->mailbox_out[1 ];/* Load return mailbox registers. */ ha->flags.mbox_int =1 ;
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -7574,7 +7574,7 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev)spin_lock_irqsave (&ha->hardware_lock, flags);if (IS_QLA2100 (ha) ||IS_QLA2200 (ha)){ - stat =RD_REG_DWORD (®->hccr); + stat =RD_REG_WORD (®->hccr);if (stat &HCCR_RISC_PAUSE ) risc_paused =1 ; }else if (IS_QLA23XX (ha)) {
Re: [PATCH 4/4] qla2xxx: Fix the code that reads from mailbox registers
Hi Bart,
Quoted 33 lines · Bart Van Assche
Make the MMIO accessors stronly typed such that the compiler checks whether the accessor function is used that matches the register width. Fix those MMIO reads where another number of bits was read or written than the size of the register.
Cc Himanshu Madhani <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Daniel Wagner <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_def.h | 53 +++++++++++++++++++++++++++------ drivers/scsi/qla2xxx/qla_init.c | 6 ++-- drivers/scsi/qla2xxx/qla_iocb.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 4 +-- drivers/scsi/qla2xxx/qla_mbx.c | 2 +- drivers/scsi/qla2xxx/qla_mr.c | 26 ++++++++-------- drivers/scsi/qla2xxx/qla_nx.c | 4 +-- drivers/scsi/qla2xxx/qla_os.c | 2 +- 8 files changed, 67 insertions(+), 32 deletions(-)drivers/scsi/qla2xxx/qla_def.h +0
-3@@ -128,15 +128,50 @@ static inline uint32_t make_handle(uint16_t x, uint16_t y)* I/O register */ -#define RD_REG_BYTE (addr) readb(addr) -#define RD_REG_WORD (addr) readw(addr) -#define RD_REG_DWORD (addr) readl(addr)
drivers/scsi/qla2xxx/qla_def.h static inline uint32_t make_handle(uint16_t x, uint16_t y) · line 134
Quoted 10 lines
drivers/scsi/qla2xxx/qla_def.h +4
-6-#define RD_REG_BYTE_RELAXED (addr) readb_relaxed(addr) -#define RD_REG_WORD_RELAXED (addr) readw_relaxed(addr) -#define RD_REG_DWORD_RELAXED (addr) readl_relaxed(addr) -#define WRT_REG_BYTE (addr, data) writeb(data, addr) -#define WRT_REG_WORD (addr, data) writew(data, addr) -#define WRT_REG_DWORD (addr, data) writel(data, addr) +static inline u8 RD_REG_BYTE (const volatile u8 __iomem *addr) +{ +return readb (addr); +}
I would prefer lower case for the inline function names.
Thanks,
Daniel
Re: [PATCH 4/4] qla2xxx: Fix the code that reads from mailbox registers
Quoted 16 lines · Daniel Wagner
drivers/scsi/qla2xxx/qla_def.h static inline uint32_t make_handle(uint16_t x, uint16_t y) · line 134
Quoted 13 lines · Bart Van Assche
drivers/scsi/qla2xxx/qla_def.h +4
-9-#define RD_REG_BYTE (addr) readb(addr) -#define RD_REG_WORD (addr) readw(addr) -#define RD_REG_DWORD (addr) readl(addr) -#define RD_REG_BYTE_RELAXED (addr) readb_relaxed(addr) -#define RD_REG_WORD_RELAXED (addr) readw_relaxed(addr) -#define RD_REG_DWORD_RELAXED (addr) readl_relaxed(addr) -#define WRT_REG_BYTE (addr, data) writeb(data, addr) -#define WRT_REG_WORD (addr, data) writew(data, addr) -#define WRT_REG_DWORD (addr, data) writel(data, addr) +static inline u8 RD_REG_BYTE (const volatile u8 __iomem *addr) +{ +return readb (addr); +}I would prefer lower case for the inline function names.
How about doing that as a separate patch such that this patch can remain small and readable?
Thanks,
Bart.
Re: [PATCH 4/4] qla2xxx: Fix the code that reads from mailbox registers
Quoted 4 lines
Quoted 1 line
I would prefer lower case for the inline function names.
How about doing that as a separate patch such that this patch can remain small and readable?
Sure, fine with me.