Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94c7fa0fcc89571b24c90e0a7545ad31aa390f24
Commit:     94c7fa0fcc89571b24c90e0a7545ad31aa390f24
Parent:     cb824c32f1163a8004d0e2f484ded84255caebf4
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 22:29:53 2007 +0200
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 22:29:53 2007 +0200

    atiixp: DMA setup fixes
    
    * Fix handling of unsupported/invalid modes in atiixp_set_dma_mode().
    
    * ATI controllers allow separate PIO and DMA timings so remove programming
      of PIO modes from atiixp_set_dma_mode().  Also remove no longer needed
      atiixp_dma_2_pio() helper.
    
    * SWDMA timings are not programmed by atiixp_set_dma_mode() and if SWDMA
      mode is chosen atiixp_dma_host_on() erroneously enables UDMA, just disable
      support for SWDMA modes for now.
    
    * Enable support for MWDMA0 mode.
    
    * Bump driver version.
    
    Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/pci/atiixp.c |   53 ++++-----------------------------------------
 1 files changed, 5 insertions(+), 48 deletions(-)

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 0eb97f0..14a61b1 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/atiixp.c     Version 0.02    Jun 16 2007
+ *  linux/drivers/ide/pci/atiixp.c     Version 0.03    Aug 3 2007
  *
  *  Copyright (C) 2003 ATI Inc. <[EMAIL PROTECTED]>
  *  Copyright (C) 2004,2007 Bartlomiej Zolnierkiewicz
@@ -47,43 +47,6 @@ static int save_mdma_mode[4];
 
 static DEFINE_SPINLOCK(atiixp_lock);
 
-/**
- *     atiixp_dma_2_pio                -       return the PIO mode matching DMA
- *     @xfer_rate: transfer speed
- *
- *     Returns the nearest equivalent PIO timing for the PIO or DMA
- *     mode requested by the controller.
- */
-
-static u8 atiixp_dma_2_pio(u8 xfer_rate) {
-       switch(xfer_rate) {
-               case XFER_UDMA_6:
-               case XFER_UDMA_5:
-               case XFER_UDMA_4:
-               case XFER_UDMA_3:
-               case XFER_UDMA_2:
-               case XFER_UDMA_1:
-               case XFER_UDMA_0:
-               case XFER_MW_DMA_2:
-               case XFER_PIO_4:
-                       return 4;
-               case XFER_MW_DMA_1:
-               case XFER_PIO_3:
-                       return 3;
-               case XFER_SW_DMA_2:
-               case XFER_PIO_2:
-                       return 2;
-               case XFER_MW_DMA_0:
-               case XFER_SW_DMA_1:
-               case XFER_SW_DMA_0:
-               case XFER_PIO_1:
-               case XFER_PIO_0:
-               case XFER_PIO_SLOW:
-               default:
-                       return 0;
-       }
-}
-
 static void atiixp_dma_host_on(ide_drive_t *drive)
 {
        struct pci_dev *dev = drive->hwif->pci_dev;
@@ -169,7 +132,9 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const 
u8 speed)
        int timing_shift = (drive->dn & 2) ? 16 : 0 + (drive->dn & 1) ? 0 : 8;
        u32 tmp32;
        u16 tmp16;
-       u8 pio;
+
+       if (speed < XFER_MW_DMA_0)
+               return;
 
        spin_lock_irqsave(&atiixp_lock, flags);
 
@@ -191,13 +156,6 @@ static void atiixp_set_dma_mode(ide_drive_t *drive, const 
u8 speed)
        }
 
        spin_unlock_irqrestore(&atiixp_lock, flags);
-
-       if (speed >= XFER_SW_DMA_0)
-               pio = atiixp_dma_2_pio(speed);
-       else
-               pio = speed - XFER_PIO_0;
-
-       atiixp_set_pio_mode(drive, pio);
 }
 
 /**
@@ -249,8 +207,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
 
        hwif->atapi_dma = 1;
        hwif->ultra_mask = 0x3f;
-       hwif->mwdma_mask = 0x06;
-       hwif->swdma_mask = 0x04;
+       hwif->mwdma_mask = 0x07;
 
        pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ch, &udma_mode);
 
-
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