diff mbox series

[U-Boot,RFC] net: designware: drop compatible altr, socfpga-stmmac

Message ID 20190819184313.8383-1-ralph.siemsen@linaro.org
State Accepted
Commit 642b80d256e1ba35e0dc8157a588b49c11b177f4
Delegated to: Joe Hershberger
Headers show
Series [U-Boot,RFC] net: designware: drop compatible altr, socfpga-stmmac | expand

Commit Message

Ralph Siemsen Aug. 19, 2019, 6:43 p.m. UTC
The same compatible = "altr,socfpga-stmmac" appears in both
drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
creating ambiguity in which driver will be bound.

For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
So drop the compatible string from designware.c.

Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
---
This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
Maintainers of those boards have been copied, kindly review.

 drivers/net/designware.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Alexey Brodkin Aug. 20, 2019, 8:07 a.m. UTC | #1
Hi Ralph,

> -----Original Message-----
> From: Ralph Siemsen <ralph.siemsen@linaro.org>
> Sent: Monday, August 19, 2019 9:43 PM
> To: u-boot@lists.denx.de; Joe Hershberger <joe.hershberger@ni.com>; Alexey Brodkin
> <abrodkin@synopsys.com>; Vlad Zakharov <vzakhar@synopsys.com>
> Cc: Ralph Siemsen <ralph.siemsen@linaro.org>
> Subject: [RFC PATCH] net: designware: drop compatible altr,socfpga-stmmac
> 
> The same compatible = "altr,socfpga-stmmac" appears in both
> drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> creating ambiguity in which driver will be bound.
> 
> For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> So drop the compatible string from designware.c.
> 
> Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
> ---
> This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
> Maintainers of those boards have been copied, kindly review.

Thanks for this clean-up.

Speaking about AXS10x board where we do have DW GMAC
I cannot recall the reason I chose to use "altr,socfpga-stmmac"
for the board here [1] 3 years ago.

But given we don't have any special quirks implemented whatever
is the most generic DW GMAC compatible string is should be good for us.

Joe, could you please suggest if we need to use just "st,stm32-dwmac"
or add our own compatible as the ASIC is not from ST obviously but
an FPGA with Synopsys ARC SoC?

[1] https://gitlab.denx.de/u-boot/u-boot/commit/fb2dea60e8f355ae00d427db09112a90839c96ec

-Alexey
Simon Goldschmidt Aug. 20, 2019, 8:30 a.m. UTC | #2
Ralph Siemsen <ralph.siemsen@linaro.org> schrieb am Mo., 19. Aug. 2019,
20:43:

> The same compatible = "altr,socfpga-stmmac" appears in both
> drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> creating ambiguity in which driver will be bound.
>
> For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> So drop the compatible string from designware.c.
>
> Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
>

Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>

---
> This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
> Maintainers of those boards have been copied, kindly review.
>
>  drivers/net/designware.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/drivers/net/designware.c b/drivers/net/designware.c
> index c4fe40b19a..145eeac45f 100644
> --- a/drivers/net/designware.c
> +++ b/drivers/net/designware.c
> @@ -847,7 +847,6 @@ int designware_eth_ofdata_to_platdata(struct udevice
> *dev)
>
>  static const struct udevice_id designware_eth_ids[] = {
>         { .compatible = "allwinner,sun7i-a20-gmac" },
> -       { .compatible = "altr,socfpga-stmmac" },
>         { .compatible = "amlogic,meson6-dwmac" },
>         { .compatible = "amlogic,meson-gx-dwmac" },
>         { .compatible = "amlogic,meson-gxbb-dwmac" },
> --
> 2.17.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>
Joe Hershberger Sept. 3, 2019, 10:09 p.m. UTC | #3
On Tue, Aug 20, 2019 at 3:07 AM Alexey Brodkin
<Alexey.Brodkin@synopsys.com> wrote:
>
> Hi Ralph,
>
> > -----Original Message-----
> > From: Ralph Siemsen <ralph.siemsen@linaro.org>
> > Sent: Monday, August 19, 2019 9:43 PM
> > To: u-boot@lists.denx.de; Joe Hershberger <joe.hershberger@ni.com>; Alexey Brodkin
> > <abrodkin@synopsys.com>; Vlad Zakharov <vzakhar@synopsys.com>
> > Cc: Ralph Siemsen <ralph.siemsen@linaro.org>
> > Subject: [RFC PATCH] net: designware: drop compatible altr,socfpga-stmmac
> >
> > The same compatible = "altr,socfpga-stmmac" appears in both
> > drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> > creating ambiguity in which driver will be bound.
> >
> > For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> > So drop the compatible string from designware.c.
> >
> > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
> > ---
> > This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
> > Maintainers of those boards have been copied, kindly review.
>
> Thanks for this clean-up.
>
> Speaking about AXS10x board where we do have DW GMAC
> I cannot recall the reason I chose to use "altr,socfpga-stmmac"
> for the board here [1] 3 years ago.
>
> But given we don't have any special quirks implemented whatever
> is the most generic DW GMAC compatible string is should be good for us.
>
> Joe, could you please suggest if we need to use just "st,stm32-dwmac"
> or add our own compatible as the ASIC is not from ST obviously but
> an FPGA with Synopsys ARC SoC?

I think we should only be using what Linux does, so I'm afraid I have
to defer to what exists in the DTs there.

-Joe

> [1] https://gitlab.denx.de/u-boot/u-boot/commit/fb2dea60e8f355ae00d427db09112a90839c96ec
>
> -Alexey
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Joe Hershberger Sept. 3, 2019, 10:10 p.m. UTC | #4
On Mon, Aug 19, 2019 at 1:43 PM Ralph Siemsen <ralph.siemsen@linaro.org> wrote:
>
> The same compatible = "altr,socfpga-stmmac" appears in both
> drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> creating ambiguity in which driver will be bound.
>
> For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> So drop the compatible string from designware.c.
>
> Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Alexey Brodkin Sept. 4, 2019, 5:59 a.m. UTC | #5
Hi Joe,

> -----Original Message-----
> From: Joe Hershberger <joe.hershberger@ni.com>
> Sent: Wednesday, September 4, 2019 1:10 AM
> To: Alexey Brodkin <abrodkin@synopsys.com>
> Cc: Ralph Siemsen <ralph.siemsen@linaro.org>; Joseph Hershberger <joseph.hershberger@ni.com>; u-
> boot@lists.denx.de; linux-snps-arc@lists.infradead.org; Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> Subject: Re: [U-Boot] [RFC PATCH] net: designware: drop compatible altr, socfpga-stmmac
> 
> On Tue, Aug 20, 2019 at 3:07 AM Alexey Brodkin
> <Alexey.Brodkin@synopsys.com> wrote:
> >
> > Hi Ralph,
> >
> > > -----Original Message-----
> > > From: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > Sent: Monday, August 19, 2019 9:43 PM
> > > To: u-boot@lists.denx.de; Joe Hershberger <joe.hershberger@ni.com>; Alexey Brodkin
> > > <abrodkin@synopsys.com>; Vlad Zakharov <vzakhar@synopsys.com>
> > > Cc: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > Subject: [RFC PATCH] net: designware: drop compatible altr,socfpga-stmmac
> > >
> > > The same compatible = "altr,socfpga-stmmac" appears in both
> > > drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> > > creating ambiguity in which driver will be bound.
> > >
> > > For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> > > So drop the compatible string from designware.c.
> > >
> > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > ---
> > > This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
> > > Maintainers of those boards have been copied, kindly review.
> >
> > Thanks for this clean-up.
> >
> > Speaking about AXS10x board where we do have DW GMAC
> > I cannot recall the reason I chose to use "altr,socfpga-stmmac"
> > for the board here [1] 3 years ago.
> >
> > But given we don't have any special quirks implemented whatever
> > is the most generic DW GMAC compatible string is should be good for us.
> >
> > Joe, could you please suggest if we need to use just "st,stm32-dwmac"
> > or add our own compatible as the ASIC is not from ST obviously but
> > an FPGA with Synopsys ARC SoC?
> 
> I think we should only be using what Linux does, so I'm afraid I have
> to defer to what exists in the DTs there.

In the Linux kernel we use "snps,dwmac", see [1].
But maybe we need to switch to "snps,dwmac-3.70a" even as what we really have is 3.73a.

While in U-Boot we don't have either one, the most generic is "st,stm32-dwmac", see [2].
So maybe we want to add at least "snps,dwmac".

@Jose Abreu could you please confirm if "snps,dwmac-3.70a" is OK for GMAC IP v3.73a?

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arc/boot/dts/axs10x_mb.dtsi#n74
[2] https://gitlab.denx.de/u-boot/u-boot/blob/master/drivers/net/designware.c#L855

-Alexey
Jose Abreu Sept. 4, 2019, 1:48 p.m. UTC | #6
From: Alexey Brodkin <abrodkin@synopsys.com>
Date: Sep/04/2019, 06:59:01 (UTC+00:00)

> Hi Joe,
> 
> > -----Original Message-----
> > From: Joe Hershberger <joe.hershberger@ni.com>
> > Sent: Wednesday, September 4, 2019 1:10 AM
> > To: Alexey Brodkin <abrodkin@synopsys.com>
> > Cc: Ralph Siemsen <ralph.siemsen@linaro.org>; Joseph Hershberger <joseph.hershberger@ni.com>; u-
> > boot@lists.denx.de; linux-snps-arc@lists.infradead.org; Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
> > Subject: Re: [U-Boot] [RFC PATCH] net: designware: drop compatible altr, socfpga-stmmac
> > 
> > On Tue, Aug 20, 2019 at 3:07 AM Alexey Brodkin
> > <Alexey.Brodkin@synopsys.com> wrote:
> > >
> > > Hi Ralph,
> > >
> > > > -----Original Message-----
> > > > From: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > > Sent: Monday, August 19, 2019 9:43 PM
> > > > To: u-boot@lists.denx.de; Joe Hershberger <joe.hershberger@ni.com>; Alexey Brodkin
> > > > <abrodkin@synopsys.com>; Vlad Zakharov <vzakhar@synopsys.com>
> > > > Cc: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > > Subject: [RFC PATCH] net: designware: drop compatible altr,socfpga-stmmac
> > > >
> > > > The same compatible = "altr,socfpga-stmmac" appears in both
> > > > drivers/net/designware.c and drivers/net/dwmac_socfgpa.c,
> > > > creating ambiguity in which driver will be bound.
> > > >
> > > > For Intel/Altera SoC devices, dwmac_socfpga.c is the correct driver.
> > > > So drop the compatible string from designware.c.
> > > >
> > > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
> > > > ---
> > > > This compatible string also appears in: axs10x_mb.dtsi and hsdk.dts.
> > > > Maintainers of those boards have been copied, kindly review.
> > >
> > > Thanks for this clean-up.
> > >
> > > Speaking about AXS10x board where we do have DW GMAC
> > > I cannot recall the reason I chose to use "altr,socfpga-stmmac"
> > > for the board here [1] 3 years ago.
> > >
> > > But given we don't have any special quirks implemented whatever
> > > is the most generic DW GMAC compatible string is should be good for us.
> > >
> > > Joe, could you please suggest if we need to use just "st,stm32-dwmac"
> > > or add our own compatible as the ASIC is not from ST obviously but
> > > an FPGA with Synopsys ARC SoC?
> > 
> > I think we should only be using what Linux does, so I'm afraid I have
> > to defer to what exists in the DTs there.
> 
> In the Linux kernel we use "snps,dwmac", see [1].
> But maybe we need to switch to "snps,dwmac-3.70a" even as what we really have is 3.73a.
> 
> While in U-Boot we don't have either one, the most generic is "st,stm32-dwmac", see [2].
> So maybe we want to add at least "snps,dwmac".
> 
> @Jose Abreu could you please confirm if "snps,dwmac-3.70a" is OK for GMAC IP v3.73a?

Yes it should be okay.

> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arc/boot/dts/axs10x_mb.dtsi#n74
> [2] https://gitlab.denx.de/u-boot/u-boot/blob/master/drivers/net/designware.c#L855
> 
> -Alexey


---
Thanks,
Jose Miguel Abreu
Joe Hershberger Sept. 4, 2019, 4:41 p.m. UTC | #7
Hi Ralph,

https://patchwork.ozlabs.org/patch/1149481/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git

Thanks!
-Joe
diff mbox series

Patch

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index c4fe40b19a..145eeac45f 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -847,7 +847,6 @@  int designware_eth_ofdata_to_platdata(struct udevice *dev)
 
 static const struct udevice_id designware_eth_ids[] = {
 	{ .compatible = "allwinner,sun7i-a20-gmac" },
-	{ .compatible = "altr,socfpga-stmmac" },
 	{ .compatible = "amlogic,meson6-dwmac" },
 	{ .compatible = "amlogic,meson-gx-dwmac" },
 	{ .compatible = "amlogic,meson-gxbb-dwmac" },