lkml.org 
[lkml]   [2018]   [Oct]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.18 27/33] r8169: re-enable MSI-X on RTL8168g
    Date
    From: Heiner Kallweit <hkallweit1@gmail.com>

    [ Upstream commit 9675931e6b65d160d16bcc9472c1acef15524def ]

    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@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 36422f783fe7..2eea2b66d970 100644
    --- a/drivers/net/ethernet/realtek/r8169.c
    +++ b/drivers/net/ethernet/realtek/r8169.c
    @@ -7546,11 +7546,6 @@ static int rtl_alloc_irq(struct rtl8169_private *tp)
    RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~MSIEnable);
    RTL_W8(tp, 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
    - */
    - flags = PCI_IRQ_LEGACY | PCI_IRQ_MSI;
    } else {
    flags = PCI_IRQ_ALL_TYPES;
    }
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-30 14:32    [W:3.467 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site