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

Commit 633bb738 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.  All are device specific additions and
  workarounds"

* 'for-4.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata/sata_fsl.c: add ATA_FLAG_NO_LOG_PAGE to blacklist the controller for log page reads
  libata-eh.c: Introduce new ata port flag for controller which lockup on read log page
  sata_sil: disable trim
  AHCI: Fix softreset failed issue of Port Multiplier
  sata/mvebu: use #ifdef around suspend/resume code
  ahci: Order SATA device IDs for codename Lewisburg
  ahci: Add Device ID for Intel Sunrise Point PCH
parents 51825c8a 4f2568f5

drivers/ata/ahci.c

+12 −10
Original line number Diff line number Diff line
@@ -314,16 +314,6 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1f37), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3e), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci_avn }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa202), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa184), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa204), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa18e), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa20e), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */
@@ -350,10 +340,22 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x9d03), board_ahci }, /* Sunrise Point-LP AHCI */

	{ PCI_VDEVICE(INTEL, 0x9d05), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0x9d07), board_ahci }, /* Sunrise Point-LP RAID */

	{ PCI_VDEVICE(INTEL, 0xa102), board_ahci }, /* Sunrise Point-H AHCI */

	{ PCI_VDEVICE(INTEL, 0xa103), board_ahci }, /* Sunrise Point-H AHCI */

	{ PCI_VDEVICE(INTEL, 0xa105), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa106), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa107), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0xa10f), board_ahci }, /* Sunrise Point-H RAID */

	{ PCI_VDEVICE(INTEL, 0x2822), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa182), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa184), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa186), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa18e), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa202), board_ahci }, /* Lewisburg AHCI*/

	{ PCI_VDEVICE(INTEL, 0xa204), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa206), board_ahci }, /* Lewisburg RAID*/

	{ PCI_VDEVICE(INTEL, 0xa20e), board_ahci }, /* Lewisburg RAID*/



	/* JMicron 360/1/3/5/6, match class to avoid IDE function */

	{ PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,

drivers/ata/ahci_mvebu.c

+5 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) 
	writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA);

}



#ifdef CONFIG_PM_SLEEP

static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state)

{

	return ahci_platform_suspend_host(&pdev->dev);
@@ -81,6 +82,10 @@ static int ahci_mvebu_resume(struct platform_device *pdev) 


	return ahci_platform_resume_host(&pdev->dev);

}

#else

#define ahci_mvebu_suspend NULL

#define ahci_mvebu_resume NULL

#endif



static const struct ata_port_info ahci_mvebu_port_info = {

	.flags	   = AHCI_FLAG_COMMON,

drivers/ata/libahci.c

+9 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,15 @@ static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp, 
	ata_tf_to_fis(tf, pmp, is_cmd, fis);

	ahci_fill_cmd_slot(pp, 0, cmd_fis_len | flags | (pmp << 12));



	/* set port value for softreset of Port Multiplier */

	if (pp->fbs_enabled && pp->fbs_last_dev != pmp) {

		tmp = readl(port_mmio + PORT_FBS);

		tmp &= ~(PORT_FBS_DEV_MASK | PORT_FBS_DEC);

		tmp |= pmp << PORT_FBS_DEV_OFFSET;

		writel(tmp, port_mmio + PORT_FBS);

		pp->fbs_last_dev = pmp;

	}



	/* issue & wait */

	writel(1, port_mmio + PORT_CMD_ISSUE);

drivers/ata/libata-eh.c

+8 −0
Original line number Diff line number Diff line
@@ -1505,12 +1505,20 @@ static const char *ata_err_string(unsigned int err_mask) 
unsigned int ata_read_log_page(struct ata_device *dev, u8 log,

			       u8 page, void *buf, unsigned int sectors)

{

	unsigned long ap_flags = dev->link->ap->flags;

	struct ata_taskfile tf;

	unsigned int err_mask;

	bool dma = false;



	DPRINTK("read log page - log 0x%x, page 0x%x\n", log, page);



	/*

	 * Return error without actually issuing the command on controllers

	 * which e.g. lockup on a read log page.

	 */

	if (ap_flags & ATA_FLAG_NO_LOG_PAGE)

		return AC_ERR_DEV;



retry:

	ata_tf_init(dev, &tf);

	if (dev->dma_mode && ata_id_has_read_log_dma_ext(dev->id) &&

drivers/ata/sata_fsl.c

+2 −1
Original line number Diff line number Diff line
@@ -45,7 +45,8 @@ enum { 
	SATA_FSL_MAX_PRD_DIRECT	= 16,	/* Direct PRDT entries */



	SATA_FSL_HOST_FLAGS	= (ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |

				ATA_FLAG_PMP | ATA_FLAG_NCQ | ATA_FLAG_AN),

				   ATA_FLAG_PMP | ATA_FLAG_NCQ |

				   ATA_FLAG_AN | ATA_FLAG_NO_LOG_PAGE),



	SATA_FSL_MAX_CMDS	= SATA_FSL_QUEUE_DEPTH,

	SATA_FSL_CMD_HDR_SIZE	= 16,	/* 4 DWORDS */