Message ID | 20170728142318.GA20368@alpha.franken.de |
---|---|
State | RFC, archived |
Delegated to: | David Miller |
Headers | show |
On 07/28/2017 07:23 AM, Tom Bogendoerfer wrote: > On Thu, Jul 27, 2017 at 03:39:58PM -0700, Laura Abbott wrote: >> I don't know the intricacies of the Mustang hardware but external >> aborts have been a symptom of missing clocks on other hardware. > > you are right, it's a missing clock. For SGMII ports the driver > doesn't really use the clock source other then doing the one > devm_clk_get(), but this is enough to get the clock going. > > Below patch fixes the crash and brings back the second SGMII port > (even without a clock source in device tree, I guess it uses clock > from first port). From a correctness standpoint there should probably > be a clk_prepare_enable(), if port is SGMII. > > Could you test the patch ? If it works, I'll submit it. > > Thomas. > > diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > index 86058a9f3417..1d307f2def2d 100644 > --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > @@ -1785,9 +1785,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) > > xgene_enet_gpiod_get(pdata); > > - if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > + pdata->clk = devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(pdata->clk)) { > + if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { > /* Abort if the clock is defined but couldn't be > * retrived. Always abort if the clock is missing on > * DT system as the driver can't cope with this case. > Yes, this works. You can add my Tested-by. Thanks, Laura
On Fri, Jul 28, 2017 at 7:23 AM, Tom Bogendoerfer <tsbogend@alpha.franken.de> wrote: > On Thu, Jul 27, 2017 at 03:39:58PM -0700, Laura Abbott wrote: >> I don't know the intricacies of the Mustang hardware but external >> aborts have been a symptom of missing clocks on other hardware. > > you are right, it's a missing clock. For SGMII ports the driver > doesn't really use the clock source other then doing the one > devm_clk_get(), but this is enough to get the clock going. > > Below patch fixes the crash and brings back the second SGMII port > (even without a clock source in device tree, I guess it uses clock > from first port). From a correctness standpoint there should probably > be a clk_prepare_enable(), if port is SGMII. > > Could you test the patch ? If it works, I'll submit it. > > Thomas. > > diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > index 86058a9f3417..1d307f2def2d 100644 > --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c > @@ -1785,9 +1785,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) > > xgene_enet_gpiod_get(pdata); > > - if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { > - pdata->clk = devm_clk_get(&pdev->dev, NULL); > - if (IS_ERR(pdata->clk)) { > + pdata->clk = devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(pdata->clk)) { > + if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { > /* Abort if the clock is defined but couldn't be > * retrived. Always abort if the clock is missing on > * DT system as the driver can't cope with this case. > > -- Thanks for the patch. Acked-by: Iyappan Subramanian <isubramanian@apm.com> > Crap can work. Given enough thrust pigs will fly, but it's not necessarily a > good idea. [ RFC1925, 2.3 ]
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 86058a9f3417..1d307f2def2d 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1785,9 +1785,9 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) xgene_enet_gpiod_get(pdata); - if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { - pdata->clk = devm_clk_get(&pdev->dev, NULL); - if (IS_ERR(pdata->clk)) { + pdata->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(pdata->clk)) { + if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) { /* Abort if the clock is defined but couldn't be * retrived. Always abort if the clock is missing on * DT system as the driver can't cope with this case.