Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b26623da authored by françois romieu's avatar françois romieu Committed by David S. Miller
Browse files

8139cp: revert "set ring address before enabling receiver" 

This patch reverts b01af457.

The original patch was tested with emulated hardware. Real
hardware chokes.

Fixes https://bugzilla.kernel.org/show_bug.cgi?id=47041



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63617421

drivers/net/ethernet/realtek/8139cp.c

+11 −11
Original line number Diff line number Diff line
@@ -979,17 +979,6 @@ static void cp_init_hw (struct cp_private *cp) 
	cpw32_f (MAC0 + 0, le32_to_cpu (*(__le32 *) (dev->dev_addr + 0)));

	cpw32_f (MAC0 + 4, le32_to_cpu (*(__le32 *) (dev->dev_addr + 4)));



	cpw32_f(HiTxRingAddr, 0);

	cpw32_f(HiTxRingAddr + 4, 0);



	ring_dma = cp->ring_dma;

	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);



	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;

	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);



	cp_start_hw(cp);

	cpw8(TxThresh, 0x06); /* XXX convert magic num to a constant */
@@ -1003,6 +992,17 @@ static void cp_init_hw (struct cp_private *cp) 


	cpw8(Config5, cpr8(Config5) & PMEStatus);



	cpw32_f(HiTxRingAddr, 0);

	cpw32_f(HiTxRingAddr + 4, 0);



	ring_dma = cp->ring_dma;

	cpw32_f(RxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(RxRingAddr + 4, (ring_dma >> 16) >> 16);



	ring_dma += sizeof(struct cp_desc) * CP_RX_RING_SIZE;

	cpw32_f(TxRingAddr, ring_dma & 0xffffffff);

	cpw32_f(TxRingAddr + 4, (ring_dma >> 16) >> 16);



	cpw16(MultiIntr, 0);



	cpw8_f(Cfg9346, Cfg9346_Lock);