sis5513: clear prefetch and postwrite for ATAPI devices

[Linux Kernel Mailing List]

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

    sis5513: clear prefetch and postwrite for ATAPI devices
    
    Clear prefetch and postwrite for ATAPI devices instead of depending on BIOS.
    
    Acked-by: Sergei Shtylyov <[EMAIL PROTECTED]>
    Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
---
 drivers/ide/pci/sis5513.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 45666b4..f9117a8 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/sis5513.c     Version 0.29    Aug 1, 2007
+ * linux/drivers/ide/pci/sis5513.c     Version 0.30    Aug 9, 2007
  *
  * Copyright (C) 1999-2000     Andre Hedrick <[EMAIL PROTECTED]>
  * Copyright (C) 2002          Lionel Bouton <[EMAIL PROTECTED]>, Maintainer
@@ -522,20 +522,19 @@ static void sis_program_timings(ide_drive_t *drive, const 
u8 mode)
                sis_ata133_program_timings(drive, mode);
 }
 
-/* Enables per-drive prefetch and postwrite */
 static void config_drive_art_rwp (ide_drive_t *drive)
 {
        ide_hwif_t *hwif        = HWIF(drive);
        struct pci_dev *dev     = hwif->pci_dev;
-
        u8 reg4bh               = 0;
-       u8 rw_prefetch          = (0x11 << drive->dn);
+       u8 rw_prefetch          = 0;
 
-       if (drive->media != ide_disk)
-               return;
        pci_read_config_byte(dev, 0x4b, &reg4bh);
 
-       if ((reg4bh & rw_prefetch) != rw_prefetch)
+       if (drive->media == ide_disk)
+               rw_prefetch = 0x11 << drive->dn;
+
+       if ((reg4bh & (0x11 << drive->dn)) != rw_prefetch)
                pci_write_config_byte(dev, 0x4b, reg4bh|rw_prefetch);
 }
 
-
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