[U-Boot] [PATCH v2 0/2] smsc95xx: Fix MAC address programming and some minor issues
Changes since v1:
- Use __get_unaligned_le16/32 as suggested by Mike Frysinger. - Use format "%pM" to print ethernet address. - Drop third patch as it is not really required/useful.
Wolfgang Grandegger (2): smsc95xx: Fix MAC address programming smsc95xx: Debug message cleanup
drivers/usb/eth/smsc95xx.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-)
Commit 79ad54400932d6484178a372fb3b659e3437473b broke MAC address programming in the SMSC95xx register set.
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de --- drivers/usb/eth/smsc95xx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 7ee4f87..b5626e6 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -20,6 +20,7 @@ * MA 02111-1307 USA */
+#include <asm/unaligned.h> #include <common.h> #include <usb.h> #include <linux/mii.h> @@ -372,13 +373,12 @@ static int smsc95xx_init_mac_address(struct eth_device *eth, static int smsc95xx_write_hwaddr(struct eth_device *eth) { struct ueth_data *dev = (struct ueth_data *)eth->priv; - u32 addr_lo, addr_hi; + u32 addr_lo = __get_unaligned_le32(ð->enetaddr[0]); + u32 addr_hi = __get_unaligned_le16(ð->enetaddr[4]); int ret;
/* set hardware address */ debug("** %s()\n", __func__); - addr_lo = cpu_to_le32(*eth->enetaddr); - addr_hi = cpu_to_le16(*((u16 *)(eth->enetaddr + 4))); ret = smsc95xx_write_reg(dev, ADDRL, addr_lo); if (ret < 0) { debug("Failed to write ADDRL: %d\n", ret);
Acked-by: Mike Frysinger vapier@gentoo.org -mike
Hi Wolfgang,
On Tue, Nov 15, 2011 at 1:19 AM, Wolfgang Grandegger wg@denx.de wrote:
Commit 79ad54400932d6484178a372fb3b659e3437473b broke MAC address programming in the SMSC95xx register set.
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
drivers/usb/eth/smsc95xx.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index 7ee4f87..b5626e6 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -20,6 +20,7 @@ * MA 02111-1307 USA */
+#include <asm/unaligned.h> #include <common.h> #include <usb.h> #include <linux/mii.h> @@ -372,13 +373,12 @@ static int smsc95xx_init_mac_address(struct eth_device *eth, static int smsc95xx_write_hwaddr(struct eth_device *eth) { struct ueth_data *dev = (struct ueth_data *)eth->priv;
- u32 addr_lo, addr_hi;
- u32 addr_lo = __get_unaligned_le32(ð->enetaddr[0]);
- u32 addr_hi = __get_unaligned_le16(ð->enetaddr[4]);
Would prefer that you leave the definitions alone, but it's not important.
int ret;
/* set hardware address */ debug("** %s()\n", __func__);
- addr_lo = cpu_to_le32(*eth->enetaddr);
- addr_hi = cpu_to_le16(*((u16 *)(eth->enetaddr + 4)));
ret = smsc95xx_write_reg(dev, ADDRL, addr_lo); if (ret < 0) { debug("Failed to write ADDRL: %d\n", ret); -- 1.7.4.1
Acked-by: Simon Glass sjg@chromium.org
On 15/11/2011 10:19, Wolfgang Grandegger wrote:
Commit 79ad54400932d6484178a372fb3b659e3437473b broke MAC address programming in the SMSC95xx register set.
Cc: Marek Vasut marek.vasut@gmail.com Cc: Wolfgang Denk wd@denx.de Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
Applied to u-boot-staging, sbabic@denx.de, thanks.
Best regards, Stefano Babic
Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de --- drivers/usb/eth/smsc95xx.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index b5626e6..2f63340 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -380,18 +380,14 @@ static int smsc95xx_write_hwaddr(struct eth_device *eth) /* set hardware address */ debug("** %s()\n", __func__); ret = smsc95xx_write_reg(dev, ADDRL, addr_lo); - if (ret < 0) { - debug("Failed to write ADDRL: %d\n", ret); + if (ret < 0) return ret; - }
ret = smsc95xx_write_reg(dev, ADDRH, addr_hi); if (ret < 0) return ret; - debug("MAC %02x:%02x:%02x:%02x:%02x:%02x\n", - eth->enetaddr[0], eth->enetaddr[1], - eth->enetaddr[2], eth->enetaddr[3], - eth->enetaddr[4], eth->enetaddr[5]); + + debug("MAC %pM\n", eth->enetaddr); dev->have_hwaddr = 1; return 0; }
Acked-by: Mike Frysinger vapier@gentoo.org -mike
On Tue, Nov 15, 2011 at 1:19 AM, Wolfgang Grandegger wg@denx.de wrote:
Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
drivers/usb/eth/smsc95xx.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index b5626e6..2f63340 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -380,18 +380,14 @@ static int smsc95xx_write_hwaddr(struct eth_device *eth) /* set hardware address */ debug("** %s()\n", __func__); ret = smsc95xx_write_reg(dev, ADDRL, addr_lo);
- if (ret < 0) {
- debug("Failed to write ADDRL: %d\n", ret);
- if (ret < 0)
return ret;
- }
ret = smsc95xx_write_reg(dev, ADDRH, addr_hi); if (ret < 0) return ret;
- debug("MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
- eth->enetaddr[0], eth->enetaddr[1],
- eth->enetaddr[2], eth->enetaddr[3],
- eth->enetaddr[4], eth->enetaddr[5]);
- debug("MAC %pM\n", eth->enetaddr);
dev->have_hwaddr = 1; return 0; } -- 1.7.4.1
Hi Simon,
On 11/16/2011 12:22 AM, Simon Glass wrote:
On Tue, Nov 15, 2011 at 1:19 AM, Wolfgang Grandegger wg@denx.de wrote:
Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
drivers/usb/eth/smsc95xx.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Thanks. Who will take care of these patches? Do you know?
Wolfgang.
On 21/11/2011 11:49, Wolfgang Grandegger wrote:
Hi Simon,
On 11/16/2011 12:22 AM, Simon Glass wrote:
On Tue, Nov 15, 2011 at 1:19 AM, Wolfgang Grandegger wg@denx.de wrote:
Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
drivers/usb/eth/smsc95xx.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Thanks. Who will take care of these patches? Do you know?
Wolfgang. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Hi Wolfgang,
I have already merged your patches into u-boot-staging, sbabic@denx.de branch, and sent a pull request to Wolfgang (Denk).
Best regards, Stefano Babic
On 15/11/2011 10:19, Wolfgang Grandegger wrote:
Cc: Simon Glass sjg@chromium.org Cc: Mike Frysinger vapier@gentoo.org Signed-off-by: Wolfgang Grandegger wg@denx.de
Applied to u-boot-staging, sbabic@denx.de, thanks.
Best regards, Stefano Babic
participants (4)
-
Mike Frysinger -
Simon Glass -
Stefano Babic -
Wolfgang Grandegger