diff options
author | Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de> | 2018-04-19 05:05:19 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-04-19 23:11:10 +0300 |
commit | 7a0907bd399f6f2d40906c6d38ed1814d314ef74 (patch) | |
tree | 40cf539fc9d3f46c766ff386b01c71affdf5d1a9 /drivers/net/ethernet/8390 | |
parent | 31dd83b966410915a56358a8a3fc13c54d016fb3 (diff) | |
download | linux-7a0907bd399f6f2d40906c6d38ed1814d314ef74.tar.xz |
net-next: ax88796: Fix MAC address reading
To read the MAC address from the (virtual) SAprom, the remote DMA
unit needs to be set up like for every other process access to card-local
memory.
Signed-off-by: Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/8390')
-rw-r--r-- | drivers/net/ethernet/8390/ax88796.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c index da61cf3cb3a9..ae3937535838 100644 --- a/drivers/net/ethernet/8390/ax88796.c +++ b/drivers/net/ethernet/8390/ax88796.c @@ -669,10 +669,16 @@ static int ax_init_dev(struct net_device *dev) if (ax->plat->flags & AXFLG_HAS_EEPROM) { unsigned char SA_prom[32]; + ei_outb(6, ioaddr + EN0_RCNTLO); + ei_outb(0, ioaddr + EN0_RCNTHI); + ei_outb(0, ioaddr + EN0_RSARLO); + ei_outb(0, ioaddr + EN0_RSARHI); + ei_outb(E8390_RREAD + E8390_START, ioaddr + NE_CMD); for (i = 0; i < sizeof(SA_prom); i += 2) { SA_prom[i] = ei_inb(ioaddr + NE_DATAPORT); SA_prom[i + 1] = ei_inb(ioaddr + NE_DATAPORT); } + ei_outb(ENISR_RDC, ioaddr + EN0_ISR); /* Ack intr. */ if (ax->plat->wordlength == 2) for (i = 0; i < 16; i++) |