2022-10-21 21:55:37 +00:00
|
|
|
From ee995101fde67f85a3cd4c74f4f92fc4592e726b Mon Sep 17 00:00:00 2001
|
2021-11-04 20:52:43 +00:00
|
|
|
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
2022-10-21 21:55:37 +00:00
|
|
|
Date: Thu, 3 Feb 2022 22:44:42 +0100
|
|
|
|
|
Subject: [PATCH 1/3] Revert "ata: ahci: mvebu: Make SATA PHY optional for
|
|
|
|
|
Armada 3720"
|
2021-11-04 20:52:43 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
This reverts commit 45aefe3d2251e4e229d7662052739f96ad1d08d9.
|
|
|
|
|
|
|
|
|
|
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: Pali Rohár <pali@kernel.org>
|
|
|
|
|
Signed-off-by: Marek Behún <kabel@kernel.org>
|
|
|
|
|
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
2022-10-21 21:55:37 +00:00
|
|
|
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
|
|
|
|
|
Link: https://lore.kernel.org/r/20220203214444.1508-4-kabel@kernel.org
|
|
|
|
|
Signed-off-by: Vinod Koul <vkoul@kernel.org>
|
2021-11-04 20:52:43 +00:00
|
|
|
---
|
|
|
|
|
drivers/ata/ahci.h | 2 --
|
|
|
|
|
drivers/ata/ahci_mvebu.c | 2 +-
|
|
|
|
|
drivers/ata/libahci_platform.c | 2 +-
|
|
|
|
|
3 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/ata/ahci.h
|
|
|
|
|
+++ b/drivers/ata/ahci.h
|
2024-03-03 11:25:27 +00:00
|
|
|
@@ -240,8 +240,6 @@ enum {
|
2023-06-15 20:00:09 +00:00
|
|
|
as default lpm_policy */
|
|
|
|
|
AHCI_HFLAG_SUSPEND_PHYS = BIT(26), /* handle PHYs during
|
|
|
|
|
suspend/resume */
|
|
|
|
|
- AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = BIT(27), /* ignore -EOPNOTSUPP
|
|
|
|
|
- from phy_power_on() */
|
|
|
|
|
AHCI_HFLAG_NO_SXS = BIT(28), /* SXS not supported */
|
2024-03-03 11:25:27 +00:00
|
|
|
AHCI_HFLAG_43BIT_ONLY = BIT(29), /* 43bit DMA addr limit */
|
2021-11-04 20:52:43 +00:00
|
|
|
|
|
|
|
|
--- a/drivers/ata/ahci_mvebu.c
|
|
|
|
|
+++ b/drivers/ata/ahci_mvebu.c
|
|
|
|
|
@@ -227,7 +227,7 @@ static const struct ahci_mvebu_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[] = {
|
|
|
|
|
--- a/drivers/ata/libahci_platform.c
|
|
|
|
|
+++ b/drivers/ata/libahci_platform.c
|
|
|
|
|
@@ -59,7 +59,7 @@ int ahci_platform_enable_phys(struct ahc
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
}
|
