tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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:
Revert "[PATCH] Add 0x7110 piix to ata_piix.c"
[libata] sata_nv: Add PCI IDs
[PATCH] ahci: fix status register check in ahci_softreset

Linus Torvalds aefba081 3ccfc65c

+9 -7
unified split
+1 -2
drivers/ata/ahci.c
··· 736 736 } 737 737 738 738 /* check BUSY/DRQ, perform Command List Override if necessary */ 739 - ahci_tf_read(ap, &tf); 740 - if (tf.command & (ATA_BUSY | ATA_DRQ)) { 739 + if (ahci_check_status(ap) & (ATA_BUSY | ATA_DRQ)) { 741 740 rc = ahci_clo(ap); 742 741 743 742 if (rc == -EOPNOTSUPP) {
-1
drivers/ata/ata_piix.c
··· 168 168 #ifdef ATA_ENABLE_PATA 169 169 /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */ 170 170 /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */ 171 - { 0x8086, 0x7110, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 }, 172 171 { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 }, 173 172 { 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, 174 173 { 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+8 -4
drivers/ata/sata_nv.c
··· 117 117 { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC }, 118 118 { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC }, 119 119 { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC }, 120 - { PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, 121 - { PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, 122 - { PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, 123 - { PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, 120 + { PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, /* MCP65 */ 121 + { PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, /* MCP65 */ 122 + { PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, /* MCP65 */ 123 + { PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, /* MCP65 */ 124 + { PCI_VDEVICE(NVIDIA, 0x0550), GENERIC }, /* MCP67 */ 125 + { PCI_VDEVICE(NVIDIA, 0x0551), GENERIC }, /* MCP67 */ 126 + { PCI_VDEVICE(NVIDIA, 0x0552), GENERIC }, /* MCP67 */ 127 + { PCI_VDEVICE(NVIDIA, 0x0553), GENERIC }, /* MCP67 */ 124 128 { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, 125 129 PCI_ANY_ID, PCI_ANY_ID, 126 130 PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },