releases/4.20.16/net-stmmac-send-tso-packets-always-from-queue-0.patch

   1 From efd9a8d9741fdcb5501ae7a0a6a516c797d323b4 Mon Sep 17 00:00:00 2001
   2 From: Jose Abreu <jose.abreu@synopsys.com>
   3 Date: Wed, 30 Jan 2019 15:54:20 +0100
   4 Subject: net: stmmac: Send TSO packets always from Queue 0
   5
   6 [ Upstream commit c5acdbee22a1b200dde07effd26fd1f649e9ab8a ]
   7
   8 The number of TSO enabled channels in HW can be different than the
   9 number of total channels. There is no way to determined, at runtime, the
  10 number of TSO capable channels and its safe to assume that if TSO is
  11 enabled then at least channel 0 will be TSO capable.
  12
  13 Lets always send TSO packets from Queue 0.
  14
  15 Signed-off-by: Jose Abreu <joabreu@synopsys.com>
  16 Cc: Joao Pinto <jpinto@synopsys.com>
  17 Cc: David S. Miller <davem@davemloft.net>
  18 Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
  19 Cc: Alexandre Torgue <alexandre.torgue@st.com>
  20 Signed-off-by: David S. Miller <davem@davemloft.net>
  21 Signed-off-by: Sasha Levin <sashal@kernel.org>
  22 ---
  23  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 11 ++++++++++-
  24  1 file changed, 10 insertions(+), 1 deletion(-)
  25
  26 diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  27 index 5d83d6a7694b..f76f6ae3fa87 100644
  28 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  29 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
  30 @@ -3033,8 +3033,17 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev)
  31
  32         /* Manage oversized TCP frames for GMAC4 device */
  33         if (skb_is_gso(skb) && priv->tso) {
  34 -               if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))
  35 +               if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
  36 +                       /*
  37 +                        * There is no way to determine the number of TSO
  38 +                        * capable Queues. Let's use always the Queue 0
  39 +                        * because if TSO is supported then at least this
  40 +                        * one will be capable.
  41 +                        */
  42 +                       skb_set_queue_mapping(skb, 0);
  43 +
  44                         return stmmac_tso_xmit(skb, dev);
  45 +               }
  46         }
  47
  48         if (unlikely(stmmac_tx_avail(priv, queue) < nfrags + 1)) {
  49 --
  50 2.19.1
  51