| From f2b66c78635dcb4c533cdb723d1118af01af93e4 Mon Sep 17 00:00:00 2001 |
| From: Heiner Kallweit <hkallweit1@gmail.com> |
| Date: Tue, 24 Mar 2020 20:58:29 +0100 |
| Subject: [PATCH] r8169: re-enable MSI on RTL8168c |
| |
| commit f13bc68131b0c0d67a77fb43444e109828a983bf upstream. |
| |
| The original change fixed an issue on RTL8168b by mimicking the vendor |
| driver behavior to disable MSI on chip versions before RTL8168d. |
| This however now caused an issue on a system with RTL8168c, see [0]. |
| Therefore leave MSI disabled on RTL8168b, but re-enable it on RTL8168c. |
| |
| [0] https://bugzilla.redhat.com/show_bug.cgi?id=1792839 |
| |
| Fixes: 003bd5b4a7b4 ("r8169: don't use MSI before RTL8168d") |
| Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c |
| index a2ff23f0288f..3fa5fd4122e6 100644 |
| --- a/drivers/net/ethernet/realtek/r8169.c |
| +++ b/drivers/net/ethernet/realtek/r8169.c |
| @@ -7060,7 +7060,7 @@ static int rtl_alloc_irq(struct rtl8169_private *tp) |
| RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable); |
| rtl_lock_config_regs(tp); |
| /* fall through */ |
| - case RTL_GIGA_MAC_VER_07 ... RTL_GIGA_MAC_VER_24: |
| + case RTL_GIGA_MAC_VER_07 ... RTL_GIGA_MAC_VER_17: |
| flags = PCI_IRQ_LEGACY; |
| break; |
| default: |
| -- |
| 2.7.4 |
| |