mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
625d19c1e2
Import commits from upstream Linux replacing some downstream patches.
Move accepted patches from pending-{5.15,6.1} to backport-{5.15,6.1}.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit f631c7bbb1)
45 lines
1.1 KiB
Diff
45 lines
1.1 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 27 Oct 2022 23:39:52 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: compile out netsys v2 code
|
|
on mt7621
|
|
|
|
Avoid some branches in the hot path on low-end devices with limited CPU power,
|
|
and reduce code size
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -1323,6 +1323,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[];
|
|
|
|
+#ifdef CONFIG_SOC_MT7621
|
|
+static inline bool mtk_is_netsys_v1(struct mtk_eth *eth)
|
|
+{
|
|
+ return true;
|
|
+}
|
|
+
|
|
+static inline bool mtk_is_netsys_v2_or_greater(struct mtk_eth *eth)
|
|
+{
|
|
+ return false;
|
|
+}
|
|
+
|
|
+static inline bool mtk_is_netsys_v3_or_greater(struct mtk_eth *eth)
|
|
+{
|
|
+ return false;
|
|
+}
|
|
+#else
|
|
static inline bool mtk_is_netsys_v1(struct mtk_eth *eth)
|
|
{
|
|
return eth->soc->version == 1;
|
|
@@ -1337,6 +1353,7 @@ static inline bool mtk_is_netsys_v3_or_g
|
|
{
|
|
return eth->soc->version > 2;
|
|
}
|
|
+#endif
|
|
|
|
static inline struct mtk_foe_entry *
|
|
mtk_foe_get_entry(struct mtk_ppe *ppe, u16 hash)
|