Commit e39d9b9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ata fix from Damien Le Moal:
 "A single fix to address an issue with wake from suspend with PCS
  adapters, from Adam"

* tag 'ata-6.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: ahci: Fix PCS quirk application for suspend
parents c8451c14 37e14e4f

drivers/ata/ahci.c

+23 −9
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ enum board_ids { 
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);

static void ahci_remove_one(struct pci_dev *dev);

static void ahci_shutdown_one(struct pci_dev *dev);

static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hpriv);

static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class,

				 unsigned long deadline);

static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,
@@ -676,6 +677,25 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev, 
	ahci_save_initial_config(&pdev->dev, hpriv);

}



static int ahci_pci_reset_controller(struct ata_host *host)

{

	struct pci_dev *pdev = to_pci_dev(host->dev);

	struct ahci_host_priv *hpriv = host->private_data;

	int rc;



	rc = ahci_reset_controller(host);

	if (rc)

		return rc;



	/*

	 * If platform firmware failed to enable ports, try to enable

	 * them here.

	 */

	ahci_intel_pcs_quirk(pdev, hpriv);



	return 0;

}



static void ahci_pci_init_controller(struct ata_host *host)

{

	struct ahci_host_priv *hpriv = host->private_data;
@@ -870,7 +890,7 @@ static int ahci_pci_device_runtime_resume(struct device *dev) 
	struct ata_host *host = pci_get_drvdata(pdev);

	int rc;



	rc = ahci_reset_controller(host);

	rc = ahci_pci_reset_controller(host);

	if (rc)

		return rc;

	ahci_pci_init_controller(host);
@@ -906,7 +926,7 @@ static int ahci_pci_device_resume(struct device *dev) 
		ahci_mcp89_apple_enable(pdev);



	if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {

		rc = ahci_reset_controller(host);

		rc = ahci_pci_reset_controller(host);

		if (rc)

			return rc;
@@ -1784,12 +1804,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* save initial config */

	ahci_pci_save_initial_config(pdev, hpriv);



	/*

	 * If platform firmware failed to enable ports, try to enable

	 * them here.

	 */

	ahci_intel_pcs_quirk(pdev, hpriv);



	/* prepare host */

	if (hpriv->cap & HOST_CAP_NCQ) {

		pi.flags |= ATA_FLAG_NCQ;
@@ -1899,7 +1913,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		return rc;



	rc = ahci_reset_controller(host);

	rc = ahci_pci_reset_controller(host);

	if (rc)

		return rc;