ata: ahci_brcm: Manage reset line during suspend/resume

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.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index 66a570d0da83743caf73b26d0a4c9212ef5e4f26..76612577a59ae480636927c5ecb2a72963a7a8e8 100644 (file)
--- 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);