[openwrt/openwrt] generic: 6.6: (re-)add support multiple PPE to mtk_eth_soc
LEDE Commits
lede-commits at lists.infradead.org
Fri Jun 28 16:33:06 PDT 2024
dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/75081235b804e1e9246aaf538fda98e26f0af27c
commit 75081235b804e1e9246aaf538fda98e26f0af27c
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Tue Jun 25 19:41:06 2024 +0100
generic: 6.6: (re-)add support multiple PPE to mtk_eth_soc
Now that the issue with WED has been sorted out, re-add support for
multiple PPE to the mtk_eth_soc driver.
Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
...t-mtk_eth_soc-ppe-add-support-for-multipl.patch | 371 +++++++++++++++++++++
...t-mtk_eth_soc-ppe-prevent-ppe-update-for-.patch | 30 ++
...ethernet-mtk_eth_soc-enable-threaded-NAPI.patch | 2 +-
...t-mtk_eth_soc-compile-out-netsys-v2-code-.patch | 4 +-
...t-mtk_eth_soc-work-around-issue-with-send.patch | 6 +-
...t-ethernet-mtk_eth_soc-use-napi_build_skb.patch | 4 +-
...t-mtk_eth_soc-add-paths-and-SerDes-modes-.patch | 52 +--
7 files changed, 435 insertions(+), 34 deletions(-)
diff --git a/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch b/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch
new file mode 100644
index 0000000000..07e7e86340
--- /dev/null
+++ b/target/linux/generic/backport-6.6/752-26-v6.10-net-ethernet-mtk_eth_soc-ppe-add-support-for-multipl.patch
@@ -0,0 +1,371 @@
+From dee4dd10c79aaca192b73520d8fb64628468ae0f Mon Sep 17 00:00:00 2001
+From: Elad Yifee <eladwf at gmail.com>
+Date: Fri, 7 Jun 2024 11:21:50 +0300
+Subject: [PATCH] net: ethernet: mtk_eth_soc: ppe: add support for multiple
+ PPEs
+
+Add the missing pieces to allow multiple PPEs units, one for each GMAC.
+mtk_gdm_config has been modified to work on targted mac ID,
+the inner loop moved outside of the function to allow unrelated
+operations like setting the MAC's PPE index.
+Introduce a sanity check in flow_offload_replace to account for
+non-MTK ingress devices.
+Additional field 'ppe_idx' was added to struct mtk_mac in order
+to keep track on the assigned PPE unit.
+
+Signed-off-by: Elad Yifee <eladwf at gmail.com>
+Link: https://lore.kernel.org/r/20240607082155.20021-1-eladwf@gmail.com
+Signed-off-by: Jakub Kicinski <kuba at kernel.org>
+---
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 112 +++++++++++-------
+ drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 +-
+ .../net/ethernet/mediatek/mtk_ppe_offload.c | 17 ++-
+ 3 files changed, 92 insertions(+), 45 deletions(-)
+
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+@@ -80,7 +80,9 @@ static const struct mtk_reg_map mtk_reg_
+ .fq_blen = 0x1b2c,
+ },
+ .gdm1_cnt = 0x2400,
+- .gdma_to_ppe = 0x4444,
++ .gdma_to_ppe = {
++ [0] = 0x4444,
++ },
+ .ppe_base = 0x0c00,
+ .wdma_base = {
+ [0] = 0x2800,
+@@ -144,7 +146,10 @@ static const struct mtk_reg_map mt7986_r
+ .tx_sch_rate = 0x4798,
+ },
+ .gdm1_cnt = 0x1c00,
+- .gdma_to_ppe = 0x3333,
++ .gdma_to_ppe = {
++ [0] = 0x3333,
++ [1] = 0x4444,
++ },
+ .ppe_base = 0x2000,
+ .wdma_base = {
+ [0] = 0x4800,
+@@ -192,7 +197,11 @@ static const struct mtk_reg_map mt7988_r
+ .tx_sch_rate = 0x4798,
+ },
+ .gdm1_cnt = 0x1c00,
+- .gdma_to_ppe = 0x3333,
++ .gdma_to_ppe = {
++ [0] = 0x3333,
++ [1] = 0x4444,
++ [2] = 0xcccc,
++ },
+ .ppe_base = 0x2000,
+ .wdma_base = {
+ [0] = 0x4800,
+@@ -2015,6 +2024,7 @@ static int mtk_poll_rx(struct napi_struc
+ struct mtk_rx_dma_v2 *rxd, trxd;
+ int done = 0, bytes = 0;
+ dma_addr_t dma_addr = DMA_MAPPING_ERROR;
++ int ppe_idx = 0;
+
+ while (done < budget) {
+ unsigned int pktlen, *rxdcsum;
+@@ -2058,6 +2068,7 @@ static int mtk_poll_rx(struct napi_struc
+ goto release_desc;
+
+ netdev = eth->netdev[mac];
++ ppe_idx = eth->mac[mac]->ppe_idx;
+
+ if (unlikely(test_bit(MTK_RESETTING, ð->state)))
+ goto release_desc;
+@@ -2181,7 +2192,7 @@ static int mtk_poll_rx(struct napi_struc
+ }
+
+ if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED)
+- mtk_ppe_check_skb(eth->ppe[0], skb, hash);
++ mtk_ppe_check_skb(eth->ppe[ppe_idx], skb, hash);
+
+ skb_record_rx_queue(skb, 0);
+ napi_gro_receive(napi, skb);
+@@ -3276,37 +3287,27 @@ static int mtk_start_dma(struct mtk_eth
+ return 0;
+ }
+
+-static void mtk_gdm_config(struct mtk_eth *eth, u32 config)
++static void mtk_gdm_config(struct mtk_eth *eth, u32 id, u32 config)
+ {
+- int i;
++ u32 val;
+
+ if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
+ return;
+
+- for (i = 0; i < MTK_MAX_DEVS; i++) {
+- u32 val;
+-
+- if (!eth->netdev[i])
+- continue;
++ val = mtk_r32(eth, MTK_GDMA_FWD_CFG(id));
+
+- val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));
++ /* default setup the forward port to send frame to PDMA */
++ val &= ~0xffff;
+
+- /* default setup the forward port to send frame to PDMA */
+- val &= ~0xffff;
++ /* Enable RX checksum */
++ val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN;
+
+- /* Enable RX checksum */
+- val |= MTK_GDMA_ICS_EN | MTK_GDMA_TCS_EN | MTK_GDMA_UCS_EN;
++ val |= config;
+
+- val |= config;
++ if (eth->netdev[id] && netdev_uses_dsa(eth->netdev[id]))
++ val |= MTK_GDMA_SPECIAL_TAG;
+
+- if (netdev_uses_dsa(eth->netdev[i]))
+- val |= MTK_GDMA_SPECIAL_TAG;
+-
+- mtk_w32(eth, val, MTK_GDMA_FWD_CFG(i));
+- }
+- /* Reset and enable PSE */
+- mtk_w32(eth, RST_GL_PSE, MTK_RST_GL);
+- mtk_w32(eth, 0, MTK_RST_GL);
++ mtk_w32(eth, val, MTK_GDMA_FWD_CFG(id));
+ }
+
+
+@@ -3366,7 +3367,10 @@ static int mtk_open(struct net_device *d
+ {
+ struct mtk_mac *mac = netdev_priv(dev);
+ struct mtk_eth *eth = mac->hw;
+- int i, err;
++ struct mtk_mac *target_mac;
++ int i, err, ppe_num;
++
++ ppe_num = eth->soc->ppe_num;
+
+ err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
+ if (err) {
+@@ -3390,18 +3394,38 @@ static int mtk_open(struct net_device *d
+ for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)
+ mtk_ppe_start(eth->ppe[i]);
+
+- gdm_config = soc->offload_version ? soc->reg_map->gdma_to_ppe
+- : MTK_GDMA_TO_PDMA;
+- mtk_gdm_config(eth, gdm_config);
++ for (i = 0; i < MTK_MAX_DEVS; i++) {
++ if (!eth->netdev[i])
++ break;
++
++ target_mac = netdev_priv(eth->netdev[i]);
++ if (!soc->offload_version) {
++ target_mac->ppe_idx = 0;
++ gdm_config = MTK_GDMA_TO_PDMA;
++ } else if (ppe_num >= 3 && target_mac->id == 2) {
++ target_mac->ppe_idx = 2;
++ gdm_config = soc->reg_map->gdma_to_ppe[2];
++ } else if (ppe_num >= 2 && target_mac->id == 1) {
++ target_mac->ppe_idx = 1;
++ gdm_config = soc->reg_map->gdma_to_ppe[1];
++ } else {
++ target_mac->ppe_idx = 0;
++ gdm_config = soc->reg_map->gdma_to_ppe[0];
++ }
++ mtk_gdm_config(eth, target_mac->id, gdm_config);
++ }
++ /* Reset and enable PSE */
++ mtk_w32(eth, RST_GL_PSE, MTK_RST_GL);
++ mtk_w32(eth, 0, MTK_RST_GL);
+
+ napi_enable(ð->tx_napi);
+ napi_enable(ð->rx_napi);
+ mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
+ mtk_rx_irq_enable(eth, soc->rx.irq_done_mask);
+ refcount_set(ð->dma_refcnt, 1);
+- }
+- else
++ } else {
+ refcount_inc(ð->dma_refcnt);
++ }
+
+ phylink_start(mac->phylink);
+ netif_tx_start_all_queues(dev);
+@@ -3478,7 +3502,8 @@ static int mtk_stop(struct net_device *d
+ if (!refcount_dec_and_test(ð->dma_refcnt))
+ return 0;
+
+- mtk_gdm_config(eth, MTK_GDMA_DROP_ALL);
++ for (i = 0; i < MTK_MAX_DEVS; i++)
++ mtk_gdm_config(eth, i, MTK_GDMA_DROP_ALL);
+
+ mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
+ mtk_rx_irq_disable(eth, eth->soc->rx.irq_done_mask);
+@@ -4957,23 +4982,24 @@ static int mtk_probe(struct platform_dev
+ }
+
+ if (eth->soc->offload_version) {
+- u32 num_ppe = mtk_is_netsys_v2_or_greater(eth) ? 2 : 1;
++ u8 ppe_num = eth->soc->ppe_num;
+
+- num_ppe = min_t(u32, ARRAY_SIZE(eth->ppe), num_ppe);
+- for (i = 0; i < num_ppe; i++) {
+- u32 ppe_addr = eth->soc->reg_map->ppe_base + i * 0x400;
++ ppe_num = min_t(u8, ARRAY_SIZE(eth->ppe), ppe_num);
++ for (i = 0; i < ppe_num; i++) {
++ u32 ppe_addr = eth->soc->reg_map->ppe_base;
+
++ ppe_addr += (i == 2 ? 0xc00 : i * 0x400);
+ eth->ppe[i] = mtk_ppe_init(eth, eth->base + ppe_addr, i);
+
+ if (!eth->ppe[i]) {
+ err = -ENOMEM;
+ goto err_deinit_ppe;
+ }
+- }
++ err = mtk_eth_offload_init(eth, i);
+
+- err = mtk_eth_offload_init(eth);
+- if (err)
+- goto err_deinit_ppe;
++ if (err)
++ goto err_deinit_ppe;
++ }
+ }
+
+ for (i = 0; i < MTK_MAX_DEVS; i++) {
+@@ -5076,6 +5102,7 @@ static const struct mtk_soc_data mt7621_
+ .required_pctl = false,
+ .version = 1,
+ .offload_version = 1,
++ .ppe_num = 1,
+ .hash_offset = 2,
+ .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
+ .tx = {
+@@ -5104,6 +5131,7 @@ static const struct mtk_soc_data mt7622_
+ .required_pctl = false,
+ .version = 1,
+ .offload_version = 2,
++ .ppe_num = 1,
+ .hash_offset = 2,
+ .has_accounting = true,
+ .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
+@@ -5132,6 +5160,7 @@ static const struct mtk_soc_data mt7623_
+ .required_pctl = true,
+ .version = 1,
+ .offload_version = 1,
++ .ppe_num = 1,
+ .hash_offset = 2,
+ .foe_entry_size = MTK_FOE_ENTRY_V1_SIZE,
+ .disable_pll_modes = true,
+@@ -5187,6 +5216,7 @@ static const struct mtk_soc_data mt7981_
+ .required_pctl = false,
+ .version = 2,
+ .offload_version = 2,
++ .ppe_num = 2,
+ .hash_offset = 4,
+ .has_accounting = true,
+ .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE,
+@@ -5216,6 +5246,7 @@ static const struct mtk_soc_data mt7986_
+ .required_pctl = false,
+ .version = 2,
+ .offload_version = 2,
++ .ppe_num = 2,
+ .hash_offset = 4,
+ .has_accounting = true,
+ .foe_entry_size = MTK_FOE_ENTRY_V2_SIZE,
+@@ -5245,6 +5276,7 @@ static const struct mtk_soc_data mt7988_
+ .required_pctl = false,
+ .version = 3,
+ .offload_version = 2,
++ .ppe_num = 3,
+ .hash_offset = 4,
+ .has_accounting = true,
+ .foe_entry_size = MTK_FOE_ENTRY_V3_SIZE,
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+@@ -1132,7 +1132,7 @@ struct mtk_reg_map {
+ u32 tx_sch_rate; /* tx scheduler rate control registers */
+ } qdma;
+ u32 gdm1_cnt;
+- u32 gdma_to_ppe;
++ u32 gdma_to_ppe[3];
+ u32 ppe_base;
+ u32 wdma_base[3];
+ u32 pse_iq_sta;
+@@ -1170,6 +1170,7 @@ struct mtk_soc_data {
+ u8 offload_version;
+ u8 hash_offset;
+ u8 version;
++ u8 ppe_num;
+ u16 foe_entry_size;
+ netdev_features_t hw_features;
+ bool has_accounting;
+@@ -1294,7 +1295,7 @@ struct mtk_eth {
+
+ struct metadata_dst *dsa_meta[MTK_MAX_DSA_PORTS];
+
+- struct mtk_ppe *ppe[2];
++ struct mtk_ppe *ppe[3];
+ struct rhashtable flow_table;
+
+ struct bpf_prog __rcu *prog;
+@@ -1319,6 +1320,7 @@ struct mtk_eth {
+ struct mtk_mac {
+ int id;
+ phy_interface_t interface;
++ u8 ppe_idx;
+ int speed;
+ struct device_node *of_node;
+ struct phylink *phylink;
+@@ -1440,7 +1442,7 @@ int mtk_gmac_sgmii_path_setup(struct mtk
+ int mtk_gmac_gephy_path_setup(struct mtk_eth *eth, int mac_id);
+ int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id);
+
+-int mtk_eth_offload_init(struct mtk_eth *eth);
++int mtk_eth_offload_init(struct mtk_eth *eth, u8 id);
+ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type,
+ void *type_data);
+ int mtk_flow_offload_cmd(struct mtk_eth *eth, struct flow_cls_offload *cls,
+--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+@@ -245,10 +245,10 @@ mtk_flow_offload_replace(struct mtk_eth
+ int ppe_index)
+ {
+ struct flow_rule *rule = flow_cls_offload_flow_rule(f);
++ struct net_device *idev = NULL, *odev = NULL;
+ struct flow_action_entry *act;
+ struct mtk_flow_data data = {};
+ struct mtk_foe_entry foe;
+- struct net_device *odev = NULL;
+ struct mtk_flow_entry *entry;
+ int offload_type = 0;
+ int wed_index = -1;
+@@ -264,6 +264,17 @@ mtk_flow_offload_replace(struct mtk_eth
+ struct flow_match_meta match;
+
+ flow_rule_match_meta(rule, &match);
++ if (mtk_is_netsys_v2_or_greater(eth)) {
++ idev = __dev_get_by_index(&init_net, match.key->ingress_ifindex);
++ if (idev) {
++ struct mtk_mac *mac = netdev_priv(idev);
++
++ if (WARN_ON(mac->ppe_idx >= eth->soc->ppe_num))
++ return -EINVAL;
++
++ ppe_index = mac->ppe_idx;
++ }
++ }
+ } else {
+ return -EOPNOTSUPP;
+ }
+@@ -630,7 +641,9 @@ int mtk_eth_setup_tc(struct net_device *
+ }
+ }
+
+-int mtk_eth_offload_init(struct mtk_eth *eth)
++int mtk_eth_offload_init(struct mtk_eth *eth, u8 id)
+ {
++ if (!eth->ppe[id] || !eth->ppe[id]->foe_table)
++ return 0;
+ return rhashtable_init(ð->flow_table, &mtk_flow_ht_params);
+ }
diff --git a/target/linux/generic/backport-6.6/752-27-v6.10-net-ethernet-mtk_eth_soc-ppe-prevent-ppe-update-for-.patch b/target/linux/generic/backport-6.6/752-27-v6.10-net-ethernet-mtk_eth_soc-ppe-prevent-ppe-update-for-.patch
new file mode 100644
index 0000000000..dbf574d80a
--- /dev/null
+++ b/target/linux/generic/backport-6.6/752-27-v6.10-net-ethernet-mtk_eth_soc-ppe-prevent-ppe-update-for-.patch
@@ -0,0 +1,30 @@
+From 73cfd947dbdb25ef9863ac49c4596a7d53ad4025 Mon Sep 17 00:00:00 2001
+From: Elad Yifee <eladwf at gmail.com>
+Date: Sun, 23 Jun 2024 20:51:09 +0300
+Subject: [PATCH] net: ethernet: mtk_eth_soc: ppe: prevent ppe update for
+ non-mtk devices
+
+Introduce an additional validation to ensure that the PPE index
+is modified exclusively for mtk_eth ingress devices.
+This primarily addresses the issue related
+to WED operation with multiple PPEs.
+
+Fixes: dee4dd10c79a ("net: ethernet: mtk_eth_soc: ppe: add support for multiple PPEs")
+Signed-off-by: Elad Yifee <eladwf at gmail.com>
+Link: https://lore.kernel.org/r/20240623175113.24437-1-eladwf@gmail.com
+Signed-off-by: Paolo Abeni <pabeni at redhat.com>
+---
+ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+@@ -266,7 +266,7 @@ mtk_flow_offload_replace(struct mtk_eth
+ flow_rule_match_meta(rule, &match);
+ if (mtk_is_netsys_v2_or_greater(eth)) {
+ idev = __dev_get_by_index(&init_net, match.key->ingress_ifindex);
+- if (idev) {
++ if (idev && idev->netdev_ops == eth->netdev[0]->netdev_ops) {
+ struct mtk_mac *mac = netdev_priv(idev);
+
+ if (WARN_ON(mac->ppe_idx >= eth->soc->ppe_num))
diff --git a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
index f528e35d75..4fbf6288c8 100644
--- a/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
+++ b/target/linux/generic/pending-6.6/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -4994,6 +4994,8 @@ static int mtk_probe(struct platform_dev
+@@ -5020,6 +5020,8 @@ static int mtk_probe(struct platform_dev
* for NAPI to work
*/
init_dummy_netdev(ð->dummy_dev);
diff --git a/target/linux/generic/pending-6.6/732-00-net-ethernet-mtk_eth_soc-compile-out-netsys-v2-code-.patch b/target/linux/generic/pending-6.6/732-00-net-ethernet-mtk_eth_soc-compile-out-netsys-v2-code-.patch
index cf19523160..c3297a1087 100644
--- a/target/linux/generic/pending-6.6/732-00-net-ethernet-mtk_eth_soc-compile-out-netsys-v2-code-.patch
+++ b/target/linux/generic/pending-6.6/732-00-net-ethernet-mtk_eth_soc-compile-out-netsys-v2-code-.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -1334,6 +1334,22 @@ struct mtk_mac {
+@@ -1336,6 +1336,22 @@ struct mtk_mac {
/* the struct describing the SoC. these are declared in the soc_xyz.c files */
extern const struct of_device_id of_mtk_match[];
@@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
static inline bool mtk_is_netsys_v1(struct mtk_eth *eth)
{
return eth->soc->version == 1;
-@@ -1348,6 +1364,7 @@ static inline bool mtk_is_netsys_v3_or_g
+@@ -1350,6 +1366,7 @@ static inline bool mtk_is_netsys_v3_or_g
{
return eth->soc->version > 2;
}
diff --git a/target/linux/generic/pending-6.6/732-01-net-ethernet-mtk_eth_soc-work-around-issue-with-send.patch b/target/linux/generic/pending-6.6/732-01-net-ethernet-mtk_eth_soc-work-around-issue-with-send.patch
index 3e56661e70..53187934d0 100644
--- a/target/linux/generic/pending-6.6/732-01-net-ethernet-mtk_eth_soc-work-around-issue-with-send.patch
+++ b/target/linux/generic/pending-6.6/732-01-net-ethernet-mtk_eth_soc-work-around-issue-with-send.patch
@@ -24,7 +24,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
#include <net/page_pool/helpers.h>
#include "mtk_eth_soc.h"
-@@ -1587,12 +1588,28 @@ static void mtk_wake_queue(struct mtk_et
+@@ -1596,12 +1597,28 @@ static void mtk_wake_queue(struct mtk_et
}
}
@@ -53,7 +53,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
bool gso = false;
int tx_num;
-@@ -1614,6 +1631,18 @@ static netdev_tx_t mtk_start_xmit(struct
+@@ -1623,6 +1640,18 @@ static netdev_tx_t mtk_start_xmit(struct
return NETDEV_TX_BUSY;
}
@@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
/* TSO: fill MSS info in tcp checksum field */
if (skb_is_gso(skb)) {
if (skb_cow_head(skb, 0)) {
-@@ -1629,8 +1658,14 @@ static netdev_tx_t mtk_start_xmit(struct
+@@ -1638,8 +1667,14 @@ static netdev_tx_t mtk_start_xmit(struct
}
}
diff --git a/target/linux/generic/pending-6.6/733-01-net-ethernet-mtk_eth_soc-use-napi_build_skb.patch b/target/linux/generic/pending-6.6/733-01-net-ethernet-mtk_eth_soc-use-napi_build_skb.patch
index f81126430f..82ba768fd5 100644
--- a/target/linux/generic/pending-6.6/733-01-net-ethernet-mtk_eth_soc-use-napi_build_skb.patch
+++ b/target/linux/generic/pending-6.6/733-01-net-ethernet-mtk_eth_soc-use-napi_build_skb.patch
@@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2129,7 +2129,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -2140,7 +2140,7 @@ static int mtk_poll_rx(struct napi_struc
if (ret != XDP_PASS)
goto skip_rx;
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd at nbd.name>
if (unlikely(!skb)) {
page_pool_put_full_page(ring->page_pool,
page, true);
-@@ -2167,7 +2167,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -2178,7 +2178,7 @@ static int mtk_poll_rx(struct napi_struc
dma_unmap_single(eth->dma_dev, ((u64)trxd.rxd1 | addr64),
ring->buf_size, DMA_FROM_DEVICE);
diff --git a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
index 3a79e1a553..89dc87e1a2 100644
--- a/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
+++ b/target/linux/generic/pending-6.6/737-net-ethernet-mtk_eth_soc-add-paths-and-SerDes-modes-.patch
@@ -214,7 +214,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
#include <linux/jhash.h>
#include <linux/bitfield.h>
#include <net/dsa.h>
-@@ -261,12 +263,8 @@ static const char * const mtk_clks_sourc
+@@ -270,12 +272,8 @@ static const char * const mtk_clks_sourc
"ethwarp_wocpu2",
"ethwarp_wocpu1",
"ethwarp_wocpu0",
@@ -227,7 +227,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
"top_eth_gmii_sel",
"top_eth_refck_50m_sel",
"top_eth_sys_200m_sel",
-@@ -509,6 +507,30 @@ static void mtk_setup_bridge_switch(stru
+@@ -518,6 +516,30 @@ static void mtk_setup_bridge_switch(stru
MTK_GSW_CFG);
}
@@ -258,7 +258,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
static struct phylink_pcs *mtk_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
-@@ -517,6 +539,21 @@ static struct phylink_pcs *mtk_mac_selec
+@@ -526,6 +548,21 @@ static struct phylink_pcs *mtk_mac_selec
struct mtk_eth *eth = mac->hw;
unsigned int sid;
@@ -280,7 +280,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
if (interface == PHY_INTERFACE_MODE_SGMII ||
phy_interface_mode_is_8023z(interface)) {
sid = (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_SGMII)) ?
-@@ -568,7 +605,22 @@ static void mtk_mac_config(struct phylin
+@@ -577,7 +614,22 @@ static void mtk_mac_config(struct phylin
goto init_err;
}
break;
@@ -303,7 +303,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
break;
default:
goto err_phy;
-@@ -615,8 +667,6 @@ static void mtk_mac_config(struct phylin
+@@ -624,8 +676,6 @@ static void mtk_mac_config(struct phylin
val &= ~SYSCFG0_GE_MODE(SYSCFG0_GE_MASK, mac->id);
val |= SYSCFG0_GE_MODE(ge_mode, mac->id);
regmap_write(eth->ethsys, ETHSYS_SYSCFG0, val);
@@ -312,7 +312,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
}
/* SGMII */
-@@ -633,21 +683,40 @@ static void mtk_mac_config(struct phylin
+@@ -642,21 +692,40 @@ static void mtk_mac_config(struct phylin
/* Save the syscfg0 value for mac_finish */
mac->syscfg0 = val;
@@ -360,7 +360,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
return;
err_phy:
-@@ -660,6 +729,18 @@ init_err:
+@@ -669,6 +738,18 @@ init_err:
mac->id, phy_modes(state->interface), err);
}
@@ -379,7 +379,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
static int mtk_mac_finish(struct phylink_config *config, unsigned int mode,
phy_interface_t interface)
{
-@@ -668,6 +749,10 @@ static int mtk_mac_finish(struct phylink
+@@ -677,6 +758,10 @@ static int mtk_mac_finish(struct phylink
struct mtk_eth *eth = mac->hw;
u32 mcr_cur, mcr_new;
@@ -390,7 +390,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
/* Enable SGMII */
if (interface == PHY_INTERFACE_MODE_SGMII ||
phy_interface_mode_is_8023z(interface))
-@@ -692,10 +777,14 @@ static void mtk_mac_link_down(struct phy
+@@ -701,10 +786,14 @@ static void mtk_mac_link_down(struct phy
{
struct mtk_mac *mac = container_of(config, struct mtk_mac,
phylink_config);
@@ -408,7 +408,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
}
static void mtk_set_queue_speed(struct mtk_eth *eth, unsigned int idx,
-@@ -767,13 +856,11 @@ static void mtk_set_queue_speed(struct m
+@@ -776,13 +865,11 @@ static void mtk_set_queue_speed(struct m
mtk_w32(eth, val, soc->reg_map->qdma.qtx_sch + ofs);
}
@@ -426,7 +426,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
u32 mcr;
mcr = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id));
-@@ -807,9 +894,63 @@ static void mtk_mac_link_up(struct phyli
+@@ -816,9 +903,63 @@ static void mtk_mac_link_up(struct phyli
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
}
@@ -490,9 +490,9 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
.mac_finish = mtk_mac_finish,
.mac_link_down = mtk_mac_link_down,
.mac_link_up = mtk_mac_link_up,
-@@ -3403,6 +3544,9 @@ static int mtk_open(struct net_device *d
- struct mtk_eth *eth = mac->hw;
- int i, err;
+@@ -3407,6 +3548,9 @@ static int mtk_open(struct net_device *d
+
+ ppe_num = eth->soc->ppe_num;
+ if (mac->pextp)
+ phy_power_on(mac->pextp);
@@ -500,7 +500,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
err = phylink_of_phy_connect(mac->phylink, mac->of_node, 0);
if (err) {
netdev_err(dev, "%s: could not attach PHY: %d\n", __func__,
-@@ -3532,6 +3676,9 @@ static int mtk_stop(struct net_device *d
+@@ -3557,6 +3701,9 @@ static int mtk_stop(struct net_device *d
for (i = 0; i < ARRAY_SIZE(eth->ppe); i++)
mtk_ppe_stop(eth->ppe[i]);
@@ -510,7 +510,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
return 0;
}
-@@ -4529,6 +4676,7 @@ static const struct net_device_ops mtk_n
+@@ -4554,6 +4701,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{
const __be32 *_id = of_get_property(np, "reg", NULL);
@@ -518,7 +518,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
phy_interface_t phy_mode;
struct phylink *phylink;
struct mtk_mac *mac;
-@@ -4565,16 +4713,41 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4590,16 +4738,41 @@ static int mtk_add_mac(struct mtk_eth *e
mac->id = id;
mac->hw = eth;
mac->of_node = np;
@@ -568,7 +568,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
}
memset(mac->hwlro_ip, 0, sizeof(mac->hwlro_ip));
-@@ -4657,8 +4830,21 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4682,8 +4855,21 @@ static int mtk_add_mac(struct mtk_eth *e
phy_interface_zero(mac->phylink_config.supported_interfaces);
__set_bit(PHY_INTERFACE_MODE_INTERNAL,
mac->phylink_config.supported_interfaces);
@@ -590,7 +590,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
phylink = phylink_create(&mac->phylink_config,
of_fwnode_handle(mac->of_node),
phy_mode, &mtk_phylink_ops);
-@@ -4709,6 +4895,26 @@ free_netdev:
+@@ -4734,6 +4920,26 @@ free_netdev:
return err;
}
@@ -617,7 +617,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev)
{
struct net_device *dev, *tmp;
-@@ -4855,7 +5061,8 @@ static int mtk_probe(struct platform_dev
+@@ -4880,7 +5086,8 @@ static int mtk_probe(struct platform_dev
regmap_write(cci, 0, 3);
}
@@ -627,7 +627,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
err = mtk_sgmii_init(eth);
if (err)
-@@ -4966,6 +5173,24 @@ static int mtk_probe(struct platform_dev
+@@ -4991,6 +5198,24 @@ static int mtk_probe(struct platform_dev
}
}
@@ -652,7 +652,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) {
err = devm_request_irq(eth->dev, eth->irq[0],
mtk_handle_irq, 0,
-@@ -5068,6 +5293,11 @@ static int mtk_remove(struct platform_de
+@@ -5094,6 +5319,11 @@ static int mtk_remove(struct platform_de
mtk_stop(eth->netdev[i]);
mac = netdev_priv(eth->netdev[i]);
phylink_disconnect_phy(mac->phylink);
@@ -893,7 +893,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
struct mtk_tx_dma_desc_info {
dma_addr_t addr;
-@@ -1322,6 +1379,9 @@ struct mtk_mac {
+@@ -1324,6 +1381,9 @@ struct mtk_mac {
struct device_node *of_node;
struct phylink *phylink;
struct phylink_config phylink_config;
@@ -903,7 +903,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
struct mtk_eth *hw;
struct mtk_hw_stats *hw_stats;
__be32 hwlro_ip[MTK_MAX_LRO_IP_CNT];
-@@ -1445,6 +1505,19 @@ static inline u32 mtk_get_ib2_multicast_
+@@ -1447,6 +1507,19 @@ static inline u32 mtk_get_ib2_multicast_
return MTK_FOE_IB2_MULTICAST;
}
@@ -923,7 +923,7 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
/* read the hardware status register */
void mtk_stats_update_mac(struct mtk_mac *mac);
-@@ -1453,8 +1526,10 @@ u32 mtk_r32(struct mtk_eth *eth, unsigne
+@@ -1455,8 +1528,10 @@ u32 mtk_r32(struct mtk_eth *eth, unsigne
u32 mtk_m32(struct mtk_eth *eth, u32 mask, u32 set, unsigned int reg);
int mtk_gmac_sgmii_path_setup(struct mtk_eth *eth, int mac_id);
@@ -932,5 +932,5 @@ Signed-off-by: Daniel Golle <daniel at makrotopia.org>
int mtk_gmac_rgmii_path_setup(struct mtk_eth *eth, int mac_id);
+int mtk_gmac_usxgmii_path_setup(struct mtk_eth *eth, int mac_id);
- int mtk_eth_offload_init(struct mtk_eth *eth);
+ int mtk_eth_offload_init(struct mtk_eth *eth, u8 id);
int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type,
More information about the lede-commits
mailing list