From patchwork Mon Jan 3 14:32:18 2022 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: 12702555 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 97A07C4332F for ; Mon, 3 Jan 2022 14:32:36 +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=qEXWEJqBfKBQb7WNau+b8RUocNEMHz8+4SVBJN75VTk=; b=zMrKNBpDd71VFv 7wTi0k68NifI1XUl3CSQnVVmr9rVIvW/T1f0TvUFbea9sH7kEtKKL7fqdJtrKOZQk6iqJEk/7uEyH T6HjsjQeRmUPAn28C+er+JPv1eJ3Ig2iDfTtpX0Bgq/jbyop0fHk5pVt4lffdEyNJRh5q0nAHa6Ew 7Dv1EjD0TKndAqdtyADYITIm8RuzDYbQWFktt/Rm4V7fj3U6LZKAkM9zwOT6JuFxJFu+u5akHxiOm g/9sGUkZyxbElLDPfbG8Hs1j9i9UUAcjb5ttWvzDU7f3ubO9Bjz4Jx+N0cmskj6Tiv3uIevJ+Qlna mC/czAZWrTYTqaxKkDDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4OO3-009CNt-Ue; Mon, 03 Jan 2022 14:32:35 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n4OO1-009CMc-84 for linux-phy@lists.infradead.org; Mon, 03 Jan 2022 14:32:34 +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 dfw.source.kernel.org (Postfix) with ESMTPS id D16416111A; Mon, 3 Jan 2022 14:32:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B04FCC36AF3; Mon, 3 Jan 2022 14:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1641220352; bh=c9jZo6ZV9mMFIFA1AfmmawxHcQ+xnKpZlUDkor4Cm/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mZllXQ5MPIpJkG/LCHe9evU/b5oHpe9UmdUWlw3LfTlen/x1w7JwVcAGloEDlRh4o oV1sSe1O3/FG29aiHzATnquaWUhFsW2fA5bm3QpqrmowqUsfoUI1As+h39hxJbLPnF 0Aa3y2cZ0PM69DOIc2ZmaN89uaI0DLtKPOkpZ8tjnyR7yw3xrQ5ziu2FKIrZSTFOSA /QT1mhJEjdlLiJLC9uVh6u8uOtkqkm9Y5rY7GzmHh2/t0XYghXYLEIPhU59oqtMo+V mdBVk8xNeNFjEik7csl+pXYfyqR/kjemTnw6Gm0t60SRbIsktkAdw5Q/mhWZwiXccK 9zsWfNS/4Lt0g== 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 v3 3/5] Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720" Date: Mon, 3 Jan 2022 15:32:18 +0100 Message-Id: <20220103143220.13070-4-kabel@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220103143220.13070-1-kabel@kernel.org> References: <20220103143220.13070-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220103_063233_356766_E273FEA3 X-CRM114-Status: GOOD ( 14.20 ) 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; }