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

Commit a17b7a39 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  sata_mv: platform driver allocs dma without create
  pata_ninja32: setup changes
  pata_legacy: typo fix
  pata_amd: Note in the module description it handles Nvidia
  sata_mv: fix loop with last port
  libata: ignore deverr on SETXFER if mode is configured
  pata_via: fix SATA cable detection on cx700
parents 271cad6d fbf14e2f

drivers/ata/libata-core.c

+33 −15
Original line number Diff line number Diff line
@@ -3048,6 +3048,8 @@ int ata_down_xfermask_limit(struct ata_device *dev, unsigned int sel) 
static int ata_dev_set_mode(struct ata_device *dev)

{

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

	const char *dev_err_whine = "";

	int ign_dev_err = 0;

	unsigned int err_mask;

	int rc;
@@ -3057,41 +3059,57 @@ static int ata_dev_set_mode(struct ata_device *dev) 


	err_mask = ata_dev_set_xfermode(dev);



	if (err_mask & ~AC_ERR_DEV)

		goto fail;



	/* revalidate */

	ehc->i.flags |= ATA_EHI_POST_SETMODE;

	rc = ata_dev_revalidate(dev, ATA_DEV_UNKNOWN, 0);

	ehc->i.flags &= ~ATA_EHI_POST_SETMODE;

	if (rc)

		return rc;



	/* Old CFA may refuse this command, which is just fine */

	if (dev->xfer_shift == ATA_SHIFT_PIO && ata_id_is_cfa(dev->id))

		err_mask &= ~AC_ERR_DEV;

		ign_dev_err = 1;



	/* Some very old devices and some bad newer ones fail any kind of

	   SET_XFERMODE request but support PIO0-2 timings and no IORDY */

	if (dev->xfer_shift == ATA_SHIFT_PIO && !ata_id_has_iordy(dev->id) &&

			dev->pio_mode <= XFER_PIO_2)

		err_mask &= ~AC_ERR_DEV;

		ign_dev_err = 1;



	/* Early MWDMA devices do DMA but don't allow DMA mode setting.

	   Don't fail an MWDMA0 set IFF the device indicates it is in MWDMA0 */

	if (dev->xfer_shift == ATA_SHIFT_MWDMA &&

	    dev->dma_mode == XFER_MW_DMA_0 &&

	    (dev->id[63] >> 8) & 1)

		err_mask &= ~AC_ERR_DEV;

		ign_dev_err = 1;



	if (err_mask) {

		ata_dev_printk(dev, KERN_ERR, "failed to set xfermode "

			       "(err_mask=0x%x)\n", err_mask);

		return -EIO;

	}

	/* if the device is actually configured correctly, ignore dev err */

	if (dev->xfer_mode == ata_xfer_mask2mode(ata_id_xfermask(dev->id)))

		ign_dev_err = 1;



	ehc->i.flags |= ATA_EHI_POST_SETMODE;

	rc = ata_dev_revalidate(dev, ATA_DEV_UNKNOWN, 0);

	ehc->i.flags &= ~ATA_EHI_POST_SETMODE;

	if (rc)

		return rc;

	if (err_mask & AC_ERR_DEV) {

		if (!ign_dev_err)

			goto fail;

		else

			dev_err_whine = " (device error ignored)";

	}



	DPRINTK("xfer_shift=%u, xfer_mode=0x%x\n",

		dev->xfer_shift, (int)dev->xfer_mode);



	ata_dev_printk(dev, KERN_INFO, "configured for %s\n",

		       ata_mode_string(ata_xfer_mode2mask(dev->xfer_mode)));

	ata_dev_printk(dev, KERN_INFO, "configured for %s%s\n",

		       ata_mode_string(ata_xfer_mode2mask(dev->xfer_mode)),

		       dev_err_whine);



	return 0;



 fail:

	ata_dev_printk(dev, KERN_ERR, "failed to set xfermode "

		       "(err_mask=0x%x)\n", err_mask);

	return -EIO;

}



/**

drivers/ata/pata_amd.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ static void __exit amd_exit(void) 
}



MODULE_AUTHOR("Alan Cox");

MODULE_DESCRIPTION("low-level driver for AMD PATA IDE");

MODULE_DESCRIPTION("low-level driver for AMD and Nvidia PATA IDE");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, amd);

MODULE_VERSION(DRV_VERSION);

drivers/ata/pata_legacy.c

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static int opti82c611a; /* Opti82c611A on primary 1, sec 2, both 3 */ 
static int opti82c46x;		/* Opti 82c465MV present(pri/sec autodetect) */

static int qdi;			/* Set to probe QDI controllers */

static int winbond;		/* Set to probe Winbond controllers,

					give I/O port if non stdanard */

					give I/O port if non standard */

static int autospeed;		/* Chip present which snoops speed changes */

static int pio_mask = 0x1F;	/* PIO range for autospeed devices */

static int iordy_mask = 0xFFFFFFFF;	/* Use iordy if available */

drivers/ata/pata_ninja32.c

+7 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 *	Base + 0x00 IRQ Status

 *	Base + 0x01 IRQ control

 *	Base + 0x02 Chipset control

 *	Base + 0x03 Unknown

 *	Base + 0x04 VDMA and reset control + wait bits

 *	Base + 0x08 BMIMBA

 *	Base + 0x0C DMA Length
@@ -174,8 +175,12 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) 
	ata_std_ports(&ap->ioaddr);



	iowrite8(0x05, base + 0x01);	/* Enable interrupt lines */

	iowrite8(0xB3, base + 0x02);	/* Burst, ?? setup */

	iowrite8(0x00, base + 0x04);	/* WAIT0 ? */

	iowrite8(0xBE, base + 0x02);	/* Burst, ?? setup */

	iowrite8(0x01, base + 0x03);	/* Unknown */

	iowrite8(0x20, base + 0x04);	/* WAIT0 */

	iowrite8(0x8f, base + 0x05);	/* Unknown */

	iowrite8(0xa4, base + 0x1c);	/* Unknown */

	iowrite8(0x83, base + 0x1d);	/* BMDMA control: WAIT0 */

	/* FIXME: Should we disable them at remove ? */

	return ata_host_activate(host, dev->irq, ata_interrupt,

				 IRQF_SHARED, &ninja32_sht);

drivers/ata/pata_via.c

+5 −1
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ enum { 
	VIA_BAD_ID	= 0x100, /* Has wrong vendor ID (0x1107) */

	VIA_BAD_AST	= 0x200, /* Don't touch Address Setup Timing */

	VIA_NO_ENABLES	= 0x400, /* Has no enablebits */

	VIA_SATA_PATA	= 0x800, /* SATA/PATA combined configuration */

};



/*
@@ -100,7 +101,7 @@ static const struct via_isa_bridge { 
	{ "vx800",	PCI_DEVICE_ID_VIA_VX800,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8237s",	PCI_DEVICE_ID_VIA_8237S,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8251",	PCI_DEVICE_ID_VIA_8251,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "cx700",	PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "cx700",	PCI_DEVICE_ID_VIA_CX700,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_SATA_PATA },

	{ "vt6410",	PCI_DEVICE_ID_VIA_6410,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST | VIA_NO_ENABLES},

	{ "vt8237a",	PCI_DEVICE_ID_VIA_8237A,    0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },

	{ "vt8237",	PCI_DEVICE_ID_VIA_8237,     0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST },
@@ -172,6 +173,9 @@ static int via_cable_detect(struct ata_port *ap) { 
	if (via_cable_override(pdev))

		return ATA_CBL_PATA40_SHORT;



	if ((config->flags & VIA_SATA_PATA) && ap->port_no == 0)

		return ATA_CBL_SATA;



	/* Early chips are 40 wire */

	if ((config->flags & VIA_UDMA) < VIA_UDMA_66)

		return ATA_CBL_PATA40;