Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c650a0a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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_mv: Prevent PIO commands to be defered too long if traffic in progress.
  pata_sc1200: Fix crash on boot
  libata: fix internal command failure handling
  libata: fix PMP initialization
  sata_nv: make sure link is brough up online when skipping hardreset
  ahci / atiixp / pci quirks: rename AMD SB900 into Hudson-2
  ahci: Add the AHCI controller Linux Device ID for NVIDIA chipsets.
  pata_via: extend the rev_max for VT6330
parents 012abeea 159a7ff7

drivers/ata/ahci.c

+2 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ATI, 0x4395), board_ahci_sb700 }, /* ATI SB700/800 */



	/* AMD */

	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD SB900 */

	{ PCI_VDEVICE(AMD, 0x7800), board_ahci }, /* AMD Hudson-2 */

	/* AMD is using RAID class only for ahci controllers */

	{ PCI_VENDOR_ID_AMD, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

	  PCI_CLASS_STORAGE_RAID << 8, 0xffffff, board_ahci },
@@ -605,6 +605,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(NVIDIA, 0x0559), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055a), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x055b), board_ahci_yesncq },	/* MCP67 */

	{ PCI_VDEVICE(NVIDIA, 0x0580), board_ahci_yesncq },	/* Linux ID */

	{ PCI_VDEVICE(NVIDIA, 0x07f0), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f1), board_ahci_yesncq },	/* MCP73 */

	{ PCI_VDEVICE(NVIDIA, 0x07f2), board_ahci_yesncq },	/* MCP73 */

drivers/ata/libata-core.c

+7 −5
Original line number Diff line number Diff line
@@ -5028,13 +5028,15 @@ void ata_qc_complete(struct ata_queued_cmd *qc) 
			qc->flags |= ATA_QCFLAG_FAILED;



		if (unlikely(qc->flags & ATA_QCFLAG_FAILED)) {

			if (!ata_tag_internal(qc->tag)) {

			/* always fill result TF for failed qc */

			fill_result_tf(qc);



			if (!ata_tag_internal(qc->tag))

				ata_qc_schedule_eh(qc);

			else

				__ata_qc_complete(qc);

			return;

		}

		}



		WARN_ON_ONCE(ap->pflags & ATA_PFLAG_FROZEN);

drivers/ata/libata-eh.c

+4 −2
Original line number Diff line number Diff line
@@ -2981,12 +2981,14 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link, 
	 * device detection messages backwards.

	 */

	ata_for_each_dev(dev, link, ALL) {

		if (!(new_mask & (1 << dev->devno)) ||

		    dev->class == ATA_DEV_PMP)

		if (!(new_mask & (1 << dev->devno)))

			continue;



		dev->class = ehc->classes[dev->devno];



		if (dev->class == ATA_DEV_PMP)

			continue;



		ehc->i.flags |= ATA_EHI_PRINTINFO;

		rc = ata_dev_configure(dev);

		ehc->i.flags &= ~ATA_EHI_PRINTINFO;

drivers/ata/pata_atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static const struct pci_device_id atiixp[] = { 
	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP400_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP600_IDE), },

	{ PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_IXP700_IDE), },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_SB900_IDE), },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_HUDSON2_IDE), },



	{ },

};

drivers/ata/pata_sc1200.c

+1 −2
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
		.udma_mask = ATA_UDMA2,

		.port_ops = &sc1200_port_ops

	};

	/* Can't enable port 2 yet, see top comments */

	const struct ata_port_info *ppi[] = { &info, };

	const struct ata_port_info *ppi[] = { &info, NULL };



	return ata_pci_sff_init_one(dev, ppi, &sc1200_sht, NULL);

}