Patchwork [V2] ARM: mx28: Skip OCOTP FEC MAC setup if in DT

login
register
mail settings
Submitter Marek Vasut
Date Sept. 25, 2012, 11:32 a.m.
Message ID <1348572738-9743-1-git-send-email-marex@denx.de>
Download mbox | patch
Permalink /patch/186787/
State New
Headers show

Comments

Marek Vasut - Sept. 25, 2012, 11:32 a.m.
Currently, the kernel unconditionally adds "local-mac-address" and
"mac-address" properties under both FEC ethernet DT nodes in case
the update_fec_mac_prop() function is called. These properties are
loaded with MAC address compiled from vendors OUI and a per-device
NIC saved in OCOTP storage.

Some more advanced bootloaders do augment the DT passed to the kernel
by these properties already. In such case, it is wrong for kernel to
override these values.

Adjust the FEC MAC address loading so that in case the DT properties
are already present in the DT passed from the bootloader, skip the
loading from OCOTP altogether. If the DT properties are not present,
load them from OCOTP.

Note that the later case will lead to zeroed out MAC address if OCOTP
is not programmed. This will lead to FEC not working at all.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
---
 arch/arm/mach-mxs/mach-mxs.c |    4 ++++
 1 file changed, 4 insertions(+)

V2: Assign from variable before checking for the "local-mac-address" property.
    As Shawn explained, this prevents the function from repeatedly finding the
    first FEC.
Shawn Guo - Sept. 25, 2012, 11:44 a.m.
On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> Currently, the kernel unconditionally adds "local-mac-address" and
> "mac-address" properties under both FEC ethernet DT nodes in case
> the update_fec_mac_prop() function is called. These properties are
> loaded with MAC address compiled from vendors OUI and a per-device
> NIC saved in OCOTP storage.
> 
> Some more advanced bootloaders do augment the DT passed to the kernel
> by these properties already. In such case, it is wrong for kernel to
> override these values.
> 
> Adjust the FEC MAC address loading so that in case the DT properties
> are already present in the DT passed from the bootloader, skip the
> loading from OCOTP altogether. If the DT properties are not present,
> load them from OCOTP.
> 
> Note that the later case will lead to zeroed out MAC address if OCOTP
> is not programmed. This will lead to FEC not working at all.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>

Queued for 3.8, thanks.
Marek Vasut - Sept. 25, 2012, 1:40 p.m.
Dear Shawn Guo,

> On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> > Currently, the kernel unconditionally adds "local-mac-address" and
> > "mac-address" properties under both FEC ethernet DT nodes in case
> > the update_fec_mac_prop() function is called. These properties are
> > loaded with MAC address compiled from vendors OUI and a per-device
> > NIC saved in OCOTP storage.
> > 
> > Some more advanced bootloaders do augment the DT passed to the kernel
> > by these properties already. In such case, it is wrong for kernel to
> > override these values.
> > 
> > Adjust the FEC MAC address loading so that in case the DT properties
> > are already present in the DT passed from the bootloader, skip the
> > loading from OCOTP altogether. If the DT properties are not present,
> > load them from OCOTP.
> > 
> > Note that the later case will lead to zeroed out MAC address if OCOTP
> > is not programmed. This will lead to FEC not working at all.
> > 
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> 
> Queued for 3.8, thanks.

Ain't this a bugfix? So maybe CC stable etc. ?

Best regards,
Marek Vasut
Shawn Guo - Sept. 25, 2012, 2:37 p.m.
Sorry, I just dropped the patch, and you need to convince me that the
patch is actually needed to fix a bug.

On Tue, Sep 25, 2012 at 03:40:18PM +0200, Marek Vasut wrote:
> Dear Shawn Guo,
> 
> > On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> > > Currently, the kernel unconditionally adds "local-mac-address" and
> > > "mac-address" properties under both FEC ethernet DT nodes in case
> > > the update_fec_mac_prop() function is called. These properties are
> > > loaded with MAC address compiled from vendors OUI and a per-device
> > > NIC saved in OCOTP storage.
> > > 

The function update_fec_mac_prop is only called for imx28-evk and m28evk
boards which are known having valid/unique MAC address programmed in
OCOTP.  In that case, shouldn't we always read MAC from OCOTP instead
of trusting the "local-mac-address" property from device tree, which
might stand a chance that it's not valid or unique?

Shawn

> > > Some more advanced bootloaders do augment the DT passed to the kernel
> > > by these properties already. In such case, it is wrong for kernel to
> > > override these values.
> > > 
> > > Adjust the FEC MAC address loading so that in case the DT properties
> > > are already present in the DT passed from the bootloader, skip the
> > > loading from OCOTP altogether. If the DT properties are not present,
> > > load them from OCOTP.
> > > 
> > > Note that the later case will lead to zeroed out MAC address if OCOTP
> > > is not programmed. This will lead to FEC not working at all.
> > > 
> > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > > Cc: Shawn Guo <shawn.guo@linaro.org>
> > 
> > Queued for 3.8, thanks.
> 
> Ain't this a bugfix? So maybe CC stable etc. ?
> 
> Best regards,
> Marek Vasut
Marek Vasut - Sept. 25, 2012, 2:51 p.m.
Dear Shawn Guo,

> Sorry, I just dropped the patch, and you need to convince me that the
> patch is actually needed to fix a bug.
> 
> On Tue, Sep 25, 2012 at 03:40:18PM +0200, Marek Vasut wrote:
> > Dear Shawn Guo,
> > 
> > > On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> > > > Currently, the kernel unconditionally adds "local-mac-address" and
> > > > "mac-address" properties under both FEC ethernet DT nodes in case
> > > > the update_fec_mac_prop() function is called. These properties are
> > > > loaded with MAC address compiled from vendors OUI and a per-device
> > > > NIC saved in OCOTP storage.
> 
> The function update_fec_mac_prop is only called for imx28-evk and m28evk
> boards which are known having valid/unique MAC address programmed in
> OCOTP.

Actually I disabled it on m28, since the OCOTP is not always programmed. The 
board is shipped with blank OCOTP. The imx28-evk is shipped with blank OCOTP as 
well, no?

> In that case, shouldn't we always read MAC from OCOTP instead
> of trusting the "local-mac-address" property from device tree, which
> might stand a chance that it's not valid or unique?

Definitelly not. If the bootloader doesn't pass correct local-mac-address 
property, the bootloader is broken and it is not our problem (any invalid DT 
passed from bootloader is not our problem and is not fixed by us ... most of the 
time). On the other hand:

1) if it doesn't pass any local-mac-address property, it is safe to read from 
OCOTP (this is the case of bootlets) to fill in the blank with at least 
something ... even though if the OCOTP is empty, FEC won't work anyway.

2) if the bootloader does pass a local-mac-address property, then it is 
intentional and it can be later overriden anyway by "ifconfig ... hw ether" if 
needed .

If the bootloader does pass such information, it is either sourced from OCOTP 
(in which case it might fall back to 1) and pass nothing ) or elsewhere, in 
which case it's 2) and the bootloader has obviously better knowledge of the 
hardware than we do.

I firmly disagree with force-overriding the DT properties, since esp. in case of 
development kits, it doesn't give the users the freedom to program their OCOTP 
the way they need it to.

Also, the users don't have freedom to frob with their MAC address easily -- when 
the OCOTP isn't programmed yet, their FEC won't work, for example in case of NFS 
root filesystem, this is a problem. With this patch, you don't have the problem.

> Shawn
> 
> > > > Some more advanced bootloaders do augment the DT passed to the kernel
> > > > by these properties already. In such case, it is wrong for kernel to
> > > > override these values.
> > > > 
> > > > Adjust the FEC MAC address loading so that in case the DT properties
> > > > are already present in the DT passed from the bootloader, skip the
> > > > loading from OCOTP altogether. If the DT properties are not present,
> > > > load them from OCOTP.
> > > > 
> > > > Note that the later case will lead to zeroed out MAC address if OCOTP
> > > > is not programmed. This will lead to FEC not working at all.
> > > > 
> > > > Signed-off-by: Marek Vasut <marex@denx.de>
> > > > Cc: Fabio Estevam <fabio.estevam@freescale.com>
> > > > Cc: Shawn Guo <shawn.guo@linaro.org>
> > > 
> > > Queued for 3.8, thanks.
> > 
> > Ain't this a bugfix? So maybe CC stable etc. ?
> > 
> > Best regards,
> > Marek Vasut

Best regards,
Marek Vasut
Shawn Guo - Sept. 25, 2012, 3:18 p.m.
On Tue, Sep 25, 2012 at 04:51:59PM +0200, Marek Vasut wrote:
> Dear Shawn Guo,
> 
> > Sorry, I just dropped the patch, and you need to convince me that the
> > patch is actually needed to fix a bug.
> > 
> > On Tue, Sep 25, 2012 at 03:40:18PM +0200, Marek Vasut wrote:
> > > Dear Shawn Guo,
> > > 
> > > > On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> > > > > Currently, the kernel unconditionally adds "local-mac-address" and
> > > > > "mac-address" properties under both FEC ethernet DT nodes in case
> > > > > the update_fec_mac_prop() function is called. These properties are
> > > > > loaded with MAC address compiled from vendors OUI and a per-device
> > > > > NIC saved in OCOTP storage.
> > 
> > The function update_fec_mac_prop is only called for imx28-evk and m28evk
> > boards which are known having valid/unique MAC address programmed in
> > OCOTP.
> 
> Actually I disabled it on m28, since the OCOTP is not always programmed. The 
> board is shipped with blank OCOTP.

Then removing the call to update_fec_mac_prop for m28 is enough.

> The imx28-evk is shipped with blank OCOTP as 
> well, no?
> 
No.  imx28-evk is shipped with MAC programmed into OCOTP.

> > In that case, shouldn't we always read MAC from OCOTP instead
> > of trusting the "local-mac-address" property from device tree, which
> > might stand a chance that it's not valid or unique?
> 
> Definitelly not. If the bootloader doesn't pass correct local-mac-address 
> property, the bootloader is broken and it is not our problem (any invalid DT 
> passed from bootloader is not our problem and is not fixed by us ... most of the 
> time).

It is our problem.  We shouldn't trust bootloader on that whenever it's
possible for ourselves to figure it out.  You can say "hey bootloader,
this is your problem not ours", but FEC driver in kernel is not working.
Isn't it a problem for kernel when FEC is not working?

> On the other hand:
> 
> 1) if it doesn't pass any local-mac-address property, it is safe to read from 
> OCOTP (this is the case of bootlets) to fill in the blank with at least 
> something ... even though if the OCOTP is empty, FEC won't work anyway.
> 
> 2) if the bootloader does pass a local-mac-address property, then it is 
> intentional and it can be later overriden anyway by "ifconfig ... hw ether" if 
> needed .
> 
> If the bootloader does pass such information, it is either sourced from OCOTP 
> (in which case it might fall back to 1) and pass nothing ) or elsewhere, in 
> which case it's 2) and the bootloader has obviously better knowledge of the 
> hardware than we do.
> 
> I firmly disagree with force-overriding the DT properties, since esp. in case of 
> development kits, it doesn't give the users the freedom to program their OCOTP 
> the way they need it to.
> 
> Also, the users don't have freedom to frob with their MAC address easily -- when 
> the OCOTP isn't programmed yet, their FEC won't work, for example in case of NFS 
> root filesystem, this is a problem. With this patch, you don't have the problem.
> 
Please bear in mind, we only call update_fec_mac_prop for boards that
are known having MAC programmed in OCOTP.

Shawn
Marek Vasut - Sept. 25, 2012, 3:35 p.m.
Dear Shawn Guo,

> On Tue, Sep 25, 2012 at 04:51:59PM +0200, Marek Vasut wrote:
> > Dear Shawn Guo,
> > 
> > > Sorry, I just dropped the patch, and you need to convince me that the
> > > patch is actually needed to fix a bug.
> > > 
> > > On Tue, Sep 25, 2012 at 03:40:18PM +0200, Marek Vasut wrote:
> > > > Dear Shawn Guo,
> > > > 
> > > > > On Tue, Sep 25, 2012 at 01:32:18PM +0200, Marek Vasut wrote:
> > > > > > Currently, the kernel unconditionally adds "local-mac-address"
> > > > > > and "mac-address" properties under both FEC ethernet DT nodes in
> > > > > > case the update_fec_mac_prop() function is called. These
> > > > > > properties are loaded with MAC address compiled from vendors OUI
> > > > > > and a per-device NIC saved in OCOTP storage.
> > > 
> > > The function update_fec_mac_prop is only called for imx28-evk and
> > > m28evk boards which are known having valid/unique MAC address
> > > programmed in OCOTP.
> > 
> > Actually I disabled it on m28, since the OCOTP is not always programmed.
> > The board is shipped with blank OCOTP.
> 
> Then removing the call to update_fec_mac_prop for m28 is enough.

It is not. We do not want to loost OCOTP completely. I would actually like to 
add the call back, with this patch in that would be possible and fine solution.

> > The imx28-evk is shipped with blank OCOTP as
> > well, no?
> 
> No.  imx28-evk is shipped with MAC programmed into OCOTP.

Does that not limit the users of that kit then ?

> > > In that case, shouldn't we always read MAC from OCOTP instead
> > > of trusting the "local-mac-address" property from device tree, which
> > > might stand a chance that it's not valid or unique?
> > 
> > Definitelly not. If the bootloader doesn't pass correct local-mac-address
> > property, the bootloader is broken and it is not our problem (any invalid
> > DT passed from bootloader is not our problem and is not fixed by us ...
> > most of the time).
> 
> It is our problem.  We shouldn't trust bootloader on that whenever it's
> possible for ourselves to figure it out.

Correct. You can not reliably figure out the MAC address. See, on sparc (this is 
where DT came from), it was all about relying on bootloader to pass the proper 
data to kernel.

> You can say "hey bootloader, this is your problem not ours"

If it mangles the DT? You are right, it is not our problem, we can not do 
anything about it.

My understanding of your claim is like saying that you can't trust the 
"interrupts" property of GPMI nand controller ... because you can figure out the 
value from the CPU ID. If bootloader mangles this part, you will also override 
it in kernel?

> , but FEC driver in kernel is not working.
> Isn't it a problem for kernel when FEC is not working?

But the _main_ question here is not about working vs. not-working . The point of 
this patch is to make OCOTP recommended, but overridable via _standard_ means. 
Thus giving users more freedom!

> > On the other hand:
> > 
> > 1) if it doesn't pass any local-mac-address property, it is safe to read
> > from OCOTP (this is the case of bootlets) to fill in the blank with at
> > least something ... even though if the OCOTP is empty, FEC won't work
> > anyway.
> > 
> > 2) if the bootloader does pass a local-mac-address property, then it is
> > intentional and it can be later overriden anyway by "ifconfig ... hw
> > ether" if needed .
> > 
> > If the bootloader does pass such information, it is either sourced from
> > OCOTP (in which case it might fall back to 1) and pass nothing ) or
> > elsewhere, in which case it's 2) and the bootloader has obviously better
> > knowledge of the hardware than we do.
> > 
> > I firmly disagree with force-overriding the DT properties, since esp. in
> > case of development kits, it doesn't give the users the freedom to
> > program their OCOTP the way they need it to.
> > 
> > Also, the users don't have freedom to frob with their MAC address easily
> > -- when the OCOTP isn't programmed yet, their FEC won't work, for
> > example in case of NFS root filesystem, this is a problem. With this
> > patch, you don't have the problem.
> 
> Please bear in mind, we only call update_fec_mac_prop for boards that
> are known having MAC programmed in OCOTP.

Agreed, now we do. This can change (I would like to see it change).

> Shawn

Best regards,
Marek Vasut
Marek Vasut - Oct. 26, 2012, 10:01 a.m.
Dear Shawn Guo,

> Currently, the kernel unconditionally adds "local-mac-address" and
> "mac-address" properties under both FEC ethernet DT nodes in case
> the update_fec_mac_prop() function is called. These properties are
> loaded with MAC address compiled from vendors OUI and a per-device
> NIC saved in OCOTP storage.
> 
> Some more advanced bootloaders do augment the DT passed to the kernel
> by these properties already. In such case, it is wrong for kernel to
> override these values.
> 
> Adjust the FEC MAC address loading so that in case the DT properties
> are already present in the DT passed from the bootloader, skip the
> loading from OCOTP altogether. If the DT properties are not present,
> load them from OCOTP.
> 
> Note that the later case will lead to zeroed out MAC address if OCOTP
> is not programmed. This will lead to FEC not working at all.
> 
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Shawn Guo <shawn.guo@linaro.org>
[...]

Can we apply this for 3.7? I believe it is harmless and beneficial for some 
parties at least.

Best regards,
Marek Vasut
Shawn Guo - Oct. 30, 2012, 1:31 a.m.
On Fri, Oct 26, 2012 at 12:01:58PM +0200, Marek Vasut wrote:
> Can we apply this for 3.7?

You meant for 3.8?

Shawn

> I believe it is harmless and beneficial for some 
> parties at least.
>
Marek Vasut - Oct. 30, 2012, 10:46 a.m.
Dear Shawn Guo,

> On Fri, Oct 26, 2012 at 12:01:58PM +0200, Marek Vasut wrote:
> > Can we apply this for 3.7?
> 
> You meant for 3.8?

3.7 would be nice, but it's too late now.

Best regards,
Marek Vasut
Shawn Guo - Oct. 30, 2012, 11:21 a.m.
On Tue, Oct 30, 2012 at 11:46:34AM +0100, Marek Vasut wrote:
> Dear Shawn Guo,
> 
> > On Fri, Oct 26, 2012 at 12:01:58PM +0200, Marek Vasut wrote:
> > > Can we apply this for 3.7?
> > 
> > You meant for 3.8?
> 
> 3.7 would be nice, but it's too late now.
> 
Applied for 3.8.

Patch

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 86a9343..c1f3c79 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -175,8 +175,12 @@  static void __init update_fec_mac_prop(enum mac_oui oui)
 		np = of_find_compatible_node(from, NULL, "fsl,imx28-fec");
 		if (!np)
 			return;
+
 		from = np;
 
+		if (of_get_property(np, "local-mac-address", NULL))
+			continue;
+
 		newmac = kzalloc(sizeof(*newmac) + 6, GFP_KERNEL);
 		if (!newmac)
 			return;