generic: 6.18: mtk_eth_soc: improve non-MTK tag_8021q DSA

Add patches to improve support for using 3rd-party DSA switches
like MaxLinear MxL862xx with MediaTek's mtk_eth_soc being the
conduit. This involves reorganizing hardware queues to avoid
overlap (currently dp->index is used -- if there is more than one
DSA switch this is problematic), and correctly programming flows
of the non-MTK DSA users ports in the PPE offloading engine.

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

Author: dangowrt

target/linux/generic/hack-6.18/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch

@@ -37,7 +37,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
  		.glo_cfg	= 0x4604,
  		.rst_idx	= 0x4608,
  		.delay_irq	= 0x460c,
-@@ -4125,6 +4128,56 @@ static void mtk_set_mcr_max_rx(struct mt
+@@ -4178,6 +4181,56 @@ static void mtk_set_mcr_max_rx(struct mt
  		mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
  }
 
@@ -63,7 +63,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
 +	mtk_hw_dump_reg(eth, "FE", 0x1400, 0x300);
 +	mtk_hw_dump_reg(eth, "ADMA", reg_map->pdma.rx_ptr, 0x300);
 +	if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) {
-+		for (id = 0; id < MTK_QDMA_NUM_QUEUES / 16; id++) {
++		for (id = 0; id < eth->soc->num_tx_queues / MTK_QTX_PER_PAGE; id++) {
 +			mtk_w32(eth, id, reg_map->qdma.page);
 +			pr_info("\nQDMA PAGE:%x ", mtk_r32(eth, reg_map->qdma.page));
 +			mtk_hw_dump_reg(eth, "QDMA", reg_map->qdma.qtx_cfg, 0x100);
@@ -94,7 +94,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
  static void mtk_hw_reset(struct mtk_eth *eth)
  {
  	u32 val;
-@@ -4604,6 +4657,8 @@ static void mtk_pending_work(struct work
+@@ -4657,6 +4710,8 @@ static void mtk_pending_work(struct work
  	rtnl_lock();
  	set_bit(MTK_RESETTING, &eth->state);
 
@@ -105,7 +105,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
  	/* Run again reset preliminary configuration in order to avoid any
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -1192,6 +1192,7 @@ struct mtk_reg_map {
+@@ -1200,6 +1200,7 @@ struct mtk_reg_map {
  		u32	rx_ptr;		/* rx base pointer */
  		u32	rx_cnt_cfg;	/* rx max count configuration */
  		u32	qcrx_ptr;	/* rx cpu pointer */

target/linux/generic/pending-6.18/795-01-net-ethernet-mtk_ppe_offload-use-rhashtable_lookup_f.patch

@@ -0,0 +1,68 @@
+From 75baf4f561029dc48a5b244320c50773356f9f3e Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 23 Apr 2026 15:08:11 +0100
+Subject: [PATCH 1/9] net: ethernet: mtk_ppe_offload: use
+ rhashtable_lookup_fast in flow ops
+
+mtk_flow_offload_replace(), mtk_flow_offload_destroy() and
+mtk_flow_offload_stats() look up the flow hash table with
+rhashtable_lookup(), which is annotated __must_hold_shared(RCU)
+and, per kerneldoc, "must only be called under the RCU read lock."
+
+All three call sites run under mtk_flow_offload_mutex but without
+an explicit rcu_read_lock(), so CONFIG_PROVE_RCU trips:
+
+  suspicious rcu_dereference_check() usage!
+  include/linux/rhashtable.h:632 ...
+  Call trace:
+    mtk_flow_offload_replace+0x...
+    mtk_flow_offload_cmd+0x...
+    ...
+
+Switch to rhashtable_lookup_fast(), which takes the RCU read lock
+around the lookup internally.  The driver's mutex keeps the entry
+pointer alive past the rhashtable_lookup_fast() call -- exactly the
+"other mechanism guaranteeing that the object won't go away" that
+rhashtable_lookup_fast()'s kerneldoc requires.
+
+No functional change; just silences a lockdep false positive.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+@@ -261,7 +261,8 @@ mtk_flow_offload_replace(struct mtk_eth
+ 	int err = 0;
+ 	int i;
+ 
+-	if (rhashtable_lookup(&eth->flow_table, &f->cookie, mtk_flow_ht_params))
++	if (rhashtable_lookup_fast(&eth->flow_table, &f->cookie,
++				   mtk_flow_ht_params))
+ 		return -EEXIST;
+ 
+ 	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_META)) {
+@@ -503,8 +504,8 @@ mtk_flow_offload_destroy(struct mtk_eth
+ {
+ 	struct mtk_flow_entry *entry;
+ 
+-	entry = rhashtable_lookup(&eth->flow_table, &f->cookie,
+-				  mtk_flow_ht_params);
++	entry = rhashtable_lookup_fast(&eth->flow_table, &f->cookie,
++				       mtk_flow_ht_params);
+ 	if (!entry)
+ 		return -ENOENT;
+ 
+@@ -525,8 +526,8 @@ mtk_flow_offload_stats(struct mtk_eth *e
+ 	u64 packets, bytes;
+ 	int idle;
+ 
+-	entry = rhashtable_lookup(&eth->flow_table, &f->cookie,
+-				  mtk_flow_ht_params);
++	entry = rhashtable_lookup_fast(&eth->flow_table, &f->cookie,
++				       mtk_flow_ht_params);
+ 	if (!entry)
+ 		return -ENOENT;
+ 

target/linux/generic/pending-6.18/795-02-net-ethernet-mtk_ppe-set-tport_idx-on-netsys_v3-for-.patch

@@ -0,0 +1,72 @@
+From daa37761de13976153502332f2fa675bd3761cc4 Mon Sep 17 00:00:00 2001
+From: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
+Date: Thu, 23 Apr 2026 13:56:30 +0100
+Subject: [PATCH 2/9] net: ethernet: mtk_ppe: set tport_idx on netsys_v3 for
+ QoS
+
+On MT7988 (netsys_v3) the PPE MAC info block carries a transport
+port index field. When not set, ETH-to-ETH and WiFi-to-ETH hardware-
+offloaded flows do not enter QDMA for scheduling, even with
+IB2_PSE_QOS programmed on the entry -- the packet bypasses the
+QDMA scheduler entirely, so any per-queue shaping installed
+downstream has no effect.
+
+Populate the netsys_v3 tport/tinfo fields in struct mtk_foe_mac_info
+and set TPORT_IDX=1 from mtk_foe_entry_set_queue() on v3+.
+No functional change on netsys_v1 or v2.
+
+The hard-coded value 1 matches MediaTek's reference driver; the
+datasheet may define additional transport modes, but none are in use
+by in-tree consumers.
+
+Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
+[Daniel Golle: hoist l2 declaration to function top per kernel C89 style]
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/net/ethernet/mediatek/mtk_ppe.c | 7 +++++++
+ drivers/net/ethernet/mediatek/mtk_ppe.h | 4 ++++
+ 2 files changed, 11 insertions(+)
+
+--- a/drivers/net/ethernet/mediatek/mtk_ppe.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe.c
+@@ -479,6 +479,7 @@ int mtk_foe_entry_set_queue(struct mtk_e
+ 			    unsigned int queue)
+ {
+ 	u32 *ib2 = mtk_foe_entry_ib2(eth, entry);
++	struct mtk_foe_mac_info *l2;
+ 
+ 	if (mtk_is_netsys_v2_or_greater(eth)) {
+ 		*ib2 &= ~MTK_FOE_IB2_QID_V2;
+@@ -490,6 +491,12 @@ int mtk_foe_entry_set_queue(struct mtk_e
+ 		*ib2 |= MTK_FOE_IB2_PSE_QOS;
+ 	}
+ 
++	if (mtk_is_netsys_v3_or_greater(eth)) {
++		l2 = mtk_foe_entry_l2(eth, entry);
++		l2->tport &= ~MTK_FOE_TPORT_IDX;
++		l2->tport |= FIELD_PREP(MTK_FOE_TPORT_IDX, 1);
++	}
++
+ 	return 0;
+ }
+ 
+--- a/drivers/net/ethernet/mediatek/mtk_ppe.h
++++ b/drivers/net/ethernet/mediatek/mtk_ppe.h
+@@ -96,6 +96,8 @@ enum {
+ #define MTK_FOE_WINFO_AMSDU_HF		BIT(23)
+ #define MTK_FOE_WINFO_AMSDU_EN		BIT(24)
+ 
++#define MTK_FOE_TPORT_IDX		GENMASK(3, 0)
++
+ enum {
+ 	MTK_FOE_STATE_INVALID,
+ 	MTK_FOE_STATE_UNBIND,
+@@ -124,6 +126,8 @@ struct mtk_foe_mac_info {
+ 	/* netsys_v3 */
+ 	u32 w3info;
+ 	u32 amsdu;
++	u16 tinfo;
++	u16 tport;
+ };
+ 
+ /* software-only entry type */

target/linux/generic/pending-6.18/795-03-net-ethernet-mtk_ppe_offload-set-output-device-befor.patch

@@ -0,0 +1,59 @@
+From eef4108f42f1b6e41274be5220253b2cd37ae8d1 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Thu, 23 Apr 2026 13:57:37 +0100
+Subject: [PATCH 3/9] net: ethernet: mtk_ppe_offload: set output device before
+ VLAN/PPPoE push
+
+In mtk_flow_offload_replace(), run mtk_flow_set_output_device() and
+mtk_wed_flow_add() before the VLAN push loop and PPPoE push, rather
+than after them.
+
+Today this is a no-op: set_output_device() on the DSA_TAG_PROTO_MTK
+path writes the special-tag etype into the L2 block, not a VLAN, so
+the relative order of VLAN push and output-device setup does not
+matter. The WED path likewise does not stack any VLANs.
+
+This prepares the ground for taggers whose output-device setup
+pushes an outer 802.1Q tag (e.g. DSA_TAG_PROTO_MXL862_8021Q) which
+must land in vlan1 so that subsequent user VLANs stack into vlan2.
+Getting that order wrong would put the DSA outer tag in vlan2 and
+the user VLAN in vlan1, which the switch catchall strip rule would
+then remove from the wrong layer.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+---
+ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+--- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
++++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c
+@@ -453,6 +453,14 @@ mtk_flow_offload_replace(struct mtk_eth
+ 			return err;
+ 	}
+ 
++	err = mtk_flow_set_output_device(eth, &foe, odev, data.eth.h_dest,
++					 &wed_index);
++	if (err)
++		return err;
++
++	if (wed_index >= 0 && (err = mtk_wed_flow_add(wed_index)) < 0)
++		return err;
++
+ 	if (offload_type == MTK_PPE_PKT_TYPE_BRIDGE)
+ 		foe.bridge.vlan = data.vlan_in;
+ 
+@@ -462,14 +470,6 @@ mtk_flow_offload_replace(struct mtk_eth
+ 	if (data.pppoe.num == 1)
+ 		mtk_foe_entry_set_pppoe(eth, &foe, data.pppoe.sid);
+ 
+-	err = mtk_flow_set_output_device(eth, &foe, odev, data.eth.h_dest,
+-					 &wed_index);
+-	if (err)
+-		return err;
+-
+-	if (wed_index >= 0 && (err = mtk_wed_flow_add(wed_index)) < 0)
+-		return err;
+-
+ 	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry)
+ 		return -ENOMEM;