Commit 39714efc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ATA updates from Damien Le Moal:

 - Modify the AHCI driver to print the link power management policy used
   on scan, to help with debugging issues (Niklas)

 - Add support for the ASM2116 series adapters to the AHCI driver
   (Szuying)

 - Prepare libata for the coming gcc and Clang __counted_by attribute
   (Kees)

 - Following the recent estensive fixing of libata suspend/resume
   handling, several patches further cleanup and improve disk power
   state management (me)

 - Reduce the verbosity of some error messages for non-fatal temporary
   errors, e.g. slow response to device reset when scanning a port, and
   warning messages that are in fact normal, e.g. disabling a device on
   suspend or when removing it (me)

 - Cleanup DMA helper functions (me)

 - Fix sata_mv drive handling of potential errors durring probe (Ma)

 - Cleanup the xgene and imx drivers using the functions
   of_device_get_match_data() and device_get_match_data() (Rob)

 - Improve the tegra driver device tree (Rob)

* tag 'ata-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: (22 commits)
  dt-bindings: ata: tegra: Disallow undefined properties
  ata: libata-core: Improve ata_dev_power_set_active()
  ata: libata-eh: Spinup disk on resume after revalidation
  ata: imx: Use device_get_match_data()
  ata: xgene: Use of_device_get_match_data()
  ata: sata_mv: aspeed: fix value check in mv_platform_probe()
  ata: ahci: Add Intel Alder Lake-P AHCI controller to low power chipsets list
  ata: libata: Cleanup inline DMA helper functions
  ata: libata-eh: Reduce "disable device" message verbosity
  ata: libata-eh: Improve reset error messages
  ata: libata-sata: Improve ata_sas_slave_configure()
  ata: libata-core: Do not resume runtime suspended ports
  ata: libata-core: Do not poweroff runtime suspended ports
  ata: libata-core: Remove ata_port_resume_async()
  ata: libata-core: Remove ata_port_suspend_async()
  ata: libata-core: Detach a port devices on shutdown
  ata: libata-core: Synchronize ata_port_detach() with hotplug
  ata: libata-scsi: Cleanup ata_scsi_start_stop_xlat()
  scsi: Remove scsi device no_start_on_resume flag
  ata: libata: Annotate struct ata_cpr_log with __counted_by
  ...
parents 90d624af 0e533cba

Documentation/devicetree/bindings/ata/nvidia,tegra-ahci.yaml

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ allOf: 
        - interconnects

        - power-domains



additionalProperties: true

additionalProperties: false



examples:

  - |

drivers/ata/ahci.c

+6 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x02d7), board_ahci_low_power }, /* Comet Lake PCH RAID */

	/* Elkhart Lake IDs 0x4b60 & 0x4b62 https://sata-io.org/product/8803 not tested yet */

	{ PCI_VDEVICE(INTEL, 0x4b63), board_ahci_low_power }, /* Elkhart Lake AHCI */

	{ PCI_VDEVICE(INTEL, 0x7ae2), board_ahci_low_power }, /* Alder Lake-P 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,
@@ -604,6 +605,11 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(ASMEDIA, 0x0621), board_ahci },   /* ASM1061R */

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

	{ PCI_VDEVICE(ASMEDIA, 0x0624), board_ahci },   /* ASM1062+JMB575 */

	{ PCI_VDEVICE(ASMEDIA, 0x1062), board_ahci },	/* ASM1062A */

	{ PCI_VDEVICE(ASMEDIA, 0x1064), board_ahci },	/* ASM1064 */

	{ PCI_VDEVICE(ASMEDIA, 0x1164), board_ahci },   /* ASM1164 */

	{ PCI_VDEVICE(ASMEDIA, 0x1165), board_ahci },   /* ASM1165 */

	{ PCI_VDEVICE(ASMEDIA, 0x1166), board_ahci },   /* ASM1166 */



	/*

	 * Samsung SSDs found on some macbooks.  NCQ times out if MSI is

drivers/ata/ahci_imx.c

+3 −7
Original line number Diff line number Diff line
@@ -9,10 +9,11 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/ahci_platform.h>

#include <linux/gpio/consumer.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/libata.h>
@@ -1050,16 +1051,11 @@ static int imx8_sata_probe(struct device *dev, struct imx_ahci_priv *imxpriv) 
static int imx_ahci_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	const struct of_device_id *of_id;

	struct ahci_host_priv *hpriv;

	struct imx_ahci_priv *imxpriv;

	unsigned int reg_val;

	int ret;



	of_id = of_match_device(imx_ahci_of_match, dev);

	if (!of_id)

		return -EINVAL;



	imxpriv = devm_kzalloc(dev, sizeof(*imxpriv), GFP_KERNEL);

	if (!imxpriv)

		return -ENOMEM;
@@ -1067,7 +1063,7 @@ static int imx_ahci_probe(struct platform_device *pdev) 
	imxpriv->ahci_pdev = pdev;

	imxpriv->no_device = false;

	imxpriv->first_time = true;

	imxpriv->type = (unsigned long)of_id->data;

	imxpriv->type = (enum ahci_imx_type)device_get_match_data(dev);



	imxpriv->sata_clk = devm_clk_get(dev, "sata");

	if (IS_ERR(imxpriv->sata_clk)) {

drivers/ata/ahci_xgene.c

+3 −8
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/ahci_platform.h>

#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/of.h>

#include <linux/phy/phy.h>

#include "ahci.h"
@@ -735,7 +733,6 @@ static int xgene_ahci_probe(struct platform_device *pdev) 
	struct ahci_host_priv *hpriv;

	struct xgene_ahci_context *ctx;

	struct resource *res;

	const struct of_device_id *of_devid;

	enum xgene_ahci_version version = XGENE_AHCI_V1;

	const struct ata_port_info *ppi[] = { &xgene_ahci_v1_port_info,

					      &xgene_ahci_v2_port_info };
@@ -778,10 +775,8 @@ static int xgene_ahci_probe(struct platform_device *pdev) 
		ctx->csr_mux = csr;

	}



	of_devid = of_match_device(xgene_ahci_of_match, dev);

	if (of_devid) {

		if (of_devid->data)

			version = (unsigned long) of_devid->data;

	if (dev->of_node) {

		version = (enum xgene_ahci_version)of_device_get_match_data(dev);

	}

#ifdef CONFIG_ACPI

	else {

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line
@@ -2730,7 +2730,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, 


		if (rc)

			return rc;

		ata_port_desc(host->ports[i], "irq %d", irq);

		ata_port_desc_misc(host->ports[i], irq);

	}



	return ata_host_register(host, sht);