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>

diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
index da61cf3cb3a974bece7d423cbace27e072b15c06..ae3937535838ba5c0dc4f26ceb606609b7969f9f 100644 (file)
--- 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++)