mirror of
https://github.com/torvalds/linux.git
synced 2024-12-06 11:01:43 +00:00
r8152: load the default MAC address
Except for RTL_VER_01, replace loading the MAC address from PLA_IDR with from PLA_BACKUP. The default MAC address may be modified by the other OS, so the PLA_IDR may be not the default MAC address. The data in the PLA_BACKUP address of the RTL_VER_01 may be destoryed, so load MAC address from PLA_IDR for RTL_VER_01. Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b97027233d
commit
8a91c8246a
@ -889,11 +889,26 @@ int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags);
|
|||||||
static inline void set_ethernet_addr(struct r8152 *tp)
|
static inline void set_ethernet_addr(struct r8152 *tp)
|
||||||
{
|
{
|
||||||
struct net_device *dev = tp->netdev;
|
struct net_device *dev = tp->netdev;
|
||||||
|
int ret;
|
||||||
u8 node_id[8] = {0};
|
u8 node_id[8] = {0};
|
||||||
|
|
||||||
if (pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id) < 0)
|
if (tp->version == RTL_VER_01)
|
||||||
|
ret = pla_ocp_read(tp, PLA_IDR, sizeof(node_id), node_id);
|
||||||
|
else
|
||||||
|
ret = pla_ocp_read(tp, PLA_BACKUP, sizeof(node_id), node_id);
|
||||||
|
|
||||||
|
if (ret < 0) {
|
||||||
netif_notice(tp, probe, dev, "inet addr fail\n");
|
netif_notice(tp, probe, dev, "inet addr fail\n");
|
||||||
else {
|
} else {
|
||||||
|
if (tp->version != RTL_VER_01) {
|
||||||
|
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR,
|
||||||
|
CRWECR_CONFIG);
|
||||||
|
pla_ocp_write(tp, PLA_IDR, BYTE_EN_SIX_BYTES,
|
||||||
|
sizeof(node_id), node_id);
|
||||||
|
ocp_write_byte(tp, MCU_TYPE_PLA, PLA_CRWECR,
|
||||||
|
CRWECR_NORAML);
|
||||||
|
}
|
||||||
|
|
||||||
memcpy(dev->dev_addr, node_id, dev->addr_len);
|
memcpy(dev->dev_addr, node_id, dev->addr_len);
|
||||||
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
|
memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user