Re: [RESEND PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert

[Florian Fainelli]

On 12/16/20 1:41 PM, Jim Quinlan wrote:
> The Brcmstb PCIe RC uses a reset control "rescal" for certain chips.  This
> reset implements a "pulse reset" so it matches more the reset/rearm
> calls instead of the deassert/assert calls.
> 
> Also, add reset_control calls in suspend/resume functions.
> 
> Signed-off-by: Jim Quinlan 

This should probably deserve a Fixes tag as well:

Fixes: 740d6c3708a9 ("PCI: brcmstb: Add control of rescal reset")
Acked-by: Florian Fainelli 

Thanks!
-- 
Florian

[RESEND PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert

[Jim Quinlan]

The Brcmstb PCIe RC uses a reset control "rescal" for certain chips.  This
reset implements a "pulse reset" so it matches more the reset/rearm
calls instead of the deassert/assert calls.

Also, add reset_control calls in suspend/resume functions.

Signed-off-by: Jim Quinlan 
---
 drivers/pci/controller/pcie-brcmstb.c | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/drivers/pci/controller/pcie-brcmstb.c 
b/drivers/pci/controller/pcie-brcmstb.c
index d41257f43a8f..9f190db4cfcf 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -1127,6 +1127,7 @@ static int brcm_pcie_suspend(struct device *dev)
 
brcm_pcie_turn_off(pcie);
ret = brcm_phy_stop(pcie);
+   reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
 
return ret;
@@ -1142,9 +1143,13 @@ static int brcm_pcie_resume(struct device *dev)
base = pcie->base;
clk_prepare_enable(pcie->clk);
 
+   ret = reset_control_reset(pcie->rescal);
+   if (ret)
+   goto err0;
+
ret = brcm_phy_start(pcie);
if (ret)
-   goto err;
+   goto err1;
 
/* Take bridge out of reset so we can access the SERDES reg */
pcie->bridge_sw_init_set(pcie, 0);
@@ -1159,14 +1164,16 @@ static int brcm_pcie_resume(struct device *dev)
 
ret = brcm_pcie_setup(pcie);
if (ret)
-   goto err;
+   goto err1;
 
if (pcie->msi)
brcm_msi_set_regs(pcie->msi);
 
return 0;
 
-err:
+err1:
+   reset_control_rearm(pcie->rescal);
+err0:
clk_disable_unprepare(pcie->clk);
return ret;
 }
@@ -1176,7 +1183,7 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie)
brcm_msi_remove(pcie);
brcm_pcie_turn_off(pcie);
brcm_phy_stop(pcie);
-   reset_control_assert(pcie->rescal);
+   reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
 }
 
@@ -1251,13 +1258,13 @@ static int brcm_pcie_probe(struct platform_device *pdev)
return PTR_ERR(pcie->rescal);
}
 
-   ret = reset_control_deassert(pcie->rescal);
+   ret = reset_control_reset(pcie->rescal);
if (ret)
dev_err(>dev, "failed to deassert 'rescal'\n");
 
ret = brcm_phy_start(pcie);
if (ret) {
-   reset_control_assert(pcie->rescal);
+   reset_control_rearm(pcie->rescal);
clk_disable_unprepare(pcie->clk);
return ret;
}
-- 
2.17.1