| Message ID | 20180525183326.5245-1-marek.vasut+renesas@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI: rcar: Clean up PHY init on failure | expand |
CC Sergei On Fri, May 25, 2018 at 8:33 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > If the Gen3 PHY fails to power up, the code does not undo the > initialization caused by phy_init(). Add the missing failure > handling to the rcar_pcie_phy_init_gen3() function. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/pci/host/pcie-rcar.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 695781934f0a..477bf40cc031 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -678,7 +678,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie) > if (err) > return err; > > - return phy_power_on(pcie->phy); > + err = phy_power_on(pcie->phy); > + if (err) > + phy_exit(pcie->phy); > + > + return err; > } > > static int rcar_msi_alloc(struct rcar_msi *chip) Gr{oetje,eeting}s, Geert
On 5/25/2018 9:33 PM, Marek Vasut wrote: > If the Gen3 PHY fails to power up, the code does not undo the > initialization caused by phy_init(). Add the missing failure > handling to the rcar_pcie_phy_init_gen3() function. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") [...] Oops, it's my sloppy coding again. Sorry about that... MBR, Sergei
On Fri, May 25, 2018 at 09:27:42PM +0200, Geert Uytterhoeven wrote: > CC Sergei > > On Fri, May 25, 2018 at 8:33 PM, Marek Vasut <marek.vasut@gmail.com> wrote: > > If the Gen3 PHY fails to power up, the code does not undo the > > initialization caused by phy_init(). Add the missing failure > > handling to the rcar_pcie_phy_init_gen3() function. > > > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > Cc: Phil Edworthy <phil.edworthy@renesas.com> > > Cc: Simon Horman <horms+renesas@verge.net.au> > > Cc: Wolfram Sang <wsa@the-dreams.de> > > Cc: linux-renesas-soc@vger.kernel.org > > Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Acked-by: Simon Horman <horms+renesas@verge.net.au>
On Fri, May 25, 2018 at 08:33:26PM +0200, Marek Vasut wrote: > If the Gen3 PHY fails to power up, the code does not undo the > initialization caused by phy_init(). Add the missing failure > handling to the rcar_pcie_phy_init_gen3() function. > > Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Phil Edworthy <phil.edworthy@renesas.com> > Cc: Simon Horman <horms+renesas@verge.net.au> > Cc: Wolfram Sang <wsa@the-dreams.de> > Cc: linux-renesas-soc@vger.kernel.org > Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") > --- > drivers/pci/host/pcie-rcar.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) Applied to pci/controller-fixes to be tentatively merged for -rc4, thanks. Lorenzo > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index 695781934f0a..477bf40cc031 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -678,7 +678,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie) > if (err) > return err; > > - return phy_power_on(pcie->phy); > + err = phy_power_on(pcie->phy); > + if (err) > + phy_exit(pcie->phy); > + > + return err; > } > > static int rcar_msi_alloc(struct rcar_msi *chip) > -- > 2.16.2 >
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 695781934f0a..477bf40cc031 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -678,7 +678,11 @@ static int rcar_pcie_phy_init_gen3(struct rcar_pcie *pcie) if (err) return err; - return phy_power_on(pcie->phy); + err = phy_power_on(pcie->phy); + if (err) + phy_exit(pcie->phy); + + return err; } static int rcar_msi_alloc(struct rcar_msi *chip)
If the Gen3 PHY fails to power up, the code does not undo the initialization caused by phy_init(). Add the missing failure handling to the rcar_pcie_phy_init_gen3() function. Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Phil Edworthy <phil.edworthy@renesas.com> Cc: Simon Horman <horms+renesas@verge.net.au> Cc: Wolfram Sang <wsa@the-dreams.de> Cc: linux-renesas-soc@vger.kernel.org Fixes: 517ca93a7159 ("PCI: rcar: Add R-Car gen3 PHY support") --- drivers/pci/host/pcie-rcar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)