Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1325521 > unrolled thread
| Started by | Lubomir Rintel <lkundrak@v3.sk> |
|---|---|
| First post | 2016-02-03 16:10 +0100 |
| Last post | 2016-02-03 16:50 +0100 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH 1/2] net/smscx5xx: use the device tree for mac address Lubomir Rintel <lkundrak@v3.sk> - 2016-02-03 16:10 +0100
Re: [PATCH 1/2] net/smscx5xx: use the device tree for mac address Arnd Bergmann <arnd@arndb.de> - 2016-02-03 16:30 +0100
Re: [PATCH 1/2] net/smscx5xx: use the device tree for mac address Lubomir Rintel <lkundrak@v3.sk> - 2016-02-03 16:50 +0100
| From | Lubomir Rintel <lkundrak@v3.sk> |
|---|---|
| Date | 2016-02-03 16:10 +0100 |
| Subject | [PATCH 1/2] net/smscx5xx: use the device tree for mac address |
| Message-ID | <qY7ea-3y7-23@gated-at.bofh.it> |
From: Arnd Bergmann <arnd@arndb.de>
This takes the MAC address for smsc75xx/smsc95xx USB network devices
from a the device tree. This is required to get a usable persistent
address on the popular beagleboard, whose hardware designers
accidentally forgot that an ethernet device really requires an a
MAC address to be functional.
The smsc75xx and smsc95xx drivers are just two copies of the
same code, so better fix both.
Tested-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/usb/smsc75xx.c | 10 ++++++++++
drivers/net/usb/smsc95xx.c | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 30033db..b2e33e6 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -29,6 +29,7 @@
#include <linux/crc32.h>
#include <linux/usb/usbnet.h>
#include <linux/slab.h>
+#include <linux/of_device.h>
#include "smsc75xx.h"
#define SMSC_CHIPNAME "smsc75xx"
@@ -761,6 +762,8 @@ static int smsc75xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
static void smsc75xx_init_mac_address(struct usbnet *dev)
{
+ const void *address;
+
/* try reading mac address from EEPROM */
if (smsc75xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
@@ -772,6 +775,13 @@ static void smsc75xx_init_mac_address(struct usbnet *dev)
}
}
+ address = of_get_property(dev->udev->dev.of_node,
+ "local-mac-address", NULL);
+ if (address) {
+ memcpy(dev->net->dev_addr, address, ETH_ALEN);
+ return;
+ }
+
/* no eeprom, or eeprom values are invalid. generate random MAC */
eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 66b3ab9..021b9ce 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -29,6 +29,7 @@
#include <linux/crc32.h>
#include <linux/usb/usbnet.h>
#include <linux/slab.h>
+#include <linux/of_device.h>
#include "smsc95xx.h"
#define SMSC_CHIPNAME "smsc95xx"
@@ -765,6 +766,8 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
static void smsc95xx_init_mac_address(struct usbnet *dev)
{
+ const void *address;
+
/* try reading mac address from EEPROM */
if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
dev->net->dev_addr) == 0) {
@@ -775,6 +778,13 @@ static void smsc95xx_init_mac_address(struct usbnet *dev)
}
}
+ address = of_get_property(dev->udev->dev.of_node,
+ "local-mac-address", NULL);
+ if (address) {
+ memcpy(dev->net->dev_addr, address, ETH_ALEN);
+ return;
+ }
+
/* no eeprom, or eeprom values are invalid. generate random MAC */
eth_hw_addr_random(dev->net);
netif_dbg(dev, ifup, dev->net, "MAC address set to eth_random_addr\n");
--
2.5.0
[toc] | [next] | [standalone]
| From | Arnd Bergmann <arnd@arndb.de> |
|---|---|
| Date | 2016-02-03 16:30 +0100 |
| Message-ID | <qY7xw-3G4-21@gated-at.bofh.it> |
| In reply to | #1325521 |
On Wednesday 03 February 2016 16:02:38 Lubomir Rintel wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> This takes the MAC address for smsc75xx/smsc95xx USB network devices
> from a the device tree. This is required to get a usable persistent
> address on the popular beagleboard, whose hardware designers
> accidentally forgot that an ethernet device really requires an a
> MAC address to be functional.
>
> The smsc75xx and smsc95xx drivers are just two copies of the
> same code, so better fix both.
>
> Tested-by: Lubomir Rintel <lkundrak@v3.sk>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
I have no memory of writing this patch, where did you find it?
The changelog sounds like I wrote it, so I assume it was me after all.
> + address = of_get_property(dev->udev->dev.of_node,
> + "local-mac-address", NULL);
> + if (address) {
> + memcpy(dev->net->dev_addr, address, ETH_ALEN);
> + return;
> + }
This should use of_get_mac_address(), not an open-coded property
lookup. The function was probably added after I wrote the
the original patch.
Arnd
[toc] | [prev] | [next] | [standalone]
| From | Lubomir Rintel <lkundrak@v3.sk> |
|---|---|
| Date | 2016-02-03 16:50 +0100 |
| Message-ID | <qY7QS-3Om-11@gated-at.bofh.it> |
| In reply to | #1325540 |
On Wed, 2016-02-03 at 16:23 +0100, Arnd Bergmann wrote:
> On Wednesday 03 February 2016 16:02:38 Lubomir Rintel wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> >
> > This takes the MAC address for smsc75xx/smsc95xx USB network
> > devices
> > from a the device tree. This is required to get a usable persistent
> > address on the popular beagleboard, whose hardware designers
> > accidentally forgot that an ethernet device really requires an a
> > MAC address to be functional.
> >
> > The smsc75xx and smsc95xx drivers are just two copies of the
> > same code, so better fix both.
> >
> > Tested-by: Lubomir Rintel <lkundrak@v3.sk>
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> >
>
> I have no memory of writing this patch, where did you find it?
2011's discussion: https://lkml.org/lkml/2011/3/17/416
(Link also in the cover letter).
> The changelog sounds like I wrote it, so I assume it was me after
> all.
>
> > + address = of_get_property(dev->udev->dev.of_node,
> > + "local-mac-address", NULL);
> > + if (address) {
> > + memcpy(dev->net->dev_addr, address, ETH_ALEN);
> > + return;
> > + }
>
> This should use of_get_mac_address(), not an open-coded property
> lookup. The function was probably added after I wrote the
> the original patch.
Okay. Will fix that up once I get feedback for the devicetree part.
> Arnd
Thanks,
Lubo
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web