From patchwork Wed Dec 8 02:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 12663289 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3457DC433EF for ; Wed, 8 Dec 2021 02:40:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GHZowJC1Xb3dcuEf0G5FXx19dq/Kw+NgFFPTu1J1YFg=; b=MwvZA8F83BkR7+ 68sYweQXlZjgUXcaoTqx+3yUZF4BAbaDV0ufXh9wgf21n7W8Q8UOcFei22gnjXbj/o4ohxN94oEcU Fr/ALbnSyWSibnWrIKVhuNRAND3JBd/uWbGk7qUojCM9EP9AYvQ1aBrdWpqSwU25C+VPlvAp2JXdJ wp6GFieQtCYgVXl2YTjisAPITRUjB9qkpXc8PdK01NjmxVbRB2LNwb/71bX+whx1EWd/8+SU7HP8H FvsPD8TT5hZ+eIzoe/HM8LnDOnbVbEQqFFZLYb6Pr2ArVbCPVcpBeXO35AguUa/RgkPEqnKdFpmmm FSEIdq786jJJvombj9mw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mumt6-00AiDu-MJ; Wed, 08 Dec 2021 02:40:56 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mumt3-00AiCl-Kj for linux-phy@lists.infradead.org; Wed, 08 Dec 2021 02:40:55 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 65E64B81F50; Wed, 8 Dec 2021 02:40:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C138C341C8; Wed, 8 Dec 2021 02:40:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638931251; bh=+Rj5nfgGjmwV6Dug7p3+3X833FrXiYs5dzzDeEYHfss=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uxl8ISnj/LvTKeZ3TxZEwyaAamiJN6IEt+mZFey02wFpBV3y8zkx/laWN33lX0tIN oZlX5/xk1kwBc7GIg9jYkfhoQzMyr/0O2jli1uXsKRRlOoGNiqWRfKmk+z7Em6gkBy N2M0X0s7jDMT9t452hYociRU00l5g/S3HCH+pSwp4jmTvu6Qk6FOa0nGRkLDq86YTg GF9cKiy+UxU2+raJmNvpB/qrAj40TG7vrR2RZ+1m30malmEEPf+AHJIe4Zf7zHN6sT WD/zTePBxN/kJ3nKH1keQjQ+2A7Y5RnE6eCbddwh6AYr7t/hkos3mPiG9m5vEnrsv9 hHR/Kklp2673w== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Vinod Koul Cc: linux-phy@lists.infradead.org, Kishon Vijay Abraham I , pali@kernel.org, Miquel Raynal , Gregory CLEMENT , =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH phy v2 4/6] Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720" Date: Wed, 8 Dec 2021 03:40:36 +0100 Message-Id: <20211208024038.8797-5-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211208024038.8797-1-kabel@kernel.org> References: <20211208024038.8797-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_184053_843957_E3757833 X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org From: Pali Rohár 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 Signed-off-by: Marek Behún Acked-by: Miquel Raynal --- drivers/ata/ahci.h | 2 -- drivers/ata/ahci_mvebu.c | 2 +- drivers/ata/libahci_platform.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index eeac5482f1d1..a57d90dd4964 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -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 */ diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index 3ad46d26d9d5..d4bba3ace45d 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -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[] = { diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 0910441321f7..250b82e30aa3 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c @@ -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; }