kernel: mtk_eth_soc: fix hw hash reporting for MT7986

Import patch from Linux 6.0.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/generic/backport-5.15/710-v6.0-net-ethernet-mtk_eth_soc-fix-hw-hash-reporting-for-M.patch b/target/linux/generic/backport-5.15/710-v6.0-net-ethernet-mtk_eth_soc-fix-hw-hash-reporting-for-M.patch
new file mode 100644 (file)
index 0000000..87941ef
--- /dev/null
+++ b/target/linux/generic/backport-5.15/710-v6.0-net-ethernet-mtk_eth_soc-fix-hw-hash-reporting-for-M.patch
@@ -0,0 +1,74 @@
+From 0cf731f9ebb5bf6f252055bebf4463a5c0bd490b Mon Sep 17 00:00:00 2001
+From: Lorenzo Bianconi <lorenzo@kernel.org>
+Date: Tue, 23 Aug 2022 14:24:07 +0200
+Subject: [PATCH] net: ethernet: mtk_eth_soc: fix hw hash reporting for
+ MTK_NETSYS_V2
+
+Properly report hw rx hash for mt7986 chipset accroding to the new dma
+descriptor layout.
+
+Fixes: 197c9e9b17b11 ("net: ethernet: mtk_eth_soc: introduce support for mt7986 chipset")
+Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
+Link: https://lore.kernel.org/r/091394ea4e705fbb35f828011d98d0ba33808f69.1661257293.git.lorenzo@kernel.org
+Signed-off-by: Paolo Abeni <pabeni@redhat.com>
+---
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 +++++++++++----------
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h |  5 +++++
+ 2 files changed, 17 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+@@ -1469,10 +1469,19 @@ static int mtk_poll_rx(struct napi_struc
+               skb->dev = netdev;
+               skb_put(skb, pktlen);
+ 
+-              if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))
++              if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
++                      hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY;
++                      if (hash != MTK_RXD5_FOE_ENTRY)
++                              skb_set_hash(skb, jhash_1word(hash, 0),
++                                           PKT_HASH_TYPE_L4);
+                       rxdcsum = &trxd.rxd3;
+-              else
++              } else {
++                      hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;
++                      if (hash != MTK_RXD4_FOE_ENTRY)
++                              skb_set_hash(skb, jhash_1word(hash, 0),
++                                           PKT_HASH_TYPE_L4);
+                       rxdcsum = &trxd.rxd4;
++              }
+ 
+               if (*rxdcsum & eth->soc->txrx.rx_dma_l4_valid)
+                       skb->ip_summed = CHECKSUM_UNNECESSARY;
+@@ -1481,16 +1490,9 @@ static int mtk_poll_rx(struct napi_struc
+               skb->protocol = eth_type_trans(skb, netdev);
+               bytes += pktlen;
+ 
+-              hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY;
+-              if (hash != MTK_RXD4_FOE_ENTRY) {
+-                      hash = jhash_1word(hash, 0);
+-                      skb_set_hash(skb, hash, PKT_HASH_TYPE_L4);
+-              }
+-
+               reason = FIELD_GET(MTK_RXD4_PPE_CPU_REASON, trxd.rxd4);
+               if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
+-                      mtk_ppe_check_skb(eth->ppe, skb,
+-                                        trxd.rxd4 & MTK_RXD4_FOE_ENTRY);
++                      mtk_ppe_check_skb(eth->ppe, skb, hash);
+ 
+               if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) {
+                       if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+@@ -307,6 +307,11 @@
+ #define RX_DMA_L4_VALID_PDMA  BIT(30)         /* when PDMA is used */
+ #define RX_DMA_SPECIAL_TAG    BIT(22)
+ 
++/* PDMA descriptor rxd5 */
++#define MTK_RXD5_FOE_ENTRY    GENMASK(14, 0)
++#define MTK_RXD5_PPE_CPU_REASON       GENMASK(22, 18)
++#define MTK_RXD5_SRC_PORT     GENMASK(29, 26)
++
+ #define RX_DMA_GET_SPORT(x)   (((x) >> 19) & 0xf)
+ #define RX_DMA_GET_SPORT_V2(x)        (((x) >> 26) & 0x7)
+ 

diff --git a/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
index e3e338bd4ffc6555054ad2f1b5d6a23d6e89de1a..298122375fd34d76a24874cbb51a860d7dcb6b1b 100644 (file)
--- a/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
+++ b/target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2381,8 +2381,8 @@ static irqreturn_t mtk_handle_irq_rx(int
+@@ -2383,8 +2383,8 @@ static irqreturn_t mtk_handle_irq_rx(int
  
        eth->rx_events++;
        if (likely(napi_schedule_prep(&eth->rx_napi))) {
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        }
  
        return IRQ_HANDLED;
-@@ -2394,8 +2394,8 @@ static irqreturn_t mtk_handle_irq_tx(int
+@@ -2396,8 +2396,8 @@ static irqreturn_t mtk_handle_irq_tx(int
  
        eth->tx_events++;
        if (likely(napi_schedule_prep(&eth->tx_napi))) {
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        }
  
        return IRQ_HANDLED;
-@@ -3585,6 +3585,8 @@ static int mtk_probe(struct platform_dev
+@@ -3587,6 +3587,8 @@ static int mtk_probe(struct platform_dev
         * for NAPI to work
         */
        init_dummy_netdev(&eth->dummy_dev);

diff --git a/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch b/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch
index 4c0d1001e0fc3c0ebf43db56fa73915ed9f7d5a5..9b0d411bbacea5cd90edf04b2813e8b45e99248a 100644 (file)
--- a/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch
+++ b/target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch
@@ -14,7 +14,7 @@ Signed-off-by: Frank Wunderlich <frank-w@public-files.de>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3637,6 +3637,7 @@ static const struct mtk_soc_data mt2701_
+@@ -3639,6 +3639,7 @@ static const struct mtk_soc_data mt2701_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7623_CLKS_BITMAP,
        .required_pctl = true,

diff --git a/target/linux/mediatek/patches-5.15/703-v5.17-net-ethernet-mtk_eth_soc-implement-Clause-45-MDIO-ac.patch b/target/linux/mediatek/patches-5.15/703-v5.17-net-ethernet-mtk_eth_soc-implement-Clause-45-MDIO-ac.patch
index de1079ffae51651a5ebf028591a4b5fc329a4425..7544787701633d3a7745735d4dafbd4b63710241 100644 (file)
--- a/target/linux/mediatek/patches-5.15/703-v5.17-net-ethernet-mtk_eth_soc-implement-Clause-45-MDIO-ac.patch
+++ b/target/linux/mediatek/patches-5.15/703-v5.17-net-ethernet-mtk_eth_soc-implement-Clause-45-MDIO-ac.patch
@@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -322,9 +322,12 @@
+@@ -327,9 +327,12 @@
  #define PHY_IAC_ADDR_MASK     GENMASK(24, 20)
  #define PHY_IAC_ADDR(x)               FIELD_PREP(PHY_IAC_ADDR_MASK, (x))
  #define PHY_IAC_CMD_MASK      GENMASK(19, 18)

diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
index 8a39c81e01774bef0e08daf487228eaf6da00afa..43526f3c4a76fab375cf2d010c2298af27ab25e0 100644 (file)
--- a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
@@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3228,6 +3228,7 @@ static const struct net_device_ops mtk_n
+@@ -3230,6 +3230,7 @@ static const struct net_device_ops mtk_n
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {
@@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        const __be32 *_id = of_get_property(np, "reg", NULL);
        phy_interface_t phy_mode;
        struct phylink *phylink;
-@@ -3347,6 +3348,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3349,6 +3350,9 @@ static int mtk_add_mac(struct mtk_eth *e
        else
                eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;
  

diff --git a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
index 063b317fd5ce24e8b9685f076ec8818bcb30672b..94e99da015e1b8a449e95434dac11c06e7ff1c2b 100644 (file)
--- a/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
+++ b/target/linux/ramips/patches-5.15/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
@@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
                phydev->mii_ts->link_state(phydev->mii_ts, phydev);
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
-@@ -1315,7 +1315,8 @@ void phylink_destroy(struct phylink *pl)
+@@ -1323,7 +1323,8 @@ void phylink_destroy(struct phylink *pl)
  }
  EXPORT_SYMBOL_GPL(phylink_destroy);