Skip to content

Commit bcf2b86

Browse files
hkallweitdavem330
authored andcommitted
r8169: move disabling interrupt coalescing to RTL8169/RTL8168 init
RTL8125 doesn't support the same coalescing registers, therefore move this initialization to the 8168/6169-specific init. Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ce37115 commit bcf2b86

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5087,6 +5087,9 @@ static void rtl_hw_start_8168(struct rtl8169_private *tp)
50875087
RTL_W8(tp, MaxTxPacketSize, TxPacketMax);
50885088

50895089
rtl_hw_config(tp);
5090+
5091+
/* disable interrupt coalescing */
5092+
RTL_W16(tp, IntrMitigate, 0x0000);
50905093
}
50915094

50925095
static void rtl_hw_start_8169(struct rtl8169_private *tp)
@@ -5110,6 +5113,9 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp)
51105113
rtl8169_set_magic_reg(tp, tp->mac_version);
51115114

51125115
RTL_W32(tp, RxMissed, 0);
5116+
5117+
/* disable interrupt coalescing */
5118+
RTL_W16(tp, IntrMitigate, 0x0000);
51135119
}
51145120

51155121
static void rtl_hw_start(struct rtl8169_private *tp)
@@ -5128,8 +5134,6 @@ static void rtl_hw_start(struct rtl8169_private *tp)
51285134
rtl_set_rx_tx_desc_registers(tp);
51295135
rtl_lock_config_regs(tp);
51305136

5131-
/* disable interrupt coalescing */
5132-
RTL_W16(tp, IntrMitigate, 0x0000);
51335137
/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
51345138
RTL_R8(tp, IntrMask);
51355139
RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);

0 commit comments

Comments
 (0)