drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case
Subsystems (2)
PATCH 1/1 drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case
Orion5.x systems are still using machine files and not device-tree. Commit 96cb4342382290c9 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio") has replaced devm_clk_get() with of_clk_get(), leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.
drivers/net/ethernet/marvell/mvmdio.c +22 -9
@@ -319,20 +319,33 @@ static int orion_mdio_probe(struct platfinit_waitqueue_head (&dev->smi_busy_wait); -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 ) { +if (pdev->dev.of_node) { +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]); + } + +if (!IS_ERR (of_clk_get (pdev->dev.of_node, +ARRAY_SIZE (dev->clk)))) +dev_warn (&pdev->dev, + "unsupported number of clocks, limiting to the first " + __stringify(ARRAY_SIZE(dev->clk)) "\n"); + }else { + dev->clk[0 ] =clk_get (&pdev->dev,NULL ); +if (PTR_ERR (dev->clk[0 ]) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto out_clk; } -if (IS_ERR (dev->clk[i])) -break ; -clk_prepare_enable (dev->clk[i]); +if (!IS_ERR (dev->clk[0 ])) +clk_prepare_enable (dev->clk[0 ]); } -if (!IS_ERR (of_clk_get (pdev->dev.of_node,ARRAY_SIZE (dev->clk)))) - dev_warn(&pdev->dev, "unsupported number of clocks, limiting to the first " - __stringify(ARRAY_SIZE(dev->clk)) "\n"); dev->err_interrupt =platform_get_irq (pdev,0 ); if (dev->err_interrupt > 0 &&
Quoted 34 lines · Arnaud Patard
Orion5.x systems are still using machine files and not device-tree. Commit
96cb4342382290c9("net: mvmdio: allow up to three clocks to be specified for orion-mdio") has replaceddevm_clk_get()withof_clk_get(), leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.Fixes 96cb4342382290c9 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio")Signed-off-by Arnaud Patard <[email protected]>Index:
linux-next/drivers/net/ethernet/marvell/mvmdio.c
===================================================================drivers/net/ethernet/marvell/mvmdio.c +13
-3@@ -319,20 +319,33 @@ static int orion_mdio_probe(struct platfinit_waitqueue_head (&dev->smi_busy_wait); -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 ) { + if (pdev->dev.of_node) { + 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]); + } + + if (!IS_ERR(of_clk_get(pdev->dev.of_node,
drivers/net/ethernet/marvell/mvmdio.c static int orion_mdio_probe(struct platf · line 344
Quoted 10 lines
drivers/net/ethernet/marvell/mvmdio.c +7
-0+ ARRAY_SIZE(dev->clk)))) +dev_warn (&pdev->dev, + "unsupported number of clocks, limiting to the first " + __stringify(ARRAY_SIZE(dev->clk)) "\n"); + }else { + dev->clk[0 ] =clk_get (&pdev->dev,NULL ); +if (PTR_ERR (dev->clk[0 ]) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto out_clk; }
Hi Arnaud
It is a long time since i looked at Orion5x. Is this else clause even needed? If my memory is right, i don't think it needs to enable tclk? It was kirkwood which first added gateable clocks. And all kirkwood boards are not DT.
Thanks
Andrew
Andrew Lunn <[email protected]> writes:
Hi,
Quoted 48 lines · Arnaud Patard
Quoted 34 lines
Orion5.x systems are still using machine files and not device-tree. Commit
96cb4342382290c9("net: mvmdio: allow up to three clocks to be specified for orion-mdio") has replaceddevm_clk_get()withof_clk_get(), leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.Fixes 96cb4342382290c9 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio")Signed-off-by Arnaud Patard <[email protected]>Index:
linux-next/drivers/net/ethernet/marvell/mvmdio.c
===================================================================drivers/net/ethernet/marvell/mvmdio.c +13
-3@@ -319,20 +319,33 @@ static int orion_mdio_probe(struct platfinit_waitqueue_head (&dev->smi_busy_wait); -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 ) { + if (pdev->dev.of_node) { + 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]); + } + + if (!IS_ERR(of_clk_get(pdev->dev.of_node,drivers/net/ethernet/marvell/mvmdio.c static int orion_mdio_probe(struct platf · line 344
Quoted 10 lines
drivers/net/ethernet/marvell/mvmdio.c +7
-0+ ARRAY_SIZE(dev->clk)))) +dev_warn (&pdev->dev, + "unsupported number of clocks, limiting to the first " + __stringify(ARRAY_SIZE(dev->clk)) "\n"); + }else { + dev->clk[0 ] =clk_get (&pdev->dev,NULL ); +if (PTR_ERR (dev->clk[0 ]) == -EPROBE_DEFER ) { ret = -EPROBE_DEFER ; goto out_clk; }Hi Arnaud
Quoted 4 lines
It is a long time since i looked at Orion5x. Is this else clause even needed? If my memory is right, i don't think it needs to enable tclk? It was kirkwood which first added gateable clocks. And all kirkwood boards are not DT.
I was not sure if the else clause was needed or not so I only restored similar behaviour to what was there before the commit 96cb4342382290c9.
By looking at the commit logs, the commit adding the clock support 3d604da1e9547c09 (net: mvmdio: get and enable optional clock) doesn't mention the SoC names. So, I've no idea if it's needed or not.
Arnaud
Quoted 10 lines · Arnaud Patard
Orion5.x systems are still using machine files and not device-tree. Commit
96cb4342382290c9("net: mvmdio: allow up to three clocks to be specified for orion-mdio") has replaceddevm_clk_get()withof_clk_get(), leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.Fixes 96cb4342382290c9 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio")Signed-off-by Arnaud Patard <[email protected]>
Andrew
David Miller
maintainerFrom: Arnaud Patard (Rtp) <[email protected]>
Date: Fri, 02 Aug 2019 10:32:40 +0200
Quoted 10 lines
Orion5.x systems are still using machine files and not device-tree. Commit
96cb4342382290c9("net: mvmdio: allow up to three clocks to be specified for orion-mdio") has replaceddevm_clk_get()withof_clk_get(), leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.Fixes 96cb4342382290c9 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio")Signed-off-by Arnaud Patard <[email protected]>
Applied and queued up for -stable, thanks.