* [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors
@ 2023-06-07 9:34 Feiyang Chen
2023-06-07 11:55 ` Maciej Fijalkowski
2023-06-07 13:48 ` Maxime Chevallier
0 siblings, 2 replies; 5+ messages in thread
From: Feiyang Chen @ 2023-06-07 9:34 UTC (permalink / raw)
To: peppe.cavallaro, alexandre.torgue, joabreu, maxime.chevallier
Cc: Feiyang Chen, netdev, loongson-kernel, chris.chenfeiyang,
Yanteng Si
When CONFIG_PCS_LYNX is not set, lynx_pcs_destroy() will not be
exported. Add #ifdef CONFIG_PCS_LYNX around that code to avoid
build errors like these:
ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister':
stmmac_mdio.c:(.text+0x1440): undefined reference to `lynx_pcs_destroy'
Reported-by: Yanteng Si <siyanteng@loongson.cn>
Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver")
Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index c784a6731f08..c1a23846a01c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -665,8 +665,10 @@ int stmmac_mdio_unregister(struct net_device *ndev)
if (priv->hw->xpcs)
xpcs_destroy(priv->hw->xpcs);
+#ifdef CONFIG_PCS_LYNX
if (priv->hw->lynx_pcs)
lynx_pcs_destroy(priv->hw->lynx_pcs);
+#endif
mdiobus_unregister(priv->mii);
priv->mii->priv = NULL;
--
2.39.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors
2023-06-07 9:34 [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors Feiyang Chen
@ 2023-06-07 11:55 ` Maciej Fijalkowski
2023-06-07 14:02 ` Maxime Chevallier
2023-06-07 13:48 ` Maxime Chevallier
1 sibling, 1 reply; 5+ messages in thread
From: Maciej Fijalkowski @ 2023-06-07 11:55 UTC (permalink / raw)
To: Feiyang Chen
Cc: peppe.cavallaro, alexandre.torgue, joabreu, maxime.chevallier,
netdev, loongson-kernel, chris.chenfeiyang, Yanteng Si
On Wed, Jun 07, 2023 at 05:34:40PM +0800, Feiyang Chen wrote:
> When CONFIG_PCS_LYNX is not set, lynx_pcs_destroy() will not be
> exported. Add #ifdef CONFIG_PCS_LYNX around that code to avoid
> build errors like these:
>
> ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister':
> stmmac_mdio.c:(.text+0x1440): undefined reference to `lynx_pcs_destroy'
>
> Reported-by: Yanteng Si <siyanteng@loongson.cn>
> Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver")
> Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index c784a6731f08..c1a23846a01c 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> @@ -665,8 +665,10 @@ int stmmac_mdio_unregister(struct net_device *ndev)
> if (priv->hw->xpcs)
> xpcs_destroy(priv->hw->xpcs);
>
> +#ifdef CONFIG_PCS_LYNX
wouldn't it be better to provide a stub of lynx_pcs_destroy() for
!CONFIG_PCS_LYNX ? otherwise all of the users will have to surrounded with
this ifdef.
> if (priv->hw->lynx_pcs)
> lynx_pcs_destroy(priv->hw->lynx_pcs);
> +#endif
>
> mdiobus_unregister(priv->mii);
> priv->mii->priv = NULL;
> --
> 2.39.3
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors
2023-06-07 11:55 ` Maciej Fijalkowski
@ 2023-06-07 14:02 ` Maxime Chevallier
2023-06-07 15:34 ` Simon Horman
0 siblings, 1 reply; 5+ messages in thread
From: Maxime Chevallier @ 2023-06-07 14:02 UTC (permalink / raw)
To: Maciej Fijalkowski
Cc: Feiyang Chen, peppe.cavallaro, alexandre.torgue, joabreu, netdev,
loongson-kernel, chris.chenfeiyang, Yanteng Si
Hello,
On Wed, 7 Jun 2023 13:55:41 +0200
Maciej Fijalkowski <maciej.fijalkowski@intel.com> wrote:
> On Wed, Jun 07, 2023 at 05:34:40PM +0800, Feiyang Chen wrote:
> > When CONFIG_PCS_LYNX is not set, lynx_pcs_destroy() will not be
> > exported. Add #ifdef CONFIG_PCS_LYNX around that code to avoid
> > build errors like these:
> >
> > ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister':
> > stmmac_mdio.c:(.text+0x1440): undefined reference to `lynx_pcs_destroy'
> >
> > Reported-by: Yanteng Si <siyanteng@loongson.cn>
> > Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver")
> > Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
> > ---
> > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > index c784a6731f08..c1a23846a01c 100644
> > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > @@ -665,8 +665,10 @@ int stmmac_mdio_unregister(struct net_device *ndev)
> > if (priv->hw->xpcs)
> > xpcs_destroy(priv->hw->xpcs);
> >
> > +#ifdef CONFIG_PCS_LYNX
>
> wouldn't it be better to provide a stub of lynx_pcs_destroy() for
> !CONFIG_PCS_LYNX ? otherwise all of the users will have to surrounded with
> this ifdef.
I just sent another fix that has been in the works since yesterday :
https://lore.kernel.org/netdev/20230607135941.407054-1-maxime.chevallier@bootlin.com/T/#t
It uses a better solution of only using pcs_lynx-related helpers on dwmac_socfpga,
as this is the only stmmac variant that needs this PCS.
Sorry for the mess,
Maxime
> > if (priv->hw->lynx_pcs)
> > lynx_pcs_destroy(priv->hw->lynx_pcs);
> > +#endif
> >
> > mdiobus_unregister(priv->mii);
> > priv->mii->priv = NULL;
> > --
> > 2.39.3
> >
> >
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors
2023-06-07 14:02 ` Maxime Chevallier
@ 2023-06-07 15:34 ` Simon Horman
0 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2023-06-07 15:34 UTC (permalink / raw)
To: Maxime Chevallier
Cc: Maciej Fijalkowski, Feiyang Chen, peppe.cavallaro,
alexandre.torgue, joabreu, netdev, loongson-kernel,
chris.chenfeiyang, Yanteng Si
On Wed, Jun 07, 2023 at 04:02:19PM +0200, Maxime Chevallier wrote:
> Hello,
>
> On Wed, 7 Jun 2023 13:55:41 +0200
> Maciej Fijalkowski <maciej.fijalkowski@intel.com> wrote:
>
> > On Wed, Jun 07, 2023 at 05:34:40PM +0800, Feiyang Chen wrote:
> > > When CONFIG_PCS_LYNX is not set, lynx_pcs_destroy() will not be
> > > exported. Add #ifdef CONFIG_PCS_LYNX around that code to avoid
> > > build errors like these:
> > >
> > > ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister':
> > > stmmac_mdio.c:(.text+0x1440): undefined reference to `lynx_pcs_destroy'
> > >
> > > Reported-by: Yanteng Si <siyanteng@loongson.cn>
> > > Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver")
> > > Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
> > > ---
> > > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 ++
> > > 1 file changed, 2 insertions(+)
> > >
> > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > > index c784a6731f08..c1a23846a01c 100644
> > > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> > > @@ -665,8 +665,10 @@ int stmmac_mdio_unregister(struct net_device *ndev)
> > > if (priv->hw->xpcs)
> > > xpcs_destroy(priv->hw->xpcs);
> > >
> > > +#ifdef CONFIG_PCS_LYNX
> >
> > wouldn't it be better to provide a stub of lynx_pcs_destroy() for
> > !CONFIG_PCS_LYNX ? otherwise all of the users will have to surrounded with
> > this ifdef.
>
> I just sent another fix that has been in the works since yesterday :
>
> https://lore.kernel.org/netdev/20230607135941.407054-1-maxime.chevallier@bootlin.com/T/#t
>
> It uses a better solution of only using pcs_lynx-related helpers on dwmac_socfpga,
> as this is the only stmmac variant that needs this PCS.
>
> Sorry for the mess,
>
> Maxime
Thanks everyone, and sorry for my part in this mess.
Let's keep working on the solution at the thread above.
--
pw-bot: reject
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors
2023-06-07 9:34 [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors Feiyang Chen
2023-06-07 11:55 ` Maciej Fijalkowski
@ 2023-06-07 13:48 ` Maxime Chevallier
1 sibling, 0 replies; 5+ messages in thread
From: Maxime Chevallier @ 2023-06-07 13:48 UTC (permalink / raw)
To: Feiyang Chen
Cc: peppe.cavallaro, alexandre.torgue, joabreu, netdev,
loongson-kernel, chris.chenfeiyang, Yanteng Si
Hello,
On Wed, 7 Jun 2023 17:34:40 +0800
Feiyang Chen <chenfeiyang@loongson.cn> wrote:
> When CONFIG_PCS_LYNX is not set, lynx_pcs_destroy() will not be
> exported. Add #ifdef CONFIG_PCS_LYNX around that code to avoid
> build errors like these:
>
> ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister':
> stmmac_mdio.c:(.text+0x1440): undefined reference to `lynx_pcs_destroy'
I have sent a series aiming to fix this yesterday [1], which I'll followup today
addressing the last pieces for the fix. Sorry about this,
Maxime
> Reported-by: Yanteng Si <siyanteng@loongson.cn>
> Fixes: 5d1f3fe7d2d5 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver")
> Signed-off-by: Feiyang Chen <chenfeiyang@loongson.cn>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index c784a6731f08..c1a23846a01c 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> @@ -665,8 +665,10 @@ int stmmac_mdio_unregister(struct net_device *ndev)
> if (priv->hw->xpcs)
> xpcs_destroy(priv->hw->xpcs);
>
> +#ifdef CONFIG_PCS_LYNX
> if (priv->hw->lynx_pcs)
> lynx_pcs_destroy(priv->hw->lynx_pcs);
> +#endif
>
> mdiobus_unregister(priv->mii);
> priv->mii->priv = NULL;
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-07 15:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-07 9:34 [PATCH] net: stmmac: Fix stmmac_mdio_unregister() build errors Feiyang Chen
2023-06-07 11:55 ` Maciej Fijalkowski
2023-06-07 14:02 ` Maxime Chevallier
2023-06-07 15:34 ` Simon Horman
2023-06-07 13:48 ` Maxime Chevallier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).