Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
sata_via: apply magic FIFO fix to vt6420 too
+5
-4
+5
-4
drivers/ata/sata_via.c
+5
-4
drivers/ata/sata_via.c
···
538
538
return 0;
539
539
}
540
540
541
-
static void svia_configure(struct pci_dev *pdev)
541
+
static void svia_configure(struct pci_dev *pdev, int board_id)
542
542
{
543
543
u8 tmp8;
544
544
···
577
577
}
578
578
579
579
/*
580
-
* vt6421 has problems talking to some drives. The following
580
+
* vt6420/1 has problems talking to some drives. The following
581
581
* is the fix from Joseph Chan <JosephChan@via.com.tw>.
582
582
*
583
583
* When host issues HOLD, device may send up to 20DW of data
···
596
596
*
597
597
* https://bugzilla.kernel.org/show_bug.cgi?id=15173
598
598
* http://article.gmane.org/gmane.linux.ide/46352
599
+
* http://thread.gmane.org/gmane.linux.kernel/1062139
599
600
*/
600
-
if (pdev->device == 0x3249) {
601
+
if (board_id == vt6420 || board_id == vt6421) {
601
602
pci_read_config_byte(pdev, 0x52, &tmp8);
602
603
tmp8 |= 1 << 2;
603
604
pci_write_config_byte(pdev, 0x52, tmp8);
···
653
652
if (rc)
654
653
return rc;
655
654
656
-
svia_configure(pdev);
655
+
svia_configure(pdev, board_id);
657
656
658
657
pci_set_master(pdev);
659
658
return ata_host_activate(host, pdev->irq, ata_bmdma_interrupt,