Commit ee995101 authored by Pali Rohár's avatar Pali Rohár Committed by Vinod Koul
Browse files

Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720" 



This reverts commit 45aefe3d.

Armada 3720 PHY driver (phy-mvebu-a3700-comphy.c) does not return
-EOPNOTSUPP from phy_power_on() callback anymore.

So remove AHCI_HFLAG_IGN_NOTSUPP_POWER_ON flag from Armada 3720 plat data.

AHCI_HFLAG_IGN_NOTSUPP_POWER_ON is not used by any other ahci driver, so
remove this flag completely.

Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Acked-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Acked-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
Link: https://lore.kernel.org/r/20220203214444.1508-4-kabel@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 93433708

drivers/ata/ahci.h

+0 −2
Original line number Diff line number Diff line
@@ -240,8 +240,6 @@ enum { 
							as default lpm_policy */

	AHCI_HFLAG_SUSPEND_PHYS		= (1 << 26), /* handle PHYs during

							suspend/resume */

	AHCI_HFLAG_IGN_NOTSUPP_POWER_ON	= (1 << 27), /* ignore -EOPNOTSUPP

							from phy_power_on() */

	AHCI_HFLAG_NO_SXS		= (1 << 28), /* SXS not supported */



	/* ap->flags bits */

drivers/ata/ahci_mvebu.c

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_380_plat_data = { 


static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = {

	.plat_config = ahci_mvebu_armada_3700_config,

	.flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON,

	.flags = AHCI_HFLAG_SUSPEND_PHYS,

};



static const struct of_device_id ahci_mvebu_of_match[] = {

drivers/ata/libahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ int ahci_platform_enable_phys(struct ahci_host_priv *hpriv) 
		}



		rc = phy_power_on(hpriv->phys[i]);

		if (rc && !(rc == -EOPNOTSUPP && (hpriv->flags & AHCI_HFLAG_IGN_NOTSUPP_POWER_ON))) {

		if (rc) {

			phy_exit(hpriv->phys[i]);

			goto disable_phys;

		}