git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From 750bb44dbbe9dfb4ba3e1f8a746b831b39ba3cd9 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
   3 Date: Thu, 23 Sep 2021 19:35:57 +0200
   4 Subject: [PATCH] Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada
   5  3720"
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This reverts commit 45aefe3d2251e4e229d7662052739f96ad1d08d9.
  11
  12 Armada 3720 PHY driver (phy-mvebu-a3700-comphy.c) does not return
  13 -EOPNOTSUPP from phy_power_on() callback anymore.
  14
  15 So remove AHCI_HFLAG_IGN_NOTSUPP_POWER_ON flag from Armada 3720 plat data.
  16
  17 AHCI_HFLAG_IGN_NOTSUPP_POWER_ON is not used by any other ahci driver, so
  18 remove this flag completely.
  19
  20 Signed-off-by: Pali Rohár <pali@kernel.org>
  21 Signed-off-by: Marek Behún <kabel@kernel.org>
  22 Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
  23 ---
  24  drivers/ata/ahci.h             | 2 --
  25  drivers/ata/ahci_mvebu.c       | 2 +-
  26  drivers/ata/libahci_platform.c | 2 +-
  27  3 files changed, 2 insertions(+), 4 deletions(-)
  28
  29 --- a/drivers/ata/ahci.h
  30 +++ b/drivers/ata/ahci.h
  31 @@ -240,8 +240,6 @@ enum {
  32                                                         as default lpm_policy */
  33         AHCI_HFLAG_SUSPEND_PHYS         = (1 << 26), /* handle PHYs during
  34                                                         suspend/resume */
  35 -       AHCI_HFLAG_IGN_NOTSUPP_POWER_ON = (1 << 27), /* ignore -EOPNOTSUPP
  36 -                                                       from phy_power_on() */
  37         AHCI_HFLAG_NO_SXS               = (1 << 28), /* SXS not supported */
  38
  39         /* ap->flags bits */
  40 --- a/drivers/ata/ahci_mvebu.c
  41 +++ b/drivers/ata/ahci_mvebu.c
  42 @@ -227,7 +227,7 @@ static const struct ahci_mvebu_plat_data
  43
  44  static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = {
  45         .plat_config = ahci_mvebu_armada_3700_config,
  46 -       .flags = AHCI_HFLAG_SUSPEND_PHYS | AHCI_HFLAG_IGN_NOTSUPP_POWER_ON,
  47 +       .flags = AHCI_HFLAG_SUSPEND_PHYS,
  48  };
  49
  50  static const struct of_device_id ahci_mvebu_of_match[] = {
  51 --- a/drivers/ata/libahci_platform.c
  52 +++ b/drivers/ata/libahci_platform.c
  53 @@ -59,7 +59,7 @@ int ahci_platform_enable_phys(struct ahc
  54                 }
  55
  56                 rc = phy_power_on(hpriv->phys[i]);
  57 -               if (rc && !(rc == -EOPNOTSUPP && (hpriv->flags & AHCI_HFLAG_IGN_NOTSUPP_POWER_ON))) {
  58 +               if (rc) {
  59                         phy_exit(hpriv->phys[i]);
  60                         goto disable_phys;
  61                 }