Commit 86125df7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull libata fixes from Tejun Heo:

 - Jens's patches to expand the usable command depth from 31 to 32 broke
   sata_fsl due to a subtle command iteration bug. Fixed by introducing
   explicit iteration helpers and using the correct variant.

 - On some laptops, enabling LPM by default reportedly led to occasional
   hard hangs. Blacklist the affected cases.

 - Other misc fixes / changes.

* 'for-4.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ata: Remove depends on HAS_DMA in case of platform dependency
  ata: Fix ZBC_OUT all bit handling
  ata: Fix ZBC_OUT command block check
  ahci: Add Intel Ice Lake LP PCI ID
  ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
  sata_nv: remove redundant pointers sdev0 and sdev1
  sata_fsl: remove dead code in tag retrieval
  sata_fsl: convert to command iterator
  libata: convert eh to command iterators
  libata: add command iterator helpers
  ata: ahci_mvebu: ahci_mvebu_stop_engine() can be static
  libahci: Fix possible Spectre-v1 pmp indexing in ahci_led_store()
parents a74aa967 d55bac27

drivers/ata/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ config SATA_DWC_VDEBUG 


config SATA_HIGHBANK

	tristate "Calxeda Highbank SATA support"

	depends on HAS_DMA

	depends on ARCH_HIGHBANK || COMPILE_TEST

	help

	  This option enables support for the Calxeda Highbank SoC's
@@ -408,7 +407,6 @@ config SATA_HIGHBANK 


config SATA_MV

	tristate "Marvell SATA support"

	depends on HAS_DMA

	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \

		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST

	select GENERIC_PHY

drivers/ata/ahci.c

+60 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x0f23), board_ahci_mobile }, /* Bay Trail AHCI */

	{ PCI_VDEVICE(INTEL, 0x22a3), board_ahci_mobile }, /* Cherry Tr. AHCI */

	{ PCI_VDEVICE(INTEL, 0x5ae3), board_ahci_mobile }, /* ApolloLake AHCI */

	{ PCI_VDEVICE(INTEL, 0x34d3), board_ahci_mobile }, /* Ice Lake LP AHCI */



	/* 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,
@@ -1280,6 +1281,59 @@ static bool ahci_broken_suspend(struct pci_dev *pdev) 
	return strcmp(buf, dmi->driver_data) < 0;

}



static bool ahci_broken_lpm(struct pci_dev *pdev)

{

	static const struct dmi_system_id sysids[] = {

		/* Various Lenovo 50 series have LPM issues with older BIOSen */

		{

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X250"),

			},

			.driver_data = "20180406", /* 1.31 */

		},

		{

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L450"),

			},

			.driver_data = "20180420", /* 1.28 */

		},

		{

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T450s"),

			},

			.driver_data = "20180315", /* 1.33 */

		},

		{

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W541"),

			},

			/*

			 * Note date based on release notes, 2.35 has been

			 * reported to be good, but I've been unable to get

			 * a hold of the reporter to get the DMI BIOS date.

			 * TODO: fix this.

			 */

			.driver_data = "20180310", /* 2.35 */

		},

		{ }	/* terminate list */

	};

	const struct dmi_system_id *dmi = dmi_first_match(sysids);

	int year, month, date;

	char buf[9];



	if (!dmi)

		return false;



	dmi_get_date(DMI_BIOS_DATE, &year, &month, &date);

	snprintf(buf, sizeof(buf), "%04d%02d%02d", year, month, date);



	return strcmp(buf, dmi->driver_data) < 0;

}



static bool ahci_broken_online(struct pci_dev *pdev)

{

#define ENCODE_BUSDEVFN(bus, slot, func)			\
@@ -1694,6 +1748,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
			"quirky BIOS, skipping spindown on poweroff\n");

	}



	if (ahci_broken_lpm(pdev)) {

		pi.flags |= ATA_FLAG_NO_LPM;

		dev_warn(&pdev->dev,

			 "BIOS update required for Link Power Management support\n");

	}



	if (ahci_broken_suspend(pdev)) {

		hpriv->flags |= AHCI_HFLAG_NO_SUSPEND;

		dev_warn(&pdev->dev,

drivers/ata/ahci_mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) 
 *

 * Return: 0 on success; Error code otherwise.

 */

int ahci_mvebu_stop_engine(struct ata_port *ap)

static int ahci_mvebu_stop_engine(struct ata_port *ap)

{

	void __iomem *port_mmio = ahci_port_base(ap);

	u32 tmp, port_fbs;

drivers/ata/libahci.c

+5 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/kernel.h>

#include <linux/gfp.h>

#include <linux/module.h>

#include <linux/nospec.h>

#include <linux/blkdev.h>

#include <linux/delay.h>

#include <linux/interrupt.h>
@@ -1146,10 +1147,12 @@ static ssize_t ahci_led_store(struct ata_port *ap, const char *buf, 


	/* get the slot number from the message */

	pmp = (state & EM_MSG_LED_PMP_SLOT) >> 8;

	if (pmp < EM_MAX_SLOTS)

	if (pmp < EM_MAX_SLOTS) {

		pmp = array_index_nospec(pmp, EM_MAX_SLOTS);

		emp = &pp->em_priv[pmp];

	else

	} else {

		return -EINVAL;

	}



	/* mask off the activity bits if we are in sw_activity

	 * mode, user should turn off sw_activity before setting

drivers/ata/libata-core.c

+3 −0
Original line number Diff line number Diff line
@@ -2493,6 +2493,9 @@ int ata_dev_configure(struct ata_device *dev) 
	    (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2)

		dev->horkage |= ATA_HORKAGE_NOLPM;



	if (ap->flags & ATA_FLAG_NO_LPM)

		dev->horkage |= ATA_HORKAGE_NOLPM;



	if (dev->horkage & ATA_HORKAGE_NOLPM) {

		ata_dev_warn(dev, "LPM support broken, forcing max_power\n");

		dev->link->ap->target_lpm_policy = ATA_LPM_MAX_POWER;

CRA Git | Maintained and supported by SUSTech CRA and CCSE