Commit 3629a6ce authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller

net/macb: clear unused address register

Only the first register set is used for matching but
we support getting the initial hw addr from any of
the registers.

To prevent stale entries and false matches clear unused
register sets. This most important for the at91_ether
driver where u-boot always uses the 2nd register set.
Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dbfdbb9
...@@ -108,6 +108,14 @@ void macb_set_hwaddr(struct macb *bp) ...@@ -108,6 +108,14 @@ void macb_set_hwaddr(struct macb *bp)
macb_or_gem_writel(bp, SA1B, bottom); macb_or_gem_writel(bp, SA1B, bottom);
top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4))); top = cpu_to_le16(*((u16 *)(bp->dev->dev_addr + 4)));
macb_or_gem_writel(bp, SA1T, top); macb_or_gem_writel(bp, SA1T, top);
/* Clear unused address register sets */
macb_or_gem_writel(bp, SA2B, 0);
macb_or_gem_writel(bp, SA2T, 0);
macb_or_gem_writel(bp, SA3B, 0);
macb_or_gem_writel(bp, SA3T, 0);
macb_or_gem_writel(bp, SA4B, 0);
macb_or_gem_writel(bp, SA4T, 0);
} }
EXPORT_SYMBOL_GPL(macb_set_hwaddr); EXPORT_SYMBOL_GPL(macb_set_hwaddr);
......
...@@ -74,6 +74,12 @@ ...@@ -74,6 +74,12 @@
#define GEM_HRT 0x0084 #define GEM_HRT 0x0084
#define GEM_SA1B 0x0088 #define GEM_SA1B 0x0088
#define GEM_SA1T 0x008C #define GEM_SA1T 0x008C
#define GEM_SA2B 0x0090
#define GEM_SA2T 0x0094
#define GEM_SA3B 0x0098
#define GEM_SA3T 0x009C
#define GEM_SA4B 0x00A0
#define GEM_SA4T 0x00A4
#define GEM_OTX 0x0100 #define GEM_OTX 0x0100
#define GEM_DCFG1 0x0280 #define GEM_DCFG1 0x0280
#define GEM_DCFG2 0x0284 #define GEM_DCFG2 0x0284
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment