Skip to content

Commit

Permalink
r8169: move disabling interrupt coalescing to RTL8169/RTL8168 init
Browse files Browse the repository at this point in the history
RTL8125 doesn't support the same coalescing registers, therefore move
this initialization to the 8168/6169-specific init.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Aug 30, 2019
1 parent ce37115 commit bcf2b86
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions drivers/net/ethernet/realtek/r8169_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -5087,6 +5087,9 @@ static void rtl_hw_start_8168(struct rtl8169_private *tp)
RTL_W8(tp, MaxTxPacketSize, TxPacketMax);

rtl_hw_config(tp);

/* disable interrupt coalescing */
RTL_W16(tp, IntrMitigate, 0x0000);
}

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

RTL_W32(tp, RxMissed, 0);

/* disable interrupt coalescing */
RTL_W16(tp, IntrMitigate, 0x0000);
}

static void rtl_hw_start(struct rtl8169_private *tp)
Expand All @@ -5128,8 +5134,6 @@ static void rtl_hw_start(struct rtl8169_private *tp)
rtl_set_rx_tx_desc_registers(tp);
rtl_lock_config_regs(tp);

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

0 comments on commit bcf2b86

Please sign in to comment.