* [PATCH 1/2] net: bgmac-platform: handle mac-address deferral
@ 2021-09-25 11:36 ` Matthew Hagan
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Hagan @ 2021-09-25 11:36 UTC (permalink / raw)
Cc: Christian Lamparter, Florian Fainelli, Andrew Lunn,
Matthew Hagan, Rob Herring, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, Rafał Miłecki,
David S. Miller, Jakub Kicinski, devicetree, linux-arm-kernel,
linux-kernel, netdev
This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
handle deferred probe error due to mac-address" patch for the
bgmac-platform driver [1].
As is the case with the bgmac-bcma driver, this change is to cover the
scenario where the MAC address cannot yet be discovered due to reliance
on an nvmem provider which is yet to be instantiated, resulting in a
random address being assigned that has to be manually overridden.
[1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
drivers/net/ethernet/broadcom/bgmac-platform.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/broadcom/bgmac-platform.c b/drivers/net/ethernet/broadcom/bgmac-platform.c
index 4ab5bf64d353..df8ff839cc62 100644
--- a/drivers/net/ethernet/broadcom/bgmac-platform.c
+++ b/drivers/net/ethernet/broadcom/bgmac-platform.c
@@ -192,6 +192,9 @@ static int bgmac_probe(struct platform_device *pdev)
bgmac->dma_dev = &pdev->dev;
ret = of_get_mac_address(np, bgmac->net_dev->dev_addr);
+ if (ret == -EPROBE_DEFER)
+ return ret;
+
if (ret)
dev_warn(&pdev->dev,
"MAC address not present in device tree\n");
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: NSP: MX6X: get mac-address from eeprom
2021-09-25 11:36 ` Matthew Hagan
@ 2021-09-25 11:36 ` Matthew Hagan
-1 siblings, 0 replies; 8+ messages in thread
From: Matthew Hagan @ 2021-09-25 11:36 UTC (permalink / raw)
Cc: Christian Lamparter, Florian Fainelli, Andrew Lunn,
Matthew Hagan, Rob Herring, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, Rafał Miłecki,
David S. Miller, Jakub Kicinski, devicetree, linux-arm-kernel,
linux-kernel, netdev
The MAC address on the MX64/MX65 series is located on the AT24 EEPROM.
This is the same as other Meraki devices such as the MR32 [1].
[1] https://lore.kernel.org/linux-arm-kernel/fa8271d02ef74a687f365cebe5c55ec846963ab7.1631986106.git.chunkeey@gmail.com/
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
index 6519b7c61af1..5de727de6a4b 100644
--- a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
@@ -39,6 +39,8 @@ led-3 {
&amac2 {
status = "okay";
+ nvmem-cells = <&mac_address>;
+ nvmem-cell-names = "mac-address";
};
&ehci0 {
@@ -53,6 +55,12 @@ eeprom@50 {
reg = <0x50>;
pagesize = <32>;
read-only;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ mac_address: mac-address@66 {
+ reg = <0x66 0x6>;
+ };
};
};
--
2.27.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/2] ARM: dts: NSP: MX6X: get mac-address from eeprom
@ 2021-09-25 11:36 ` Matthew Hagan
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Hagan @ 2021-09-25 11:36 UTC (permalink / raw)
Cc: Christian Lamparter, Florian Fainelli, Andrew Lunn,
Matthew Hagan, Rob Herring, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, Rafał Miłecki,
David S. Miller, Jakub Kicinski, devicetree, linux-arm-kernel,
linux-kernel, netdev
The MAC address on the MX64/MX65 series is located on the AT24 EEPROM.
This is the same as other Meraki devices such as the MR32 [1].
[1] https://lore.kernel.org/linux-arm-kernel/fa8271d02ef74a687f365cebe5c55ec846963ab7.1631986106.git.chunkeey@gmail.com/
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
index 6519b7c61af1..5de727de6a4b 100644
--- a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
@@ -39,6 +39,8 @@ led-3 {
&amac2 {
status = "okay";
+ nvmem-cells = <&mac_address>;
+ nvmem-cell-names = "mac-address";
};
&ehci0 {
@@ -53,6 +55,12 @@ eeprom@50 {
reg = <0x50>;
pagesize = <32>;
read-only;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ mac_address: mac-address@66 {
+ reg = <0x66 0x6>;
+ };
};
};
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral
2021-09-25 11:36 ` Matthew Hagan
@ 2021-09-25 16:48 ` Andrew Lunn
-1 siblings, 0 replies; 8+ messages in thread
From: Andrew Lunn @ 2021-09-25 16:48 UTC (permalink / raw)
To: Matthew Hagan
Cc: Christian Lamparter, Florian Fainelli, Rob Herring, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Rafał Miłecki,
David S. Miller, Jakub Kicinski, devicetree, linux-arm-kernel,
linux-kernel, netdev
On Sat, Sep 25, 2021 at 11:36:27AM +0000, Matthew Hagan wrote:
> This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
> handle deferred probe error due to mac-address" patch for the
> bgmac-platform driver [1].
>
> As is the case with the bgmac-bcma driver, this change is to cover the
> scenario where the MAC address cannot yet be discovered due to reliance
> on an nvmem provider which is yet to be instantiated, resulting in a
> random address being assigned that has to be manually overridden.
>
> [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral
@ 2021-09-25 16:48 ` Andrew Lunn
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Lunn @ 2021-09-25 16:48 UTC (permalink / raw)
To: Matthew Hagan
Cc: Christian Lamparter, Florian Fainelli, Rob Herring, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Rafał Miłecki,
David S. Miller, Jakub Kicinski, devicetree, linux-arm-kernel,
linux-kernel, netdev
On Sat, Sep 25, 2021 at 11:36:27AM +0000, Matthew Hagan wrote:
> This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
> handle deferred probe error due to mac-address" patch for the
> bgmac-platform driver [1].
>
> As is the case with the bgmac-bcma driver, this change is to cover the
> scenario where the MAC address cannot yet be discovered due to reliance
> on an nvmem provider which is yet to be instantiated, resulting in a
> random address being assigned that has to be manually overridden.
>
> [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral
2021-09-25 11:36 ` Matthew Hagan
@ 2021-09-26 2:21 ` Florian Fainelli
-1 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2021-09-26 2:21 UTC (permalink / raw)
To: Matthew Hagan
Cc: Christian Lamparter, Florian Fainelli, Andrew Lunn, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list,
Rafał Miłecki, David S. Miller, Jakub Kicinski,
devicetree, linux-arm-kernel, linux-kernel, netdev
On 9/25/2021 4:36 AM, Matthew Hagan wrote:
> This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
> handle deferred probe error due to mac-address" patch for the
> bgmac-platform driver [1].
>
> As is the case with the bgmac-bcma driver, this change is to cover the
> scenario where the MAC address cannot yet be discovered due to reliance
> on an nvmem provider which is yet to be instantiated, resulting in a
> random address being assigned that has to be manually overridden.
>
> [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] net: bgmac-platform: handle mac-address deferral
@ 2021-09-26 2:21 ` Florian Fainelli
0 siblings, 0 replies; 8+ messages in thread
From: Florian Fainelli @ 2021-09-26 2:21 UTC (permalink / raw)
To: Matthew Hagan
Cc: Christian Lamparter, Florian Fainelli, Andrew Lunn, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list,
Rafał Miłecki, David S. Miller, Jakub Kicinski,
devicetree, linux-arm-kernel, linux-kernel, netdev
On 9/25/2021 4:36 AM, Matthew Hagan wrote:
> This patch is a replication of Christian Lamparter's "net: bgmac-bcma:
> handle deferred probe error due to mac-address" patch for the
> bgmac-platform driver [1].
>
> As is the case with the bgmac-bcma driver, this change is to cover the
> scenario where the MAC address cannot yet be discovered due to reliance
> on an nvmem provider which is yet to be instantiated, resulting in a
> random address being assigned that has to be manually overridden.
>
> [1] https://lore.kernel.org/netdev/20210919115725.29064-1-chunkeey@gmail.com
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 8+ messages in thread