target/linux/generic/pending-5.15/781-net-ethernet-mtk_eth_soc-fix-mask-of-RX_DMA_GET_SPOR.patch

   1 From 8743af8a77dd909970462ca578358128cce5d027 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Tue, 27 Sep 2022 15:39:39 +0100
   4 Subject: [PATCH] net: ethernet: mtk_eth_soc: fix mask of
   5  RX_DMA_GET_SPORT{,_V2}
   6 To: linux-mediatek@lists.infradead.org,
   7     netdev@vger.kernel.org,
   8     Lorenzo Bianconi <lorenzo@kernel.org>
   9 Cc: Sujuan Chen <sujuan.chen@mediatek.com>,
  10     Bo Jiao <Bo.Jiao@mediatek.com>,
  11     Felix Fietkau <nbd@nbd.name>,
  12     John Crispin <john@phrozen.org>,
  13     Sean Wang <sean.wang@mediatek.com>,
  14     Mark Lee <Mark-MC.Lee@mediatek.com>,
  15     David S. Miller <davem@davemloft.net>,
  16     Eric Dumazet <edumazet@google.com>,
  17     Jakub Kicinski <kuba@kernel.org>,
  18     Paolo Abeni <pabeni@redhat.com>,
  19     Matthias Brugger <matthias.bgg@gmail.com>,
  20     Chen Minqiang <ptpt52@gmail.com>
  21
  22 The bitmasks applied in RX_DMA_GET_SPORT and RX_DMA_GET_SPORT_V2 macros
  23 were swapped. Fix that.
  24
  25 Reported-by: Chen Minqiang <ptpt52@gmail.com>
  26 Fixes: 160d3a9b192985 ("net: ethernet: mtk_eth_soc: introduce MTK_NETSYS_V2 support")
  27 Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
  28 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  29 ---
  30  drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 ++--
  31  1 file changed, 2 insertions(+), 2 deletions(-)
  32
  33 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  34 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
  35 @@ -315,8 +315,8 @@
  36  #define MTK_RXD5_PPE_CPU_REASON        GENMASK(22, 18)
  37  #define MTK_RXD5_SRC_PORT      GENMASK(29, 26)
  38
  39 -#define RX_DMA_GET_SPORT(x)    (((x) >> 19) & 0xf)
  40 -#define RX_DMA_GET_SPORT_V2(x) (((x) >> 26) & 0x7)
  41 +#define RX_DMA_GET_SPORT(x)    (((x) >> 19) & 0x7)
  42 +#define RX_DMA_GET_SPORT_V2(x) (((x) >> 26) & 0xf)
  43
  44  /* PDMA V2 descriptor rxd3 */
  45  #define RX_DMA_VTAG_V2         BIT(0)