Merge branch 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata (af94bdfa) · Commits · 戴 / test

Pull libata fixes from Tejun Heo: "Two libata fixes. One to disable hotplug on VT6420 which never worked properly. The other reverts an earlier patch which disabled the second port on SB600/700. There were some confusions due to earlier datasheets which incorrectly indicated that the second port is not implemented on both SB600 and 700" * 'for-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: sata_via: Enable hotplug only on VT6421 Revert "pata_atiixp: Don't use unconnected secondary port on SB600/SB700"

drivers/ata/pata_atiixp.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -278,11 +278,6 @@ static int atiixp_init_one(struct pci_dev pdev, const struct pci_device_id id)
		};
		const struct ata_port_info *ppi[] = { &info, &info };

		/* SB600/700 don't have secondary port wired */
		if ((pdev->device == PCI_DEVICE_ID_ATI_IXP600_IDE) \|\|
		(pdev->device == PCI_DEVICE_ID_ATI_IXP700_IDE))
		ppi[1] = &ata_dummy_port_info;

		return ata_pci_bmdma_init_one(pdev, ppi, &atiixp_sht, NULL,
		ATA_HOST_PARALLEL_SCAN);
		}

drivers/ata/sata_via.c

+10 −8

Original line number	Diff line number	Diff line
		@@ -644,6 +644,7 @@ static void svia_configure(struct pci_dev *pdev, int board_id,
		pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8);
		}

		if (board_id == vt6421) {
		/* enable IRQ on hotplug */
		pci_read_config_byte(pdev, SVIA_MISC_3, &tmp8);
		if ((tmp8 & SATA_HOTPLUG) != SATA_HOTPLUG) {
		@@ -653,6 +654,7 @@ static void svia_configure(struct pci_dev *pdev, int board_id,
		tmp8 \|= SATA_HOTPLUG;
		pci_write_config_byte(pdev, SVIA_MISC_3, tmp8);
		}
		}

		/*
		* vt6420/1 has problems talking to some drives. The following

Admin message