ata: ahci_brcm: Fix use of BCM7216 reset controller
Subsystems (6)
v3 cover ata: ahci_brcm: Fix use of BCM7216 reset controller
v3 -- discard commit from v2; instead relay on the new function
reset_control_rearm provided in a recent commit [1] applied to reset/next.
-- New commit to correct pcie-brcmstb.c usage of a reset controller
to use reset/rearm verses deassert/assert.
v2 -- refactor rescal-reset driver to implement assert/deassert rather than
reset because the reset call only fires once per lifetime and we need to reset after every resume from S2 or S3.
-- Split the use of "ahci" and "rescal" controllers in separate fields
to keep things simple.
v1 -- original
[1] Applied commit "reset: make shared pulsed reset controls re-triggerable" found at git://git.pengutronix.de/git/pza/linux.git
branch reset/shared-retrigger
Jim Quinlan (2):
ata: ahci_brcm: Fix use of BCM7216 reset controller
PCI: brcmstb: use reset/rearm instead of deassert/assert
drivers/ata/ahci_brcm.c | 46 +++++++++++++-------------- drivers/pci/controller/pcie-brcmstb.c | 19 +++++++---- 2 files changed, 36 insertions(+), 29 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/2 ata: ahci_brcm: Fix use of BCM7216 reset controller
From: Jim Quinlan <[email protected]>
This driver may use one of two resets controllers. Keep them in separate variables to keep things simple. The reset controller "rescal" is shared between the AHCI driver and the PCIe driver for the BrcmSTB 7216 chip. Use devm_reset_control_get_optional_shared() to handle this sharing.
--- drivers/ata/ahci_brcm.c | 46 ++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/ata/ahci_brcm.c +23 -23
@@ -86,7 +86,8 @@ struct brcm_ahci_priv {u32 port_mask;u32 quirks;enum brcm_ahci_version version; -struct reset_control *rcdev; +struct reset_control *rcdev_rescal; +struct reset_control *rcdev_ahci; };static inline u32 brcm_sata_readreg (void __iomem *addr)
@@ -352,8 +353,8 @@ static int brcm_ahci_suspend(struct device *dev)else ret =0 ; -if (priv->version !=BRCM_SATA_BCM7216 ) -reset_control_assert (priv->rcdev); +reset_control_assert (priv->rcdev_ahci); +reset_control_rearm (priv->rcdev_rescal);return ret; }
@@ -365,10 +366,10 @@ static int __maybe_unused brcm_ahci_resume(struct device *dev)struct brcm_ahci_priv *priv = hpriv->plat_data;int ret =0 ; -if (priv->version ==BRCM_SATA_BCM7216 ) - ret =reset_control_reset (priv->rcdev); -else - ret =reset_control_deassert (priv->rcdev); + ret =reset_control_deassert (priv->rcdev_ahci); +if (ret) +return ret; + ret =reset_control_reset (priv->rcdev_rescal);if (ret)return ret;
@@ -428,7 +429,6 @@ static int brcm_ahci_probe(struct platform_device *pdev) {const struct of_device_id *of_id;struct device *dev = &pdev->dev; -const char *reset_name =NULL ;struct brcm_ahci_priv *priv;struct ahci_host_priv *hpriv;struct resource *res;
@@ -450,15 +450,15 @@ static int brcm_ahci_probe(struct platform_device *pdev)if (IS_ERR (priv->top_ctrl))return PTR_ERR (priv->top_ctrl); -/* Reset is optional depending on platform and named differently */ -if (priv->version ==BRCM_SATA_BCM7216 ) - reset_name ="rescal" ; -else - reset_name ="ahci" ; - - priv->rcdev =devm_reset_control_get_optional (&pdev->dev, reset_name); -if (IS_ERR (priv->rcdev)) -return PTR_ERR (priv->rcdev); +if (priv->version ==BRCM_SATA_BCM7216 ) { + priv->rcdev_rescal =devm_reset_control_get_optional_shared ( + &pdev->dev,"rescal" ); +if (IS_ERR (priv->rcdev_rescal)) +return PTR_ERR (priv->rcdev_rescal); + } + priv->rcdev_ahci =devm_reset_control_get_optional (&pdev->dev,"ahci" ); +if (IS_ERR (priv->rcdev_ahci)) +return PTR_ERR (priv->rcdev_ahci); hpriv =ahci_platform_get_resources (pdev,0 );if (IS_ERR (hpriv))
@@ -479,10 +479,10 @@ static int brcm_ahci_probe(struct platform_device *pdev)break ; } -if (priv->version ==BRCM_SATA_BCM7216 ) - ret =reset_control_reset (priv->rcdev); -else - ret =reset_control_deassert (priv->rcdev); + ret =reset_control_reset (priv->rcdev_rescal); +if (ret) +return ret; + ret =reset_control_deassert (priv->rcdev_ahci);if (ret)return ret;
@@ -527,8 +527,8 @@ static int brcm_ahci_probe(struct platform_device *pdev) out_disable_clks:ahci_platform_disable_clks (hpriv); out_reset: -if (priv->version !=BRCM_SATA_BCM7216 ) -reset_control_assert (priv->rcdev); +reset_control_assert (priv->rcdev_ahci); +reset_control_rearm (priv->rcdev_rescal);return ret; }
Signature · 1 line
2.17.1
PATCH v3 2/2 PCI: brcmstb: use reset/rearm instead of deassert/assert
In reply to Jim QuinlanThe 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.
--- drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/pci/controller/pcie-brcmstb.c +13 -6
@@ -1138,6 +1138,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;
@@ -1153,9 +1154,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 );
@@ -1170,14 +1175,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; }
@@ -1187,7 +1194,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); }
@@ -1262,13 +1269,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 (&pdev->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; }
Signature · 1 line
2.17.1