diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-02 09:14:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-02 09:14:48 -0800 |
| commit | e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6 (patch) | |
| tree | be16dc950dda26f44aaa09455879acbca7efbcae /drivers/ata/pata_atiixp.c | |
| parent | 222335b755726f539c4a056ce119e017aa4166c4 (diff) | |
| parent | 49c8042996c84f0df6c49ea2e28a7ef38cd7d773 (diff) | |
| download | op-kernel-dev-e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6.zip op-kernel-dev-e47fddf2470feb228e1d3ff41fc78dad4cfbbcc6.tar.gz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: Initialize nbytes for internal sg commands
libata: Fix ata_busy_wait() kernel docs
pata_via: Correct missing comments
pata_atiixp: propogate cable detection hack from drivers/ide to the new driver
ahci/pata_jmicron: fix JMicron quirk
Diffstat (limited to 'drivers/ata/pata_atiixp.c')
| -rw-r--r-- | drivers/ata/pata_atiixp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c index 6f6672c..504e1db 100644 --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -36,15 +36,22 @@ enum { static int atiixp_pre_reset(struct ata_port *ap) { struct pci_dev *pdev = to_pci_dev(ap->host->dev); - static struct pci_bits atiixp_enable_bits[] = { + static const struct pci_bits atiixp_enable_bits[] = { { 0x48, 1, 0x01, 0x00 }, { 0x48, 1, 0x08, 0x00 } }; + u8 udma; if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no])) return -ENOENT; - ap->cbl = ATA_CBL_PATA80; + /* Hack from drivers/ide/pci. Really we want to know how to do the + raw detection not play follow the bios mode guess */ + pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ap->port_no, &udma); + if ((udma & 0x07) >= 0x04 || (udma & 0x70) >= 0x40) + ap->cbl = ATA_CBL_PATA80; + else + ap->cbl = ATA_CBL_PATA40; return ata_std_prereset(ap); } |
