Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9896b29 authored by Josua Mayer's avatar Josua Mayer Committed by Greg Kroah-Hartman
Browse files

net: mvmdio: defer probe of orion-mdio if a clock is not ready 



[ Upstream commit 433a06d7d74e677c40b1148c70c48677ff62fb6b ]

Defer probing of the orion-mdio interface when getting a clock returns
EPROBE_DEFER. This avoids locking up the Armada 8k SoC when mdio is used
before all clocks have been enabled.

Signed-off-by: default avatarJosua Mayer <josua@solid-run.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5f6c5f5a

drivers/net/ethernet/marvell/mvmdio.c

+5 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ static int orion_mdio_probe(struct platform_device *pdev) 


	for (i = 0; i < ARRAY_SIZE(dev->clk); i++) {

		dev->clk[i] = of_clk_get(pdev->dev.of_node, i);

		if (PTR_ERR(dev->clk[i]) == -EPROBE_DEFER) {

			ret = -EPROBE_DEFER;

			goto out_clk;

		}

		if (IS_ERR(dev->clk[i]))

			break;

		clk_prepare_enable(dev->clk[i]);
@@ -362,6 +366,7 @@ static int orion_mdio_probe(struct platform_device *pdev) 
	if (dev->err_interrupt > 0)

		writel(0, dev->regs + MVMDIO_ERR_INT_MASK);



out_clk:

	for (i = 0; i < ARRAY_SIZE(dev->clk); i++) {

		if (IS_ERR(dev->clk[i]))

			break;