Fix qla2xxx endianness annotations
Subsystems (2)
v3 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.
Changes compared to v2:
- Removed one BUILD_BUG_ON() statement.
Changes compared to v1:
- Left out the raw_smp_processor_id() patch because it may take time to achieve agreement about this patch.
- Added three patches to this series: two patches for verifying structure size at compile time and one patch for changing function names from upper case to lower case.
Bart Van Assche (6):
qla2xxx: Sort BUILD_BUG_ON() statements alphabetically
qla2xxx: Add more BUILD_BUG_ON() statements
qla2xxx: Fix endianness annotations in header files
qla2xxx: Fix endianness annotations in source files
qla2xxx: Fix the code that reads from mailbox registers
qla2xxx: Change {RD,WRT}_REG_*() function names from upper case into
lower case
drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 672 +++++++++++++------------- drivers/scsi/qla2xxx/qla_dbg.h | 442 ++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 711 ++++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 ++++++++++++++--------------- drivers/scsi/qla2xxx/qla_init.c | 279 +++++------ drivers/scsi/qla2xxx/qla_inline.h | 8 +- drivers/scsi/qla2xxx/qla_iocb.c | 121 ++--- drivers/scsi/qla2xxx/qla_isr.c | 217 +++++---- drivers/scsi/qla2xxx/qla_mbx.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.h | 32 +- drivers/scsi/qla2xxx/qla_nvme.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.c | 161 +++---- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_nx2.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 128 +++-- drivers/scsi/qla2xxx/qla_sup.c | 345 +++++++------- drivers/scsi/qla2xxx/qla_target.c | 84 ++-- drivers/scsi/qla2xxx/qla_target.h | 208 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 12 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 + 24 files changed, 2317 insertions(+), 2190 deletions(-)
PATCH v3 1/6 qla2xxx: Sort BUILD_BUG_ON() statements alphabetically
Before adding more BUILD_BUG_ON() statements, sort the existing statements alphabetically.
--- drivers/scsi/qla2xxx/qla_os.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +2 -2
@@ -7858,11 +7858,11 @@ qla2x00_module_init(void)BUILD_BUG_ON (sizeof (struct init_cb_24xx ) !=128 );BUILD_BUG_ON (sizeof (struct init_cb_81xx ) !=128 );BUILD_BUG_ON (sizeof (struct pt_ls4_request ) !=64 ); +BUILD_BUG_ON (sizeof (struct qla_flt_header ) !=8 ); +BUILD_BUG_ON (sizeof (struct qla_flt_region ) !=16 );BUILD_BUG_ON (sizeof (struct sns_cmd_pkt ) !=2064 );BUILD_BUG_ON (sizeof (struct verify_chip_entry_84xx ) !=64 );BUILD_BUG_ON (sizeof (struct vf_evfp_entry_24xx ) !=56 ); -BUILD_BUG_ON (sizeof (struct qla_flt_region ) !=16 ); -BUILD_BUG_ON (sizeof (struct qla_flt_header ) !=8 );/* Allocate cache for SRBs. */ srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
PATCH v3 2/6 qla2xxx: Add more BUILD_BUG_ON() statements
In reply to Bart Van AsscheBefore fixing the endianness annotations in data structures, make the compiler verify the size of FC protocol and firmware data structures.
--- drivers/scsi/qla2xxx/qla_os.c | 74 ++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 ++++++ 2 files changed, 88 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +74 -0
@@ -7838,31 +7838,105 @@ qla2x00_module_init(void) {int ret =0 ; +BUILD_BUG_ON (sizeof (cmd_a64_entry_t) !=64 );BUILD_BUG_ON (sizeof (cmd_entry_t) !=64 );BUILD_BUG_ON (sizeof (cont_a64_entry_t) !=64 );BUILD_BUG_ON (sizeof (cont_entry_t) !=64 );BUILD_BUG_ON (sizeof (init_cb_t) !=96 ); +BUILD_BUG_ON (sizeof (mrk_entry_t) !=64 );BUILD_BUG_ON (sizeof (ms_iocb_entry_t) !=64 );BUILD_BUG_ON (sizeof (request_t) !=64 ); +BUILD_BUG_ON (sizeof (struct abort_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct abort_iocb_entry_fx00 ) !=64 ); +BUILD_BUG_ON (sizeof (struct abts_entry_24xx ) !=64 );BUILD_BUG_ON (sizeof (struct access_chip_84xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct access_chip_84xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct access_chip_rsp_84xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct cmd_bidir ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_bidir ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_nvme ) !=64 ); +BUILD_BUG_ON (sizeof (struct cmd_nvme ) !=64 ); +BUILD_BUG_ON (sizeof (struct cmd_type_6 ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_type_6 ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_type_7 ) !=64 ); +BUILD_BUG_ON (sizeof (struct cmd_type_7 ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_type_7_fx00 ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_type_crc_2 ) !=64 ); +BUILD_BUG_ON (sizeof (struct cmd_type_crc_2 ) !=64 );BUILD_BUG_ON (sizeof (struct ct_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct ct_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct ct_fdmi1_hba_attributes ) !=2344 ); +BUILD_BUG_ON (sizeof (struct ct_fdmi2_hba_attributes ) !=4424 ); +BUILD_BUG_ON (sizeof (struct ct_fdmi2_port_attributes ) !=4164 ); +BUILD_BUG_ON (sizeof (struct ct_fdmi_hba_attr ) !=260 ); +BUILD_BUG_ON (sizeof (struct ct_fdmi_port_attr ) !=260 ); +BUILD_BUG_ON (sizeof (struct ct_rsp_hdr ) !=16 ); +BUILD_BUG_ON (sizeof (struct ct_sns_req ) !=4460 );BUILD_BUG_ON (sizeof (struct ctio_crc2_to_fw ) !=64 ); +BUILD_BUG_ON (sizeof (struct device_reg_24xx ) !=256 ); +BUILD_BUG_ON (sizeof (struct device_reg_25xxmq ) !=24 ); +BUILD_BUG_ON (sizeof (struct device_reg_2xxx ) !=256 ); +BUILD_BUG_ON (sizeof (struct device_reg_82xx ) !=1288 ); +BUILD_BUG_ON (sizeof (struct device_reg_fx00 ) !=216 ); +BUILD_BUG_ON (sizeof (struct els_entry_24xx ) !=64 );BUILD_BUG_ON (sizeof (struct els_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct els_sts_entry_24xx ) !=64 );BUILD_BUG_ON (sizeof (struct fxdisc_entry_fx00 ) !=64 ); +BUILD_BUG_ON (sizeof (struct fxdisc_entry_fx00 ) !=64 ); +BUILD_BUG_ON (sizeof (struct imm_ntfy_from_isp ) !=64 );BUILD_BUG_ON (sizeof (struct init_cb_24xx ) !=128 );BUILD_BUG_ON (sizeof (struct init_cb_81xx ) !=128 ); +BUILD_BUG_ON (sizeof (struct init_cb_81xx ) !=128 ); +BUILD_BUG_ON (sizeof (struct logio_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct mbx_entry ) !=64 ); +BUILD_BUG_ON (sizeof (struct mid_init_cb_24xx ) !=5252 ); +BUILD_BUG_ON (sizeof (struct mrk_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvram_24xx ) !=512 ); +BUILD_BUG_ON (sizeof (struct nvram_81xx ) !=512 );BUILD_BUG_ON (sizeof (struct pt_ls4_request ) !=64 ); +BUILD_BUG_ON (sizeof (struct pt_ls4_rx_unsol ) !=64 ); +BUILD_BUG_ON (sizeof (struct purex_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct qla2100_fw_dump ) !=123634 ); +BUILD_BUG_ON (sizeof (struct qla2300_fw_dump ) !=136100 ); +BUILD_BUG_ON (sizeof (struct qla24xx_fw_dump ) !=37976 ); +BUILD_BUG_ON (sizeof (struct qla25xx_fw_dump ) !=39228 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_fce_chain ) !=52 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_fw_dump ) !=136172 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_mq_chain ) !=524 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_mqueue_chain ) !=8 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_mqueue_header ) !=12 ); +BUILD_BUG_ON (sizeof (struct qla2xxx_offld_chain ) !=24 ); +BUILD_BUG_ON (sizeof (struct qla81xx_fw_dump ) !=39420 ); +BUILD_BUG_ON (sizeof (struct qla82xx_uri_data_desc ) !=28 ); +BUILD_BUG_ON (sizeof (struct qla82xx_uri_table_desc ) !=32 ); +BUILD_BUG_ON (sizeof (struct qla83xx_fw_dump ) !=51196 ); +BUILD_BUG_ON (sizeof (struct qla_fdt_layout ) !=128 );BUILD_BUG_ON (sizeof (struct qla_flt_header ) !=8 ); +BUILD_BUG_ON (sizeof (struct qla_flt_header ) !=8 ); +BUILD_BUG_ON (sizeof (struct qla_flt_region ) !=16 );BUILD_BUG_ON (sizeof (struct qla_flt_region ) !=16 ); +BUILD_BUG_ON (sizeof (struct qla_npiv_entry ) !=24 ); +BUILD_BUG_ON (sizeof (struct qla_npiv_header ) !=16 ); +BUILD_BUG_ON (sizeof (struct rdp_rsp_payload ) !=336 );BUILD_BUG_ON (sizeof (struct sns_cmd_pkt ) !=2064 ); +BUILD_BUG_ON (sizeof (struct sns_cmd_pkt ) !=2064 ); +BUILD_BUG_ON (sizeof (struct sts_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct tsk_mgmt_entry ) !=64 ); +BUILD_BUG_ON (sizeof (struct tsk_mgmt_entry_fx00 ) !=64 ); +BUILD_BUG_ON (sizeof (struct verify_chip_entry_84xx ) !=64 );BUILD_BUG_ON (sizeof (struct verify_chip_entry_84xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct verify_chip_rsp_84xx ) !=52 ); +BUILD_BUG_ON (sizeof (struct vf_evfp_entry_24xx ) !=56 );BUILD_BUG_ON (sizeof (struct vf_evfp_entry_24xx ) !=56 ); +BUILD_BUG_ON (sizeof (struct vp_config_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct vp_ctrl_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct vp_rpt_id_entry_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (sts21_entry_t) !=64 ); +BUILD_BUG_ON (sizeof (sts22_entry_t) !=64 ); +BUILD_BUG_ON (sizeof (sts_cont_entry_t) !=64 ); +BUILD_BUG_ON (sizeof (sts_entry_t) !=64 ); +BUILD_BUG_ON (sizeof (sw_info_t) !=32 ); +BUILD_BUG_ON (sizeof (target_id_t) !=2 );/* Allocate cache for SRBs. */ srb_cachep = kmem_cache_create("qla2xxx_srbs", sizeof(srb_t), 0,
drivers/scsi/qla2xxx/tcm_qla2xxx.c +14 -0
@@ -1958,6 +1958,20 @@ static int __init tcm_qla2xxx_init(void) {int ret; +BUILD_BUG_ON (sizeof (struct abts_recv_from_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct abts_resp_from_24xx_fw ) !=64 ); +BUILD_BUG_ON (sizeof (struct atio7_fcp_cmnd ) !=32 ); +BUILD_BUG_ON (sizeof (struct atio_from_isp ) !=64 ); +BUILD_BUG_ON (sizeof (struct ba_acc_le ) !=12 ); +BUILD_BUG_ON (sizeof (struct ba_rjt_le ) !=4 ); +BUILD_BUG_ON (sizeof (struct ctio7_from_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct ctio7_to_24xx ) !=64 ); +BUILD_BUG_ON (sizeof (struct ctio_crc2_to_fw ) !=64 ); +BUILD_BUG_ON (sizeof (struct ctio_crc_from_fw ) !=64 ); +BUILD_BUG_ON (sizeof (struct ctio_to_2xxx ) !=64 ); +BUILD_BUG_ON (sizeof (struct fcp_hdr_le ) !=24 ); +BUILD_BUG_ON (sizeof (struct nack_to_isp ) !=64 ); + ret =tcm_qla2xxx_register_configfs ();if (ret <0 )return ret;
PATCH v3 3/6 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.
PATCH v3 4/6 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 | 75 +++++++++++++------------- 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 | 75 ++++++++++++++------------ drivers/scsi/qla2xxx/qla_target.c | 74 ++++++++++++------------- drivers/scsi/qla2xxx/qla_tmpl.c | 4 +- 14 files changed, 318 insertions(+), 314 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 +39 -36
264 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 +40 -35
257 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 ]); }
PATCH v3 5/6 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)) {
PATCH v3 6/6 qla2xxx: Change {RD,WRT}_REG_*() function names from upper case into lower case
In reply to Bart Van AsscheThis was suggested by Daniel Wagner.
--- drivers/scsi/qla2xxx/qla_dbg.c | 582 +++++++++++++++--------------- drivers/scsi/qla2xxx/qla_def.h | 30 +- drivers/scsi/qla2xxx/qla_init.c | 204 +++++------ drivers/scsi/qla2xxx/qla_inline.h | 6 +- drivers/scsi/qla2xxx/qla_iocb.c | 64 ++-- drivers/scsi/qla2xxx/qla_isr.c | 128 +++---- drivers/scsi/qla2xxx/qla_mbx.c | 74 ++-- drivers/scsi/qla2xxx/qla_mr.c | 94 ++--- drivers/scsi/qla2xxx/qla_mr.h | 24 +- drivers/scsi/qla2xxx/qla_nvme.c | 4 +- drivers/scsi/qla2xxx/qla_nx.c | 68 ++-- drivers/scsi/qla2xxx/qla_nx2.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 26 +- drivers/scsi/qla2xxx/qla_sup.c | 270 +++++++------- drivers/scsi/qla2xxx/qla_target.c | 10 +- drivers/scsi/qla2xxx/qla_tmpl.c | 8 +- 16 files changed, 802 insertions(+), 802 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.c +291 -291
@@ -124,26 +124,26 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,if (i + dwords > ram_dwords) dwords = ram_dwords - i; -WRT_REG_WORD (®->mailbox0,MBC_LOAD_DUMP_MPI_RAM ); -WRT_REG_WORD (®->mailbox1,LSW (addr)); -WRT_REG_WORD (®->mailbox8,MSW (addr)); +wrt_reg_word (®->mailbox0,MBC_LOAD_DUMP_MPI_RAM ); +wrt_reg_word (®->mailbox1,LSW (addr)); +wrt_reg_word (®->mailbox8,MSW (addr)); -WRT_REG_WORD (®->mailbox2,MSW (LSD (dump_dma))); -WRT_REG_WORD (®->mailbox3,LSW (LSD (dump_dma))); -WRT_REG_WORD (®->mailbox6,MSW (MSD (dump_dma))); -WRT_REG_WORD (®->mailbox7,LSW (MSD (dump_dma))); +wrt_reg_word (®->mailbox2,MSW (LSD (dump_dma))); +wrt_reg_word (®->mailbox3,LSW (LSD (dump_dma))); +wrt_reg_word (®->mailbox6,MSW (MSD (dump_dma))); +wrt_reg_word (®->mailbox7,LSW (MSD (dump_dma))); -WRT_REG_WORD (®->mailbox4,MSW (dwords)); -WRT_REG_WORD (®->mailbox5,LSW (dwords)); +wrt_reg_word (®->mailbox4,MSW (dwords)); +wrt_reg_word (®->mailbox5,LSW (dwords)); -WRT_REG_WORD (®->mailbox9,0 ); -WRT_REG_DWORD (®->hccr,HCCRX_SET_HOST_INT ); +wrt_reg_word (®->mailbox9,0 ); +wrt_reg_dword (®->hccr,HCCRX_SET_HOST_INT ); ha->flags.mbox_int =0 ;while (timer--) {udelay (5 ); - stat =RD_REG_DWORD (®->host_status); + stat =rd_reg_dword (®->host_status);/* Check for pending interrupts. */ if (!(stat &HSRX_RISC_INT ))continue ;
@@ -153,15 +153,15 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, stat != 0x10 && stat != 0x11) {/* Clear this intr; it wasn't a mailbox intr */ -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); -RD_REG_DWORD (®->hccr); +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_INT ); +rd_reg_dword (®->hccr);continue ; }set_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); - rval =RD_REG_WORD (®->mailbox0) &MBS_MASK ; -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); -RD_REG_DWORD (®->hccr); + rval =rd_reg_word (®->mailbox0) &MBS_MASK ; +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_INT ); +rd_reg_dword (®->hccr);break ; } ha->flags.mbox_int =1 ;
@@ -204,23 +204,23 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,if (i + dwords > ram_dwords) dwords = ram_dwords - i; -WRT_REG_WORD (®->mailbox0,MBC_DUMP_RISC_RAM_EXTENDED ); -WRT_REG_WORD (®->mailbox1,LSW (addr)); -WRT_REG_WORD (®->mailbox8,MSW (addr)); +wrt_reg_word (®->mailbox0,MBC_DUMP_RISC_RAM_EXTENDED ); +wrt_reg_word (®->mailbox1,LSW (addr)); +wrt_reg_word (®->mailbox8,MSW (addr)); -WRT_REG_WORD (®->mailbox2,MSW (LSD (dump_dma))); -WRT_REG_WORD (®->mailbox3,LSW (LSD (dump_dma))); -WRT_REG_WORD (®->mailbox6,MSW (MSD (dump_dma))); -WRT_REG_WORD (®->mailbox7,LSW (MSD (dump_dma))); +wrt_reg_word (®->mailbox2,MSW (LSD (dump_dma))); +wrt_reg_word (®->mailbox3,LSW (LSD (dump_dma))); +wrt_reg_word (®->mailbox6,MSW (MSD (dump_dma))); +wrt_reg_word (®->mailbox7,LSW (MSD (dump_dma))); -WRT_REG_WORD (®->mailbox4,MSW (dwords)); -WRT_REG_WORD (®->mailbox5,LSW (dwords)); -WRT_REG_DWORD (®->hccr,HCCRX_SET_HOST_INT ); +wrt_reg_word (®->mailbox4,MSW (dwords)); +wrt_reg_word (®->mailbox5,LSW (dwords)); +wrt_reg_dword (®->hccr,HCCRX_SET_HOST_INT ); ha->flags.mbox_int =0 ;while (timer--) {udelay (5 ); - stat =RD_REG_DWORD (®->host_status); + stat =rd_reg_dword (®->host_status);/* Check for pending interrupts. */ if (!(stat &HSRX_RISC_INT ))
@@ -229,15 +229,15 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram, stat &=0xff ;if (stat !=0x1 && stat !=0x2 && stat !=0x10 && stat !=0x11 ) { -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); -RD_REG_DWORD (®->hccr); +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_INT ); +rd_reg_dword (®->hccr);continue ; }set_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); - rval =RD_REG_WORD (®->mailbox0) &MBS_MASK ; -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_INT ); -RD_REG_DWORD (®->hccr); + rval =rd_reg_word (®->mailbox0) &MBS_MASK ; +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_INT ); +rd_reg_dword (®->hccr);break ; } ha->flags.mbox_int =1 ;
@@ -290,10 +290,10 @@ qla24xx_read_window(struct device_reg_24xx __iomem *reg, uint32_t iobase, {__le32 __iomem *dmp_reg; -WRT_REG_DWORD (®->iobase_addr, iobase); +wrt_reg_dword (®->iobase_addr, iobase); dmp_reg = ®->iobase_window;for ( ; count--; dmp_reg++) - *buf++ =htonl (RD_REG_DWORD (dmp_reg)); + *buf++ =htonl (rd_reg_dword (dmp_reg));return buf; }
@@ -301,11 +301,11 @@ qla24xx_read_window(struct device_reg_24xx __iomem *reg, uint32_t iobase,void qla24xx_pause_risc (struct device_reg_24xx __iomem *reg,struct qla_hw_data *ha) { -WRT_REG_DWORD (®->hccr,HCCRX_SET_RISC_PAUSE ); +wrt_reg_dword (®->hccr,HCCRX_SET_RISC_PAUSE );/* 100 usec delay is sufficient enough for hardware to pause RISC */ udelay (100 ); -if (RD_REG_DWORD (®->host_status) &HSRX_RISC_PAUSED ) +if (rd_reg_dword (®->host_status) &HSRX_RISC_PAUSED )set_bit (RISC_PAUSE_CMPL , &ha->fw_dump_cap_flags); }
@@ -322,17 +322,17 @@ qla24xx_soft_reset(struct qla_hw_data *ha)* Driver can proceed with the reset sequence after waiting * for a timeout period. */ -WRT_REG_DWORD (®->ctrl_status,CSRX_DMA_SHUTDOWN |MWB_4096_BYTES ); +wrt_reg_dword (®->ctrl_status,CSRX_DMA_SHUTDOWN |MWB_4096_BYTES );for (cnt =0 ; cnt <30000 ; cnt++) { -if ((RD_REG_DWORD (®->ctrl_status) &CSRX_DMA_ACTIVE ) ==0 ) +if ((rd_reg_dword (®->ctrl_status) &CSRX_DMA_ACTIVE ) ==0 )break ;udelay (10 ); } -if (!(RD_REG_DWORD (®->ctrl_status) &CSRX_DMA_ACTIVE )) +if (!(rd_reg_dword (®->ctrl_status) &CSRX_DMA_ACTIVE ))set_bit (DMA_SHUTDOWN_CMPL , &ha->fw_dump_cap_flags); -WRT_REG_DWORD (®->ctrl_status, +wrt_reg_dword (®->ctrl_status,CSRX_ISP_SOFT_RESET |CSRX_DMA_SHUTDOWN |MWB_4096_BYTES );pci_read_config_word (ha->pdev,PCI_COMMAND , &wd);
@@ -340,19 +340,19 @@ qla24xx_soft_reset(struct qla_hw_data *ha)/* Wait for soft-reset to complete. */ for (cnt =0 ; cnt <30000 ; cnt++) { -if ((RD_REG_DWORD (®->ctrl_status) & +if ((rd_reg_dword (®->ctrl_status) &CSRX_ISP_SOFT_RESET ) ==0 )break ;udelay (10 ); } -if (!(RD_REG_DWORD (®->ctrl_status) &CSRX_ISP_SOFT_RESET )) +if (!(rd_reg_dword (®->ctrl_status) &CSRX_ISP_SOFT_RESET ))set_bit (ISP_RESET_CMPL , &ha->fw_dump_cap_flags); -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_RESET ); -RD_REG_DWORD (®->hccr);/* PCI Posting. */ +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_RESET ); +rd_reg_dword (®->hccr);/* PCI Posting. */ -for (cnt =10000 ;RD_REG_WORD (®->mailbox0) !=0 && +for (cnt =10000 ;rd_reg_word (®->mailbox0) !=0 && rval ==QLA_SUCCESS ; cnt--) {if (cnt)udelay (10 );
@@ -397,11 +397,11 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be16 *ram,WRT_MAILBOX_REG (ha, reg,7 ,LSW (MSD (dump_dma)));WRT_MAILBOX_REG (ha, reg,4 , words); -WRT_REG_WORD (®->hccr,HCCR_SET_HOST_INT ); +wrt_reg_word (®->hccr,HCCR_SET_HOST_INT );for (timer =6000000 ; timer; timer--) {/* Check for pending interrupts. */ - stat =RD_REG_DWORD (®->u.isp2300.host_status); + stat =rd_reg_dword (®->u.isp2300.host_status);if (stat &HSR_RISC_INT ) { stat &=0xff ;
@@ -412,10 +412,10 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be16 *ram, mb0 =RD_MAILBOX_REG (ha, reg,0 );/* Release mailbox registers. */ -WRT_REG_WORD (®->semaphore,0 ); -WRT_REG_WORD (®->hccr, +wrt_reg_word (®->semaphore,0 ); +wrt_reg_word (®->hccr,HCCR_CLR_RISC_INT ); -RD_REG_WORD (®->hccr); +rd_reg_word (®->hccr);break ; }else if (stat ==0x10 || stat ==0x11 ) { set_bit(MBX_INTERRUPT,
@@ -423,15 +423,15 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be16 *ram, mb0 =RD_MAILBOX_REG (ha, reg,0 ); -WRT_REG_WORD (®->hccr, +wrt_reg_word (®->hccr,HCCR_CLR_RISC_INT ); -RD_REG_WORD (®->hccr); +rd_reg_word (®->hccr);break ; }/* clear this intr; it wasn't a mailbox intr */ -WRT_REG_WORD (®->hccr,HCCR_CLR_RISC_INT ); -RD_REG_WORD (®->hccr); +wrt_reg_word (®->hccr,HCCR_CLR_RISC_INT ); +rd_reg_word (®->hccr); }udelay (5 ); }
@@ -456,7 +456,7 @@ qla2xxx_read_window(struct device_reg_2xxx __iomem *reg, uint32_t count,__le16 __iomem *dmp_reg = ®->u.isp2300.fb_cmd;for ( ; count--; dmp_reg++) - *buf++ =htons (RD_REG_WORD (dmp_reg)); + *buf++ =htons (rd_reg_word (dmp_reg)); } static inline void *
@@ -683,13 +683,13 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, __be32 **last_chain) reg =ISP_QUE_REG (ha, cnt); que_idx = cnt *4 ; mq->qregs[que_idx] = -htonl (RD_REG_DWORD (®->isp25mq.req_q_in)); +htonl (rd_reg_dword (®->isp25mq.req_q_in)); mq->qregs[que_idx+1 ] = -htonl (RD_REG_DWORD (®->isp25mq.req_q_out)); +htonl (rd_reg_dword (®->isp25mq.req_q_out)); mq->qregs[que_idx+2 ] = -htonl (RD_REG_DWORD (®->isp25mq.rsp_q_in)); +htonl (rd_reg_dword (®->isp25mq.rsp_q_in)); mq->qregs[que_idx+3 ] = -htonl (RD_REG_DWORD (®->isp25mq.rsp_q_out)); +htonl (rd_reg_dword (®->isp25mq.rsp_q_out)); }return ptr +sizeof (struct qla2xxx_mq_chain );
@@ -756,13 +756,13 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla2xxx_prep_dump (ha, ha->fw_dump); rval =QLA_SUCCESS ; - fw->hccr =htons (RD_REG_WORD (®->hccr)); + fw->hccr =htons (rd_reg_word (®->hccr));/* Pause RISC. */ -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); +wrt_reg_word (®->hccr,HCCR_PAUSE_RISC );if (IS_QLA2300 (ha)) {for (cnt =30000 ; - (RD_REG_WORD (®->hccr) &HCCR_RISC_PAUSE ) ==0 && + (rd_reg_word (®->hccr) &HCCR_RISC_PAUSE ) ==0 && rval ==QLA_SUCCESS ; cnt--) {if (cnt)udelay (100 );
@@ -770,74 +770,74 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked) rval =QLA_FUNCTION_TIMEOUT ; } }else { -RD_REG_WORD (®->hccr);/* PCI Posting. */ +rd_reg_word (®->hccr);/* PCI Posting. */ udelay (10 ); }if (rval ==QLA_SUCCESS ) { dmp_reg = ®->flash_address;for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++, dmp_reg++) - fw->pbiu_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->pbiu_reg[cnt] =htons (rd_reg_word (dmp_reg)); dmp_reg = ®->u.isp2300.req_q_in;for (cnt =0 ; cnt <sizeof (fw->risc_host_reg) /2 ; cnt++, dmp_reg++) - fw->risc_host_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->risc_host_reg[cnt] =htons (rd_reg_word (dmp_reg)); dmp_reg = ®->u.isp2300.mailbox0;for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, dmp_reg++) - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (dmp_reg)); -WRT_REG_WORD (®->ctrl_status,0x40 ); +wrt_reg_word (®->ctrl_status,0x40 );qla2xxx_read_window (reg,32 , fw->resp_dma_reg); -WRT_REG_WORD (®->ctrl_status,0x50 ); +wrt_reg_word (®->ctrl_status,0x50 );qla2xxx_read_window (reg,48 , fw->dma_reg); -WRT_REG_WORD (®->ctrl_status,0x00 ); +wrt_reg_word (®->ctrl_status,0x00 ); dmp_reg = ®->risc_hw;for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++, dmp_reg++) - fw->risc_hdw_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->risc_hdw_reg[cnt] =htons (rd_reg_word (dmp_reg)); -WRT_REG_WORD (®->pcr,0x2000 ); +wrt_reg_word (®->pcr,0x2000 );qla2xxx_read_window (reg,16 , fw->risc_gp0_reg); -WRT_REG_WORD (®->pcr,0x2200 ); +wrt_reg_word (®->pcr,0x2200 );qla2xxx_read_window (reg,16 , fw->risc_gp1_reg); -WRT_REG_WORD (®->pcr,0x2400 ); +wrt_reg_word (®->pcr,0x2400 );qla2xxx_read_window (reg,16 , fw->risc_gp2_reg); -WRT_REG_WORD (®->pcr,0x2600 ); +wrt_reg_word (®->pcr,0x2600 );qla2xxx_read_window (reg,16 , fw->risc_gp3_reg); -WRT_REG_WORD (®->pcr,0x2800 ); +wrt_reg_word (®->pcr,0x2800 );qla2xxx_read_window (reg,16 , fw->risc_gp4_reg); -WRT_REG_WORD (®->pcr,0x2A00 ); +wrt_reg_word (®->pcr,0x2A00 );qla2xxx_read_window (reg,16 , fw->risc_gp5_reg); -WRT_REG_WORD (®->pcr,0x2C00 ); +wrt_reg_word (®->pcr,0x2C00 );qla2xxx_read_window (reg,16 , fw->risc_gp6_reg); -WRT_REG_WORD (®->pcr,0x2E00 ); +wrt_reg_word (®->pcr,0x2E00 );qla2xxx_read_window (reg,16 , fw->risc_gp7_reg); -WRT_REG_WORD (®->ctrl_status,0x10 ); +wrt_reg_word (®->ctrl_status,0x10 );qla2xxx_read_window (reg,64 , fw->frame_buf_hdw_reg); -WRT_REG_WORD (®->ctrl_status,0x20 ); +wrt_reg_word (®->ctrl_status,0x20 );qla2xxx_read_window (reg,64 , fw->fpm_b0_reg); -WRT_REG_WORD (®->ctrl_status,0x30 ); +wrt_reg_word (®->ctrl_status,0x30 );qla2xxx_read_window (reg,64 , fw->fpm_b1_reg);/* Reset RISC. */ -WRT_REG_WORD (®->ctrl_status,CSR_ISP_SOFT_RESET ); +wrt_reg_word (®->ctrl_status,CSR_ISP_SOFT_RESET );for (cnt =0 ; cnt <30000 ; cnt++) { -if ((RD_REG_WORD (®->ctrl_status) & +if ((rd_reg_word (®->ctrl_status) &CSR_ISP_SOFT_RESET ) ==0 )break ;
@@ -929,11 +929,11 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla2xxx_prep_dump (ha, ha->fw_dump); rval =QLA_SUCCESS ; - fw->hccr =htons (RD_REG_WORD (®->hccr)); + fw->hccr =htons (rd_reg_word (®->hccr));/* Pause RISC. */ -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); -for (cnt =30000 ; (RD_REG_WORD (®->hccr) &HCCR_RISC_PAUSE ) ==0 && +wrt_reg_word (®->hccr,HCCR_PAUSE_RISC ); +for (cnt =30000 ; (rd_reg_word (®->hccr) &HCCR_RISC_PAUSE ) ==0 && rval ==QLA_SUCCESS ; cnt--) {if (cnt)udelay (100 );
@@ -943,60 +943,60 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)if (rval ==QLA_SUCCESS ) { dmp_reg = ®->flash_address;for (cnt =0 ; cnt <sizeof (fw->pbiu_reg) /2 ; cnt++, dmp_reg++) - fw->pbiu_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->pbiu_reg[cnt] =htons (rd_reg_word (dmp_reg)); dmp_reg = ®->u.isp2100.mailbox0;for (cnt =0 ; cnt < ha->mbx_count; cnt++, dmp_reg++) {if (cnt ==8 ) dmp_reg = ®->u_end.isp2200.mailbox8; - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (dmp_reg)); } dmp_reg = ®->u.isp2100.unused_2[0 ];for (cnt =0 ; cnt <sizeof (fw->dma_reg) /2 ; cnt++, dmp_reg++) - fw->dma_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->dma_reg[cnt] =htons (rd_reg_word (dmp_reg)); -WRT_REG_WORD (®->ctrl_status,0x00 ); +wrt_reg_word (®->ctrl_status,0x00 ); dmp_reg = ®->risc_hw;for (cnt =0 ; cnt <sizeof (fw->risc_hdw_reg) /2 ; cnt++, dmp_reg++) - fw->risc_hdw_reg[cnt] =htons (RD_REG_WORD (dmp_reg)); + fw->risc_hdw_reg[cnt] =htons (rd_reg_word (dmp_reg)); -WRT_REG_WORD (®->pcr,0x2000 ); +wrt_reg_word (®->pcr,0x2000 );qla2xxx_read_window (reg,16 , fw->risc_gp0_reg); -WRT_REG_WORD (®->pcr,0x2100 ); +wrt_reg_word (®->pcr,0x2100 );qla2xxx_read_window (reg,16 , fw->risc_gp1_reg); -WRT_REG_WORD (®->pcr,0x2200 ); +wrt_reg_word (®->pcr,0x2200 );qla2xxx_read_window (reg,16 , fw->risc_gp2_reg); -WRT_REG_WORD (®->pcr,0x2300 ); +wrt_reg_word (®->pcr,0x2300 );qla2xxx_read_window (reg,16 , fw->risc_gp3_reg); -WRT_REG_WORD (®->pcr,0x2400 ); +wrt_reg_word (®->pcr,0x2400 );qla2xxx_read_window (reg,16 , fw->risc_gp4_reg); -WRT_REG_WORD (®->pcr,0x2500 ); +wrt_reg_word (®->pcr,0x2500 );qla2xxx_read_window (reg,16 , fw->risc_gp5_reg); -WRT_REG_WORD (®->pcr,0x2600 ); +wrt_reg_word (®->pcr,0x2600 );qla2xxx_read_window (reg,16 , fw->risc_gp6_reg); -WRT_REG_WORD (®->pcr,0x2700 ); +wrt_reg_word (®->pcr,0x2700 );qla2xxx_read_window (reg,16 , fw->risc_gp7_reg); -WRT_REG_WORD (®->ctrl_status,0x10 ); +wrt_reg_word (®->ctrl_status,0x10 );qla2xxx_read_window (reg,16 , fw->frame_buf_hdw_reg); -WRT_REG_WORD (®->ctrl_status,0x20 ); +wrt_reg_word (®->ctrl_status,0x20 );qla2xxx_read_window (reg,64 , fw->fpm_b0_reg); -WRT_REG_WORD (®->ctrl_status,0x30 ); +wrt_reg_word (®->ctrl_status,0x30 );qla2xxx_read_window (reg,64 , fw->fpm_b1_reg);/* Reset the ISP. */ -WRT_REG_WORD (®->ctrl_status,CSR_ISP_SOFT_RESET ); +wrt_reg_word (®->ctrl_status,CSR_ISP_SOFT_RESET ); } for (cnt = 30000; RD_MAILBOX_REG(ha, reg, 0) != 0 &&
@@ -1009,11 +1009,11 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)/* Pause RISC. */ if (rval ==QLA_SUCCESS && (IS_QLA2200 (ha) || (IS_QLA2100 (ha) && - (RD_REG_WORD (®->mctr) & (BIT_1 |BIT_0 )) !=0 ))) { + (rd_reg_word (®->mctr) & (BIT_1 |BIT_0 )) !=0 ))) { -WRT_REG_WORD (®->hccr,HCCR_PAUSE_RISC ); +wrt_reg_word (®->hccr,HCCR_PAUSE_RISC );for (cnt =30000 ; - (RD_REG_WORD (®->hccr) &HCCR_RISC_PAUSE ) ==0 && + (rd_reg_word (®->hccr) &HCCR_RISC_PAUSE ) ==0 && rval ==QLA_SUCCESS ; cnt--) {if (cnt)udelay (100 );
@@ -1023,13 +1023,13 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)if (rval ==QLA_SUCCESS ) {/* Set memory configuration and timing. */ if (IS_QLA2100 (ha)) -WRT_REG_WORD (®->mctr,0xf1 ); +wrt_reg_word (®->mctr,0xf1 );else -WRT_REG_WORD (®->mctr,0xf2 ); -RD_REG_WORD (®->mctr);/* PCI Posting. */ +wrt_reg_word (®->mctr,0xf2 ); +rd_reg_word (®->mctr);/* PCI Posting. */ /* Release RISC. */ -WRT_REG_WORD (®->hccr,HCCR_RELEASE_RISC ); +wrt_reg_word (®->hccr,HCCR_RELEASE_RISC ); } }
@@ -1042,26 +1042,26 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)for (cnt =0 ; cnt <sizeof (fw->risc_ram) /2 && rval ==QLA_SUCCESS ; cnt++, risc_address++) {WRT_MAILBOX_REG (ha, reg,1 , risc_address); -WRT_REG_WORD (®->hccr,HCCR_SET_HOST_INT ); +wrt_reg_word (®->hccr,HCCR_SET_HOST_INT );for (timer =6000000 ; timer !=0 ; timer--) {/* Check for pending interrupts. */ -if (RD_REG_WORD (®->istatus) &ISR_RISC_INT ) { -if (RD_REG_WORD (®->semaphore) &BIT_0 ) { +if (rd_reg_word (®->istatus) &ISR_RISC_INT ) { +if (rd_reg_word (®->semaphore) &BIT_0 ) {set_bit (MBX_INTERRUPT , &ha->mbx_cmd_flags); mb0 =RD_MAILBOX_REG (ha, reg,0 ); mb2 =RD_MAILBOX_REG (ha, reg,2 ); -WRT_REG_WORD (®->semaphore,0 ); -WRT_REG_WORD (®->hccr, +wrt_reg_word (®->semaphore,0 ); +wrt_reg_word (®->hccr,HCCR_CLR_RISC_INT ); -RD_REG_WORD (®->hccr); +rd_reg_word (®->hccr);break ; } -WRT_REG_WORD (®->hccr,HCCR_CLR_RISC_INT ); -RD_REG_WORD (®->hccr); +wrt_reg_word (®->hccr,HCCR_CLR_RISC_INT ); +rd_reg_word (®->hccr); }udelay (5 ); }
@@ -1133,7 +1133,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) fw = &ha->fw_dump->isp.isp24;qla2xxx_prep_dump (ha, ha->fw_dump); - fw->host_status =htonl (RD_REG_DWORD (®->host_status)); + fw->host_status =htonl (rd_reg_dword (®->host_status));/* * Pause RISC. No need to track timeout, as resetting the chip
@@ -1144,40 +1144,40 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)/* Host interface registers. */ dmp_reg = ®->flash_addr;for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++, dmp_reg++) - fw->host_reg[cnt] =htonl (RD_REG_DWORD (dmp_reg)); + fw->host_reg[cnt] =htonl (rd_reg_dword (dmp_reg));/* Disable interrupts. */ -WRT_REG_DWORD (®->ictrl,0 ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,0 ); +rd_reg_dword (®->ictrl);/* Shadow registers. */ -WRT_REG_DWORD (®->iobase_addr,0x0F70 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_select,0xB0000000 ); - fw->shadow_reg[0 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_addr,0x0F70 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_select,0xB0000000 ); + fw->shadow_reg[0 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0100000 ); - fw->shadow_reg[1 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0100000 ); + fw->shadow_reg[1 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0200000 ); - fw->shadow_reg[2 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0200000 ); + fw->shadow_reg[2 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0300000 ); - fw->shadow_reg[3 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0300000 ); + fw->shadow_reg[3 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0400000 ); - fw->shadow_reg[4 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0400000 ); + fw->shadow_reg[4 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0500000 ); - fw->shadow_reg[5 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0500000 ); + fw->shadow_reg[5 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0600000 ); - fw->shadow_reg[6 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0600000 ); + fw->shadow_reg[6 ] =htonl (rd_reg_dword (®->iobase_sdata));/* Mailbox registers. */ mbx_reg = ®->mailbox0;for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (mbx_reg));/* Transfer sequence registers. */ iter_reg = fw->xseq_gp_reg;
@@ -1216,19 +1216,19 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) iter_reg =qla24xx_read_window (reg,0x7200 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->resp0_dma_reg; iter_reg =qla24xx_read_window (reg,0x7300 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->req1_dma_reg; iter_reg =qla24xx_read_window (reg,0x7400 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg));/* Transmit DMA registers. */ iter_reg = fw->xmt0_dma_reg;
@@ -1389,7 +1389,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla2xxx_prep_dump (ha, ha->fw_dump); ha->fw_dump->version =htonl (2 ); - fw->host_status =htonl (RD_REG_DWORD (®->host_status)); + fw->host_status =htonl (rd_reg_dword (®->host_status));/* * Pause RISC. No need to track timeout, as resetting the chip
@@ -1403,73 +1403,73 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla24xx_read_window (reg,0x7010 ,16 , iter_reg);/* PCIe registers. */ -WRT_REG_DWORD (®->iobase_addr,0x7C00 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_window,0x01 ); +wrt_reg_dword (®->iobase_addr,0x7C00 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_window,0x01 ); dmp_reg = ®->iobase_c4; - fw->pcie_regs[0 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[0 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[1 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[1 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[2 ] =htonl (RD_REG_DWORD (dmp_reg)); - fw->pcie_regs[3 ] =htonl (RD_REG_DWORD (®->iobase_window)); + fw->pcie_regs[2 ] =htonl (rd_reg_dword (dmp_reg)); + fw->pcie_regs[3 ] =htonl (rd_reg_dword (®->iobase_window)); -WRT_REG_DWORD (®->iobase_window,0x00 ); -RD_REG_DWORD (®->iobase_window); +wrt_reg_dword (®->iobase_window,0x00 ); +rd_reg_dword (®->iobase_window);/* Host interface registers. */ dmp_reg = ®->flash_addr;for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++, dmp_reg++) - fw->host_reg[cnt] =htonl (RD_REG_DWORD (dmp_reg)); + fw->host_reg[cnt] =htonl (rd_reg_dword (dmp_reg));/* Disable interrupts. */ -WRT_REG_DWORD (®->ictrl,0 ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,0 ); +rd_reg_dword (®->ictrl);/* Shadow registers. */ -WRT_REG_DWORD (®->iobase_addr,0x0F70 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_select,0xB0000000 ); - fw->shadow_reg[0 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_addr,0x0F70 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_select,0xB0000000 ); + fw->shadow_reg[0 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0100000 ); - fw->shadow_reg[1 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0100000 ); + fw->shadow_reg[1 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0200000 ); - fw->shadow_reg[2 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0200000 ); + fw->shadow_reg[2 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0300000 ); - fw->shadow_reg[3 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0300000 ); + fw->shadow_reg[3 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0400000 ); - fw->shadow_reg[4 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0400000 ); + fw->shadow_reg[4 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0500000 ); - fw->shadow_reg[5 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0500000 ); + fw->shadow_reg[5 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0600000 ); - fw->shadow_reg[6 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0600000 ); + fw->shadow_reg[6 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0700000 ); - fw->shadow_reg[7 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0700000 ); + fw->shadow_reg[7 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0800000 ); - fw->shadow_reg[8 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0800000 ); + fw->shadow_reg[8 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0900000 ); - fw->shadow_reg[9 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0900000 ); + fw->shadow_reg[9 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0A00000 ); - fw->shadow_reg[10 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0A00000 ); + fw->shadow_reg[10 ] =htonl (rd_reg_dword (®->iobase_sdata));/* RISC I/O register. */ -WRT_REG_DWORD (®->iobase_addr,0x0010 ); - fw->risc_io_reg =htonl (RD_REG_DWORD (®->iobase_window)); +wrt_reg_dword (®->iobase_addr,0x0010 ); + fw->risc_io_reg =htonl (rd_reg_dword (®->iobase_window));/* Mailbox registers. */ mbx_reg = ®->mailbox0;for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (mbx_reg));/* Transfer sequence registers. */ iter_reg = fw->xseq_gp_reg;
@@ -1533,19 +1533,19 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) iter_reg =qla24xx_read_window (reg,0x7200 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->resp0_dma_reg; iter_reg =qla24xx_read_window (reg,0x7300 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->req1_dma_reg; iter_reg =qla24xx_read_window (reg,0x7400 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg));/* Transmit DMA registers. */ iter_reg = fw->xmt0_dma_reg;
@@ -1713,7 +1713,7 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) fw = &ha->fw_dump->isp.isp81;qla2xxx_prep_dump (ha, ha->fw_dump); - fw->host_status =htonl (RD_REG_DWORD (®->host_status)); + fw->host_status =htonl (rd_reg_dword (®->host_status));/* * Pause RISC. No need to track timeout, as resetting the chip
@@ -1727,73 +1727,73 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla24xx_read_window (reg,0x7010 ,16 , iter_reg);/* PCIe registers. */ -WRT_REG_DWORD (®->iobase_addr,0x7C00 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_window,0x01 ); +wrt_reg_dword (®->iobase_addr,0x7C00 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_window,0x01 ); dmp_reg = ®->iobase_c4; - fw->pcie_regs[0 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[0 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[1 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[1 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[2 ] =htonl (RD_REG_DWORD (dmp_reg)); - fw->pcie_regs[3 ] =htonl (RD_REG_DWORD (®->iobase_window)); + fw->pcie_regs[2 ] =htonl (rd_reg_dword (dmp_reg)); + fw->pcie_regs[3 ] =htonl (rd_reg_dword (®->iobase_window)); -WRT_REG_DWORD (®->iobase_window,0x00 ); -RD_REG_DWORD (®->iobase_window); +wrt_reg_dword (®->iobase_window,0x00 ); +rd_reg_dword (®->iobase_window);/* Host interface registers. */ dmp_reg = ®->flash_addr;for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++, dmp_reg++) - fw->host_reg[cnt] =htonl (RD_REG_DWORD (dmp_reg)); + fw->host_reg[cnt] =htonl (rd_reg_dword (dmp_reg));/* Disable interrupts. */ -WRT_REG_DWORD (®->ictrl,0 ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,0 ); +rd_reg_dword (®->ictrl);/* Shadow registers. */ -WRT_REG_DWORD (®->iobase_addr,0x0F70 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_select,0xB0000000 ); - fw->shadow_reg[0 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_addr,0x0F70 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_select,0xB0000000 ); + fw->shadow_reg[0 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0100000 ); - fw->shadow_reg[1 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0100000 ); + fw->shadow_reg[1 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0200000 ); - fw->shadow_reg[2 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0200000 ); + fw->shadow_reg[2 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0300000 ); - fw->shadow_reg[3 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0300000 ); + fw->shadow_reg[3 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0400000 ); - fw->shadow_reg[4 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0400000 ); + fw->shadow_reg[4 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0500000 ); - fw->shadow_reg[5 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0500000 ); + fw->shadow_reg[5 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0600000 ); - fw->shadow_reg[6 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0600000 ); + fw->shadow_reg[6 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0700000 ); - fw->shadow_reg[7 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0700000 ); + fw->shadow_reg[7 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0800000 ); - fw->shadow_reg[8 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0800000 ); + fw->shadow_reg[8 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0900000 ); - fw->shadow_reg[9 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0900000 ); + fw->shadow_reg[9 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0A00000 ); - fw->shadow_reg[10 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0A00000 ); + fw->shadow_reg[10 ] =htonl (rd_reg_dword (®->iobase_sdata));/* RISC I/O register. */ -WRT_REG_DWORD (®->iobase_addr,0x0010 ); - fw->risc_io_reg =htonl (RD_REG_DWORD (®->iobase_window)); +wrt_reg_dword (®->iobase_addr,0x0010 ); + fw->risc_io_reg =htonl (rd_reg_dword (®->iobase_window));/* Mailbox registers. */ mbx_reg = ®->mailbox0;for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (mbx_reg));/* Transfer sequence registers. */ iter_reg = fw->xseq_gp_reg;
@@ -1857,19 +1857,19 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) iter_reg =qla24xx_read_window (reg,0x7200 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->resp0_dma_reg; iter_reg =qla24xx_read_window (reg,0x7300 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->req1_dma_reg; iter_reg =qla24xx_read_window (reg,0x7400 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg));/* Transmit DMA registers. */ iter_reg = fw->xmt0_dma_reg;
@@ -2041,7 +2041,7 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) fw = &ha->fw_dump->isp.isp83;qla2xxx_prep_dump (ha, ha->fw_dump); - fw->host_status =htonl (RD_REG_DWORD (®->host_status)); + fw->host_status =htonl (rd_reg_dword (®->host_status));/* * Pause RISC. No need to track timeout, as resetting the chip
@@ -2049,24 +2049,24 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)*/ qla24xx_pause_risc (reg, ha); -WRT_REG_DWORD (®->iobase_addr,0x6000 ); +wrt_reg_dword (®->iobase_addr,0x6000 ); dmp_reg = ®->iobase_window; -RD_REG_DWORD (dmp_reg); -WRT_REG_DWORD (dmp_reg,0 ); +rd_reg_dword (dmp_reg); +wrt_reg_dword (dmp_reg,0 ); dmp_reg = ®->unused_4_1[0 ]; -RD_REG_DWORD (dmp_reg); -WRT_REG_DWORD (dmp_reg,0 ); +rd_reg_dword (dmp_reg); +wrt_reg_dword (dmp_reg,0 ); -WRT_REG_DWORD (®->iobase_addr,0x6010 ); +wrt_reg_dword (®->iobase_addr,0x6010 ); dmp_reg = ®->unused_4_1[2 ]; -RD_REG_DWORD (dmp_reg); -WRT_REG_DWORD (dmp_reg,0 ); +rd_reg_dword (dmp_reg); +wrt_reg_dword (dmp_reg,0 );/* select PCR and disable ecc checking and correction */ -WRT_REG_DWORD (®->iobase_addr,0x0F70 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_select,0x60000000 );/* write to F0h = PCR */ +wrt_reg_dword (®->iobase_addr,0x0F70 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_select,0x60000000 );/* write to F0h = PCR */ /* Host/Risc registers. */ iter_reg = fw->host_risc_reg;
@@ -2075,73 +2075,73 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)qla24xx_read_window (reg,0x7040 ,16 , iter_reg);/* PCIe registers. */ -WRT_REG_DWORD (®->iobase_addr,0x7C00 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_window,0x01 ); +wrt_reg_dword (®->iobase_addr,0x7C00 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_window,0x01 ); dmp_reg = ®->iobase_c4; - fw->pcie_regs[0 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[0 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[1 ] =htonl (RD_REG_DWORD (dmp_reg)); + fw->pcie_regs[1 ] =htonl (rd_reg_dword (dmp_reg)); dmp_reg++; - fw->pcie_regs[2 ] =htonl (RD_REG_DWORD (dmp_reg)); - fw->pcie_regs[3 ] =htonl (RD_REG_DWORD (®->iobase_window)); + fw->pcie_regs[2 ] =htonl (rd_reg_dword (dmp_reg)); + fw->pcie_regs[3 ] =htonl (rd_reg_dword (®->iobase_window)); -WRT_REG_DWORD (®->iobase_window,0x00 ); -RD_REG_DWORD (®->iobase_window); +wrt_reg_dword (®->iobase_window,0x00 ); +rd_reg_dword (®->iobase_window);/* Host interface registers. */ dmp_reg = ®->flash_addr;for (cnt =0 ; cnt <sizeof (fw->host_reg) /4 ; cnt++, dmp_reg++) - fw->host_reg[cnt] =htonl (RD_REG_DWORD (dmp_reg)); + fw->host_reg[cnt] =htonl (rd_reg_dword (dmp_reg));/* Disable interrupts. */ -WRT_REG_DWORD (®->ictrl,0 ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,0 ); +rd_reg_dword (®->ictrl);/* Shadow registers. */ -WRT_REG_DWORD (®->iobase_addr,0x0F70 ); -RD_REG_DWORD (®->iobase_addr); -WRT_REG_DWORD (®->iobase_select,0xB0000000 ); - fw->shadow_reg[0 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_addr,0x0F70 ); +rd_reg_dword (®->iobase_addr); +wrt_reg_dword (®->iobase_select,0xB0000000 ); + fw->shadow_reg[0 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0100000 ); - fw->shadow_reg[1 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0100000 ); + fw->shadow_reg[1 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0200000 ); - fw->shadow_reg[2 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0200000 ); + fw->shadow_reg[2 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0300000 ); - fw->shadow_reg[3 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0300000 ); + fw->shadow_reg[3 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0400000 ); - fw->shadow_reg[4 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0400000 ); + fw->shadow_reg[4 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0500000 ); - fw->shadow_reg[5 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0500000 ); + fw->shadow_reg[5 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0600000 ); - fw->shadow_reg[6 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0600000 ); + fw->shadow_reg[6 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0700000 ); - fw->shadow_reg[7 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0700000 ); + fw->shadow_reg[7 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0800000 ); - fw->shadow_reg[8 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0800000 ); + fw->shadow_reg[8 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0900000 ); - fw->shadow_reg[9 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0900000 ); + fw->shadow_reg[9 ] =htonl (rd_reg_dword (®->iobase_sdata)); -WRT_REG_DWORD (®->iobase_select,0xB0A00000 ); - fw->shadow_reg[10 ] =htonl (RD_REG_DWORD (®->iobase_sdata)); +wrt_reg_dword (®->iobase_select,0xB0A00000 ); + fw->shadow_reg[10 ] =htonl (rd_reg_dword (®->iobase_sdata));/* RISC I/O register. */ -WRT_REG_DWORD (®->iobase_addr,0x0010 ); - fw->risc_io_reg =htonl (RD_REG_DWORD (®->iobase_window)); +wrt_reg_dword (®->iobase_addr,0x0010 ); + fw->risc_io_reg =htonl (rd_reg_dword (®->iobase_window));/* Mailbox registers. */ mbx_reg = ®->mailbox0;for (cnt =0 ; cnt <sizeof (fw->mailbox_reg) /2 ; cnt++, mbx_reg++) - fw->mailbox_reg[cnt] =htons (RD_REG_WORD (mbx_reg)); + fw->mailbox_reg[cnt] =htons (rd_reg_word (mbx_reg));/* Transfer sequence registers. */ iter_reg = fw->xseq_gp_reg;
@@ -2237,19 +2237,19 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) iter_reg =qla24xx_read_window (reg,0x7200 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->resp0_dma_reg; iter_reg =qla24xx_read_window (reg,0x7300 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg)); iter_reg = fw->req1_dma_reg; iter_reg =qla24xx_read_window (reg,0x7400 ,8 , iter_reg); dmp_reg = ®->iobase_q;for (cnt =0 ; cnt <7 ; cnt++, dmp_reg++) - *iter_reg++ =htonl (RD_REG_DWORD (dmp_reg)); + *iter_reg++ =htonl (rd_reg_dword (dmp_reg));/* Transmit DMA registers. */ iter_reg = fw->xmt0_dma_reg;
@@ -2455,16 +2455,16 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)ql_log (ql_log_warn, vha,0xd00f ,"try a bigger hammer!!!\n" ); -WRT_REG_DWORD (®->hccr,HCCRX_SET_RISC_RESET ); -RD_REG_DWORD (®->hccr); +wrt_reg_dword (®->hccr,HCCRX_SET_RISC_RESET ); +rd_reg_dword (®->hccr); -WRT_REG_DWORD (®->hccr,HCCRX_REL_RISC_PAUSE ); -RD_REG_DWORD (®->hccr); +wrt_reg_dword (®->hccr,HCCRX_REL_RISC_PAUSE ); +rd_reg_dword (®->hccr); -WRT_REG_DWORD (®->hccr,HCCRX_CLR_RISC_RESET ); -RD_REG_DWORD (®->hccr); +wrt_reg_dword (®->hccr,HCCRX_CLR_RISC_RESET ); +rd_reg_dword (®->hccr); -for (cnt =30000 ; cnt && (RD_REG_WORD (®->mailbox0)); cnt--) +for (cnt =30000 ; cnt && (rd_reg_word (®->mailbox0)); cnt--)udelay (5 );if (!cnt) {
@@ -2732,7 +2732,7 @@ ql_dump_regs(uint level, scsi_qla_host_t *vha, uint id)ql_dbg (level, vha, id,"Mailbox registers:\n" );for (i =0 ; i <6 ; i++, mbx_reg++)ql_dbg (level, vha, id, -"mbox[%d] %#04x\n" , i,RD_REG_WORD (mbx_reg)); +"mbox[%d] %#04x\n" , i,rd_reg_word (mbx_reg)); }
drivers/scsi/qla2xxx/qla_def.h +15 -15
@@ -128,47 +128,47 @@ static inline uint32_t make_handle(uint16_t x, uint16_t y)* I/O register */ -static inline u8 RD_REG_BYTE (const volatile u8 __iomem *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) +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) +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) +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) +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) +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) +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) +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) +static inline void wrt_reg_dword (volatile __le32 __iomem *addr,u32 data) {return writel (data, addr); }
@@ -258,8 +258,8 @@ static inline void WRT_REG_DWORD(volatile __le32 __iomem *addr, u32 data)* The ISP2312 v2 chip cannot access the FLASH/GPIO registers via MMIO in an * 133Mhz slot. */ -#define RD_REG_WORD_PIO (addr) (inw((unsigned long)addr)) -#define WRT_REG_WORD_PIO (addr, data) (outw(data, (unsigned long)addr)) +#define rd_reg_word_PIO (addr) (inw((unsigned long)addr)) +#define wrt_reg_word_PIO (addr, data) (outw(data, (unsigned long)addr))/* * Fibre Channel device definitions.
@@ -956,18 +956,18 @@ typedef union { &(reg)->u_end.isp2200.mailbox8 + (num) - 8) : \ &(reg)->u.isp2300.mailbox0 + (num))#define RD_MAILBOX_REG (ha, reg, num) \ - RD_REG_WORD(MAILBOX_REG(ha, reg, num)) + rd_reg_word(MAILBOX_REG(ha, reg, num))#define WRT_MAILBOX_REG (ha, reg, num, data) \ - WRT_REG_WORD(MAILBOX_REG(ha, reg, num), data) + wrt_reg_word(MAILBOX_REG(ha, reg, num), data)#define FB_CMD_REG (ha, reg) \ (IS_QLA2100(ha) || IS_QLA2200(ha) ? \ &(reg)->fb_cmd_2100 : \ &(reg)->u.isp2300.fb_cmd)#define RD_FB_CMD_REG (ha, reg) \ - RD_REG_WORD(FB_CMD_REG(ha, reg)) + rd_reg_word(FB_CMD_REG(ha, reg))#define WRT_FB_CMD_REG (ha, reg, data) \ - WRT_REG_WORD(FB_CMD_REG(ha, reg), data) + wrt_reg_word(FB_CMD_REG(ha, reg), data) typedef struct { uint32_t out_mb; /* outbound from driver */
drivers/scsi/qla2xxx/qla_init.c +102 -102
454 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +3 -3
@@ -46,10 +46,10 @@ qla2x00_debounce_register(volatile __le16 __iomem *addr)volatile uint16_t second;do { - first =RD_REG_WORD (addr); + first =rd_reg_word (addr);barrier ();cpu_relax (); - second =RD_REG_WORD (addr); + second =rd_reg_word (addr); }while (first != second);return (first);
@@ -329,7 +329,7 @@ qla_83xx_start_iocbs(struct qla_qpair *qpair) }else req->ring_ptr++; -WRT_REG_DWORD (req->req_q_in, req->ring_index); +wrt_reg_dword (req->req_q_in, req->ring_index); } static inline int
drivers/scsi/qla2xxx/qla_iocb.c +32 -32
176 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +64 -64
338 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mbx.c +37 -37
155 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mr.c +47 -47
223 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mr.h +12 -12
@@ -359,47 +359,47 @@ struct config_info_data {#define CONTINUE_A64_TYPE_FX00 0x03/* Continuation entry. */ #define QLAFX00_SET_HST_INTR (ha, value) \ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HST_TO_HBA_REG, \ + wrt_reg_dword((ha)->cregbase + QLAFX00_HST_TO_HBA_REG, \ value)#define QLAFX00_CLR_HST_INTR (ha, value) \ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG, \ + wrt_reg_dword((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG, \ ~value)#define QLAFX00_RD_INTR_REG (ha) \ - RD_REG_DWORD((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG) + rd_reg_dword((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG)#define QLAFX00_CLR_INTR_REG (ha, value) \ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG, \ + wrt_reg_dword((ha)->cregbase + QLAFX00_HBA_TO_HOST_REG, \ ~value)#define QLAFX00_SET_HBA_SOC_REG (ha, off, val)\ - WRT_REG_DWORD((ha)->cregbase + off, val) + wrt_reg_dword((ha)->cregbase + off, val)#define QLAFX00_GET_HBA_SOC_REG (ha, off)\ - RD_REG_DWORD((ha)->cregbase + off) + rd_reg_dword((ha)->cregbase + off)#define QLAFX00_HBA_RST_REG (ha, val)\ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HST_RST_REG, val) + wrt_reg_dword((ha)->cregbase + QLAFX00_HST_RST_REG, val)#define QLAFX00_RD_ICNTRL_REG (ha) \ - RD_REG_DWORD((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG) + rd_reg_dword((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG)#define QLAFX00_ENABLE_ICNTRL_REG (ha) \ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG, \ + wrt_reg_dword((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG, \ (QLAFX00_GET_HBA_SOC_REG(ha, QLAFX00_HBA_ICNTRL_REG) | \ QLAFX00_ICR_ENB_MASK))#define QLAFX00_DISABLE_ICNTRL_REG (ha) \ - WRT_REG_DWORD((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG, \ + wrt_reg_dword((ha)->cregbase + QLAFX00_HBA_ICNTRL_REG, \ (QLAFX00_GET_HBA_SOC_REG(ha, QLAFX00_HBA_ICNTRL_REG) & \ QLAFX00_ICR_DIS_MASK))#define QLAFX00_RD_REG (ha, off) \ - RD_REG_DWORD((ha)->cregbase + off) + rd_reg_dword((ha)->cregbase + off)#define QLAFX00_WR_REG (ha, off, val) \ - WRT_REG_DWORD((ha)->cregbase + off, val) + wrt_reg_dword((ha)->cregbase + off, val)struct qla_mt_iocb_rqst_fx00 {__le32 reserved_0;
drivers/scsi/qla2xxx/qla_nvme.c +2 -2
@@ -384,7 +384,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) req_cnt =qla24xx_calc_iocbs (vha, tot_dsds);if (req->cnt < (req_cnt +2 )) { cnt =IS_SHADOW_REG_CAPABLE (ha) ? *req->out_ptr : -RD_REG_DWORD_RELAXED (req->req_q_out); +rd_reg_dword_relaxed (req->req_q_out);if (req->ring_index < cnt) req->cnt = cnt - req->ring_index;
@@ -514,7 +514,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) }/* Set chip new ring index. */ -WRT_REG_DWORD (req->req_q_in, req->ring_index); +wrt_reg_dword (req->req_q_in, req->ring_index); queuing_error:spin_unlock_irqrestore (&qpair->qp_lock, flags);
drivers/scsi/qla2xxx/qla_nx.c +34 -34
187 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_nx2.c +6 -6
@@ -3946,8 +3946,8 @@ qla8044_intr_handler(int irq, void *dev_id)spin_lock_irqsave (&ha->hardware_lock, flags);for (iter =1 ; iter--; ) { -if (RD_REG_DWORD (®->host_int)) { - stat =RD_REG_DWORD (®->host_status); +if (rd_reg_dword (®->host_int)) { + stat =rd_reg_dword (®->host_status);if ((stat &HSRX_RISC_INT ) ==0 )break ;
@@ -3961,9 +3961,9 @@ qla8044_intr_handler(int irq, void *dev_id)break ;case 0x12 : mb[0 ] =MSW (stat); - mb[1 ] =RD_REG_WORD (®->mailbox_out[1 ]); - mb[2 ] =RD_REG_WORD (®->mailbox_out[2 ]); - mb[3 ] =RD_REG_WORD (®->mailbox_out[3 ]); + mb[1 ] =rd_reg_word (®->mailbox_out[1 ]); + mb[2 ] =rd_reg_word (®->mailbox_out[2 ]); + mb[3 ] =rd_reg_word (®->mailbox_out[3 ]);qla2x00_async_event (vha, rsp, mb);break ;case 0x13 :
@@ -3976,7 +3976,7 @@ qla8044_intr_handler(int irq, void *dev_id)break ; } } -WRT_REG_DWORD (®->host_int,0 ); +wrt_reg_dword (®->host_int,0 ); }qla2x00_handle_mbx_completion (ha, status);
drivers/scsi/qla2xxx/qla_os.c +13 -13
@@ -1216,9 +1216,9 @@ uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha)struct device_reg_82xx __iomem *reg82 = &ha->iobase->isp82;if (IS_P3P_TYPE (ha)) -return ((RD_REG_DWORD (®82->host_int)) ==ISP_REG_DISCONNECT ); +return ((rd_reg_dword (®82->host_int)) ==ISP_REG_DISCONNECT );else -return ((RD_REG_DWORD (®->host_status)) == +return ((rd_reg_dword (®->host_status)) ==ISP_REG_DISCONNECT ); }
@@ -1902,8 +1902,8 @@ qla2x00_enable_intrs(struct qla_hw_data *ha)spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =1 ;/* enable risc and host interrupts */ -WRT_REG_WORD (®->ictrl,ICR_EN_INT |ICR_EN_RISC ); -RD_REG_WORD (®->ictrl); +wrt_reg_word (®->ictrl,ICR_EN_INT |ICR_EN_RISC ); +rd_reg_word (®->ictrl);spin_unlock_irqrestore (&ha->hardware_lock, flags); }
@@ -1917,8 +1917,8 @@ qla2x00_disable_intrs(struct qla_hw_data *ha)spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =0 ;/* disable risc and host interrupts */ -WRT_REG_WORD (®->ictrl,0 ); -RD_REG_WORD (®->ictrl); +wrt_reg_word (®->ictrl,0 ); +rd_reg_word (®->ictrl);spin_unlock_irqrestore (&ha->hardware_lock, flags); }
@@ -1930,8 +1930,8 @@ qla24xx_enable_intrs(struct qla_hw_data *ha)spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =1 ; -WRT_REG_DWORD (®->ictrl,ICRX_EN_RISC_INT ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,ICRX_EN_RISC_INT ); +rd_reg_dword (®->ictrl);spin_unlock_irqrestore (&ha->hardware_lock, flags); }
@@ -1945,8 +1945,8 @@ qla24xx_disable_intrs(struct qla_hw_data *ha)return ;spin_lock_irqsave (&ha->hardware_lock, flags); ha->interrupts_on =0 ; -WRT_REG_DWORD (®->ictrl,0 ); -RD_REG_DWORD (®->ictrl); +wrt_reg_dword (®->ictrl,0 ); +rd_reg_dword (®->ictrl);spin_unlock_irqrestore (&ha->hardware_lock, flags); }
@@ -7574,15 +7574,15 @@ 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_WORD (®->hccr); + stat =rd_reg_word (®->hccr);if (stat &HCCR_RISC_PAUSE ) risc_paused =1 ; }else if (IS_QLA23XX (ha)) { - stat =RD_REG_DWORD (®->u.isp2300.host_status); + stat =rd_reg_dword (®->u.isp2300.host_status);if (stat &HSR_RISC_PAUSED ) risc_paused =1 ; }else if (IS_FWI2_CAPABLE (ha)) { - stat =RD_REG_DWORD (®24->host_status); + stat =rd_reg_dword (®24->host_status);if (stat &HSRX_RISC_PAUSED ) risc_paused =1 ; }
drivers/scsi/qla2xxx/qla_sup.c +135 -135
84 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.
Arun, Quinn: This series still needs review.
Thanks!
Quoted 51 lines
This patch series fixes the endianness annotations in the qla2xxx driver. Please consider this patch series for the v5.7 kernel.
Thanks,
Bart.
Changes compared to v2:
- Removed oneBUILD_BUG_ON()statement.Changes compared to v1:
- Left out theraw_smp_processor_id()patch because it may take time to achieve agreement about this patch.
- Added three patches to this series: two patches for verifying structure size at compile time and one patch for changing function names from upper case to lower case.Bart Van Assche (6):
qla2xxx: SortBUILD_BUG_ON()statements alphabetically
qla2xxx: Add moreBUILD_BUG_ON()statements
qla2xxx: Fix endianness annotations in header files
qla2xxx: Fix endianness annotations in source files
qla2xxx: Fix the code that reads from mailbox registers
qla2xxx: Change {RD,WRT}_REG_*() function names from upper case into
lower casedrivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 672 +++++++++++++------------- drivers/scsi/qla2xxx/qla_dbg.h | 442 ++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 711 ++++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 ++++++++++++++--------------- drivers/scsi/qla2xxx/qla_init.c | 279 +++++------ drivers/scsi/qla2xxx/qla_inline.h | 8 +- drivers/scsi/qla2xxx/qla_iocb.c | 121 ++--- drivers/scsi/qla2xxx/qla_isr.c | 217 +++++---- drivers/scsi/qla2xxx/qla_mbx.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.h | 32 +- drivers/scsi/qla2xxx/qla_nvme.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.c | 161 +++---- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_nx2.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 128 +++-- drivers/scsi/qla2xxx/qla_sup.c | 345 +++++++------- drivers/scsi/qla2xxx/qla_target.c | 84 ++-- drivers/scsi/qla2xxx/qla_target.h | 208 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 12 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 + 24 files changed, 2317 insertions(+), 2190 deletions(-)
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 4 lines · Martin K. Petersen
Arun, Quinn: This series still needs review.
Thanks!
Hi Martin,
Yes, we will provide a review. As this is a big change, we would need some more time for the review and testing.
I had some early thoughts on the series, I will take another look at it and respond.
Regards,
-Arun
Quoted 54 lines
Quoted 52 lines
This patch series fixes the endianness annotations in the qla2xxx driver. Please consider this patch series for the v5.7 kernel.
Thanks,
Bart.
Changes compared to v2:
- Removed oneBUILD_BUG_ON()statement.Changes compared to v1:
- Left out theraw_smp_processor_id()patch because it may take time to achieve agreement about this patch.
- Added three patches to this series: two patches for verifying structure size at compile time and one patch for changing function names from upper case to lower case.Bart Van Assche (6):
qla2xxx: SortBUILD_BUG_ON()statements alphabetically
qla2xxx: Add moreBUILD_BUG_ON()statements
qla2xxx: Fix endianness annotations in header files
qla2xxx: Fix endianness annotations in source files
qla2xxx: Fix the code that reads from mailbox registers
qla2xxx: Change {RD,WRT}_REG_*() function names from upper case into
lower casedrivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 672 +++++++++++++------------- drivers/scsi/qla2xxx/qla_dbg.h | 442 ++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 711 ++++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 738 ++++++++++++++--------------- drivers/scsi/qla2xxx/qla_init.c | 279 +++++------ drivers/scsi/qla2xxx/qla_inline.h | 8 +- drivers/scsi/qla2xxx/qla_iocb.c | 121 ++--- drivers/scsi/qla2xxx/qla_isr.c | 217 +++++---- drivers/scsi/qla2xxx/qla_mbx.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.c | 111 +++-- drivers/scsi/qla2xxx/qla_mr.h | 32 +- drivers/scsi/qla2xxx/qla_nvme.c | 12 +- drivers/scsi/qla2xxx/qla_nvme.h | 46 +- drivers/scsi/qla2xxx/qla_nx.c | 161 +++---- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_nx2.c | 12 +- drivers/scsi/qla2xxx/qla_os.c | 128 +++-- drivers/scsi/qla2xxx/qla_sup.c | 345 +++++++------- drivers/scsi/qla2xxx/qla_target.c | 84 ++-- drivers/scsi/qla2xxx/qla_target.h | 208 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 12 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 + 24 files changed, 2317 insertions(+), 2190 deletions(-)