devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com,
	Florian Fainelli <f.fainelli@gmail.com>,
	Jens Axboe <axboe@kernel.dk>, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Hans de Goede <hdegoede@redhat.com>,
	Philipp Zabel <p.zabel@pengutronix.de>, Tejun Heo <tj@kernel.org>,
	Jaedon Shin <jaedon.shin@gmail.com>,
	linux-ide@vger.kernel.org (open list:LIBATA SUBSYSTEM (Serial
	and Parallel ATA drivers)),
	devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
	FLATTENED DEVICE TREE BINDINGS)
Subject: [PATCH 5/8] ata: ahci_brcm: Manage reset line during suspend/resume
Date: Tue, 10 Dec 2019 10:53:48 -0800	[thread overview]
Message-ID: <20191210185351.14825-6-f.fainelli@gmail.com> (raw)
In-Reply-To: <20191210185351.14825-1-f.fainelli@gmail.com>

We were not managing the reset line during suspend/resume, but this
needs to be done to ensure that the controller can exit low power modes
correctly, especially with deep sleep suspend mode that may reset parts
of the logic.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/ata/ahci_brcm.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 66a570d0da83..76612577a59a 100644
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -343,10 +343,16 @@ static int brcm_ahci_suspend(struct device *dev)
 	struct ata_host *host = dev_get_drvdata(dev);
 	struct ahci_host_priv *hpriv = host->private_data;
 	struct brcm_ahci_priv *priv = hpriv->plat_data;
+	int ret;
 
 	brcm_sata_phys_disable(priv);
 
-	return ahci_platform_suspend(dev);
+	ret = ahci_platform_suspend(dev);
+
+	if (!IS_ERR_OR_NULL(priv->rcdev))
+		reset_control_assert(priv->rcdev);
+
+	return ret;
 }
 
 static int brcm_ahci_resume(struct device *dev)
@@ -354,7 +360,12 @@ static int brcm_ahci_resume(struct device *dev)
 	struct ata_host *host = dev_get_drvdata(dev);
 	struct ahci_host_priv *hpriv = host->private_data;
 	struct brcm_ahci_priv *priv = hpriv->plat_data;
-	int ret;
+	int ret = 0;
+
+	if (!IS_ERR_OR_NULL(priv->rcdev))
+		ret = reset_control_deassert(priv->rcdev);
+	if (ret)
+		return ret;
 
 	/* Make sure clocks are turned on before re-configuration */
 	ret = ahci_platform_enable_clks(hpriv);
-- 
2.17.1


  parent reply	other threads:[~2019-12-10 18:55 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 18:53 [PATCH 0/8] ata: ahci_brcm: Fixes and new device support Florian Fainelli
2019-12-10 18:53 ` [PATCH 1/8] ata: libahci_platform: Export again ahci_platform_<en/dis>able_phys() Florian Fainelli
2019-12-10 18:53 ` [PATCH 2/8] ata: ahci_brcm: Fix AHCI resources management Florian Fainelli
2019-12-10 18:53 ` [PATCH 3/8] ata: ahci_brcm: BCM7425 AHCI requires AHCI_HFLAG_DELAY_ENGINE Florian Fainelli
2019-12-10 18:53 ` [PATCH 4/8] ata: ahci_brcm: Add missing clock management during recovery Florian Fainelli
2019-12-10 18:53 ` Florian Fainelli [this message]
2019-12-10 18:53 ` [PATCH 6/8] ata: ahci_brcm: Add a shutdown callback Florian Fainelli
2019-12-10 18:53 ` [PATCH 7/8] dt-bindings: ata: Document BCM7216 AHCI controller compatible Florian Fainelli
2019-12-19 20:21   ` Rob Herring
2019-12-10 18:53 ` [PATCH 8/8] ata: ahci_brcm: Support BCM7216 reset controller name Florian Fainelli
2019-12-11 13:31 ` [PATCH 0/8] ata: ahci_brcm: Fixes and new device support Hans de Goede
2019-12-26  3:34   ` Florian Fainelli
2019-12-26  3:46     ` Jens Axboe
2020-01-02 23:06       ` Florian Fainelli
2020-01-07 16:47 ` Naresh Kamboju
2020-01-07 17:29   ` Naresh Kamboju
2020-01-07 17:39     ` Florian Fainelli
2020-01-07 19:30       ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191210185351.14825-6-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=devicetree@vger.kernel.org \
    --cc=hdegoede@redhat.com \
    --cc=jaedon.shin@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=p.zabel@pengutronix.de \
    --cc=robh+dt@kernel.org \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).