Commit 54dfffde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Various device specific fixes.  Nothing too interesting"

* 'for-3.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: disable NCQ on Samsung pci-e SSDs on macbooks
  ata: sata_mv: Cleanup only the initialized ports
  sata_sil: apply MOD15WRITE quirk to TOSHIBA MK2561GSYN
  ata: enable quirk from jmicron JMB350 for JMB394
  ATA: SATA_MV: Add missing Kconfig select statememnt
  ata: pata_imx: Check the return value from clk_prepare_enable()
parents 6a4d07f8 67809f85

drivers/ata/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ config SATA_HIGHBANK 


config SATA_MV

	tristate "Marvell SATA support"

	select GENERIC_PHY

	help

	  This option enables support for the Marvell Serial ATA family.

	  Currently supports 88SX[56]0[48][01] PCI(-X) chips,

drivers/ata/ahci.c

+14 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ enum board_ids { 
	/* board IDs by feature in alphabetical order */

	board_ahci,

	board_ahci_ign_iferr,

	board_ahci_noncq,

	board_ahci_nosntf,

	board_ahci_yes_fbs,
@@ -121,6 +122,13 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_noncq] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_nosntf] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_SNTF),

		.flags		= AHCI_FLAG_COMMON,
@@ -452,6 +460,12 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */

	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci },	/* ASM1062 */



	/*

	 * Samsung SSDs found on some macbooks.  NCQ times out.

	 * https://bugzilla.kernel.org/show_bug.cgi?id=60731

	 */

	{ PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_noncq },



	/* Enmotus */

	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },

drivers/ata/libata-pmp.c

+5 −2
Original line number Diff line number Diff line
@@ -447,8 +447,11 @@ static void sata_pmp_quirks(struct ata_port *ap) 
		 * otherwise.  Don't try hard to recover it.

		 */

		ap->pmp_link[ap->nr_pmp_links - 1].flags |= ATA_LFLAG_NO_RETRY;

	} else if (vendor == 0x197b && devid == 0x2352) {

		/* chip found in Thermaltake BlackX Duet, jmicron JMB350? */

	} else if (vendor == 0x197b && (devid == 0x2352 || devid == 0x0325)) {

		/*

		 * 0x2352: found in Thermaltake BlackX Duet, jmicron JMB350?

		 * 0x0325: jmicron JMB394.

		 */

		ata_for_each_link(link, ap, EDGE) {

			/* SRST breaks detection and disks get misclassified

			 * LPM disabled to avoid potential problems

drivers/ata/pata_imx.c

+6 −2
Original line number Diff line number Diff line
@@ -119,7 +119,9 @@ static int pata_imx_probe(struct platform_device *pdev) 
		return PTR_ERR(priv->clk);

	}



	clk_prepare_enable(priv->clk);

	ret = clk_prepare_enable(priv->clk);

	if (ret)

		return ret;



	host = ata_host_alloc(&pdev->dev, 1);

	if (!host) {
@@ -212,7 +214,9 @@ static int pata_imx_resume(struct device *dev) 
	struct ata_host *host = dev_get_drvdata(dev);

	struct pata_imx_priv *priv = host->private_data;



	clk_prepare_enable(priv->clk);

	int ret = clk_prepare_enable(priv->clk);

	if (ret)

		return ret;



	__raw_writel(priv->ata_ctl, priv->host_regs + PATA_IMX_ATA_CONTROL);

drivers/ata/sata_mv.c

+8 −4
Original line number Diff line number Diff line
@@ -4104,7 +4104,6 @@ static int mv_platform_probe(struct platform_device *pdev) 
	if (!hpriv->port_phys)

		return -ENOMEM;

	host->private_data = hpriv;

	hpriv->n_ports = n_ports;

	hpriv->board_idx = chip_soc;



	host->iomap = NULL;
@@ -4132,13 +4131,18 @@ static int mv_platform_probe(struct platform_device *pdev) 
			rc = PTR_ERR(hpriv->port_phys[port]);

			hpriv->port_phys[port] = NULL;

			if (rc != -EPROBE_DEFER)

				dev_warn(&pdev->dev, "error getting phy %d",

					rc);

				dev_warn(&pdev->dev, "error getting phy %d", rc);



			/* Cleanup only the initialized ports */

			hpriv->n_ports = port;

			goto err;

		} else

			phy_power_on(hpriv->port_phys[port]);

	}



	/* All the ports have been initialized */

	hpriv->n_ports = n_ports;



	/*

	 * (Re-)program MBUS remapping windows if we are asked to.

	 */
@@ -4176,7 +4180,7 @@ err: 
		clk_disable_unprepare(hpriv->clk);

		clk_put(hpriv->clk);

	}

	for (port = 0; port < n_ports; port++) {

	for (port = 0; port < hpriv->n_ports; port++) {

		if (!IS_ERR(hpriv->port_clks[port])) {

			clk_disable_unprepare(hpriv->port_clks[port]);

			clk_put(hpriv->port_clks[port]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE