kernel: move accepted mtk_eth_soc patches to generic-backport

[openwrt/openwrt.git] / target / linux / generic / pending-5.15 / 731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch

diff --git a/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch b/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
index c7b5a989c2e07a7514a0abc3d79b4467dfc171d3..36e3f01e54ba5c8eef738f85f3edba8946f608d6 100644 (file)
--- a/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
+++ b/target/linux/generic/pending-5.15/731-net-ethernet-mediatek-ppe-add-support-for-flow-accou.patch
@@ -53,7 +53,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4320,7 +4320,9 @@ static int mtk_probe(struct platform_dev
+@@ -4582,7 +4582,9 @@ static int mtk_probe(struct platform_dev
                        u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
  
                        eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr,
@@ -64,7 +64,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
                        if (!eth->ppe[i]) {
                                err = -ENOMEM;
                                goto err_free_dev;
-@@ -4445,6 +4447,7 @@ static const struct mtk_soc_data mt7622_
+@@ -4707,6 +4709,7 @@ static const struct mtk_soc_data mt7622_
        .required_pctl = false,
        .offload_version = 2,
        .hash_offset = 2,
@@ -72,7 +72,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        .foe_entry_size = sizeof(struct mtk_foe_entry) - 16,
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
-@@ -4482,6 +4485,7 @@ static const struct mtk_soc_data mt7629_
+@@ -4744,6 +4747,7 @@ static const struct mtk_soc_data mt7629_
        .hw_features = MTK_HW_FEATURES,
        .required_clks = MT7629_CLKS_BITMAP,
        .required_pctl = false,
@@ -80,7 +80,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        .txrx = {
                .txd_size = sizeof(struct mtk_tx_dma),
                .rxd_size = sizeof(struct mtk_rx_dma),
-@@ -4502,6 +4506,7 @@ static const struct mtk_soc_data mt7986_
+@@ -4764,6 +4768,7 @@ static const struct mtk_soc_data mt7986_
        .offload_version = 2,
        .hash_offset = 4,
        .foe_entry_size = sizeof(struct mtk_foe_entry),
@@ -90,7 +90,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
                .rxd_size = sizeof(struct mtk_rx_dma_v2),
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -1007,6 +1007,7 @@ struct mtk_soc_data {
+@@ -1042,6 +1042,7 @@ struct mtk_soc_data {
        u8              hash_offset;
        u16             foe_entry_size;
        netdev_features_t hw_features;
@@ -147,7 +147,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
  static void mtk_ppe_cache_clear(struct mtk_ppe *ppe)
  {
        ppe_set(ppe, MTK_PPE_CACHE_CTL, MTK_PPE_CACHE_CTL_CLEAR);
-@@ -444,6 +484,13 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
+@@ -464,6 +504,13 @@ __mtk_foe_entry_clear(struct mtk_ppe *pp
                hwe->ib1 &= ~MTK_FOE_IB1_STATE;
                hwe->ib1 |= FIELD_PREP(MTK_FOE_IB1_STATE, MTK_FOE_STATE_INVALID);
                dma_wmb();
@@ -161,7 +161,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        }
        entry->hash = 0xffff;
  
-@@ -551,6 +598,9 @@ __mtk_foe_entry_commit(struct mtk_ppe *p
+@@ -571,6 +618,9 @@ __mtk_foe_entry_commit(struct mtk_ppe *p
        wmb();
        hwe->ib1 = entry->ib1;
  
@@ -171,7 +171,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        dma_wmb();
  
        mtk_ppe_cache_clear(ppe);
-@@ -742,14 +792,42 @@ int mtk_ppe_prepare_reset(struct mtk_ppe
+@@ -762,14 +812,42 @@ int mtk_ppe_prepare_reset(struct mtk_ppe
        return mtk_ppe_wait_busy(ppe);
  }
  
@@ -215,7 +215,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
  
        ppe = devm_kzalloc(dev, sizeof(*ppe), GFP_KERNEL);
        if (!ppe)
-@@ -764,6 +842,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_
+@@ -784,6 +862,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_
        ppe->eth = eth;
        ppe->dev = dev;
        ppe->version = version;
@@ -223,7 +223,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
  
        foe = dmam_alloc_coherent(ppe->dev,
                                  MTK_PPE_ENTRIES * soc->foe_entry_size,
-@@ -779,6 +858,25 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_
+@@ -799,6 +878,25 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_
        if (!ppe->foe_flow)
                return NULL;
  
@@ -249,7 +249,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        mtk_ppe_debugfs_init(ppe, index);
  
        return ppe;
-@@ -893,6 +991,16 @@ void mtk_ppe_start(struct mtk_ppe *ppe)
+@@ -913,6 +1011,16 @@ void mtk_ppe_start(struct mtk_ppe *ppe)
                ppe_w32(ppe, MTK_PPE_DEFAULT_CPU_PORT1, 0xcb777);
                ppe_w32(ppe, MTK_PPE_SBW_CTRL, 0x7f);
        }
@@ -276,7 +276,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
  #define MTK_FOE_IB2_WDMA_DEVIDX               BIT(16)
  #define MTK_FOE_IB2_WDMA_WINFO                BIT(17)
  
-@@ -283,16 +284,34 @@ struct mtk_flow_entry {
+@@ -285,16 +286,34 @@ struct mtk_flow_entry {
        unsigned long cookie;
  };
  
@@ -311,7 +311,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        u16 foe_check_time[MTK_PPE_ENTRIES];
        struct hlist_head *foe_flow;
  
-@@ -302,7 +321,7 @@ struct mtk_ppe {
+@@ -304,7 +323,7 @@ struct mtk_ppe {
  };
  
  struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base,
@@ -320,7 +320,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
  void mtk_ppe_start(struct mtk_ppe *ppe);
  int mtk_ppe_stop(struct mtk_ppe *ppe);
  int mtk_ppe_prepare_reset(struct mtk_ppe *ppe);
-@@ -354,5 +373,7 @@ int mtk_foe_entry_commit(struct mtk_ppe
+@@ -358,5 +377,7 @@ int mtk_foe_entry_commit(struct mtk_ppe
  void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
  int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry);
  int mtk_ppe_debugfs_init(struct mtk_ppe *ppe, int index);
@@ -363,7 +363,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        return 0;
 --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
 +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
-@@ -491,6 +491,7 @@ static int
+@@ -497,6 +497,7 @@ static int
  mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f)
  {
        struct mtk_flow_entry *entry;
@@ -371,7 +371,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
        u32 idle;
  
        entry = rhashtable_lookup(&eth->flow_table, &f->cookie,
-@@ -501,6 +502,12 @@ mtk_flow_offload_stats(struct mtk_eth *e
+@@ -507,6 +508,12 @@ mtk_flow_offload_stats(struct mtk_eth *e
        idle = mtk_foe_entry_idle_time(eth->ppe[entry->ppe_index], entry);
        f->stats.lastused = jiffies - idle * HZ;