On 7/24/20 1:33 PM, Jim Quinlan wrote:
> From: Jim Quinlan <jquinlan@xxxxxxxxxxxx>
>
> A 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.
>
> Signed-off-by: Jim Quinlan <jquinlan@xxxxxxxxxxxx>
>
> Fixes: 272ecd60a636 ("ata: ahci_brcm: BCM7216 reset is self de-asserting")
> Fixes: c345ec6a50e9 ("ata: ahci_brcm: Support BCM7216 reset controller name")
Sorry for not noticing earlier, the Fixes tag should go above your
Signed-off-by, and they do not require a new line.
I believe that you also need to call reset_control_deassert() in
brcm_ahci_resume() for symmetry and finally you can really submit this
independently from this patch series since it is a pure bug fix (even
though it is unveiled by working on PCIe as they share the same rescal
reset).
Thanks!
> ---
> drivers/ata/ahci_brcm.c | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
> index 6853dbb4131d..d6115bc04b09 100644
> --- a/drivers/ata/ahci_brcm.c
> +++ b/drivers/ata/ahci_brcm.c
> @@ -428,7 +428,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;
> @@ -452,11 +451,10 @@ static int brcm_ahci_probe(struct platform_device *pdev)
>
> /* Reset is optional depending on platform and named differently */
> if (priv->version == BRCM_SATA_BCM7216)
> - reset_name = "rescal";
> + priv->rcdev = devm_reset_control_get_optional_shared(&pdev->dev, "rescal");
> else
> - reset_name = "ahci";
> + priv->rcdev = devm_reset_control_get_optional(&pdev->dev, "ahci");
>
> - priv->rcdev = devm_reset_control_get_optional(&pdev->dev, reset_name);
> if (IS_ERR(priv->rcdev))
> return PTR_ERR(priv->rcdev);
>
> @@ -479,10 +477,7 @@ 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_deassert(priv->rcdev);
> if (ret)
> return ret;
>
>
--
Florian
