summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-09-21 16:29:05 +0900
committerJeff Garzik <jeff@garzik.org>2007-09-25 21:30:56 -0400
commitedeb614c1c8388b354d93ff7790317cc5d6a38ec (patch)
tree453dcedc7806b0449e0541b7ccdd5698b6491014
parent228f47b959a0cf2e24c9696757c7e6510334e499 (diff)
downloadlinux-3.10-edeb614c1c8388b354d93ff7790317cc5d6a38ec.tar.gz
linux-3.10-edeb614c1c8388b354d93ff7790317cc5d6a38ec.tar.bz2
linux-3.10-edeb614c1c8388b354d93ff7790317cc5d6a38ec.zip
pata_sis: add missing UDMA5 timing value in sis_66_set_dmamode()
sis_66_set_dmamode() also handles early UDMA100 (SIS630 ET) but is missing udma timing value for UDMA100. According to sis5513, this should be 0x8000. This caused UDMA100 device to fail on pata_sis till it downgrades to UDMA66 while it works fine on sis5513 at UDMA100. Reported by Adam Blech. Signed-off-by: Tejun Heo <htejun@gmail.com> Cc: Adam Blech <desaster.area@addcom.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/pata_sis.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 2bd7645f1a8..cce2834b2b6 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -375,8 +375,9 @@ static void sis_66_set_dmamode (struct ata_port *ap, struct ata_device *adev)
int drive_pci = sis_old_port_base(adev);
u16 timing;
+ /* MWDMA 0-2 and UDMA 0-5 */
const u16 mwdma_bits[] = { 0x008, 0x302, 0x301 };
- const u16 udma_bits[] = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000};
+ const u16 udma_bits[] = { 0xF000, 0xD000, 0xB000, 0xA000, 0x9000, 0x8000 };
pci_read_config_word(pdev, drive_pci, &timing);