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

Commit 35b5c55f 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:
  ahci: add device ID for 82801JI sata controller
  drivers/ata: Move a dereference below a NULL test
  libata: implement and use HORKAGE_NOSETXFER, take#2
  libata: fix follow-up SRST failure path
parents e9e961c9 b2dde6af

drivers/ata/ahci.c

+1 −0
Original line number Diff line number Diff line
@@ -513,6 +513,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x502a), board_ahci }, /* Tolapai */

	{ PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */

	{ PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */

	{ PCI_VDEVICE(INTEL, 0x3a22), board_ahci }, /* ICH10 */

	{ PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */

	{ PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */

	{ PCI_VDEVICE(INTEL, 0x3b25), board_ahci }, /* PCH RAID */

drivers/ata/libata-core.c

+18 −2
Original line number Diff line number Diff line
@@ -3392,17 +3392,27 @@ int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel) 


static int ata_dev_set_mode(struct ata_device *dev)

{

	struct ata_port *ap = dev->link->ap;

	struct ata_eh_context *ehc = &dev->link->eh_context;

	const bool nosetxfer = dev->horkage & ATA_HORKAGE_NOSETXFER;

	const char *dev_err_whine = "";

	int ign_dev_err = 0;

	unsigned int err_mask;

	unsigned int err_mask = 0;

	int rc;



	dev->flags &= ~ATA_DFLAG_PIO;

	if (dev->xfer_shift == ATA_SHIFT_PIO)

		dev->flags |= ATA_DFLAG_PIO;



	if (nosetxfer && ap->flags & ATA_FLAG_SATA && ata_id_is_sata(dev->id))

		dev_err_whine = " (SET_XFERMODE skipped)";

	else {

		if (nosetxfer)

			ata_dev_printk(dev, KERN_WARNING,

				       "NOSETXFER but PATA detected - can't "

				       "skip SETXFER, might malfunction\n");

		err_mask = ata_dev_set_xfermode(dev);

	}



	if (err_mask & ~AC_ERR_DEV)

		goto fail;
@@ -4297,6 +4307,12 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { 
	/* Devices which aren't very happy with higher link speeds */

	{ "WD My Book",			NULL,	ATA_HORKAGE_1_5_GBPS, },



	/*

	 * Devices which choke on SETXFER.  Applies only if both the

	 * device and controller are SATA.

	 */

	{ "PIONEER DVD-RW  DVRTD08",	"1.00",	ATA_HORKAGE_NOSETXFER },



	/* End Marker */

	{ }

};

drivers/ata/libata-eh.c

+4 −0
Original line number Diff line number Diff line
@@ -2517,6 +2517,10 @@ int ata_eh_reset(struct ata_link *link, int classify, 


			ata_eh_about_to_do(link, NULL, ATA_EH_RESET);

			rc = ata_do_reset(link, reset, classes, deadline, true);

			if (rc) {

				failed_link = link;

				goto fail;

			}

		}

	} else {

		if (verbose)

drivers/ata/pata_at91.c

+2 −1
Original line number Diff line number Diff line
@@ -312,11 +312,12 @@ static int __devinit pata_at91_probe(struct platform_device *pdev) 
static int __devexit pata_at91_remove(struct platform_device *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	struct at91_ide_info *info = host->private_data;

	struct at91_ide_info *info;

	struct device *dev = &pdev->dev;



	if (!host)

		return 0;

	info = host->private_data;



	ata_host_detach(host);

include/linux/libata.h

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ enum { 
						    not multiple of 16 bytes */

	ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),	/* firmware update warning */

	ATA_HORKAGE_1_5_GBPS	= (1 << 13),	/* force 1.5 Gbps */

	ATA_HORKAGE_NOSETXFER	= (1 << 14),	/* skip SETXFER, SATA only */



	 /* DMA mask for user DMA control: User visible values; DO NOT

	    renumber */