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

Commit 1a964649 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8169: adjust the flow of hw_start 



The suggestion as following:
- initial settings or default settings
- rtl_hw_start_xxx. rtl_hw_start_xxx may change some default settings.
- enable tx/rx. This has to be after the above two steps.
- rtl_set_rx_mode. AcceptXXXs have to be enabled after enabling tx/rx.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 57538c4a

drivers/net/ethernet/realtek/r8169.c

+17 −17
Original line number Diff line number Diff line
@@ -5240,10 +5240,7 @@ static void rtl_hw_start_8168(struct net_device *dev) 


	rtl_set_rx_tx_desc_registers(tp, ioaddr);



	rtl_set_rx_mode(dev);



	RTL_W32(TxConfig, (TX_DMA_BURST << TxDMAShift) |

		(InterFrameGap << TxInterFrameGapShift));

	rtl_set_rx_tx_config_registers(tp);



	RTL_R8(IntrMask);
@@ -5330,9 +5327,11 @@ static void rtl_hw_start_8168(struct net_device *dev) 
		break;

	}



	RTL_W8(Cfg9346, Cfg9346_Lock);



	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);



	RTL_W8(Cfg9346, Cfg9346_Lock);

	rtl_set_rx_mode(dev);



	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);

}
@@ -5490,6 +5489,17 @@ static void rtl_hw_start_8101(struct net_device *dev) 


	RTL_W8(Cfg9346, Cfg9346_Unlock);



	RTL_W8(MaxTxPacketSize, TxPacketMax);



	rtl_set_rx_max_size(ioaddr, rx_buf_sz);



	tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;

	RTL_W16(CPlusCmd, tp->cp_cmd);



	rtl_set_rx_tx_desc_registers(tp, ioaddr);



	rtl_set_rx_tx_config_registers(tp);



	switch (tp->mac_version) {

	case RTL_GIGA_MAC_VER_07:

		rtl_hw_start_8102e_1(tp);
@@ -5521,24 +5531,14 @@ static void rtl_hw_start_8101(struct net_device *dev) 


	RTL_W8(Cfg9346, Cfg9346_Lock);



	RTL_W8(MaxTxPacketSize, TxPacketMax);



	rtl_set_rx_max_size(ioaddr, rx_buf_sz);



	tp->cp_cmd &= ~R810X_CPCMD_QUIRK_MASK;

	RTL_W16(CPlusCmd, tp->cp_cmd);



	RTL_W16(IntrMitigate, 0x0000);



	rtl_set_rx_tx_desc_registers(tp, ioaddr);



	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);

	rtl_set_rx_tx_config_registers(tp);



	RTL_R8(IntrMask);



	rtl_set_rx_mode(dev);



	RTL_R8(IntrMask);



	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xf000);

}