Commit 2aaf09a0 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski

r8169: work around short packet hw bug on RTL8125

Network problems with RTL8125B have been reported [0] and with help
from Realtek it turned out that this chip version has a hw problem
with short packets (similar to RTL8168evl). Having said that activate
the same workaround as for RTL8168evl.
Realtek suggested to activate the workaround for RTL8125A too, even
though they're not 100% sure yet which RTL8125 versions are affected.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=209839

Fixes: 0439297b ("r8169: add support for RTL8125B")
Reported-by: default avatarMaxim Plotnikov <wgh@torlan.ru>
Tested-by: default avatarMaxim Plotnikov <wgh@torlan.ru>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/8002c31a-60b9-58f1-f0dd-8fd07239917f@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ac6f929d
...@@ -4080,9 +4080,17 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb, ...@@ -4080,9 +4080,17 @@ static int rtl8169_xmit_frags(struct rtl8169_private *tp, struct sk_buff *skb,
return -EIO; return -EIO;
} }
static bool rtl_test_hw_pad_bug(struct rtl8169_private *tp, struct sk_buff *skb) static bool rtl_test_hw_pad_bug(struct rtl8169_private *tp)
{ {
return skb->len < ETH_ZLEN && tp->mac_version == RTL_GIGA_MAC_VER_34; switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_34:
case RTL_GIGA_MAC_VER_60:
case RTL_GIGA_MAC_VER_61:
case RTL_GIGA_MAC_VER_63:
return true;
default:
return false;
}
} }
static void rtl8169_tso_csum_v1(struct sk_buff *skb, u32 *opts) static void rtl8169_tso_csum_v1(struct sk_buff *skb, u32 *opts)
...@@ -4154,7 +4162,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp, ...@@ -4154,7 +4162,7 @@ static bool rtl8169_tso_csum_v2(struct rtl8169_private *tp,
opts[1] |= transport_offset << TCPHO_SHIFT; opts[1] |= transport_offset << TCPHO_SHIFT;
} else { } else {
if (unlikely(rtl_test_hw_pad_bug(tp, skb))) if (unlikely(skb->len < ETH_ZLEN && rtl_test_hw_pad_bug(tp)))
return !eth_skb_pad(skb); return !eth_skb_pad(skb);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment