Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=083d1631be7c36309359792ecf61aaf88559043f
Commit:     083d1631be7c36309359792ecf61aaf88559043f
Parent:     292148f8bb2b5d120440e046d24de07a739461aa
Author:     Wu, Gilbert <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 30 15:31:25 2007 -0800
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Sat Feb 3 13:54:14 2007 -0600

    [SCSI] aic94xx: update for v28 firmware
    
    These changes work compatibly with the old V17 firmware
    
    Contribution:
    
       Ed Chim <[EMAIL PROTECTED]>
       Gilbert Wu <[EMAIL PROTECTED]>
    
    Change Log:
    
    1.    Use dword instead of qword to display the value of Connection
    State register for debug purpose.
    
    2.    There are some registers location of AIC94xx chip has been changed
    according to the new V28 firmware. The patch has redefined the register
    location and provided initialization.
    
    3.    The new sequencer firmware v28 for Aic94xx SAS/SATA Linux open
    source device driver can be downloaded from
    http://www.adaptec.com/NR/exeres/35B611BC-9789-4B5B-82C6-85A2CCA8A46A.htm
    
    Signed-off-by: Gilbert Wu <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/aic94xx/aic94xx_dump.c    |    2 +-
 drivers/scsi/aic94xx/aic94xx_reg_def.h |    5 +++--
 drivers/scsi/aic94xx/aic94xx_seq.c     |    2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/aic94xx/aic94xx_dump.c 
b/drivers/scsi/aic94xx/aic94xx_dump.c
index e6ade59..6bd8e30 100644
--- a/drivers/scsi/aic94xx/aic94xx_dump.c
+++ b/drivers/scsi/aic94xx/aic94xx_dump.c
@@ -556,7 +556,7 @@ static void asd_dump_lseq_state(struct asd_ha_struct 
*asd_ha, int lseq)
        PRINT_LMIP_word(asd_ha, lseq, Q_TGTXFR_TAIL);
        PRINT_LMIP_byte(asd_ha, lseq, LINK_NUMBER);
        PRINT_LMIP_byte(asd_ha, lseq, SCRATCH_FLAGS);
-       PRINT_LMIP_qword(asd_ha, lseq, CONNECTION_STATE);
+       PRINT_LMIP_dword(asd_ha, lseq, CONNECTION_STATE);
        PRINT_LMIP_word(asd_ha, lseq, CONCTL);
        PRINT_LMIP_byte(asd_ha, lseq, CONSTAT);
        PRINT_LMIP_byte(asd_ha, lseq, CONNECTION_MODES);
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h 
b/drivers/scsi/aic94xx/aic94xx_reg_def.h
index a11f4e6..a43e8cd 100644
--- a/drivers/scsi/aic94xx/aic94xx_reg_def.h
+++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h
@@ -2226,9 +2226,10 @@
 #define LmSEQ_SAS_RESET_MODE(LinkNum)          (LmSCRATCH(LinkNum) + 0x0074)
 #define LmSEQ_LINK_RESET_RETRY_COUNT(LinkNum)  (LmSCRATCH(LinkNum) + 0x0075)
 #define LmSEQ_NUM_LINK_RESET_RETRIES(LinkNum)  (LmSCRATCH(LinkNum) + 0x0076)
-#define LmSEQ_OOB_INT_ENABLES(LinkNum)         (LmSCRATCH(LinkNum) + 0x007A)
+#define LmSEQ_OOB_INT_ENABLES(LinkNum)         (LmSCRATCH(LinkNum) + 0x0078)
+#define LmSEQ_NOTIFY_TIMER_DOWN_COUNT(LinkNum) (LmSCRATCH(LinkNum) + 0x007A)
 #define LmSEQ_NOTIFY_TIMER_TIMEOUT(LinkNum)    (LmSCRATCH(LinkNum) + 0x007C)
-#define LmSEQ_NOTIFY_TIMER_DOWN_COUNT(LinkNum) (LmSCRATCH(LinkNum) + 0x007E)
+#define LmSEQ_NOTIFY_TIMER_INITIAL_COUNT(LinkNum) (LmSCRATCH(LinkNum) + 0x007E)
 
 /* Mode dependent scratch page 1, mode 0 and mode 1 */
 #define LmSEQ_SG_LIST_PTR_ADDR0(LinkNum)        (LmSCRATCH(LinkNum) + 0x0020)
diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c 
b/drivers/scsi/aic94xx/aic94xx_seq.c
index 2768fe4..eae7a24 100644
--- a/drivers/scsi/aic94xx/aic94xx_seq.c
+++ b/drivers/scsi/aic94xx/aic94xx_seq.c
@@ -810,6 +810,8 @@ static void asd_init_lseq_mdp(struct asd_ha_struct *asd_ha, 
 int lseq)
        /* No delay for the first NOTIFY to be sent to the attached target. */
        asd_write_reg_word(asd_ha, LmSEQ_NOTIFY_TIMER_DOWN_COUNT(lseq),
                           ASD_NOTIFY_DOWN_COUNT);
+       asd_write_reg_word(asd_ha, LmSEQ_NOTIFY_TIMER_INITIAL_COUNT(lseq),
+                          ASD_NOTIFY_DOWN_COUNT);
 
        /* LSEQ Mode dependent, mode 0 and 1, page 1 setup. */
        for (i = 0; i < 2; i++) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to