Fix qla2xxx endianness annotations
Subsystems (3)
v6 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.8 kernel.
Thanks,
Bart.
Changes compared to v5:
- Added Reviewed-by tags posted as replies to v4 and v5.
Changes compared to v4:
- Addressed Hannes' and most of Arun's review comments.
- Suppressed a clang warning for the patch that suppresses a gcc warning.
- Included three new patches. Two of these patches compensate for recently introduced changes (broken C=2 build and using register offsets instead of register names) and one new patch to make the last patch in this series easier to read.
Changes compared to v3:
- Included several source code cleanup patches, e.g. to address isssues detected by checkpatch.
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 (15):
qla2xxx: Fix spelling of a variable name
qla2xxx: Suppress two recently introduced compiler warnings
qla2xxx: Simplify the functions for dumping firmware
qla2xxx: Sort BUILD_BUG_ON() statements alphabetically
qla2xxx: Add more BUILD_BUG_ON() statements
qla2xxx: Make a gap in struct qla2xxx_offld_chain explicit
qla2xxx: Increase the size of struct qla_fcp_prio_cfg to
FCP_PRIO_CFG_SIZE
qla2xxx: Change two hardcoded constants into offsetof() / sizeof()
expressions
qla2xxx: Use register names instead of register offsets
qla2xxx: Fix the code that reads from mailbox registers
qla2xxx: Change {RD,WRT}_REG_*() function names from upper case into
lower case
qla2xxx: Cast explicitly to uint16_t / uint32_t
qla2xxx: Use make_handle() instead of open-coding it
qla2xxx: Fix endianness annotations in header files
qla2xxx: Fix endianness annotations in source files
drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 8 +- drivers/scsi/qla2xxx/qla_dbg.c | 826 +++++++++++++---------------- drivers/scsi/qla2xxx/qla_dbg.h | 443 ++++++++-------- drivers/scsi/qla2xxx/qla_def.h | 715 +++++++++++++------------ drivers/scsi/qla2xxx/qla_fw.h | 768 +++++++++++++-------------- drivers/scsi/qla2xxx/qla_gbl.h | 21 +- drivers/scsi/qla2xxx/qla_init.c | 286 +++++----- drivers/scsi/qla2xxx/qla_inline.h | 8 +- drivers/scsi/qla2xxx/qla_iocb.c | 135 ++--- drivers/scsi/qla2xxx/qla_isr.c | 237 ++++----- drivers/scsi/qla2xxx/qla_mbx.c | 123 +++-- drivers/scsi/qla2xxx/qla_mid.c | 4 +- drivers/scsi/qla2xxx/qla_mr.c | 115 ++-- drivers/scsi/qla2xxx/qla_mr.h | 32 +- drivers/scsi/qla2xxx/qla_nvme.c | 16 +- drivers/scsi/qla2xxx/qla_nvme.h | 64 +-- drivers/scsi/qla2xxx/qla_nx.c | 163 +++--- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_nx2.c | 18 +- drivers/scsi/qla2xxx/qla_os.c | 124 +++-- drivers/scsi/qla2xxx/qla_sup.c | 323 +++++------ drivers/scsi/qla2xxx/qla_target.c | 104 ++-- drivers/scsi/qla2xxx/qla_target.h | 232 ++++---- drivers/scsi/qla2xxx/qla_tmpl.c | 39 +- drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 + include/trace/events/qla.h | 7 + 27 files changed, 2452 insertions(+), 2412 deletions(-)
PATCH v6 1/15 qla2xxx: Fix spelling of a variable name
--- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_fw.h +1 -1
@@ -1292,7 +1292,7 @@ struct device_reg_24xx { };/* RISC-RISC semaphore register PCI offet */ #define RISC_REGISTER_BASE_OFFSET 0x7010 -#define RISC_REGISTER_WINDOW_OFFET 0x6 +#define RISC_REGISTER_WINDOW_OFFSET 0x6/* RISC-RISC semaphore/flag register (risc address 0x7016) */
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -2861,7 +2861,7 @@ qla25xx_read_risc_sema_reg(scsi_qla_host_t *vha, uint32_t *data)struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;WRT_REG_DWORD (®->iobase_addr,RISC_REGISTER_BASE_OFFSET ); - *data =RD_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFET ); + *data =RD_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFSET ); }
@@ -2871,7 +2871,7 @@ qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;WRT_REG_DWORD (®->iobase_addr,RISC_REGISTER_BASE_OFFSET ); -WRT_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFET , data); +WRT_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFSET , data); } static void
Re: [PATCH v6 01/15] qla2xxx: Fix spelling of a variable name
Quoted 41 lines · Bart Van Assche
Reviewed-by Daniel Wagner <[email protected]>Reviewed-by Himanshu Madhani <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_fw.h | 2 +- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/scsi/qla2xxx/qla_fw.h +1
-1@@ -1292,7 +1292,7 @@ struct device_reg_24xx { };/* RISC-RISC semaphore register PCI offet */ #define RISC_REGISTER_BASE_OFFSET 0x7010 -#define RISC_REGISTER_WINDOW_OFFET 0x6 +#define RISC_REGISTER_WINDOW_OFFSET 0x6/* RISC-RISC semaphore/flag register (risc address 0x7016) */ drivers/scsi/qla2xxx/qla_init.c +1
-1@@ -2861,7 +2861,7 @@ qla25xx_read_risc_sema_reg(scsi_qla_host_t *vha, uint32_t *data)struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;WRT_REG_DWORD (®->iobase_addr,RISC_REGISTER_BASE_OFFSET ); - *data =RD_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFET ); + *data =RD_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFSET ); }
drivers/scsi/qla2xxx/qla_init.c qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data) · line 2877
Quoted 8 lines
drivers/scsi/qla2xxx/qla_init.c +1
-1@@ -2871,7 +2871,7 @@ qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;WRT_REG_DWORD (®->iobase_addr,RISC_REGISTER_BASE_OFFSET ); -WRT_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFET , data); +WRT_REG_DWORD (®->iobase_window +RISC_REGISTER_WINDOW_OFFSET , data); } static void
Thanks,
Roman
PATCH v6 2/15 qla2xxx: Suppress two recently introduced compiler warnings
In reply to Bart Van AsscheSuppress the following two compiler warnings because these are not useful:
In file included from ./include/trace/define_trace.h:102,
from ./include/trace/events/qla.h:39,
from drivers/scsi/qla2xxx/qla_dbg.c:77:
./include/trace/events/qla.h: In function 'trace_event_raw_event_qla_log_event':
./include/trace/trace_events.h:691:9: warning: function 'trace_event_raw_event_qla_log_event' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
691 | struct trace_event_raw_##call *entry; \
| ^~~~~~~~~~~~~~~~
./include/trace/events/qla.h:12:1: note: in expansion of macro 'DECLARE_EVENT_CLASS'
12 | DECLARE_EVENT_CLASS(qla_log_event,
| ^~~~~~~~~~~~~~~~~~~
In file included from ./include/trace/define_trace.h:103,
from ./include/trace/events/qla.h:39,
from drivers/scsi/qla2xxx/qla_dbg.c:77:
./include/trace/events/qla.h: In function 'perf_trace_qla_log_event':
./include/trace/perf.h:41:9: warning: function 'perf_trace_qla_log_event' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
41 | struct hlist_head *head; \
| ^~~~~~~~~~./include/trace/events/qla.h:12:1: note: in expansion of macro 'DECLARE_EVENT_CLASS'
--- include/trace/events/qla.h | 7 +++++++ 1 file changed, 7 insertions(+)
include/trace/events/qla.h +7 -0
@@ -9,6 +9,11 @@#define QLA_MSG_MAX 256 +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wsuggest-attribute=format" +#endif + DECLARE_EVENT_CLASS(qla_log_event, TP_PROTO(const char *buf, struct va_format *vaf),
@@ -27,6 +32,8 @@ DECLARE_EVENT_CLASS(qla_log_event,TP_printk ("%s %s" ,__get_str (buf),__get_str (msg)) ); +#pragma GCC diagnostic pop +DEFINE_EVENT (qla_log_event, ql_dbg_log, TP_PROTO(const char *buf, struct va_format *vaf), TP_ARGS(buf, vaf)
PATCH v6 3/15 qla2xxx: Simplify the functions for dumping firmware
In reply to Bart Van AsscheInstead of passing an argument to the firmware dumping functions that tells these functions whether or not to obtain the hardware lock, obtain that lock before calling these functions. This patch fixes the following recently introduced C=2 build error:
CHECK drivers/scsi/qla2xxx/qla_tmpl.cdrivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: Expected ; at end of statement drivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: got } drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: Expected } at end of function drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: got end-of-input
--- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 153 ++++++++---------------------- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 21 ++-- drivers/scsi/qla2xxx/qla_isr.c | 12 +-- drivers/scsi/qla2xxx/qla_mbx.c | 6 +- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/scsi/qla2xxx/qla_nx2.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/scsi/qla2xxx/qla_tmpl.c | 19 +--- 11 files changed, 71 insertions(+), 156 deletions(-)
drivers/scsi/qla2xxx/qla_bsg.c +2 -2
@@ -691,7 +691,7 @@ qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config,* dump and reset the chip. */ if (ret) { - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags); } rval = -EINVAL ;
@@ -896,7 +896,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)* doesn't work take FCoE dump and then * reset the chip. */ - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags); }
drivers/scsi/qla2xxx/qla_dbg.c +39 -114
350 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_def.h +1 -1
@@ -3222,7 +3222,7 @@ struct isp_operations {int (*write_nvram)(struct scsi_qla_host *,void *,uint32_t ,uint32_t ); -void (*fw_dump) (struct scsi_qla_host *,int ); +void (*fw_dump)(struct scsi_qla_host *vha);void (*mpi_fw_dump)(struct scsi_qla_host *,int );int (*beacon_on) (struct scsi_qla_host *);
drivers/scsi/qla2xxx/qla_gbl.h +11 -10
@@ -637,15 +637,16 @@ extern int qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *);/* * Global Function Prototypes in qla_dbg.c source file. */ -extern void qla2100_fw_dump (scsi_qla_host_t *,int ); -extern void qla2300_fw_dump (scsi_qla_host_t *,int ); -extern void qla24xx_fw_dump (scsi_qla_host_t *,int ); -extern void qla25xx_fw_dump (scsi_qla_host_t *,int ); -extern void qla81xx_fw_dump (scsi_qla_host_t *,int ); -extern void qla82xx_fw_dump (scsi_qla_host_t *,int ); -extern void qla8044_fw_dump (scsi_qla_host_t *,int ); - -extern void qla27xx_fwdump (scsi_qla_host_t *,int ); +void qla2xxx_dump_fw (scsi_qla_host_t *vha); +void qla2100_fw_dump (scsi_qla_host_t *vha); +void qla2300_fw_dump (scsi_qla_host_t *vha); +void qla24xx_fw_dump (scsi_qla_host_t *vha); +void qla25xx_fw_dump (scsi_qla_host_t *vha); +void qla81xx_fw_dump (scsi_qla_host_t *vha); +void qla82xx_fw_dump (scsi_qla_host_t *vha); +void qla8044_fw_dump (scsi_qla_host_t *vha); + +void qla27xx_fwdump (scsi_qla_host_t *vha);extern void qla27xx_mpi_fwdump (scsi_qla_host_t *,int );extern ulong qla27xx_fwdt_calculate_dump_size (struct scsi_qla_host *,void *);extern int qla27xx_fwdt_template_valid (void *);
@@ -873,7 +874,7 @@ extern int qla2x00_get_idma_speed(scsi_qla_host_t *, uint16_t, uint16_t *, uint16_t *);/* 83xx related functions */ -extern void qla83xx_fw_dump (scsi_qla_host_t *,int ); +void qla83xx_fw_dump (scsi_qla_host_t *vha);/* Minidump related functions */ extern int qla82xx_md_get_template_size (scsi_qla_host_t *);
drivers/scsi/qla2xxx/qla_isr.c +6 -6
@@ -220,7 +220,7 @@ qla2100_intr_handler(int irq, void *dev_id)WRT_REG_WORD (®->hccr,HCCR_RESET_RISC );RD_REG_WORD (®->hccr); - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ; }else if ((RD_REG_WORD (®->istatus) &ISR_RISC_INT ) ==0 )
@@ -351,7 +351,7 @@ qla2300_intr_handler(int irq, void *dev_id)WRT_REG_WORD (®->hccr,HCCR_RESET_RISC );RD_REG_WORD (®->hccr); - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ; }else if ((stat &HSR_RISC_INT ) ==0 )
@@ -777,7 +777,7 @@ qla27xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb) "MPI Heartbeat stop. FW dump needed\n");if (ql2xfulldump_on_mpifail) { - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha); reset_isp_needed =1 ; }
@@ -908,7 +908,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)if ((IS_QLA27XX (ha) ||IS_QLA28XX (ha)) &&RD_REG_WORD (®24->mailbox7) &BIT_8 ) ha->isp_ops->mpi_fw_dump (vha,1 ); - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha); ha->flags.fw_init_done =0 ;QLA_FW_STOPPED (ha);
@@ -3473,7 +3473,7 @@ qla24xx_intr_handler(int irq, void *dev_id)qla2xxx_check_risc_status (vha); - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ; }else if ((stat &HSRX_RISC_INT ) ==0 )
@@ -3602,7 +3602,7 @@ qla24xx_msix_default(int irq, void *dev_id)qla2xxx_check_risc_status (vha); - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);break ; }else if ((stat &HSRX_RISC_INT ) ==0 )
drivers/scsi/qla2xxx/qla_mbx.c +3 -3
@@ -462,7 +462,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)* a dump */ if (mcp->mb[0 ] !=MBC_GEN_SYSTEM_ERROR ) - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha); rval =QLA_FUNCTION_TIMEOUT ; } }
@@ -6213,7 +6213,7 @@ qla83xx_restart_nic_firmware(scsi_qla_host_t *vha)ql_dbg (ql_dbg_mbx, vha,0x1144 ,"Failed=%x mb[0]=%x mb[1]=%x.\n" , rval, mcp->mb[0 ], mcp->mb[1 ]); - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha); }else {ql_dbg (ql_dbg_mbx, vha,0x1145 ,"Done %s.\n" , __func__); }
@@ -6258,7 +6258,7 @@ qla83xx_access_control(scsi_qla_host_t *vha, uint16_t options,"Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x mb[3]=%x mb[4]=%x.\n" , rval, mcp->mb[0 ], mcp->mb[1 ], mcp->mb[2 ], mcp->mb[3 ], mcp->mb[4]); - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha); }else {if (subcode &BIT_5 ) *sector_size = mcp->mb[1 ];
drivers/scsi/qla2xxx/qla_nx.c +1 -1
@@ -4514,7 +4514,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha) }void -qla82xx_fw_dump (scsi_qla_host_t *vha,int hardware_locked) +qla82xx_fw_dump (scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw;
drivers/scsi/qla2xxx/qla_nx2.c +1 -1
@@ -4070,7 +4070,7 @@ qla8044_abort_isp(scsi_qla_host_t *vha) }void -qla8044_fw_dump (scsi_qla_host_t *vha,int hardware_locked) +qla8044_fw_dump (scsi_qla_host_t *vha) {struct qla_hw_data *ha = vha->hw;
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -7575,7 +7575,7 @@ qla2xxx_pci_mmio_enabled(struct pci_dev *pdev)if (risc_paused) {ql_log (ql_log_info, base_vha,0x9003 ,"RISC paused -- mmio_enabled, Dumping firmware.\n" ); - ha->isp_ops->fw_dump (base_vha,0 ); +qla2xxx_dump_fw (base_vha);return PCI_ERS_RESULT_NEED_RESET ; }else
drivers/scsi/qla2xxx/qla_target.c +2 -2
@@ -5670,9 +5670,9 @@ static int qlt_chk_unresolv_exchg(struct scsi_qla_host *vha, vha, 0xffff, (uint8_t *)entry, sizeof(*entry));if (qpair == ha->base_qpair) - ha->isp_ops->fw_dump (vha,1 ); + ha->isp_ops->fw_dump (vha);else - ha->isp_ops->fw_dump (vha,0 ); +qla2xxx_dump_fw (vha);set_bit (ISP_ABORT_NEEDED , &vha->dpc_flags);qla2xxx_wake_dpc (vha);
drivers/scsi/qla2xxx/qla_tmpl.c +4 -15
@@ -1081,14 +1081,9 @@ qla27xx_mpi_fwdump(scsi_qla_host_t *vha, int hardware_locked) }void -qla27xx_fwdump (scsi_qla_host_t *vha,int hardware_locked) +qla27xx_fwdump (scsi_qla_host_t *vha) { -ulong flags =0 ; - -#ifndef __CHECKER__ -if (!hardware_locked) -spin_lock_irqsave (&vha->hw->hardware_lock, flags); -#endif +lockdep_assert_held (&vha->hw->hardware_lock);if (!vha->hw->fw_dump) {ql_log (ql_log_warn, vha,0xd01e ,"-> fwdump no buffer\n" );
@@ -1105,11 +1100,11 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked)if (!fwdt->template) {ql_log (ql_log_warn, vha,0xd012 ,"-> fwdt0 no template\n" ); - goto bailout; +return ; } len =qla27xx_execute_fwdt_template (vha, fwdt->template, buf);if (len ==0 ) { - goto bailout; +return ; }else if (len != fwdt->dump_size) { ql_log(ql_log_warn, vha, 0xd013, "-> fwdt0 fwdump residual=%+ld\n",
@@ -1124,10 +1119,4 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked) vha->host_no, vha->hw->fw_dump, vha->hw->fw_dump_cap_flags);qla2x00_post_uevent_work (vha,QLA_UEVENT_CODE_FW_DUMP ); } - -bailout: -#ifndef __CHECKER__ -if (!hardware_locked) -spin_unlock_irqrestore (&vha->hw->hardware_lock, flags); -#endif }
Re: [PATCH v6 03/15] qla2xxx: Simplify the functions for dumping firmware
Quoted 20 lines · Bart Van Assche
Instead of passing an argument to the firmware dumping functions that tells these functions whether or not to obtain the hardware lock, obtain that lock before calling these functions. This patch fixes the following recently introduced C=2 build error:
CHECK
drivers/scsi/qla2xxx/qla_tmpl.cdrivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: Expected ; at end of statementdrivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: got }drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: Expected } at end of functiondrivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: got end-of-inputCc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Fixes cbb01c2f2f63 ("scsi: qla2xxx: Fix MPI failure AEN (8200) handling")Signed-off-by Bart Van Assche <[email protected]>
Quoted 14 lines
--- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 153 ++++++++---------------------- drivers/scsi/qla2xxx/qla_def.h | 2 +- drivers/scsi/qla2xxx/qla_gbl.h | 21 ++-- drivers/scsi/qla2xxx/qla_isr.c | 12 +-- drivers/scsi/qla2xxx/qla_mbx.c | 6 +- drivers/scsi/qla2xxx/qla_nx.c | 2 +- drivers/scsi/qla2xxx/qla_nx2.c | 2 +- drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/scsi/qla2xxx/qla_target.c | 4 +- drivers/scsi/qla2xxx/qla_tmpl.c | 19 +--- 11 files changed, 71 insertions(+), 156 deletions(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v6 03/15] qla2xxx: Simplify the functions for dumping firmware
In reply to Bart Van AsscheQuoted 11 lines · Bart Van Assche
Instead of passing an argument to the firmware dumping functions that tells these functions whether or not to obtain the hardware lock, obtain that lock before calling these functions. This patch fixes the following recently introduced C=2 build error:
CHECK
drivers/scsi/qla2xxx/qla_tmpl.cdrivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: Expected ; at end of statementdrivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: got }drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: Expected } at end of functiondrivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: got end-of-input
Quoted 9 lines
Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Fixes cbb01c2f2f63 ("scsi: qla2xxx: Fix MPI failure AEN (8200) handling")Signed-off-by Bart Van Assche <[email protected]>
PATCH v6 4/15 qla2xxx: Sort BUILD_BUG_ON() statements alphabetically
In reply to Bart Van AsscheBefore 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
@@ -7842,11 +7842,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 v6 5/15 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 | 58 ++++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 14 ++++++++ 2 files changed, 72 insertions(+)
drivers/scsi/qla2xxx/qla_os.c +58 -0
@@ -7822,13 +7822,19 @@ 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_rsp_84xx ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_bidir ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_nvme ) !=64 );BUILD_BUG_ON (sizeof (struct cmd_type_6 ) !=64 );
@@ -7836,17 +7842,69 @@ qla2x00_module_init(void)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 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 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_sts_entry_24xx ) !=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 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_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 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_rsp_84xx ) !=52 );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
@@ -1960,6 +1960,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 v6 6/15 qla2xxx: Make a gap in struct qla2xxx_offld_chain explicit
In reply to Bart Van AsscheThis patch makes struct qla2xxx_offld_chain compatible with ARCH=i386.
--- drivers/scsi/qla2xxx/qla_dbg.h | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_dbg.h +1 -0
@@ -238,6 +238,7 @@ struct qla2xxx_offld_chain {uint32_t chain_size;uint32_t size; +uint32_t reserved;u64 addr; };
Re: [PATCH v6 06/15] qla2xxx: Make a gap in struct qla2xxx_offld_chain explicit
Quoted 21 lines · Bart Van Assche
This patch makes struct
qla2xxx_offld_chaincompatible with ARCH=i386.Reviewed-by Daniel Wagner <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_dbg.h | 1 + 1 file changed, 1 insertion(+)drivers/scsi/qla2xxx/qla_dbg.h +0
-0
drivers/scsi/qla2xxx/qla_dbg.h struct qla2xxx_offld_chain { · line 244
Quoted 7 lines
drivers/scsi/qla2xxx/qla_dbg.h +1
-0@@ -238,6 +238,7 @@ struct qla2xxx_offld_chain {uint32_t chain_size;uint32_t size; +uint32_t reserved;u64 addr; };
Signature · 2 lines
Himanshu Madhani Oracle Linux Engineering
PATCH v6 7/15 qla2xxx: Increase the size of struct qla_fcp_prio_cfg to FCP_PRIO_CFG_SIZE
In reply to Bart Van AsscheThis patch fixes the following Coverity complaint without changing any functionality:
CID 337793 (#1 of 1): Wrong size argument (SIZEOF_MISMATCH)suspicious_sizeof: Passing argument ha->fcp_prio_cfg of type struct qla_fcp_prio_cfg * and argument 32768UL to function memset is suspicious because a multiple of sizeof (struct qla_fcp_prio_cfg) /*48*/ is expected.
memset(ha->fcp_prio_cfg, 0, FCP_PRIO_CFG_SIZE);
--- drivers/scsi/qla2xxx/qla_fw.h | 3 ++- drivers/scsi/qla2xxx/qla_os.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_fw.h +2 -1
@@ -2217,8 +2217,9 @@ struct qla_fcp_prio_cfg {#define FCP_PRIO_ATTR_PERSIST 0x2uint8_t reserved;/* Reserved for future use */ #define FCP_PRIO_CFG_HDR_SIZE 0x10 -struct qla_fcp_prio_entry entry[1 ];/* fcp priority entries */ +struct qla_fcp_prio_entry entry[1023 ];/* fcp priority entries */ #define FCP_PRIO_CFG_ENTRY_SIZE 0x20 +uint8_t reserved2[16 ]; };#define FCP_PRIO_CFG_SIZE (32*1024)/* fcp prio data per port*/
drivers/scsi/qla2xxx/qla_os.c +1 -0
@@ -7883,6 +7883,7 @@ qla2x00_module_init(void)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_fcp_prio_cfg ) !=FCP_PRIO_CFG_SIZE );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_region ) !=16 );
PATCH v6 8/15 qla2xxx: Change two hardcoded constants into offsetof() / sizeof() expressions
In reply to Bart Van AsscheThis patch does not change any functionality.
--- drivers/scsi/qla2xxx/qla_fw.h | 3 +-- drivers/scsi/qla2xxx/qla_sup.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_fw.h +1 -2
@@ -2216,9 +2216,8 @@ struct qla_fcp_prio_cfg {#define FCP_PRIO_ATTR_ENABLE 0x1#define FCP_PRIO_ATTR_PERSIST 0x2uint8_t reserved;/* Reserved for future use */ -#define FCP_PRIO_CFG_HDR_SIZE 0x10 +#define FCP_PRIO_CFG_HDR_SIZE offsetof(struct qla_fcp_prio_cfg, entry)struct qla_fcp_prio_entry entry[1023 ];/* fcp priority entries */ -#define FCP_PRIO_CFG_ENTRY_SIZE 0x20uint8_t reserved2[16 ]; };
drivers/scsi/qla2xxx/qla_sup.c +1 -1
@@ -3617,7 +3617,7 @@ qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *vha)/* read remaining FCP CMD config data from flash */ fcp_prio_addr += (FCP_PRIO_CFG_HDR_SIZE >>2 ); - len = ha->fcp_prio_cfg->num_entries *FCP_PRIO_CFG_ENTRY_SIZE ; + len = ha->fcp_prio_cfg->num_entries *sizeof (struct qla_fcp_prio_entry ); max_len =FCP_PRIO_CFG_SIZE -FCP_PRIO_CFG_HDR_SIZE ; ha->isp_ops->read_optrom(vha, &ha->fcp_prio_cfg->entry[0],
PATCH v6 9/15 qla2xxx: Use register names instead of register offsets
In reply to Bart Van AsscheMake qla27xx_write_remote_reg() easier to read by using register names instead of register offsets. The 'pahole' tool has been used to convert register offsets into register names. See also commit cbb01c2f2f63 ("scsi: qla2xxx: Fix MPI failure AEN (8200) handling").
--- drivers/scsi/qla2xxx/qla_tmpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_tmpl.c +4 -4
@@ -17,14 +17,14 @@ static void qla27xx_write_remote_reg(struct scsi_qla_host *vha, u32 addr, u32 data) { - char *reg = (char *)ISPREG(vha); + struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;ql_dbg (ql_dbg_misc, vha,0xd300 ,"%s: addr/data = %xh/%xh\n" , __func__, addr, data); -WRT_REG_DWORD (reg +IOBASE (vha),0x40 ); -WRT_REG_DWORD (reg +0xc4 , data); -WRT_REG_DWORD (reg +0xc0 , addr); +WRT_REG_DWORD (®->iobase_addr,0x40 ); +WRT_REG_DWORD (®->iobase_c4, data); +WRT_REG_DWORD (®->iobase_window, addr); }void
Re: [PATCH v6 09/15] qla2xxx: Use register names instead of register offsets
Hi Bart,
Quoted 5 lines · Bart Van Assche
Make
qla27xx_write_remote_reg()easier to read by using register names instead of register offsets. The 'pahole' tool has been used to convert register offsets into register names. See also commitcbb01c2f2f63("scsi: qla2xxx: Fix MPI failure AEN (8200) handling").
Quoted 8 lines
Reviewed-by Hannes Reinecke <[email protected]>Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
This looks like a reasonable cleanup. I looked through the rest of the file and the code is consistently using the same code pattern. It would be good to keep it consistent. I am not against this change, I am just thinking it would be good to fixup the complete file.
Thanks,
Daniel
Re: [PATCH v6 09/15] qla2xxx: Use register names instead of register offsets
In reply to Bart Van AsscheQuoted 31 lines · Bart Van Assche
Make
qla27xx_write_remote_reg()easier to read by using register names instead of register offsets. The 'pahole' tool has been used to convert register offsets into register names. See also commitcbb01c2f2f63("scsi: qla2xxx: Fix MPI failure AEN (8200) handling").Reviewed-by Hannes Reinecke <[email protected]>Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_tmpl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/scsi/qla2xxx/qla_tmpl.c +1
-1@@ -17,14 +17,14 @@ static void qla27xx_write_remote_reg(struct scsi_qla_host *vha, u32 addr, u32 data) { - char *reg = (char *)ISPREG(vha); + struct device_reg_24xx __iomem *reg = &vha->hw->iobase->isp24;ql_dbg (ql_dbg_misc, vha,0xd300 ,"%s: addr/data = %xh/%xh\n" , __func__, addr, data);
drivers/scsi/qla2xxx/qla_tmpl.c static void · line 30
Quoted 10 lines
drivers/scsi/qla2xxx/qla_tmpl.c +3
-3-WRT_REG_DWORD (reg +IOBASE (vha),0x40 ); -WRT_REG_DWORD (reg +0xc4 , data); -WRT_REG_DWORD (reg +0xc0 , addr); +WRT_REG_DWORD (®->iobase_addr,0x40 ); +WRT_REG_DWORD (®->iobase_c4, data); +WRT_REG_DWORD (®->iobase_window, addr); }void
Signature · 2 lines
Himanshu Madhani Oracle Linux Engineering
PATCH v6 10/15 qla2xxx: Fix the code that reads from mailbox registers
In reply to Bart Van AsscheMake the MMIO accessors strongly typed such that the compiler checks whether the accessor function is used that matches the register width. Fix those MMIO accesses 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);
@@ -4098,7 +4098,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. */
@@ -3164,7 +3164,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 ];
@@ -2843,13 +2843,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],
@@ -2869,7 +2869,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;
@@ -2879,7 +2879,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);
@@ -2936,13 +2936,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
@@ -1996,11 +1996,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
@@ -7558,7 +7558,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 v6 11/15 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 | 26 +- drivers/scsi/qla2xxx/qla_init.c | 205 ++++++----- 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 | 244 ++++++------- drivers/scsi/qla2xxx/qla_target.c | 10 +- drivers/scsi/qla2xxx/qla_tmpl.c | 14 +- 16 files changed, 790 insertions(+), 791 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.c +291 -291
@@ -126,26 +126,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 ;
@@ -155,15 +155,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 ;
@@ -206,23 +206,23 @@ qla24xx_dump_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_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 ))
@@ -231,15 +231,15 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *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 ;
@@ -292,10 +292,10 @@ qla24xx_read_window(struct device_reg_24xx __iomem *reg, uint32_t iobase, {uint32_t __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; }
@@ -303,11 +303,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); }
@@ -324,17 +324,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);
@@ -342,19 +342,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 );
@@ -399,11 +399,11 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *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 ;
@@ -414,10 +414,10 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *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,
@@ -425,15 +425,15 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *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 ); }
@@ -458,7 +458,7 @@ qla2xxx_read_window(struct device_reg_2xxx __iomem *reg, uint32_t count,uint16_t __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 *
@@ -685,13 +685,13 @@ qla25xx_copy_mq(struct qla_hw_data *ha, void *ptr, uint32_t **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 );
@@ -760,13 +760,13 @@ qla2300_fw_dump(scsi_qla_host_t *vha)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 );
@@ -774,74 +774,74 @@ qla2300_fw_dump(scsi_qla_host_t *vha) 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 <ARRAY_SIZE (fw->pbiu_reg); 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 <ARRAY_SIZE (fw->risc_host_reg); 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 <ARRAY_SIZE (fw->mailbox_reg); 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 <ARRAY_SIZE (fw->risc_hdw_reg); 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 ;
@@ -916,11 +916,11 @@ qla2100_fw_dump(scsi_qla_host_t *vha)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 );
@@ -930,60 +930,60 @@ qla2100_fw_dump(scsi_qla_host_t *vha)if (rval ==QLA_SUCCESS ) { dmp_reg = ®->flash_address;for (cnt =0 ; cnt <ARRAY_SIZE (fw->pbiu_reg); 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 <ARRAY_SIZE (fw->dma_reg); 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 <ARRAY_SIZE (fw->risc_hdw_reg); 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 &&
@@ -996,11 +996,11 @@ qla2100_fw_dump(scsi_qla_host_t *vha)/* 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 );
@@ -1010,13 +1010,13 @@ qla2100_fw_dump(scsi_qla_host_t *vha)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 ); } }
@@ -1029,26 +1029,26 @@ qla2100_fw_dump(scsi_qla_host_t *vha)for (cnt =0 ; cnt <ARRAY_SIZE (fw->risc_ram) && 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 ); }
@@ -1107,7 +1107,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha) 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
@@ -1118,40 +1118,40 @@ qla24xx_fw_dump(scsi_qla_host_t *vha)/* Host interface registers. */ dmp_reg = ®->flash_addr;for (cnt =0 ; cnt <ARRAY_SIZE (fw->host_reg); 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 <ARRAY_SIZE (fw->mailbox_reg); 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;
@@ -1190,19 +1190,19 @@ qla24xx_fw_dump(scsi_qla_host_t *vha) 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;
@@ -1350,7 +1350,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha)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
@@ -1364,73 +1364,73 @@ qla25xx_fw_dump(scsi_qla_host_t *vha)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 <ARRAY_SIZE (fw->host_reg); 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 <ARRAY_SIZE (fw->mailbox_reg); 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;
@@ -1494,19 +1494,19 @@ qla25xx_fw_dump(scsi_qla_host_t *vha) 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;
@@ -1661,7 +1661,7 @@ qla81xx_fw_dump(scsi_qla_host_t *vha) 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
@@ -1675,73 +1675,73 @@ qla81xx_fw_dump(scsi_qla_host_t *vha)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 <ARRAY_SIZE (fw->host_reg); 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 <ARRAY_SIZE (fw->mailbox_reg); 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;
@@ -1805,19 +1805,19 @@ qla81xx_fw_dump(scsi_qla_host_t *vha) 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;
@@ -1976,7 +1976,7 @@ qla83xx_fw_dump(scsi_qla_host_t *vha) 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
@@ -1984,24 +1984,24 @@ qla83xx_fw_dump(scsi_qla_host_t *vha)*/ 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;
@@ -2010,73 +2010,73 @@ qla83xx_fw_dump(scsi_qla_host_t *vha)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 <ARRAY_SIZE (fw->host_reg); 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 <ARRAY_SIZE (fw->mailbox_reg); 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;
@@ -2172,19 +2172,19 @@ qla83xx_fw_dump(scsi_qla_host_t *vha) 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;
@@ -2390,16 +2390,16 @@ qla83xx_fw_dump(scsi_qla_host_t *vha)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) {
@@ -2674,7 +2674,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 +13 -13
@@ -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); }
@@ -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 -103
455 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_inline.h +3 -3
@@ -46,10 +46,10 @@ qla2x00_debounce_register(volatile uint16_t __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
@@ -1221,9 +1221,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 ); }
@@ -1907,8 +1907,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); }
@@ -1922,8 +1922,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); }
@@ -1935,8 +1935,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); }
@@ -1950,8 +1950,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); }
@@ -7558,15 +7558,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 +122 -122
93 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 v6 12/15 qla2xxx: Cast explicitly to uint16_t / uint32_t
In reply to Bart Van AsscheCasting a pointer to void * and relying on an implicit cast from void * to uint16_t or uint32_t suppresses sparse warnings about endianness. Hence cast explicitly to uint16_t and uint32_t. Additionally, remove superfluous void * casts.
--- drivers/scsi/qla2xxx/qla_dbg.c | 4 ++-- drivers/scsi/qla2xxx/qla_init.c | 26 +++++++++++++------------- drivers/scsi/qla2xxx/qla_mbx.c | 6 +++--- drivers/scsi/qla2xxx/qla_mid.c | 4 ++-- drivers/scsi/qla2xxx/qla_mr.c | 4 ++-- drivers/scsi/qla2xxx/qla_nvme.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx2.c | 4 ++-- drivers/scsi/qla2xxx/qla_os.c | 10 +++++----- drivers/scsi/qla2xxx/qla_sup.c | 12 ++++++------ drivers/scsi/qla2xxx/qla_target.c | 4 ++-- 10 files changed, 39 insertions(+), 39 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.c +2 -2
@@ -115,7 +115,7 @@ qla27xx_dump_mpi_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, {struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;dma_addr_t dump_dma = ha->gid_list_dma; -uint32_t *chunk = (void *)ha->gid_list; +uint32_t *chunk = (uint32_t *)ha->gid_list;uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ;
@@ -195,7 +195,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram,int rval =QLA_FUNCTION_FAILED ;struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;dma_addr_t dump_dma = ha->gid_list_dma; -uint32_t *chunk = (void *)ha->gid_list; +uint32_t *chunk = (uint32_t *)ha->gid_list;uint32_t dwords =qla2x00_gid_list_size (ha) /4 ;uint32_t stat;ulong i, j, timer =6000000 ;
drivers/scsi/qla2xxx/qla_init.c +13 -13
@@ -992,7 +992,7 @@ static void qla24xx_async_gnl_sp_done(srb_t *sp, int res)ql_dbg (ql_dbg_disc, vha,0x20e8 ,"%s %8phC %02x:%02x:%02x CLS %x/%x lid %x \n" , - __func__, (void *)&wwn, e->port_id[2 ], e->port_id[1 ], + __func__, &wwn, e->port_id[2 ], e->port_id[1 ], e->port_id[0 ], e->current_login_state, e->last_login_state, (loop_id &0x7fff )); }
@@ -1343,7 +1343,7 @@ int qla24xx_async_gpdb(struct scsi_qla_host *vha, fc_port_t *fcport, u8 opt) mb[9 ] = vha->vp_idx; mb[10 ] = opt; - mbx->u.mbx.in = (void *)pd; + mbx->u.mbx.in = pd; mbx->u.mbx.in_dma = pd_dma; sp->done = qla24xx_async_gpdb_sp_done;
@@ -4128,7 +4128,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) req = ha->req_q_map[que];if (!req || !test_bit (que, ha->req_qid_map))continue ; - req->out_ptr = (void *)(req->ring + req->length); + req->out_ptr = (uint16_t *)(req->ring + req->length); *req->out_ptr =0 ;for (cnt =1 ; cnt < req->num_outstanding_cmds; cnt++) req->outstanding_cmds[cnt] =NULL ;
@@ -4145,7 +4145,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha) rsp = ha->rsp_q_map[que];if (!rsp || !test_bit (que, ha->rsp_qid_map))continue ; - rsp->in_ptr = (void *)(rsp->ring + rsp->length); + rsp->in_ptr = (uint16_t *)(rsp->ring + rsp->length); *rsp->in_ptr =0 ;/* Initialize response queue entries */ if (IS_QLAFX00 (ha))
@@ -7446,7 +7446,7 @@ qla27xx_check_image_status_signature(struct qla27xx_image_status *image_status)static ulong qla27xx_image_status_checksum (struct qla27xx_image_status *image_status) { -uint32_t *p = (void *)image_status; +uint32_t *p = (uint32_t *)image_status;uint n =sizeof (*image_status) /sizeof (*p);uint32_t sum =0 ;
@@ -7509,7 +7509,7 @@ qla28xx_get_aux_images( goto check_sec_image; } -qla24xx_read_flash_data (vha, (void *)&pri_aux_image_status, +qla24xx_read_flash_data (vha, (uint32_t *)&pri_aux_image_status, ha->flt_region_aux_img_status_pri,sizeof (pri_aux_image_status) >>2 );qla27xx_print_image (vha,"Primary aux image" , &pri_aux_image_status);
@@ -7542,7 +7542,7 @@ qla28xx_get_aux_images( goto check_valid_image; } -qla24xx_read_flash_data (vha, (void *)&sec_aux_image_status, +qla24xx_read_flash_data (vha, (uint32_t *)&sec_aux_image_status, ha->flt_region_aux_img_status_sec,sizeof (sec_aux_image_status) >>2 );qla27xx_print_image (vha,"Secondary aux image" , &sec_aux_image_status);
@@ -7607,7 +7607,7 @@ qla27xx_get_active_image(struct scsi_qla_host *vha, goto check_sec_image; } -if (qla24xx_read_flash_data (vha, (void *)(&pri_image_status), +if (qla24xx_read_flash_data (vha, (uint32_t *)&pri_image_status, ha->flt_region_img_status_pri,sizeof (pri_image_status) >>2 ) !=QLA_SUCCESS ) {WARN_ON_ONCE (true);
@@ -7714,7 +7714,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,ql_dbg (ql_dbg_init, vha,0x008b ,"FW: Loading firmware from flash (%x).\n" , faddr); - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring;qla24xx_read_flash_data (vha, dcode, faddr,8 );if (qla24xx_risc_firmware_invalid (dcode)) { ql_log(ql_log_fatal, vha, 0x008c,
@@ -7727,7 +7727,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr,return QLA_FUNCTION_FAILED ; } - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring; *srisc_addr =0 ; segments =FA_RISC_CODE_SEGMENTS ;for (j =0 ; j < segments; j++) {
@@ -7778,7 +7778,7 @@ qla24xx_load_risc_flash(scsi_qla_host_t *vha, uint32_t *srisc_addr, fwdt->template =NULL ; fwdt->length =0 ; - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring;qla24xx_read_flash_data (vha, dcode, faddr,7 ); risc_size =be32_to_cpu (dcode[2 ]); ql_dbg(ql_dbg_init, vha, 0x0161,
@@ -7970,7 +7970,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)return QLA_FUNCTION_FAILED ; } - fwcode = (void *)blob->fw->data; + fwcode = (uint32_t *)blob->fw->data; dcode = fwcode;if (qla24xx_risc_firmware_invalid (dcode)) { ql_log(ql_log_fatal, vha, 0x0093,
@@ -7982,7 +7982,7 @@ qla24xx_load_risc_blob(scsi_qla_host_t *vha, uint32_t *srisc_addr)return QLA_FUNCTION_FAILED ; } - dcode = (void *)req->ring; + dcode = (uint32_t *)req->ring; *srisc_addr =0 ; segments =FA_RISC_CODE_SEGMENTS ;for (j =0 ; j < segments; j++) {
drivers/scsi/qla2xxx/qla_mbx.c +3 -3
@@ -3038,7 +3038,7 @@ qla2x00_get_link_status(scsi_qla_host_t *vha, uint16_t loop_id,int rval;mbx_cmd_t mc;mbx_cmd_t *mcp = &mc; -uint32_t *iter = (void *)stats; +uint32_t *iter = (uint32_t *)stats; ushort dwords = offsetof(typeof(*stats), link_up_cnt)/sizeof(*iter);struct qla_hw_data *ha = vha->hw;
@@ -3097,7 +3097,7 @@ qla24xx_get_isp_stats(scsi_qla_host_t *vha, struct link_statistics *stats,int rval;mbx_cmd_t mc;mbx_cmd_t *mcp = &mc; -uint32_t *iter = (void *)stats; +uint32_t *iter = (uint32_t *)stats;ushort dwords =sizeof (*stats)/sizeof (*iter); ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1088,
@@ -4736,7 +4736,7 @@ qla82xx_set_driver_version(scsi_qla_host_t *vha, char *version)ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x117b ,"Entered %s.\n" , __func__); - str = (void *)version; + str = (uint16_t *)version; len =strlen (version); mcp->mb[0 ] =MBC_SET_RNID_PARAMS ;
drivers/scsi/qla2xxx/qla_mid.c +2 -2
@@ -770,7 +770,7 @@ qla25xx_create_req_que(struct qla_hw_data *ha, uint16_t options, req->req_q_in = ®->isp25mq.req_q_in; req->req_q_out = ®->isp25mq.req_q_out; req->max_q_depth = ha->req_q_map[0 ]->max_q_depth; - req->out_ptr = (void *)(req->ring + req->length); + req->out_ptr = (uint16_t *)(req->ring + req->length);mutex_unlock (&ha->mq_lock);ql_dbg (ql_dbg_multiq, base_vha,0xc004 , "ring_ptr=%p ring_index=%d, "
@@ -884,7 +884,7 @@ qla25xx_create_rsp_que(struct qla_hw_data *ha, uint16_t options, reg =ISP_QUE_REG (ha, que_id); rsp->rsp_q_in = ®->isp25mq.rsp_q_in; rsp->rsp_q_out = ®->isp25mq.rsp_q_out; - rsp->in_ptr = (void *)(rsp->ring + rsp->length); + rsp->in_ptr = (uint16_t *)(rsp->ring + rsp->length);mutex_unlock (&ha->mq_lock); ql_dbg(ql_dbg_multiq, base_vha, 0xc00b, "options=%x id=%d rsp_q_in=%p rsp_q_out=%p\n",
drivers/scsi/qla2xxx/qla_mr.c +2 -2
@@ -3212,7 +3212,7 @@ qlafx00_tm_iocb(srb_t *sp, struct tsk_mgmt_entry_fx00 *ptm_iocb) sizeof(struct scsi_lun)); } -memcpy ((void *)ptm_iocb, &tm_iocb, +memcpy (ptm_iocb, &tm_iocb,sizeof (struct tsk_mgmt_entry_fx00 ));wmb (); }
@@ -3234,7 +3234,7 @@ qlafx00_abort_iocb(srb_t *sp, struct abort_iocb_entry_fx00 *pabt_iocb) abt_iocb.tgt_id_sts =cpu_to_le16 (sp->fcport->tgt_id); abt_iocb.req_que_no =cpu_to_le16 (req->id); -memcpy ((void *)pabt_iocb, &abt_iocb, +memcpy (pabt_iocb, &abt_iocb,sizeof (struct abort_iocb_entry_fx00 ));wmb (); }
drivers/scsi/qla2xxx/qla_nvme.c +2 -2
@@ -295,7 +295,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, sp->name ="nvme_ls" ; sp->done = qla_nvme_sp_ls_done; sp->put_fn = qla_nvme_release_ls_cmd_kref; - sp->priv = (void *)priv; + sp->priv = priv; priv->sp = sp;kref_init (&sp->cmd_kref);spin_lock_init (&priv->cmd_lock);
@@ -560,7 +560,7 @@ static int qla_nvme_post_cmd(struct nvme_fc_local_port *lport,init_waitqueue_head (&sp->nvme_ls_waitq);kref_init (&sp->cmd_kref);spin_lock_init (&priv->cmd_lock); - sp->priv = (void *)priv; + sp->priv = priv; priv->sp = sp; sp->type =SRB_NVME_CMD ; sp->name ="nvme_cmd" ;
drivers/scsi/qla2xxx/qla_nx2.c +2 -2
@@ -2965,7 +2965,7 @@ qla8044_minidump_pex_dma_read(struct scsi_qla_host *vha,/* Prepare: Write pex-dma descriptor to MS memory. */ rval =qla8044_ms_mem_write_128b (vha, - m_hdr->desc_card_addr, (void *)&dma_desc, + m_hdr->desc_card_addr, (uint32_t *)&dma_desc, (sizeof (struct qla8044_pex_dma_descriptor )/16 ));if (rval) { ql_log(ql_log_warn, vha, 0xb14a,
@@ -2987,7 +2987,7 @@ qla8044_minidump_pex_dma_read(struct scsi_qla_host *vha, read_size += chunk_size; } - *d_ptr = (void *)data_ptr; + *d_ptr = (uint32_t *)data_ptr; error_exit:if (rdmem_buffer)
drivers/scsi/qla2xxx/qla_os.c +5 -5
@@ -5915,7 +5915,7 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)ql_dbg (ql_dbg_init + ql_dbg_verbose, vha,0x0181 ,"-------- ELS REQ -------\n" );ql_dump_buffer (ql_dbg_init + ql_dbg_verbose, vha,0x0182 , - (void *)purex,sizeof (*purex)); + purex,sizeof (*purex));if (qla25xx_rdp_rsp_reduce_size (vha, purex)) { rsp_payload_length =
@@ -6031,7 +6031,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 */ +uint16_t *trx = (uint16_t *)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 ];
@@ -6140,7 +6140,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 */ +uint16_t *trx = (uint16_t *)sfp;/* already be16 */ /* Optical Element Descriptor, Temperature */ rsp_payload->optical_elmt_desc[0 ].high_alarm = trx[0 ];
@@ -6266,11 +6266,11 @@ void qla24xx_process_purex_rdp(struct scsi_qla_host *vha, void *pkt)ql_dbg (ql_dbg_init + ql_dbg_verbose, vha,0x0184 ,"-------- ELS RSP -------\n" );ql_dump_buffer (ql_dbg_init + ql_dbg_verbose, vha,0x0185 , - (void *)rsp_els,sizeof (*rsp_els)); + rsp_els,sizeof (*rsp_els));ql_dbg (ql_dbg_init + ql_dbg_verbose, vha,0x0186 ,"-------- ELS RSP PAYLOAD -------\n" );ql_dump_buffer (ql_dbg_init + ql_dbg_verbose, vha,0x0187 , - (void *)rsp_payload, rsp_payload_length); + rsp_payload, rsp_payload_length); rval =qla2x00_issue_iocb (vha, rsp_els, rsp_els_dma,0 );
drivers/scsi/qla2xxx/qla_sup.c +6 -6
@@ -553,7 +553,7 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)struct qla_hw_data *ha = vha->hw;struct req_que *req = ha->req_q_map[0 ];struct qla_flt_location *fltl = (void *)req->ring; -uint32_t *dcode = (void *)req->ring; +uint32_t *dcode = (uint32_t *)req->ring;uint8_t *buf = (void *)req->ring, *bcode, last_image;/*
@@ -610,7 +610,7 @@ qla2xxx_find_flt_start(scsi_qla_host_t *vha, uint32_t *start)if (memcmp (fltl->sig,"QFLT" ,4 )) goto end; - wptr = (void *)req->ring; + wptr = (uint16_t *)req->ring; cnt =sizeof (*fltl) /sizeof (*wptr);for (chksum =0 ; cnt--; wptr++) chksum +=le16_to_cpu (*wptr);
@@ -682,7 +682,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) ha->flt_region_flt = flt_addr; wptr = (uint16_t *)ha->flt; - ha->isp_ops->read_optrom (vha, (void *)flt, flt_addr <<2 , + ha->isp_ops->read_optrom (vha, flt, flt_addr <<2 , (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ));if (le16_to_cpu (*wptr) ==0xffff )
@@ -949,7 +949,7 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)struct qla_hw_data *ha = vha->hw;struct req_que *req = ha->req_q_map[0 ];uint16_t cnt, chksum; -uint16_t *wptr = (void *)req->ring; +uint16_t *wptr = (uint16_t *)req->ring;struct qla_fdt_layout *fdt = (struct qla_fdt_layout *)req->ring;uint8_t man_id, flash_id;uint16_t mid =0 , fid =0 ;
@@ -2610,7 +2610,7 @@ qla24xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,set_bit (MBX_UPDATE_FLASH_ACTIVE , &ha->mbx_cmd_flags);/* Go with read. */ -qla24xx_read_flash_data (vha, (void *)buf, offset >>2 , length >>2 ); +qla24xx_read_flash_data (vha, buf, offset >>2 , length >>2 );/* Resume HBA. */ clear_bit (MBX_UPDATE_FLASH_ACTIVE , &ha->mbx_cmd_flags);
@@ -3528,7 +3528,7 @@ qla24xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)memset (ha->gold_fw_version,0 ,sizeof (ha->gold_fw_version)); faddr = ha->flt_region_gold_fw; -qla24xx_read_flash_data (vha, (void *)dcode, ha->flt_region_gold_fw,8 ); +qla24xx_read_flash_data (vha, dcode, ha->flt_region_gold_fw,8 );if (qla24xx_risc_firmware_invalid (dcode)) {ql_log (ql_log_warn, vha,0x0056 ,"Unrecognized golden fw at %#x.\n" , faddr);
drivers/scsi/qla2xxx/qla_target.c +2 -2
@@ -3885,7 +3885,7 @@ static void *qlt_ctio_to_cmd(struct scsi_qla_host *vha,return NULL ; } - cmd = (void *) req->outstanding_cmds[h]; + cmd = req->outstanding_cmds[h];if (unlikely (cmd ==NULL )) { ql_dbg(ql_dbg_async, vha, 0xe053, "qla_target(%d): Suspicious: unable to find the command with handle %x req->id %d rsp->id %d\n",
@@ -5932,7 +5932,7 @@ void qlt_async_event(uint16_t code, struct scsi_qla_host *vha, le16_to_cpu(mailbox[2]), le16_to_cpu(mailbox[3]));if (tgt->link_reinit_iocb_pending) {qlt_send_notify_ack (ha->base_qpair, - (void *)&tgt->link_reinit_iocb, + &tgt->link_reinit_iocb,0 ,0 ,0 ,0 ,0 ,0 ); tgt->link_reinit_iocb_pending =0 ; }
PATCH v6 13/15 qla2xxx: Use make_handle() instead of open-coding it
In reply to Bart Van Assche--- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +5 -5
@@ -819,7 +819,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) goto skip_rio;switch (mb[0 ]) {case MBA_SCSI_COMPLETION : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ])); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); handle_cnt =1 ;break ;case MBA_CMPLT_1_16BIT :
@@ -858,10 +858,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) mb[0 ] =MBA_SCSI_COMPLETION ;break ;case MBA_CMPLT_2_32BIT : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ])); - handles[1 ] =le32_to_cpu ( - ((uint32_t )(RD_MAILBOX_REG (ha, reg,7 ) <<16 )) | -RD_MAILBOX_REG (ha, reg,6 )); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); + handles[1 ] = +le32_to_cpu (make_handle (RD_MAILBOX_REG (ha, reg,7 ), +RD_MAILBOX_REG (ha, reg,6 ))); handle_cnt =2 ; mb[0 ] =MBA_SCSI_COMPLETION ;break ;
Re: [PATCH v6 13/15] qla2xxx: Use make_handle() instead of open-coding it
Quoted 31 lines · Bart Van Assche
Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/scsi/qla2xxx/qla_isr.c +1
-2@@ -819,7 +819,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) goto skip_rio;switch (mb[0 ]) {case MBA_SCSI_COMPLETION : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ])); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); handle_cnt =1 ;break ;case MBA_CMPLT_1_16BIT :@@ -858,10 +858,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) mb[0 ] =MBA_SCSI_COMPLETION ;break ;case MBA_CMPLT_2_32BIT : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ]));
drivers/scsi/qla2xxx/qla_isr.c qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) · line 867
Quoted 10 lines
drivers/scsi/qla2xxx/qla_isr.c +4
-3- handles[1 ] =le32_to_cpu ( - ((uint32_t )(RD_MAILBOX_REG (ha, reg,7 ) <<16 )) | -RD_MAILBOX_REG (ha, reg,6 )); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); + handles[1 ] = +le32_to_cpu (make_handle (RD_MAILBOX_REG (ha, reg,7 ), +RD_MAILBOX_REG (ha, reg,6 ))); handle_cnt =2 ; mb[0 ] =MBA_SCSI_COMPLETION ;break ;
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v6 13/15] qla2xxx: Use make_handle() instead of open-coding it
In reply to Bart Van AsscheQuoted 8 lines · Bart Van Assche
Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Re: [PATCH v6 13/15] qla2xxx: Use make_handle() instead of open-coding it
In reply to Bart Van AsscheQuoted 31 lines · Bart Van Assche
Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/scsi/qla2xxx/qla_isr.c +1
-2@@ -819,7 +819,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) goto skip_rio;switch (mb[0 ]) {case MBA_SCSI_COMPLETION : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ])); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); handle_cnt =1 ;break ;case MBA_CMPLT_1_16BIT :@@ -858,10 +858,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) mb[0 ] =MBA_SCSI_COMPLETION ;break ;case MBA_CMPLT_2_32BIT : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ]));
drivers/scsi/qla2xxx/qla_isr.c qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) · line 867
Quoted 10 lines
drivers/scsi/qla2xxx/qla_isr.c +4
-3- handles[1 ] =le32_to_cpu ( - ((uint32_t )(RD_MAILBOX_REG (ha, reg,7 ) <<16 )) | -RD_MAILBOX_REG (ha, reg,6 )); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); + handles[1 ] = +le32_to_cpu (make_handle (RD_MAILBOX_REG (ha, reg,7 ), +RD_MAILBOX_REG (ha, reg,6 ))); handle_cnt =2 ; mb[0 ] =MBA_SCSI_COMPLETION ;break ;
Looks fine.
Signature · 2 lines
Himanshu Madhani Oracle Linux Engineering
Re: [PATCH v6 13/15] qla2xxx: Use make_handle() instead of open-coding it
In reply to Bart Van AsscheQuoted 30 lines · Bart Van Assche
Cc Arun Easi <[email protected]>Cc Nilesh Javali <[email protected]>Cc Daniel Wagner <[email protected]>Cc Himanshu Madhani <[email protected]>Cc Hannes Reinecke <[email protected]>Cc Martin Wilck <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>--- drivers/scsi/qla2xxx/qla_isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/scsi/qla2xxx/qla_isr.c +1
-2@@ -819,7 +819,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) goto skip_rio;switch (mb[0 ]) {case MBA_SCSI_COMPLETION : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ])); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); handle_cnt =1 ;break ;case MBA_CMPLT_1_16BIT :@@ -858,10 +858,10 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) mb[0 ] =MBA_SCSI_COMPLETION ;break ;case MBA_CMPLT_2_32BIT : - handles[0 ] =le32_to_cpu ((uint32_t )((mb[2 ] <<16 ) | mb[1 ]));
drivers/scsi/qla2xxx/qla_isr.c qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) · line 867
Quoted 10 lines
drivers/scsi/qla2xxx/qla_isr.c +4
-3- handles[1 ] =le32_to_cpu ( - ((uint32_t )(RD_MAILBOX_REG (ha, reg,7 ) <<16 )) | -RD_MAILBOX_REG (ha, reg,6 )); + handles[0 ] =le32_to_cpu (make_handle (mb[2 ], mb[1 ])); + handles[1 ] = +le32_to_cpu (make_handle (RD_MAILBOX_REG (ha, reg,7 ), +RD_MAILBOX_REG (ha, reg,6 ))); handle_cnt =2 ; mb[0 ] =MBA_SCSI_COMPLETION ;break ;
Hi Bart,
Thanks,
Roman
PATCH v6 14/15 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. Annotate 'handles' as CPU-endian because for the firmware these are opaque values.
--- drivers/scsi/qla2xxx/qla_dbg.h | 444 ++++++++--------- drivers/scsi/qla2xxx/qla_def.h | 652 ++++++++++++------------- drivers/scsi/qla2xxx/qla_fw.h | 760 +++++++++++++++--------------- drivers/scsi/qla2xxx/qla_inline.h | 2 +- drivers/scsi/qla2xxx/qla_mr.h | 8 +- drivers/scsi/qla2xxx/qla_nvme.h | 64 +-- drivers/scsi/qla2xxx/qla_nx.h | 36 +- drivers/scsi/qla2xxx/qla_target.h | 232 ++++----- 8 files changed, 1099 insertions(+), 1099 deletions(-)
drivers/scsi/qla2xxx/qla_dbg.h +222 -222
@@ -12,205 +12,205 @@*/ struct qla2300_fw_dump { -uint16_t hccr; -uint16_t pbiu_reg[8 ]; -uint16_t risc_host_reg[8 ]; -uint16_t mailbox_reg[32 ]; -uint16_t resp_dma_reg[32 ]; -uint16_t dma_reg[48 ]; -uint16_t risc_hdw_reg[16 ]; -uint16_t risc_gp0_reg[16 ]; -uint16_t risc_gp1_reg[16 ]; -uint16_t risc_gp2_reg[16 ]; -uint16_t risc_gp3_reg[16 ]; -uint16_t risc_gp4_reg[16 ]; -uint16_t risc_gp5_reg[16 ]; -uint16_t risc_gp6_reg[16 ]; -uint16_t risc_gp7_reg[16 ]; -uint16_t frame_buf_hdw_reg[64 ]; -uint16_t fpm_b0_reg[64 ]; -uint16_t fpm_b1_reg[64 ]; -uint16_t risc_ram[0xf800 ]; -uint16_t stack_ram[0x1000 ]; -uint16_t data_ram[1 ]; +__be16 hccr; +__be16 pbiu_reg[8 ]; +__be16 risc_host_reg[8 ]; +__be16 mailbox_reg[32 ]; +__be16 resp_dma_reg[32 ]; +__be16 dma_reg[48 ]; +__be16 risc_hdw_reg[16 ]; +__be16 risc_gp0_reg[16 ]; +__be16 risc_gp1_reg[16 ]; +__be16 risc_gp2_reg[16 ]; +__be16 risc_gp3_reg[16 ]; +__be16 risc_gp4_reg[16 ]; +__be16 risc_gp5_reg[16 ]; +__be16 risc_gp6_reg[16 ]; +__be16 risc_gp7_reg[16 ]; +__be16 frame_buf_hdw_reg[64 ]; +__be16 fpm_b0_reg[64 ]; +__be16 fpm_b1_reg[64 ]; +__be16 risc_ram[0xf800 ]; +__be16 stack_ram[0x1000 ]; +__be16 data_ram[1 ]; };struct qla2100_fw_dump { -uint16_t hccr; -uint16_t pbiu_reg[8 ]; -uint16_t mailbox_reg[32 ]; -uint16_t dma_reg[48 ]; -uint16_t risc_hdw_reg[16 ]; -uint16_t risc_gp0_reg[16 ]; -uint16_t risc_gp1_reg[16 ]; -uint16_t risc_gp2_reg[16 ]; -uint16_t risc_gp3_reg[16 ]; -uint16_t risc_gp4_reg[16 ]; -uint16_t risc_gp5_reg[16 ]; -uint16_t risc_gp6_reg[16 ]; -uint16_t risc_gp7_reg[16 ]; -uint16_t frame_buf_hdw_reg[16 ]; -uint16_t fpm_b0_reg[64 ]; -uint16_t fpm_b1_reg[64 ]; -uint16_t risc_ram[0xf000 ]; +__be16 hccr; +__be16 pbiu_reg[8 ]; +__be16 mailbox_reg[32 ]; +__be16 dma_reg[48 ]; +__be16 risc_hdw_reg[16 ]; +__be16 risc_gp0_reg[16 ]; +__be16 risc_gp1_reg[16 ]; +__be16 risc_gp2_reg[16 ]; +__be16 risc_gp3_reg[16 ]; +__be16 risc_gp4_reg[16 ]; +__be16 risc_gp5_reg[16 ]; +__be16 risc_gp6_reg[16 ]; +__be16 risc_gp7_reg[16 ]; +__be16 frame_buf_hdw_reg[16 ]; +__be16 fpm_b0_reg[64 ]; +__be16 fpm_b1_reg[64 ]; +__be16 risc_ram[0xf000 ]; };struct qla24xx_fw_dump { -uint32_t host_status; -uint32_t host_reg[32 ]; -uint32_t shadow_reg[7 ]; -uint16_t mailbox_reg[32 ]; -uint32_t xseq_gp_reg[128 ]; -uint32_t xseq_0_reg[16 ]; -uint32_t xseq_1_reg[16 ]; -uint32_t rseq_gp_reg[128 ]; -uint32_t rseq_0_reg[16 ]; -uint32_t rseq_1_reg[16 ]; -uint32_t rseq_2_reg[16 ]; -uint32_t cmd_dma_reg[16 ]; -uint32_t req0_dma_reg[15 ]; -uint32_t resp0_dma_reg[15 ]; -uint32_t req1_dma_reg[15 ]; -uint32_t xmt0_dma_reg[32 ]; -uint32_t xmt1_dma_reg[32 ]; -uint32_t xmt2_dma_reg[32 ]; -uint32_t xmt3_dma_reg[32 ]; -uint32_t xmt4_dma_reg[32 ]; -uint32_t xmt_data_dma_reg[16 ]; -uint32_t rcvt0_data_dma_reg[32 ]; -uint32_t rcvt1_data_dma_reg[32 ]; -uint32_t risc_gp_reg[128 ]; -uint32_t lmc_reg[112 ]; -uint32_t fpm_hdw_reg[192 ]; -uint32_t fb_hdw_reg[176 ]; -uint32_t code_ram[0x2000 ]; -uint32_t ext_mem[1 ]; +__be32 host_status; +__be32 host_reg[32 ]; +__be32 shadow_reg[7 ]; +__be16 mailbox_reg[32 ]; +__be32 xseq_gp_reg[128 ]; +__be32 xseq_0_reg[16 ]; +__be32 xseq_1_reg[16 ]; +__be32 rseq_gp_reg[128 ]; +__be32 rseq_0_reg[16 ]; +__be32 rseq_1_reg[16 ]; +__be32 rseq_2_reg[16 ]; +__be32 cmd_dma_reg[16 ]; +__be32 req0_dma_reg[15 ]; +__be32 resp0_dma_reg[15 ]; +__be32 req1_dma_reg[15 ]; +__be32 xmt0_dma_reg[32 ]; +__be32 xmt1_dma_reg[32 ]; +__be32 xmt2_dma_reg[32 ]; +__be32 xmt3_dma_reg[32 ]; +__be32 xmt4_dma_reg[32 ]; +__be32 xmt_data_dma_reg[16 ]; +__be32 rcvt0_data_dma_reg[32 ]; +__be32 rcvt1_data_dma_reg[32 ]; +__be32 risc_gp_reg[128 ]; +__be32 lmc_reg[112 ]; +__be32 fpm_hdw_reg[192 ]; +__be32 fb_hdw_reg[176 ]; +__be32 code_ram[0x2000 ]; +__be32 ext_mem[1 ]; };struct qla25xx_fw_dump { -uint32_t host_status; -uint32_t host_risc_reg[32 ]; -uint32_t pcie_regs[4 ]; -uint32_t host_reg[32 ]; -uint32_t shadow_reg[11 ]; -uint32_t risc_io_reg; -uint16_t mailbox_reg[32 ]; -uint32_t xseq_gp_reg[128 ]; -uint32_t xseq_0_reg[48 ]; -uint32_t xseq_1_reg[16 ]; -uint32_t rseq_gp_reg[128 ]; -uint32_t rseq_0_reg[32 ]; -uint32_t rseq_1_reg[16 ]; -uint32_t rseq_2_reg[16 ]; -uint32_t aseq_gp_reg[128 ]; -uint32_t aseq_0_reg[32 ]; -uint32_t aseq_1_reg[16 ]; -uint32_t aseq_2_reg[16 ]; -uint32_t cmd_dma_reg[16 ]; -uint32_t req0_dma_reg[15 ]; -uint32_t resp0_dma_reg[15 ]; -uint32_t req1_dma_reg[15 ]; -uint32_t xmt0_dma_reg[32 ]; -uint32_t xmt1_dma_reg[32 ]; -uint32_t xmt2_dma_reg[32 ]; -uint32_t xmt3_dma_reg[32 ]; -uint32_t xmt4_dma_reg[32 ]; -uint32_t xmt_data_dma_reg[16 ]; -uint32_t rcvt0_data_dma_reg[32 ]; -uint32_t rcvt1_data_dma_reg[32 ]; -uint32_t risc_gp_reg[128 ]; -uint32_t lmc_reg[128 ]; -uint32_t fpm_hdw_reg[192 ]; -uint32_t fb_hdw_reg[192 ]; -uint32_t code_ram[0x2000 ]; -uint32_t ext_mem[1 ]; +__be32 host_status; +__be32 host_risc_reg[32 ]; +__be32 pcie_regs[4 ]; +__be32 host_reg[32 ]; +__be32 shadow_reg[11 ]; +__be32 risc_io_reg; +__be16 mailbox_reg[32 ]; +__be32 xseq_gp_reg[128 ]; +__be32 xseq_0_reg[48 ]; +__be32 xseq_1_reg[16 ]; +__be32 rseq_gp_reg[128 ]; +__be32 rseq_0_reg[32 ]; +__be32 rseq_1_reg[16 ]; +__be32 rseq_2_reg[16 ]; +__be32 aseq_gp_reg[128 ]; +__be32 aseq_0_reg[32 ]; +__be32 aseq_1_reg[16 ]; +__be32 aseq_2_reg[16 ]; +__be32 cmd_dma_reg[16 ]; +__be32 req0_dma_reg[15 ]; +__be32 resp0_dma_reg[15 ]; +__be32 req1_dma_reg[15 ]; +__be32 xmt0_dma_reg[32 ]; +__be32 xmt1_dma_reg[32 ]; +__be32 xmt2_dma_reg[32 ]; +__be32 xmt3_dma_reg[32 ]; +__be32 xmt4_dma_reg[32 ]; +__be32 xmt_data_dma_reg[16 ]; +__be32 rcvt0_data_dma_reg[32 ]; +__be32 rcvt1_data_dma_reg[32 ]; +__be32 risc_gp_reg[128 ]; +__be32 lmc_reg[128 ]; +__be32 fpm_hdw_reg[192 ]; +__be32 fb_hdw_reg[192 ]; +__be32 code_ram[0x2000 ]; +__be32 ext_mem[1 ]; };struct qla81xx_fw_dump { -uint32_t host_status; -uint32_t host_risc_reg[32 ]; -uint32_t pcie_regs[4 ]; -uint32_t host_reg[32 ]; -uint32_t shadow_reg[11 ]; -uint32_t risc_io_reg; -uint16_t mailbox_reg[32 ]; -uint32_t xseq_gp_reg[128 ]; -uint32_t xseq_0_reg[48 ]; -uint32_t xseq_1_reg[16 ]; -uint32_t rseq_gp_reg[128 ]; -uint32_t rseq_0_reg[32 ]; -uint32_t rseq_1_reg[16 ]; -uint32_t rseq_2_reg[16 ]; -uint32_t aseq_gp_reg[128 ]; -uint32_t aseq_0_reg[32 ]; -uint32_t aseq_1_reg[16 ]; -uint32_t aseq_2_reg[16 ]; -uint32_t cmd_dma_reg[16 ]; -uint32_t req0_dma_reg[15 ]; -uint32_t resp0_dma_reg[15 ]; -uint32_t req1_dma_reg[15 ]; -uint32_t xmt0_dma_reg[32 ]; -uint32_t xmt1_dma_reg[32 ]; -uint32_t xmt2_dma_reg[32 ]; -uint32_t xmt3_dma_reg[32 ]; -uint32_t xmt4_dma_reg[32 ]; -uint32_t xmt_data_dma_reg[16 ]; -uint32_t rcvt0_data_dma_reg[32 ]; -uint32_t rcvt1_data_dma_reg[32 ]; -uint32_t risc_gp_reg[128 ]; -uint32_t lmc_reg[128 ]; -uint32_t fpm_hdw_reg[224 ]; -uint32_t fb_hdw_reg[208 ]; -uint32_t code_ram[0x2000 ]; -uint32_t ext_mem[1 ]; +__be32 host_status; +__be32 host_risc_reg[32 ]; +__be32 pcie_regs[4 ]; +__be32 host_reg[32 ]; +__be32 shadow_reg[11 ]; +__be32 risc_io_reg; +__be16 mailbox_reg[32 ]; +__be32 xseq_gp_reg[128 ]; +__be32 xseq_0_reg[48 ]; +__be32 xseq_1_reg[16 ]; +__be32 rseq_gp_reg[128 ]; +__be32 rseq_0_reg[32 ]; +__be32 rseq_1_reg[16 ]; +__be32 rseq_2_reg[16 ]; +__be32 aseq_gp_reg[128 ]; +__be32 aseq_0_reg[32 ]; +__be32 aseq_1_reg[16 ]; +__be32 aseq_2_reg[16 ]; +__be32 cmd_dma_reg[16 ]; +__be32 req0_dma_reg[15 ]; +__be32 resp0_dma_reg[15 ]; +__be32 req1_dma_reg[15 ]; +__be32 xmt0_dma_reg[32 ]; +__be32 xmt1_dma_reg[32 ]; +__be32 xmt2_dma_reg[32 ]; +__be32 xmt3_dma_reg[32 ]; +__be32 xmt4_dma_reg[32 ]; +__be32 xmt_data_dma_reg[16 ]; +__be32 rcvt0_data_dma_reg[32 ]; +__be32 rcvt1_data_dma_reg[32 ]; +__be32 risc_gp_reg[128 ]; +__be32 lmc_reg[128 ]; +__be32 fpm_hdw_reg[224 ]; +__be32 fb_hdw_reg[208 ]; +__be32 code_ram[0x2000 ]; +__be32 ext_mem[1 ]; };struct qla83xx_fw_dump { -uint32_t host_status; -uint32_t host_risc_reg[48 ]; -uint32_t pcie_regs[4 ]; -uint32_t host_reg[32 ]; -uint32_t shadow_reg[11 ]; -uint32_t risc_io_reg; -uint16_t mailbox_reg[32 ]; -uint32_t xseq_gp_reg[256 ]; -uint32_t xseq_0_reg[48 ]; -uint32_t xseq_1_reg[16 ]; -uint32_t xseq_2_reg[16 ]; -uint32_t rseq_gp_reg[256 ]; -uint32_t rseq_0_reg[32 ]; -uint32_t rseq_1_reg[16 ]; -uint32_t rseq_2_reg[16 ]; -uint32_t rseq_3_reg[16 ]; -uint32_t aseq_gp_reg[256 ]; -uint32_t aseq_0_reg[32 ]; -uint32_t aseq_1_reg[16 ]; -uint32_t aseq_2_reg[16 ]; -uint32_t aseq_3_reg[16 ]; -uint32_t cmd_dma_reg[64 ]; -uint32_t req0_dma_reg[15 ]; -uint32_t resp0_dma_reg[15 ]; -uint32_t req1_dma_reg[15 ]; -uint32_t xmt0_dma_reg[32 ]; -uint32_t xmt1_dma_reg[32 ]; -uint32_t xmt2_dma_reg[32 ]; -uint32_t xmt3_dma_reg[32 ]; -uint32_t xmt4_dma_reg[32 ]; -uint32_t xmt_data_dma_reg[16 ]; -uint32_t rcvt0_data_dma_reg[32 ]; -uint32_t rcvt1_data_dma_reg[32 ]; -uint32_t risc_gp_reg[128 ]; -uint32_t lmc_reg[128 ]; -uint32_t fpm_hdw_reg[256 ]; -uint32_t rq0_array_reg[256 ]; -uint32_t rq1_array_reg[256 ]; -uint32_t rp0_array_reg[256 ]; -uint32_t rp1_array_reg[256 ]; -uint32_t queue_control_reg[16 ]; -uint32_t fb_hdw_reg[432 ]; -uint32_t at0_array_reg[128 ]; -uint32_t code_ram[0x2400 ]; -uint32_t ext_mem[1 ]; +__be32 host_status; +__be32 host_risc_reg[48 ]; +__be32 pcie_regs[4 ]; +__be32 host_reg[32 ]; +__be32 shadow_reg[11 ]; +__be32 risc_io_reg; +__be16 mailbox_reg[32 ]; +__be32 xseq_gp_reg[256 ]; +__be32 xseq_0_reg[48 ]; +__be32 xseq_1_reg[16 ]; +__be32 xseq_2_reg[16 ]; +__be32 rseq_gp_reg[256 ]; +__be32 rseq_0_reg[32 ]; +__be32 rseq_1_reg[16 ]; +__be32 rseq_2_reg[16 ]; +__be32 rseq_3_reg[16 ]; +__be32 aseq_gp_reg[256 ]; +__be32 aseq_0_reg[32 ]; +__be32 aseq_1_reg[16 ]; +__be32 aseq_2_reg[16 ]; +__be32 aseq_3_reg[16 ]; +__be32 cmd_dma_reg[64 ]; +__be32 req0_dma_reg[15 ]; +__be32 resp0_dma_reg[15 ]; +__be32 req1_dma_reg[15 ]; +__be32 xmt0_dma_reg[32 ]; +__be32 xmt1_dma_reg[32 ]; +__be32 xmt2_dma_reg[32 ]; +__be32 xmt3_dma_reg[32 ]; +__be32 xmt4_dma_reg[32 ]; +__be32 xmt_data_dma_reg[16 ]; +__be32 rcvt0_data_dma_reg[32 ]; +__be32 rcvt1_data_dma_reg[32 ]; +__be32 risc_gp_reg[128 ]; +__be32 lmc_reg[128 ]; +__be32 fpm_hdw_reg[256 ]; +__be32 rq0_array_reg[256 ]; +__be32 rq1_array_reg[256 ]; +__be32 rp0_array_reg[256 ]; +__be32 rp1_array_reg[256 ]; +__be32 queue_control_reg[16 ]; +__be32 fb_hdw_reg[432 ]; +__be32 at0_array_reg[128 ]; +__be32 code_ram[0x2400 ]; +__be32 ext_mem[1 ]; };#define EFT_NUM_BUFFERS 4
@@ -223,45 +223,45 @@ struct qla83xx_fw_dump {#define fce_calc_size (b) ((FCE_BYTES_PER_BUFFER) * (b))struct qla2xxx_fce_chain { -uint32_t type; -uint32_t chain_size; +__be32 type; +__be32 chain_size; -uint32_t size; -uint32_t addr_l; -uint32_t addr_h; -uint32_t eregs[8 ]; +__be32 size; +__be32 addr_l; +__be32 addr_h; +__be32 eregs[8 ]; };/* used by exchange off load and extended login offload */ struct qla2xxx_offld_chain { -uint32_t type; -uint32_t chain_size; +__be32 type; +__be32 chain_size; -uint32_t size; -uint32_t reserved; -u64 addr; +__be32 size; +__be32 reserved; +__be64 addr; };struct qla2xxx_mq_chain { -uint32_t type; -uint32_t chain_size; +__be32 type; +__be32 chain_size; -uint32_t count; -uint32_t qregs[4 *QLA_MQ_SIZE ]; +__be32 count; +__be32 qregs[4 *QLA_MQ_SIZE ]; };struct qla2xxx_mqueue_header { -uint32_t queue; +__be32 queue;#define TYPE_REQUEST_QUEUE 0x1#define TYPE_RESPONSE_QUEUE 0x2#define TYPE_ATIO_QUEUE 0x3 -uint32_t number; -uint32_t size; +__be32 number; +__be32 size; };struct qla2xxx_mqueue_chain { -uint32_t type; -uint32_t chain_size; +__be32 type; +__be32 chain_size; };#define DUMP_CHAIN_VARIANT 0x80000000
@@ -274,28 +274,28 @@ struct qla2xxx_mqueue_chain {struct qla2xxx_fw_dump {uint8_t signature[4 ]; -uint32_t version; +__be32 version; -uint32_t fw_major_version; -uint32_t fw_minor_version; -uint32_t fw_subminor_version; -uint32_t fw_attributes; +__be32 fw_major_version; +__be32 fw_minor_version; +__be32 fw_subminor_version; +__be32 fw_attributes; -uint32_t vendor; -uint32_t device; -uint32_t subsystem_vendor; -uint32_t subsystem_device; +__be32 vendor; +__be32 device; +__be32 subsystem_vendor; +__be32 subsystem_device; -uint32_t fixed_size; -uint32_t mem_size; -uint32_t req_q_size; -uint32_t rsp_q_size; +__be32 fixed_size; +__be32 mem_size; +__be32 req_q_size; +__be32 rsp_q_size; -uint32_t eft_size; -uint32_t eft_addr_l; -uint32_t eft_addr_h; +__be32 eft_size; +__be32 eft_addr_l; +__be32 eft_addr_h; -uint32_t header_size; +__be32 header_size;union {struct qla2100_fw_dump isp21;
@@ -370,7 +370,7 @@ ql_log_qp(uint32_t, struct qla_qpair *, int32_t, const char *fmt, ...);extern int qla27xx_dump_mpi_ram (struct qla_hw_data *,uint32_t ,uint32_t *,uint32_t ,void **); -extern int qla24xx_dump_ram (struct qla_hw_data *,uint32_t ,uint32_t *, +extern int qla24xx_dump_ram (struct qla_hw_data *,uint32_t ,__be32 *,uint32_t ,void **);extern void qla24xx_pause_risc (struct device_reg_24xx __iomem *,struct qla_hw_data *);
drivers/scsi/qla2xxx/qla_def.h +326 -326
1,055 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_fw.h +380 -380
1,438 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_nvme.h +32 -32
64 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_target.h +116 -116
232 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 v6 15/15 qla2xxx: Fix endianness annotations in source files
In reply to Bart Van AsscheFix all endianness complaints reported by sparse (C=2) without affecting the behavior of the code on little endian CPUs.
--- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 87 +++++++++++++++-------------- drivers/scsi/qla2xxx/qla_init.c | 59 ++++++++++---------- drivers/scsi/qla2xxx/qla_iocb.c | 71 ++++++++++++----------- drivers/scsi/qla2xxx/qla_isr.c | 93 +++++++++++++++---------------- drivers/scsi/qla2xxx/qla_mbx.c | 37 ++++++------ 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 | 27 ++++----- drivers/scsi/qla2xxx/qla_sup.c | 69 ++++++++++++----------- drivers/scsi/qla2xxx/qla_target.c | 86 ++++++++++++++-------------- drivers/scsi/qla2xxx/qla_tmpl.c | 4 +- 14 files changed, 328 insertions(+), 318 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +1 -2
@@ -227,10 +227,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 +44 -43
234 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +31 -28
205 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_iocb.c +37 -34
207 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_isr.c +45 -48
257 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_mbx.c +18 -19
@@ -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))
@@ -4736,14 +4735,14 @@ qla82xx_set_driver_version(scsi_qla_host_t *vha, char *version)ql_dbg (ql_dbg_mbx + ql_dbg_verbose, vha,0x117b ,"Entered %s.\n" , __func__); - str = (uint16_t *)version; + str = (__force __le16 *)version; len =strlen (version); mcp->mb[0 ] =MBC_SET_RNID_PARAMS ; 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
@@ -3202,7 +3202,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);
@@ -3228,9 +3228,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);
@@ -3251,7 +3250,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 +14 -13
@@ -5763,7 +5763,8 @@ qla25xx_rdp_rsp_reduce_size(struct scsi_qla_host *vha,if (!pdb) {ql_dbg (ql_dbg_init, vha,0x0181 ,"%s: Failed allocate pdb\n" , __func__); - }else if (qla24xx_get_port_database (vha, purex->nport_handle, pdb)) { + }else if (qla24xx_get_port_database (vha, +le16_to_cpu (purex->nport_handle), pdb)) {ql_dbg (ql_dbg_init, vha,0x0181 ,"%s: Failed get pdb sid=%x\n" , __func__, sid); } else if (pdb->current_login_state != PDS_PLOGI_COMPLETE &&
@@ -5957,7 +5958,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;
@@ -5968,7 +5969,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);
@@ -5980,8 +5981,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 );
@@ -6031,7 +6032,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 = (uint16_t *)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 ];
@@ -6058,17 +6059,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 ; } }
@@ -6140,7 +6141,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 = (uint16_t *)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 +37 -32
239 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_target.c +44 -42
275 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_tmpl.c +2 -2
@@ -922,9 +922,9 @@ qla27xx_firmware_info(struct scsi_qla_host *vha, tmp->firmware_version[0 ] = vha->hw->fw_major_version; tmp->firmware_version[1 ] = vha->hw->fw_minor_version; tmp->firmware_version[2 ] = vha->hw->fw_subminor_version; - tmp->firmware_version[3 ] =cpu_to_le32 ( + tmp->firmware_version[3 ] = (__force u32 )cpu_to_le32 ( vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes); - tmp->firmware_version[4 ] =cpu_to_le32 ( + tmp->firmware_version[4 ] = (__force u32 )cpu_to_le32 ( vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]); }
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Quoted 10 lines · Bart Van Assche
Fix all endianness complaints reported by sparse (C=2) without affecting the behavior of the code on little endian CPUs.
Reviewed-by Himanshu Madhani <[email protected]>Cc Nilesh Javali <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Daniel Wagner <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
Quoted 17 lines
--- drivers/scsi/qla2xxx/qla_attr.c | 3 +- drivers/scsi/qla2xxx/qla_bsg.c | 4 +- drivers/scsi/qla2xxx/qla_dbg.c | 87 +++++++++++++++-------------- drivers/scsi/qla2xxx/qla_init.c | 59 ++++++++++---------- drivers/scsi/qla2xxx/qla_iocb.c | 71 ++++++++++++----------- drivers/scsi/qla2xxx/qla_isr.c | 93 +++++++++++++++---------------- drivers/scsi/qla2xxx/qla_mbx.c | 37 ++++++------ 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 | 27 ++++----- drivers/scsi/qla2xxx/qla_sup.c | 69 ++++++++++++----------- drivers/scsi/qla2xxx/qla_target.c | 86 ++++++++++++++-------------- drivers/scsi/qla2xxx/qla_tmpl.c | 4 +- 14 files changed, 328 insertions(+), 318 deletions(-)
All looks good, but:
Quoted 7 lines
drivers/scsi/qla2xxx/qla_tmpl.c +0
-0@@ -922,9 +922,9 @@ qla27xx_firmware_info(struct scsi_qla_host *vha, tmp->firmware_version[0 ] = vha->hw->fw_major_version;
drivers/scsi/qla2xxx/qla_tmpl.c qla27xx_firmware_info(struct scsi_qla_host *vha, · line 930
Quoted 10 lines
drivers/scsi/qla2xxx/qla_tmpl.c +2
-2tmp->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 ]); }
Why do you need (__force u32) here?
It should be a 32bit array, and cpu_to_le32() trivially returns 32bits. What's there to force?
Otherwise:
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Quoted 14 lines · Hannes Reinecke
Quoted 13 lines · Bart Van Assche
drivers/scsi/qla2xxx/qla_tmpl.c +1
-2@@ -922,9 +922,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(
Quoted 8 lines
Quoted 5 lines
drivers/scsi/qla2xxx/qla_tmpl.c +1
-0+ tmp->firmware_version[4] = (__force u32)cpu_to_le32(vha->hw->fw_attributes_ext[1] << 16 |
vha->hw->fw_attributes_ext[0]);
}Why do you need (
__forceu32) here?
It should be a 32bit array, andcpu_to_le32()trivially returns 32bits. What's there to force?
The hw->fw_{major,minor,subminor}_version and also the hw->fw_attributes_ext variables have been annotated as CPU endian. I inserted the (__force u32) casts because that suppresses the endianness warnings without affecting the generated code on little endian or big endian systems. Thinking further about this, storing CPU endian values in a firmware data structure is most likely wrong. How about modifying patch 15/15 as follows?
drivers/scsi/qla2xxx/qla_tmpl.c | 10 +++++----- drivers/scsi/qla2xxx/qla_tmpl.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_tmpl.c +5 -5
@@ -919,12 +919,12 @@ static void qla27xx_firmware_info(struct scsi_qla_host *vha, struct qla27xx_fwdt_template *tmp) { - 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 ] = (__force u32 )cpu_to_le32 ( + tmp->firmware_version[0] = cpu_to_le32(vha->hw->fw_major_version); + tmp->firmware_version[1 ] =cpu_to_le32 (vha->hw->fw_minor_version); + tmp->firmware_version[2 ] =cpu_to_le32 (vha->hw->fw_subminor_version); + tmp->firmware_version[3 ] =cpu_to_le32 ( vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes); - tmp->firmware_version[4 ] = (__force u32 )cpu_to_le32 ( + tmp->firmware_version[4 ] =cpu_to_le32 ( vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]); }
drivers/scsi/qla2xxx/qla_tmpl.h +1 -1
@@ -27,7 +27,7 @@ struct __packed qla27xx_fwdt_template {uint32_t saved_state[16 ];uint32_t reserved_3[8 ]; -uint32_t firmware_version[5 ]; +__le32 firmware_version[5 ]; };#define TEMPLATE_TYPE_FWDUMP 99
Thanks,
Bart.
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Quoted 72 lines · Bart Van Assche
Quoted 14 lines · Hannes Reinecke
Quoted 13 lines · Bart Van Assche
drivers/scsi/qla2xxx/qla_tmpl.c +1
-2@@ -922,9 +922,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(Quoted 8 lines
drivers/scsi/qla2xxx/qla_tmpl.c qla27xx_firmware_info(struct scsi_qla_host *vha, · line 930
Quoted 5 lines
drivers/scsi/qla2xxx/qla_tmpl.c +1
-0+ tmp->firmware_version[4] = (__force u32)cpu_to_le32( vha->hw->fw_attributes_ext[1] << 16 | vha->hw->fw_attributes_ext[0 ]); }Why do you need (
__forceu32) here?
It should be a 32bit array, andcpu_to_le32()trivially returns 32bits. What's there to force?The hw->fw_{major,minor,subminor}_version and also the
hw->fw_attributes_extvariables have been annotated as CPU endian. I inserted the (__forceu32) casts because that suppresses the endianness warnings without affecting the generated code on little endian or big endian systems. Thinking further about this, storing CPU endian values in a firmware data structure is most likely wrong. How about modifying patch 15/15 as follows?drivers/scsi/qla2xxx/qla_tmpl.c | 10 +++++----- drivers/scsi/qla2xxx/qla_tmpl.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/scsi/qla2xxx/qla_tmpl.c +5
-5@@ -919,12 +919,12 @@ static void qla27xx_firmware_info(struct scsi_qla_host *vha, struct qla27xx_fwdt_template *tmp) { - 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 ] = (__force u32 )cpu_to_le32 ( + tmp->firmware_version[0] = cpu_to_le32(vha->hw->fw_major_version); + tmp->firmware_version[1 ] =cpu_to_le32 (vha->hw->fw_minor_version); + tmp->firmware_version[2 ] =cpu_to_le32 (vha->hw->fw_subminor_version); + tmp->firmware_version[3 ] =cpu_to_le32 ( vha->hw->fw_attributes_h <<16 | vha->hw->fw_attributes); - tmp->firmware_version[4 ] = (__force u32 )cpu_to_le32 ( + tmp->firmware_version[4 ] =cpu_to_le32 ( vha->hw->fw_attributes_ext[1 ] <<16 | vha->hw->fw_attributes_ext[0 ]); }drivers/scsi/qla2xxx/qla_tmpl.h +1
-1@@ -27,7 +27,7 @@ struct __packed qla27xx_fwdt_template {uint32_t saved_state[16 ];uint32_t reserved_3[8 ]; -uint32_t firmware_version[5 ]; +__le32 firmware_version[5 ]; };#define TEMPLATE_TYPE_FWDUMP 99
Quoted 4 lines
Thanks,
Bart.
Yes, that's better.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
In reply to Bart Van AsscheQuoted 10 lines · Bart Van Assche
Fix all endianness complaints reported by sparse (C=2) without affecting the behavior of the code on little endian CPUs.
Reviewed-by Himanshu Madhani <[email protected]>Cc Nilesh Javali <[email protected]>Cc Quinn Tran <[email protected]>Cc Martin Wilck <[email protected]>Cc Daniel Wagner <[email protected]>Cc Roman Bolshakov <[email protected]>Signed-off-by Bart Van Assche <[email protected]>
As far I can tell this looks okay but it's hard to review due it's size Stil I think we need an reviewd by the Marvell. I try to give the whole series a spin on our system next week.
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Quoted 1 line · Daniel Wagner
I try to give the whole series a spin on our system next week.
That would be welcome. v7 of this patch series is available at
https://github.com/bvanassche/linux/tree/qla2xxx-for-next.
Thanks,
Bart.
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Hi Bart,
Quoted 5 lines · Bart Van Assche
Quoted 1 line · Daniel Wagner
I try to give the whole series a spin on our system next week.
That would be welcome. v7 of this patch series is available at
https://github.com/bvanassche/linux/tree/qla2xxx-for-next.
I gave this a spin on one of our machines with a QLE2742. Seems to work fine and there was not obvious problem.
Thanks,
Daniel
Re: [PATCH v6 15/15] qla2xxx: Fix endianness annotations in source files
Quoted 9 lines · Daniel Wagner
Quoted 5 lines · Bart Van Assche
Quoted 1 line · Daniel Wagner
I try to give the whole series a spin on our system next week.
That would be welcome. v7 of this patch series is available at
https://github.com/bvanassche/linux/tree/qla2xxx-for-next.I gave this a spin on one of our machines with a QLE2742. Seems to work fine and there was not obvious problem.
Thank you for having done this testing work!
Bart.