From patchwork Thu Oct 28 18:42:40 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: 12590889 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC1AEC433EF for ; Thu, 28 Oct 2021 18:43:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 75D6460FC0 for ; Thu, 28 Oct 2021 18:43:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 75D6460FC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=4APUqMTGRmYx1usA6IuhMSbw0GD8IBxxrW4GH7rssuw=; b=zw5UIkPROP8uPF zCKGunVX2vN7sHO2ZMnzbwkt+uSNyyDrURka2z2Scf5POk/MUc2g5i6S2f21XCzAUXSBjciIT+hUt LZyJdSt6sJ37TgysgsBL5/LJiVT6HwFSmNsCq/HcRb3kkVm1hK6R6e7/In0/WdW/DJ/6z8tbuWKYT KAyhq/tZIXTVlK6idWrS+0SiTKGMFcbO3Z95xnVBK23QdSLN86v5FMloG5g8/fa0VxerGxHAXVZ1S rHoySbw1wZkQ/W6n8omu7dm8ZGDt163v6E9ggWqssYwGts3zUa0rKNj4QJgfbd9bktzJz6NS648t7 ao98HcQec9nwtuni1Q+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgAMd-008v4t-Sy; Thu, 28 Oct 2021 18:42:59 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgAMY-008v2e-NX for linux-phy@lists.infradead.org; Thu, 28 Oct 2021 18:42:58 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id CCD75610EA; Thu, 28 Oct 2021 18:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635446574; bh=syC5kPXBLfaaIJPGwPq2wqJBE2j58GdF6QrpX89v6fQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h+fXMm8kpnpd7bfk5HEKILfrddAzjQp9QZ3wp0t2xg+OPaqXrqF8liTRRlf35W+iE dYA9mfXC72g4Cac8Jnq7F/CRYocdaoWWRfVA816lvCyoBpu5P5wEIDg7JVRCEPALBt Xka2UbA0Z4Ba6E2HD4WzjvOS3q2RkHTu/FYz/ciJCwAxl7148WuNsJZ7z88cuBQJlI pEDPGkKLJaVtKv7T0vwf8vasWSiGvw6xo7zuSGHSpZiaOvhRYsUFnMHzzsY5iIurnW fFUn6ZfTSEIQyrJtrLfVHNxH2qm1ZVMNT1eokgctgAQAUXSrmvgCfsmMLk10nWSXIY 3J8dyAT8CzUVw== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Miquel Raynal Cc: linux-phy@lists.infradead.org, Vinod Koul , Kishon Vijay Abraham I , pali@kernel.org, =?utf-8?q?Marek_Be?= =?utf-8?q?h=C3=BAn?= Subject: [PATCH phy 4/6] Revert "ata: ahci: mvebu: Make SATA PHY optional for Armada 3720" Date: Thu, 28 Oct 2021 20:42:40 +0200 Message-Id: <20211028184242.22105-5-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211028184242.22105-1-kabel@kernel.org> References: <20211028184242.22105-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211028_114254_837001_6A4F1166 X-CRM114-Status: GOOD ( 11.57 ) 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 2e89499bd9c3..954cf6ca6a7a 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; }