mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
Fix broken pata_via cable detection
via_do_set_mode overwrites 80-wire cable detection bits. Let's preserve them. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
897ee77bfb
commit
08ebd43d6b
1 changed files with 10 additions and 3 deletions
|
@ -243,7 +243,6 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
|
|||
int ut;
|
||||
int offset = 3 - (2*ap->port_no) - adev->devno;
|
||||
|
||||
|
||||
/* Calculate the timing values we require */
|
||||
ata_timing_compute(adev, mode, &t, T, UT);
|
||||
|
||||
|
@ -290,9 +289,17 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
|
|||
ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Set UDMA unless device is not UDMA capable */
|
||||
if (udma_type)
|
||||
pci_write_config_byte(pdev, 0x50 + offset, ut);
|
||||
if (udma_type) {
|
||||
u8 cable80_status;
|
||||
|
||||
/* Get 80-wire cable detection bit */
|
||||
pci_read_config_byte(pdev, 0x50 + offset, &cable80_status);
|
||||
cable80_status &= 0x10;
|
||||
|
||||
pci_write_config_byte(pdev, 0x50 + offset, ut | cable80_status);
|
||||
}
|
||||
}
|
||||
|
||||
static void via_set_piomode(struct ata_port *ap, struct ata_device *adev)
|
||||
|
|
Loading…
Reference in a new issue