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

Commit c946b304 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

r8169: revert part of 6dccd16b 



The 8169/8110SC currently announces itself as:
[...]
eth0: RTL8169sc/8110sc at 0x........, ..:..:..:..:..:.., XID 18000000 IRQ ..
                                                             ^^^^^^^^
It uses RTL_GIGA_MAC_VER_05 and this part of the changeset can cut
its performance by a factor of 2~2.5 as reported by Timo.

(the driver includes code just before the hunk to write the ChipCmd
register when mac_version == RTL_GIGA_MAC_VER_0[1-4])

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Timo Jantunen <jeti@welho.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent af299901

drivers/net/r8169.c

+13 −3
Original line number Diff line number Diff line
@@ -1918,6 +1918,10 @@ static void rtl_hw_start_8169(struct net_device *dev) 


	rtl_set_rx_max_size(ioaddr);



	if ((tp->mac_version == RTL_GIGA_MAC_VER_01) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_02) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_03) ||

	    (tp->mac_version == RTL_GIGA_MAC_VER_04))

		rtl_set_rx_tx_config_registers(tp);



	tp->cp_cmd |= rtl_rw_cpluscmd(ioaddr) | PCIMulRW;
@@ -1941,6 +1945,14 @@ static void rtl_hw_start_8169(struct net_device *dev) 


	rtl_set_rx_tx_desc_registers(tp, ioaddr);



	if ((tp->mac_version != RTL_GIGA_MAC_VER_01) &&

	    (tp->mac_version != RTL_GIGA_MAC_VER_02) &&

	    (tp->mac_version != RTL_GIGA_MAC_VER_03) &&

	    (tp->mac_version != RTL_GIGA_MAC_VER_04)) {

		RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);

		rtl_set_rx_tx_config_registers(tp);

	}



	RTL_W8(Cfg9346, Cfg9346_Lock);



	/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
@@ -1955,8 +1967,6 @@ static void rtl_hw_start_8169(struct net_device *dev) 


	/* Enable all known interrupts by setting the interrupt mask. */

	RTL_W16(IntrMask, tp->intr_event);



	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);

}



static void rtl_hw_start_8168(struct net_device *dev)