[PATCH 2/2][SRU][B] r8169: re-enable MSI-X on RTL8168g

AceLan Kao acelan.kao at canonical.com
Thu Dec 27 03:17:02 UTC 2018

From: Heiner Kallweit <hkallweit1 at gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1809847

Similar to d49c88d7677b ("r8169: Enable MSI-X on RTL8106e") after
e9d0ba506ea8 ("PCI: Reprogram bridge prefetch registers on resume")
we can safely assume that this also fixes the root cause of
the issue worked around by 7c53a722459c ("r8169: don't use MSI-X on
RTL8168g"). So let's revert it.

Fixes: 7c53a722459c ("r8169: don't use MSI-X on RTL8168g")
Signed-off-by: Heiner Kallweit <hkallweit1 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit 9675931e6b65d160d16bcc9472c1acef15524def)
Signed-off-by: AceLan Kao <acelan.kao at canonical.com>
 drivers/net/ethernet/realtek/r8169.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 9c6e65896108..0c86641dd912 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -8305,11 +8305,6 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
 		RTL_W8(Config2, RTL_R8(Config2) & ~MSIEnable);
 		RTL_W8(Cfg9346, Cfg9346_Lock);
 		flags = PCI_IRQ_LEGACY;
-	} else if (tp->mac_version == RTL_GIGA_MAC_VER_40) {
-		/* This version was reported to have issues with resume
-		 * from suspend when using MSI-X
-		 */
 	} else {
 		flags = PCI_IRQ_ALL_TYPES;

More information about the kernel-team mailing list