Commit 3a5879d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux 

Pull ata updates from Niklas Cassel:

 - Fix an incorrect link_power_management_policy sysfs attribute value.

   We were previously using the same attribute value for two different
   LPM policies (me)

 - Add a ASMedia ASM1166 quirk.

   The SATA host controller always reports that it has 32 ports, even
   though it only has six ports. Add a quirk that overrides the value
   reported by the controller (Conrad)

 - Add a ASMedia ASM1061 quirk.

   The SATA host controller completely ignores the upper 21 bits of the
   DMA address. This causes IOMMU error events when a (valid) DMA
   address actually has any of the upper 21 bits set. Add a quirk that
   limits the dma_mask to 43-bits (Lennert)

* tag 'ata-6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ahci: add 43-bit DMA address quirk for ASMedia ASM1061 controllers
  ahci: asm1166: correct count of reported ports
  ata: libata-sata: improve sysfs description for ATA_LPM_UNKNOWN
parents 914e1708 20730e9b

drivers/ata/ahci.c

+28 −6
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ enum { 
enum board_ids {

	/* board IDs by feature in alphabetical order */

	board_ahci,

	board_ahci_43bit_dma,

	board_ahci_ign_iferr,

	board_ahci_low_power,

	board_ahci_no_debounce_delay,
@@ -128,6 +129,13 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_43bit_dma] = {

		AHCI_HFLAGS	(AHCI_HFLAG_43BIT_ONLY),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_ign_iferr] = {

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR),

		.flags		= AHCI_FLAG_COMMON,
@@ -597,11 +605,11 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */

	{ PCI_VDEVICE(PROMISE, 0x3781), board_ahci },   /* FastTrak TX8660 ahci-mode */



	/* Asmedia */

	/* ASMedia */

	{ PCI_VDEVICE(ASMEDIA, 0x0601), board_ahci },	/* ASM1060 */

	{ PCI_VDEVICE(ASMEDIA, 0x0602), board_ahci },	/* ASM1060 */

	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci },	/* ASM1061 */

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

	{ PCI_VDEVICE(ASMEDIA, 0x0611), board_ahci_43bit_dma },	/* ASM1061 */

	{ PCI_VDEVICE(ASMEDIA, 0x0612), board_ahci_43bit_dma },	/* ASM1061/1062 */

	{ PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */

	{ PCI_VDEVICE(ASMEDIA, 0x0622), board_ahci },   /* ASM1062R */

	{ PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */
@@ -663,6 +671,11 @@ MODULE_PARM_DESC(mobile_lpm_policy, "Default LPM policy for mobile chipsets"); 
static void ahci_pci_save_initial_config(struct pci_dev *pdev,

					 struct ahci_host_priv *hpriv)

{

	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == 0x1166) {

		dev_info(&pdev->dev, "ASM1166 has only six ports\n");

		hpriv->saved_port_map = 0x3f;

	}



	if (pdev->vendor == PCI_VENDOR_ID_JMICRON && pdev->device == 0x2361) {

		dev_info(&pdev->dev, "JMB361 has only one port\n");

		hpriv->saved_port_map = 1;
@@ -949,11 +962,20 @@ static int ahci_pci_device_resume(struct device *dev) 


#endif /* CONFIG_PM */



static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)

static int ahci_configure_dma_masks(struct pci_dev *pdev,

				    struct ahci_host_priv *hpriv)

{

	const int dma_bits = using_dac ? 64 : 32;

	int dma_bits;

	int rc;



	if (hpriv->cap & HOST_CAP_64) {

		dma_bits = 64;

		if (hpriv->flags & AHCI_HFLAG_43BIT_ONLY)

			dma_bits = 43;

	} else {

		dma_bits = 32;

	}



	/*

	 * If the device fixup already set the dma_mask to some non-standard

	 * value, don't extend it here. This happens on STA2X11, for example.
@@ -1926,7 +1948,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	ahci_gtf_filter_workaround(host);



	/* initialize adapter */

	rc = ahci_configure_dma_masks(pdev, hpriv->cap & HOST_CAP_64);

	rc = ahci_configure_dma_masks(pdev, hpriv);

	if (rc)

		return rc;

drivers/ata/ahci.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ enum { 
	AHCI_HFLAG_SUSPEND_PHYS		= BIT(26), /* handle PHYs during

						      suspend/resume */

	AHCI_HFLAG_NO_SXS		= BIT(28), /* SXS not supported */

	AHCI_HFLAG_43BIT_ONLY		= BIT(29), /* 43bit DMA addr limit */



	/* ap->flags bits */

drivers/ata/libata-sata.c

+1 −1
Original line number Diff line number Diff line
@@ -784,7 +784,7 @@ bool sata_lpm_ignore_phy_events(struct ata_link *link) 
EXPORT_SYMBOL_GPL(sata_lpm_ignore_phy_events);



static const char *ata_lpm_policy_names[] = {

	[ATA_LPM_UNKNOWN]		= "max_performance",

	[ATA_LPM_UNKNOWN]		= "keep_firmware_settings",

	[ATA_LPM_MAX_POWER]		= "max_performance",

	[ATA_LPM_MED_POWER]		= "medium_power",

	[ATA_LPM_MED_POWER_WITH_DIPM]	= "med_power_with_dipm",

include/linux/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ enum ata_completion_errors { 


/*

 * Link power management policy: If you alter this, you also need to

 * alter libata-scsi.c (for the ascii descriptions)

 * alter libata-sata.c (for the ascii descriptions)

 */

enum ata_lpm_policy {

	ATA_LPM_UNKNOWN,