esas2r: Directly call kernel functions for atomic bit operations
Subsystems (2)
PATCH 1/4 esas2r: Directly call kernel functions for atomic bit operations
Previously the code embedded the kernel's test_bit/clear_bit functions in wrappers that accepted u32 parameters. The wrapper cast these parameters to longs before passing them
to the kernel's bit functions. This did not work properly
on platforms with 64-bit longs.
--- drivers/scsi/esas2r/esas2r.h | 125 +++++++++++++++---------------- drivers/scsi/esas2r/esas2r_disc.c | 55 +++++++------- drivers/scsi/esas2r/esas2r_flash.c | 34 +++++---- drivers/scsi/esas2r/esas2r_init.c | 143 +++++++++++++++++------------------- drivers/scsi/esas2r/esas2r_int.c | 97 ++++++++++++------------ drivers/scsi/esas2r/esas2r_io.c | 73 +++++++++--------- drivers/scsi/esas2r/esas2r_ioctl.c | 28 +++---- drivers/scsi/esas2r/esas2r_main.c | 34 ++++----- drivers/scsi/esas2r/esas2r_targdb.c | 2 +- drivers/scsi/esas2r/esas2r_vda.c | 6 +- 10 files changed, 291 insertions(+), 306 deletions(-)
drivers/scsi/esas2r/esas2r.h +59 -66
@@ -799,47 +799,47 @@ struct esas2r_adapter {struct esas2r_target *targetdb_end;unsigned char *regs;unsigned char *data_window; -u32 volatile flags; -#define AF_PORT_CHANGE (u32)(0x00000001) -#define AF_CHPRST_NEEDED (u32)(0x00000004) -#define AF_CHPRST_PENDING (u32)(0x00000008) -#define AF_CHPRST_DETECTED (u32)(0x00000010) -#define AF_BUSRST_NEEDED (u32)(0x00000020) -#define AF_BUSRST_PENDING (u32)(0x00000040) -#define AF_BUSRST_DETECTED (u32)(0x00000080) -#define AF_DISABLED (u32)(0x00000100) -#define AF_FLASH_LOCK (u32)(0x00000200) -#define AF_OS_RESET (u32)(0x00002000) -#define AF_FLASHING (u32)(0x00004000) -#define AF_POWER_MGT (u32)(0x00008000) -#define AF_NVR_VALID (u32)(0x00010000) -#define AF_DEGRADED_MODE (u32)(0x00020000) -#define AF_DISC_PENDING (u32)(0x00040000) -#define AF_TASKLET_SCHEDULED (u32)(0x00080000) -#define AF_HEARTBEAT (u32)(0x00200000) -#define AF_HEARTBEAT_ENB (u32)(0x00400000) -#define AF_NOT_PRESENT (u32)(0x00800000) -#define AF_CHPRST_STARTED (u32)(0x01000000) -#define AF_FIRST_INIT (u32)(0x02000000) -#define AF_POWER_DOWN (u32)(0x04000000) -#define AF_DISC_IN_PROG (u32)(0x08000000) -#define AF_COMM_LIST_TOGGLE (u32)(0x10000000) -#define AF_LEGACY_SGE_MODE (u32)(0x20000000) -#define AF_DISC_POLLED (u32)(0x40000000) -u32 volatile flags2; -#define AF2_SERIAL_FLASH (u32)(0x00000001) -#define AF2_DEV_SCAN (u32)(0x00000002) -#define AF2_DEV_CNT_OK (u32)(0x00000004) -#define AF2_COREDUMP_AVAIL (u32)(0x00000008) -#define AF2_COREDUMP_SAVED (u32)(0x00000010) -#define AF2_VDA_POWER_DOWN (u32)(0x00000100) -#define AF2_THUNDERLINK (u32)(0x00000200) -#define AF2_THUNDERBOLT (u32)(0x00000400) -#define AF2_INIT_DONE (u32)(0x00000800) -#define AF2_INT_PENDING (u32)(0x00001000) -#define AF2_TIMER_TICK (u32)(0x00002000) -#define AF2_IRQ_CLAIMED (u32)(0x00004000) -#define AF2_MSI_ENABLED (u32)(0x00008000) +long flags; +#define AF_PORT_CHANGE 0 +#define AF_CHPRST_NEEDED 1 +#define AF_CHPRST_PENDING 2 +#define AF_CHPRST_DETECTED 3 +#define AF_BUSRST_NEEDED 4 +#define AF_BUSRST_PENDING 5 +#define AF_BUSRST_DETECTED 6 +#define AF_DISABLED 7 +#define AF_FLASH_LOCK 8 +#define AF_OS_RESET 9 +#define AF_FLASHING 10 +#define AF_POWER_MGT 11 +#define AF_NVR_VALID 12 +#define AF_DEGRADED_MODE 13 +#define AF_DISC_PENDING 14 +#define AF_TASKLET_SCHEDULED 15 +#define AF_HEARTBEAT 16 +#define AF_HEARTBEAT_ENB 17 +#define AF_NOT_PRESENT 18 +#define AF_CHPRST_STARTED 19 +#define AF_FIRST_INIT 20 +#define AF_POWER_DOWN 21 +#define AF_DISC_IN_PROG 22 +#define AF_COMM_LIST_TOGGLE 23 +#define AF_LEGACY_SGE_MODE 24 +#define AF_DISC_POLLED 25 +long flags2; +#define AF2_SERIAL_FLASH 0 +#define AF2_DEV_SCAN 1 +#define AF2_DEV_CNT_OK 2 +#define AF2_COREDUMP_AVAIL 3 +#define AF2_COREDUMP_SAVED 4 +#define AF2_VDA_POWER_DOWN 5 +#define AF2_THUNDERLINK 6 +#define AF2_THUNDERBOLT 7 +#define AF2_INIT_DONE 8 +#define AF2_INT_PENDING 9 +#define AF2_TIMER_TICK 10 +#define AF2_IRQ_CLAIMED 11 +#define AF2_MSI_ENABLED 12atomic_t disable_cnt;atomic_t dis_ints_cnt;u32 int_stat;
@@ -1150,16 +1150,6 @@ void esas2r_queue_fw_event(struct esas2r_adapter *a, int data_sz);/* Inline functions */ -static inline u32 esas2r_lock_set_flags (volatile u32 *flags,u32 bits) -{ -return test_and_set_bit (ilog2 (bits), (volatile unsigned long *)flags); -} - -static inline u32 esas2r_lock_clear_flags (volatile u32 *flags,u32 bits) -{ -return test_and_clear_bit (ilog2 (bits), - (volatile unsigned long *)flags); -}/* Allocate a chip scatter/gather list entry */ static inline struct esas2r_mem_desc *esas2r_alloc_sgl (struct esas2r_adapter *a)
@@ -1303,10 +1293,13 @@ static inline void esas2r_rq_destroy_request(struct esas2r_request *rq,static inline bool esas2r_is_tasklet_pending (struct esas2r_adapter *a) { -return (a->flags & (AF_BUSRST_NEEDED |AF_BUSRST_DETECTED - |AF_CHPRST_NEEDED |AF_CHPRST_DETECTED - |AF_PORT_CHANGE )) - ? true : false; + +return test_bit (AF_BUSRST_NEEDED , &a->flags) || +test_bit (AF_BUSRST_DETECTED , &a->flags) || +test_bit (AF_CHPRST_NEEDED , &a->flags) || +test_bit (AF_CHPRST_DETECTED , &a->flags) || +test_bit (AF_PORT_CHANGE , &a->flags); + }/*
@@ -1345,24 +1338,24 @@ static inline void esas2r_enable_chip_interrupts(struct esas2r_adapter *a)static inline void esas2r_schedule_tasklet (struct esas2r_adapter *a) {/* make sure we don't schedule twice */ -if (!(esas2r_lock_set_flags (&a->flags,AF_TASKLET_SCHEDULED ) & -ilog2 (AF_TASKLET_SCHEDULED ))) +if (!test_and_set_bit (AF_TASKLET_SCHEDULED , &a->flags))tasklet_hi_schedule (&a->tasklet); }static inline void esas2r_enable_heartbeat (struct esas2r_adapter *a) { -if (!(a->flags & (AF_DEGRADED_MODE |AF_CHPRST_PENDING )) - && (a->nvram->options2 &SASNVR2_HEARTBEAT )) -esas2r_lock_set_flags (&a->flags,AF_HEARTBEAT_ENB ); +if (!test_bit (AF_DEGRADED_MODE , &a->flags) && + !test_bit (AF_CHPRST_PENDING , &a->flags) && + (a->nvram->options2 &SASNVR2_HEARTBEAT )) +set_bit (AF_HEARTBEAT_ENB , &a->flags);else -esas2r_lock_clear_flags (&a->flags,AF_HEARTBEAT_ENB ); +clear_bit (AF_HEARTBEAT_ENB , &a->flags); }static inline void esas2r_disable_heartbeat (struct esas2r_adapter *a) { -esas2r_lock_clear_flags (&a->flags,AF_HEARTBEAT_ENB ); -esas2r_lock_clear_flags (&a->flags,AF_HEARTBEAT ); +clear_bit (AF_HEARTBEAT_ENB , &a->flags); +clear_bit (AF_HEARTBEAT , &a->flags); }/* Set the initial state for resetting the adapter on the next pass through
@@ -1372,9 +1365,9 @@ static inline void esas2r_local_reset_adapter(struct esas2r_adapter *a) {esas2r_disable_heartbeat (a); -esas2r_lock_set_flags (&a->flags,AF_CHPRST_NEEDED ); -esas2r_lock_set_flags (&a->flags,AF_CHPRST_PENDING ); -esas2r_lock_set_flags (&a->flags,AF_DISC_PENDING ); +set_bit (AF_CHPRST_NEEDED , &a->flags); +set_bit (AF_CHPRST_PENDING , &a->flags); +set_bit (AF_DISC_PENDING , &a->flags); }/* See if an interrupt is pending on the adapter. */
drivers/scsi/esas2r/esas2r_disc.c +25 -30
161 lines not on this page · raw message
drivers/scsi/esas2r/esas2r_flash.c +19 -15
@@ -231,7 +231,7 @@ static bool load_image(struct esas2r_adapter *a, struct esas2r_request *rq)* RS_PENDING, FM API tasks will continue. */ rq->req_stat =RS_PENDING ; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))/* not suppported for now */ ;else build_flash_msg (a, rq);
@@ -315,7 +315,7 @@ static bool complete_fmapi_req(struct esas2r_adapter *a,memset (fc->scratch,0 ,FM_BUF_SZ );esas2r_enable_heartbeat (a); -esas2r_lock_clear_flags (&a->flags,AF_FLASH_LOCK ); +clear_bit (AF_FLASH_LOCK , &a->flags);return false; }
@@ -526,7 +526,7 @@ no_cfg:* The download is complete. If in degraded mode, * attempt a chip reset. */ -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))esas2r_local_reset_adapter (a); a->flash_ver = fi->cmp_hdr[CH_IT_BIOS ].version;
@@ -890,7 +890,7 @@ bool esas2r_process_fs_ioctl(struct esas2r_adapter *a, } } -if (a->flags &AF_DEGRADED_MODE ) { +if (test_bit (AF_DEGRADED_MODE , &a->flags)) { fs->status =ATTO_STS_DEGRADED ;return false; }
@@ -945,8 +945,12 @@ static bool esas2r_flash_access(struct esas2r_adapter *a, u32 function)/* Now wait for the firmware to process it */ starttime =jiffies_to_msecs (jiffies); - timeout = a->flags & - (AF_CHPRST_PENDING |AF_DISC_PENDING ) ?40000 :5000 ; + +if (test_bit (AF_CHPRST_PENDING , &a->flags) || +test_bit (AF_DISC_PENDING , &a->flags)) + timeout =40000 ; +else + timeout =5000 ;while (true) { intstat =esas2r_read_register_dword (a,MU_INT_STATUS_OUT );
@@ -1008,7 +1012,7 @@ bool esas2r_read_flash_block(struct esas2r_adapter *a,u32 offset;u32 iatvr; -if (a->flags2 &AF2_SERIAL_FLASH ) +if (test_bit (AF2_SERIAL_FLASH , &a->flags2)) iatvr =MW_DATA_ADDR_SER_FLASH + (from & -WINDOW_SIZE );else iatvr =MW_DATA_ADDR_PAR_FLASH + (from & -WINDOW_SIZE );
@@ -1236,9 +1240,9 @@ static void esas2r_nvram_callback(struct esas2r_adapter *a,if (rq->req_stat !=RS_PENDING ) {/* update the NVRAM state */ if (rq->req_stat ==RS_SUCCESS ) -esas2r_lock_set_flags (&a->flags,AF_NVR_VALID ); +set_bit (AF_NVR_VALID , &a->flags);else -esas2r_lock_clear_flags (&a->flags,AF_NVR_VALID ); +clear_bit (AF_NVR_VALID , &a->flags);esas2r_enable_heartbeat (a);
@@ -1258,7 +1262,7 @@ bool esas2r_nvram_write(struct esas2r_adapter *a, struct esas2r_request *rq,u32 *sas_address_dwords = (u32 *)&sas_address_bytes[0 ];struct atto_vda_flash_req *vrq = &rq->vrq->flash; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return false;if (down_interruptible (&a->nvram_semaphore))
@@ -1302,7 +1306,7 @@ bool esas2r_nvram_write(struct esas2r_adapter *a, struct esas2r_request *rq,FLS_OFFSET_NVR , sizeof(struct esas2r_sas_nvram)); -if (a->flags &AF_LEGACY_SGE_MODE ) { +if (test_bit (AF_LEGACY_SGE_MODE , &a->flags)) { vrq->data.sge[0 ].length = cpu_to_le32(SGE_LAST |
@@ -1337,7 +1341,7 @@ bool esas2r_nvram_validate(struct esas2r_adapter *a) }else if (n->version >SASNVR_VERSION ) {esas2r_hdebug ("invalid NVRAM version" ); }else { -esas2r_lock_set_flags (&a->flags,AF_NVR_VALID ); +set_bit (AF_NVR_VALID , &a->flags); rslt = true; }
@@ -1359,7 +1363,7 @@ void esas2r_nvram_set_defaults(struct esas2r_adapter *a)struct esas2r_sas_nvram *n = a->nvram;u32 time =jiffies_to_msecs (jiffies); -esas2r_lock_clear_flags (&a->flags,AF_NVR_VALID ); +clear_bit (AF_NVR_VALID , &a->flags); *n = default_sas_nvram; n->sas_addr[3 ] |=0x0F ; n->sas_addr[4 ] =HIBYTE (LOWORD (time));
@@ -1389,7 +1393,7 @@ bool esas2r_fm_api(struct esas2r_adapter *a, struct esas2r_flash_img *fi,u8 j;struct esas2r_component_header *ch; -if (esas2r_lock_set_flags (&a->flags,AF_FLASH_LOCK ) &AF_FLASH_LOCK ) { +if (test_and_set_bit (AF_FLASH_LOCK , &a->flags)) {/* flag was already set */ fi->status =FI_STAT_BUSY ;return false;
@@ -1413,7 +1417,7 @@ bool esas2r_fm_api(struct esas2r_adapter *a, struct esas2r_flash_img *fi,return complete_fmapi_req (a, rq,FI_STAT_IMG_VER ); } -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return complete_fmapi_req (a, rq,FI_STAT_DEGRADED );switch (fi->action) {
drivers/scsi/esas2r/esas2r_init.c +69 -74
386 lines not on this page · raw message
drivers/scsi/esas2r/esas2r_int.c +49 -48
257 lines not on this page · raw message
drivers/scsi/esas2r/esas2r_io.c +35 -38
161 lines not on this page · raw message
drivers/scsi/esas2r/esas2r_ioctl.c +14 -14
@@ -347,7 +347,7 @@ static bool csmi_ioctl_tunnel(struct esas2r_adapter *a, {struct atto_vda_ioctl_req *ioctl = &rq->vrq->ioctl; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return false;esas2r_sgc_init (sgc, a, rq, rq->vrq->ioctl.sge);
@@ -463,7 +463,7 @@ static int csmi_ioctl_callback(struct esas2r_adapter *a, gcc->bios_minor_rev =LOBYTE (HIWORD (a->flash_ver)); gcc->bios_build_rev =LOWORD (a->flash_ver); -if (a->flags2 &AF2_THUNDERLINK ) +if (test_bit (AF2_THUNDERLINK , &a->flags2)) gcc->cntlr_flags =CSMI_CNTLRF_SAS_HBA |CSMI_CNTLRF_SATA_HBA ;else
@@ -485,7 +485,7 @@ static int csmi_ioctl_callback(struct esas2r_adapter *a, {struct atto_csmi_get_cntlr_sts *gcs = &ioctl_csmi->cntlr_sts; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags)) gcs->status =CSMI_CNTLR_STS_FAILED ;else gcs->status =CSMI_CNTLR_STS_GOOD ;
@@ -819,10 +819,10 @@ static int hba_ioctl_callback(struct esas2r_adapter *a, gai->adap_type =ATTO_GAI_AT_ESASRAID2 ; -if (a->flags2 &AF2_THUNDERLINK ) +if (test_bit (AF2_THUNDERLINK , &a->flags2)) gai->adap_type =ATTO_GAI_AT_TLSASHBA ; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags)) gai->adap_flags |=ATTO_GAI_AF_DEGRADED ; gai->adap_flags |= ATTO_GAI_AF_SPT_SUPP |
@@ -938,7 +938,7 @@ static int hba_ioctl_callback(struct esas2r_adapter *a,u32 total_len =ESAS2R_FWCOREDUMP_SZ ;/* Size is zero if a core dump isn't present */ -if (!(a->flags2 &AF2_COREDUMP_SAVED )) +if (!test_bit (AF2_COREDUMP_SAVED , &a->flags2)) total_len =0 ;if (len > total_len)
@@ -960,8 +960,7 @@ static int hba_ioctl_callback(struct esas2r_adapter *a,memset (a->fw_coredump_buff,0 ,ESAS2R_FWCOREDUMP_SZ ); -esas2r_lock_clear_flags (&a->flags2, -AF2_COREDUMP_SAVED ); +clear_bit (AF2_COREDUMP_SAVED , &a->flags2); }else if (trc->trace_func !=ATTO_TRC_TF_GET_INFO ) { hi->status =ATTO_STS_UNSUPPORTED ;break ;
@@ -973,7 +972,7 @@ static int hba_ioctl_callback(struct esas2r_adapter *a, trc->total_length =ESAS2R_FWCOREDUMP_SZ ;/* Return zero length buffer if core dump not present */ -if (!(a->flags2 &AF2_COREDUMP_SAVED )) +if (!test_bit (AF2_COREDUMP_SAVED , &a->flags2)) trc->total_length =0 ; }else { hi->status =ATTO_STS_UNSUPPORTED ;
@@ -1048,6 +1047,7 @@ static int hba_ioctl_callback(struct esas2r_adapter *a,else if (spt->flags &ATTO_SPTF_HEAD_OF_Q ) rq->vrq->scsi.flags |=cpu_to_le32 (FCP_CMND_TA_HEAD_Q ); +if (!esas2r_build_sg_list (a, rq, sgc)) { hi->status =ATTO_STS_OUT_OF_RSRC ;break ;
@@ -1139,15 +1139,15 @@ static int hba_ioctl_callback(struct esas2r_adapter *a,break ; } -if (a->flags &AF_CHPRST_NEEDED ) +if (test_bit (AF_CHPRST_NEEDED , &a->flags)) ac->adap_state =ATTO_AC_AS_RST_SCHED ; -else if (a->flags &AF_CHPRST_PENDING ) +else if (test_bit (AF_CHPRST_PENDING , &a->flags)) ac->adap_state =ATTO_AC_AS_RST_IN_PROG ; -else if (a->flags &AF_DISC_PENDING ) +else if (test_bit (AF_DISC_PENDING , &a->flags)) ac->adap_state =ATTO_AC_AS_RST_DISC ; -else if (a->flags &AF_DISABLED ) +else if (test_bit (AF_DISABLED , &a->flags)) ac->adap_state =ATTO_AC_AS_DISABLED ; -else if (a->flags &AF_DEGRADED_MODE ) +else if (test_bit (AF_DEGRADED_MODE , &a->flags)) ac->adap_state =ATTO_AC_AS_DEGRADED ;else ac->adap_state =ATTO_AC_AS_OK ;
drivers/scsi/esas2r/esas2r_main.c +17 -17
@@ -889,7 +889,7 @@ int esas2r_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)/* Assume success, if it fails we will fix the result later. */ cmd->result =DID_OK <<16 ; -if (unlikely (a->flags &AF_DEGRADED_MODE )) { +if (unlikely (test_bit (AF_DEGRADED_MODE , &a->flags))) { cmd->result =DID_NO_CONNECT <<16 ; cmd->scsi_done (cmd);return 0 ;
@@ -1050,7 +1050,7 @@ int esas2r_eh_abort(struct scsi_cmnd *cmd)esas2r_log (ESAS2R_LOG_INFO ,"eh_abort (%p)" , cmd); -if (a->flags &AF_DEGRADED_MODE ) { +if (test_bit (AF_DEGRADED_MODE , &a->flags)) { cmd->result =DID_ABORT <<16 ;scsi_set_resid (cmd,0 );
@@ -1131,7 +1131,7 @@ static int esas2r_host_bus_reset(struct scsi_cmnd *cmd, bool host_reset)struct esas2r_adapter *a = (struct esas2r_adapter *)cmd->device->host->hostdata; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return FAILED ;if (host_reset)
@@ -1141,14 +1141,14 @@ static int esas2r_host_bus_reset(struct scsi_cmnd *cmd, bool host_reset)/* above call sets the AF_OS_RESET flag. wait for it to clear. */ -while (a->flags &AF_OS_RESET ) { +while (test_bit (AF_OS_RESET , &a->flags)) {msleep (10 ); -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return FAILED ; } -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return FAILED ;return SUCCESS ;
@@ -1176,7 +1176,7 @@ static int esas2r_dev_targ_reset(struct scsi_cmnd *cmd, bool target_reset)u8 task_management_status =RS_PENDING ;bool completed; -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return FAILED ; retry:
@@ -1229,7 +1229,7 @@ retry:msleep (10 ); } -if (a->flags &AF_DEGRADED_MODE ) +if (test_bit (AF_DEGRADED_MODE , &a->flags))return FAILED ;if (task_management_status ==RS_BUSY ) {
@@ -1666,13 +1666,13 @@ void esas2r_adapter_tasklet(unsigned long context) {struct esas2r_adapter *a = (struct esas2r_adapter *)context; -if (unlikely (a->flags2 &AF2_TIMER_TICK )) { -esas2r_lock_clear_flags (&a->flags2,AF2_TIMER_TICK ); +if (unlikely (test_bit (AF2_TIMER_TICK , &a->flags2))) { +clear_bit (AF2_TIMER_TICK , &a->flags2);esas2r_timer_tick (a); } -if (likely (a->flags2 &AF2_INT_PENDING )) { -esas2r_lock_clear_flags (&a->flags2,AF2_INT_PENDING ); +if (likely (test_bit (AF2_INT_PENDING , &a->flags2))) { +clear_bit (AF2_INT_PENDING , &a->flags2);esas2r_adapter_interrupt (a); }
@@ -1680,12 +1680,12 @@ void esas2r_adapter_tasklet(unsigned long context)esas2r_do_tasklet_tasks (a);if (esas2r_is_tasklet_pending (a) - || (a->flags2 &AF2_INT_PENDING ) - || (a->flags2 &AF2_TIMER_TICK )) { -esas2r_lock_clear_flags (&a->flags,AF_TASKLET_SCHEDULED ); + || (test_bit (AF2_INT_PENDING , &a->flags2)) + || (test_bit (AF2_TIMER_TICK , &a->flags2))) { +clear_bit (AF_TASKLET_SCHEDULED , &a->flags);esas2r_schedule_tasklet (a); }else { -esas2r_lock_clear_flags (&a->flags,AF_TASKLET_SCHEDULED ); +clear_bit (AF_TASKLET_SCHEDULED , &a->flags); } }
@@ -1707,7 +1707,7 @@ static void esas2r_timer_callback(unsigned long context) {struct esas2r_adapter *a = (struct esas2r_adapter *)context; -esas2r_lock_set_flags (&a->flags2,AF2_TIMER_TICK ); +set_bit (AF2_TIMER_TICK , &a->flags2);esas2r_schedule_tasklet (a);
drivers/scsi/esas2r/esas2r_targdb.c +1 -1
@@ -86,7 +86,7 @@ void esas2r_targ_db_report_changes(struct esas2r_adapter *a)esas2r_trace_enter (); -if (a->flags &AF_DISC_PENDING ) { +if (test_bit (AF_DISC_PENDING , &a->flags)) {esas2r_trace_exit ();return ; }
drivers/scsi/esas2r/esas2r_vda.c +3 -3
@@ -84,7 +84,7 @@ bool esas2r_process_vda_ioctl(struct esas2r_adapter *a,return false; } -if (a->flags &AF_DEGRADED_MODE ) { +if (test_bit (AF_DEGRADED_MODE , &a->flags)) { vi->status =ATTO_STS_DEGRADED ;return false; }
@@ -389,7 +389,7 @@ void esas2r_build_mgt_req(struct esas2r_adapter *a, vrq->length =cpu_to_le32 (length);if (vrq->length) { -if (a->flags &AF_LEGACY_SGE_MODE ) { +if (test_bit (AF_LEGACY_SGE_MODE , &a->flags)) { vrq->sg_list_offset = (u8 )offsetof(struct atto_vda_mgmt_req , sge);
@@ -427,7 +427,7 @@ void esas2r_build_ae_req(struct esas2r_adapter *a, struct esas2r_request *rq) vrq->length =cpu_to_le32 (sizeof (struct atto_vda_ae_data )); -if (a->flags &AF_LEGACY_SGE_MODE ) { +if (test_bit (AF_LEGACY_SGE_MODE , &a->flags)) { vrq->sg_list_offset = (u8 )offsetof(struct atto_vda_ae_req , sge); vrq->sge[0 ].length =cpu_to_le32 (SGE_LAST | vrq->length);
Signature · 1 line
1.8.3.1
PATCH 2/4 esas2r: Fixes for big-endian platforms
In esas2r_format_init_msg(), sgl_page_size and epoch_time params are converted to little endian and the firmware version read from the hba is converted to cpu endianess.
In esas2r_rq_init_request, correct and simplify the construction of the SCSI handle.
These fixes are the result of testing on a PPC64 machine.
--- drivers/scsi/esas2r/esas2r.h | 7 ++----- drivers/scsi/esas2r/esas2r_init.c | 11 +++++++---- 2 files changed, 9 insertions(+), 9 deletions(-)
drivers/scsi/esas2r/esas2r.h +2 -5
@@ -1207,7 +1207,6 @@ static inline void esas2r_rq_init_request(struct esas2r_request *rq, struct esas2r_adapter *a) {union atto_vda_req *vrq = rq->vrq; -u32 handle;INIT_LIST_HEAD (&rq->sg_table_head); rq->data_buf = (void *)(vrq +1 );
@@ -1243,11 +1242,9 @@ static inline void esas2r_rq_init_request(struct esas2r_request *rq,/* * add a reference number to the handle to make it unique (until it -* wraps of course) while preserving the upper word +* wraps of course) while preserving the least significant word */ - - handle =be32_to_cpu (vrq->scsi.handle) &0xFFFF0000 ; - vrq->scsi.handle =cpu_to_be32 (handle + a->cmd_ref_no++); + vrq->scsi.handle = (a->cmd_ref_no++ <<16 ) | (u16 )vrq->scsi.handle;/* * the following formats a SCSI request. the caller can override as
drivers/scsi/esas2r/esas2r_init.c +7 -4
@@ -1235,8 +1235,8 @@ static bool esas2r_format_init_msg(struct esas2r_adapter *a,0 , NULL); ci = (struct atto_vda_cfg_init *)&rq->vrq->cfg.data.init; - ci->sgl_page_size = sgl_page_size; - ci->epoch_time = now.tv_sec; + ci->sgl_page_size =cpu_to_le32 (sgl_page_size); + ci->epoch_time =cpu_to_le32 (now.tv_sec); rq->flags |=RF_FAILURE_OK ; a->init_msg =ESAS2R_INIT_MSG_INIT ;break ;
@@ -1246,12 +1246,15 @@ static bool esas2r_format_init_msg(struct esas2r_adapter *a,if (rq->req_stat ==RS_SUCCESS ) {u32 major;u32 minor; +u16 fw_release; a->fw_version =le16_to_cpu ( rq->func_rsp.cfg_rsp.vda_version); a->fw_build = rq->func_rsp.cfg_rsp.fw_build; - major =LOBYTE (rq->func_rsp.cfg_rsp.fw_release); - minor =HIBYTE (rq->func_rsp.cfg_rsp.fw_release); + fw_release =le16_to_cpu ( + rq->func_rsp.cfg_rsp.fw_release); + major =LOBYTE (fw_release); + minor =HIBYTE (fw_release); a->fw_version += (major <<16 ) + (minor <<24 ); }else {esas2r_hdebug ("FAILED" );
Signature · 1 line
1.8.3.1
PATCH 3/4 esas2r: Remove superfluous mask of pcie_cap_reg
In reply to Bradley Grove--- drivers/scsi/esas2r/esas2r_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/esas2r/esas2r_init.c +1 -1
@@ -807,7 +807,7 @@ static void esas2r_init_pci_cfg_space(struct esas2r_adapter *a)int pcie_cap_reg; pcie_cap_reg =pci_find_capability (a->pcid,PCI_CAP_ID_EXP ); -if (0xffff & pcie_cap_reg) { +if (pcie_cap_reg) {u16 devcontrol; pci_read_config_word(a->pcid, pcie_cap_reg + PCI_EXP_DEVCTL,
Signature · 1 line
1.8.3.1
PATCH 4/4 esas2r: Cleanup snprinf formatting of firmware version
In reply to Bradley Grove--- drivers/scsi/esas2r/esas2r_vda.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/esas2r/esas2r_vda.c +3 -3
@@ -310,9 +310,9 @@ static void esas2r_complete_vda_ioctl(struct esas2r_adapter *a,le32_to_cpu (rsp->vda_version); cfg->data.init.fw_build = rsp->fw_build; -snprintf (buf,sizeof (buf),"%1d.%02d" , - (int )LOBYTE (le16_to_cpu (rsp->fw_release)), - (int )HIBYTE (le16_to_cpu (rsp->fw_release))); +snprintf (buf,sizeof (buf),"%1.1u.%2.2u" , + (int )LOBYTE (le16_to_cpu (rsp->fw_release)), + (int )HIBYTE (le16_to_cpu (rsp->fw_release)));memcpy (&cfg->data.init.fw_release, buf,sizeof (cfg->data.init.fw_release));
Signature · 1 line
1.8.3.1