Commit 45aefe3d authored Oct 09, 2020 by Pali Rohár Committed by Jens Axboe Oct 09, 2020

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

Older ATF does not provide SMC call for SATA phy power on functionality and
therefore initialization of ahci_mvebu is failing when older version of ATF
is using. In this case phy_power_on() function returns -EOPNOTSUPP.

This patch adds a new hflag AHCI_HFLAG_IGN_NOTSUPP_POWER_ON which cause
that ahci_platform_enable_phys() would ignore -EOPNOTSUPP errors from
phy_power_on() call.

It fixes initialization of ahci_mvebu on Espressobin boards where is older
Marvell's Arm Trusted Firmware without SMC call for SATA phy power.

This is regression introduced in commit 8e18c8e5 ("arm64: dts: marvell:
armada-3720-espressobin: declare SATA PHY property") where SATA phy was
defined and therefore ahci_platform_enable_phys() on Espressobin started
failing.

Fixes: 8e18c8e5 ("arm64: dts: marvell: armada-3720-espressobin: declare SATA PHY property")
Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Tomasz Maciej Nowak <tmn505@gmail.com>
Cc: <stable@vger.kernel.org> # 5.1+: ea17a0f1: phy: marvell: comphy: Convert internal SMCC firmware return codes to errno
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent fd86194a

drivers/ata/ahci.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,8 @@ 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() */

		/* 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,
		.flags = AHCI_HFLAG_SUSPEND_PHYS \| AHCI_HFLAG_IGN_NOTSUPP_POWER_ON,
		};

		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) {
		if (rc && !(rc == -EOPNOTSUPP && (hpriv->flags & AHCI_HFLAG_IGN_NOTSUPP_POWER_ON))) {
		phy_exit(hpriv->phys[i]);
		goto disable_phys;
		}

Admin message