[][Add PPPQ configurations for Panther AX7800/AX8400]
[Description]
Add PPPQ related configurations for Panther AX7800/AX8400
to prevent ETH/WLAN -> MT7531 2.5G(P5) traffic being
scheduled in DRAM queue. Because this data path is not
the case that would lead to pause frame issue, so we
don't need to take this scenario into account.
If without this patch, ETH/WLAN -> MT7531 2.5G(P5) traffic
might have extra dram latency and peroformance bound.
[Release-log]
N/A
Change-Id: Ia2e47292edbf6e6f47ceef79c968d2f84c787c7e
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6156989
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h
index f0ea6a2..9a601db 100644
--- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h
+++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat.h
@@ -889,6 +889,8 @@
})
#define IS_DSA_LAN(dev) (!strncmp(dev->name, "lan", 3))
+#define IS_DSA_1G_LAN(dev) (!strncmp(dev->name, "lan", 3) && \
+ strcmp(dev->name, "lan5"))
#define IS_DSA_WAN(dev) (!strncmp(dev->name, "wan", 3))
#define NONE_DSA_PORT 0xff
#define MAX_CRSN_NUM 32
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c
index ccb4525..96fecc0 100644
--- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c
+++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c
@@ -1571,7 +1571,7 @@
if (IS_HQOS_MODE)
qid = skb->mark & (MTK_QDMA_TX_MASK);
- else if (IS_PPPQ_MODE && (IS_DSA_LAN(dev) || IS_DSA_WAN(dev)))
+ else if (IS_PPPQ_MODE && (IS_DSA_1G_LAN(dev) || IS_DSA_WAN(dev)))
qid = port_id & MTK_QDMA_TX_MASK;
else
qid = 0;
@@ -1605,7 +1605,9 @@
(IS_PPPQ_MODE && !IS_DSA_LAN(dev) && !IS_DSA_WAN(dev)))
entry.ipv4_hnapt.iblk2.fqos = 0;
else
- entry.ipv4_hnapt.iblk2.fqos = 1;
+ entry.ipv4_hnapt.iblk2.fqos =
+ (!IS_PPPQ_MODE || (IS_PPPQ_MODE &&
+ (IS_DSA_1G_LAN(dev) || IS_DSA_WAN(dev))));
} else {
entry.ipv4_hnapt.iblk2.fqos = 0;
}
@@ -1637,7 +1639,9 @@
(IS_PPPQ_MODE && !IS_DSA_LAN(dev) && !IS_DSA_WAN(dev)))
entry.ipv6_5t_route.iblk2.fqos = 0;
else
- entry.ipv6_5t_route.iblk2.fqos = 1;
+ entry.ipv6_5t_route.iblk2.fqos =
+ (!IS_PPPQ_MODE || (IS_PPPQ_MODE &&
+ (IS_DSA_1G_LAN(dev) || IS_DSA_WAN(dev))));
} else {
entry.ipv6_5t_route.iblk2.fqos = 0;
}