| Message ID | BLU437-SMTP107E8BEE4B06F9E80E38CDEBFB80@phx.gbl |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Hi Bin, On Mon, Jun 15, 2015 at 5:40 AM, Bin Meng <bmeng.cn@gmail.com> wrote: > commit f566c99 "net: Update hardware MAC address if it changes in env" > removes writing MAC address to designware controller after soft reset. > This makes designware ethernet port fail to work. Actually the MAC > address should always be programmed after soft reset. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- Acked-by: Joe Hershberger <joe.hershberger@ni.com>
+Tom On Mon, Jun 15, 2015 at 11:43 PM, Joe Hershberger <joe.hershberger@gmail.com> wrote: > Hi Bin, > > On Mon, Jun 15, 2015 at 5:40 AM, Bin Meng <bmeng.cn@gmail.com> wrote: >> commit f566c99 "net: Update hardware MAC address if it changes in env" >> removes writing MAC address to designware controller after soft reset. >> This makes designware ethernet port fail to work. Actually the MAC >> address should always be programmed after soft reset. >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> --- > > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Can you grab this one for v2015.07 release? Thanks! Regards, Bin
On Mon, Jun 15, 2015 at 06:40:19PM +0800, Bin Meng wrote: > commit f566c99 "net: Update hardware MAC address if it changes in env" > removes writing MAC address to designware controller after soft reset. > This makes designware ethernet port fail to work. Actually the MAC > address should always be programmed after soft reset. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Applied to u-boot/master, thanks!
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index ae51cf3..645ca64 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -243,6 +243,12 @@ static int _dw_eth_init(struct dw_eth_dev *priv, u8 *enetaddr) mdelay(100); }; + /* + * Soft reset above clears HW address registers. + * So we have to set it here once again. + */ + _dw_write_hwaddr(priv, enetaddr); + rx_descs_init(priv); tx_descs_init(priv);
commit f566c99 "net: Update hardware MAC address if it changes in env" removes writing MAC address to designware controller after soft reset. This makes designware ethernet port fail to work. Actually the MAC address should always be programmed after soft reset. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- drivers/net/designware.c | 6 ++++++ 1 file changed, 6 insertions(+)