developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 1 | From 01556d88ad11f0d096d2816b2a69999994e1740f Mon Sep 17 00:00:00 2001 |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 2 | From: Bo-Cun Chen <bc-bocun.chen@mediatek.com> |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 3 | Date: Mon, 18 Mar 2024 16:26:28 +0800 |
| 4 | Subject: [PATCH 05/24] flow-offload-add-mkhnat-dual-ppe-new-v2 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 1 + |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 8 | drivers/net/ethernet/mediatek/mtk_eth_soc.c | 50 ++++++++++++++----- |
| 9 | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 14 ++++-- |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 10 | drivers/net/ethernet/mediatek/mtk_ppe.c | 5 +- |
developer | fce0d15 | 2024-01-11 13:37:13 +0800 | [diff] [blame] | 11 | drivers/net/ethernet/mediatek/mtk_ppe.h | 7 ++- |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 12 | .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 27 +++++++--- |
| 13 | .../net/ethernet/mediatek/mtk_ppe_offload.c | 48 ++++++++++++++---- |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 14 | include/linux/netdevice.h | 4 ++ |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 15 | 8 files changed, 119 insertions(+), 37 deletions(-) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 16 | mode change 100644 => 100755 drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 17 | |
| 18 | diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 19 | index 3a4f279..d70151b 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 20 | --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| 21 | +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 22 | @@ -483,6 +483,7 @@ |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 23 | mediatek,ethsys = <ðsys>; |
| 24 | mediatek,sgmiisys = <&sgmiisys0>, <&sgmiisys1>; |
| 25 | mediatek,wed = <&wed0>, <&wed1>; |
| 26 | + mtketh-ppe-num = <2>; |
| 27 | #reset-cells = <1>; |
| 28 | #address-cells = <1>; |
| 29 | #size-cells = <0>; |
| 30 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 31 | index 2fb67e0..7eeddb3 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 32 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| 33 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 34 | @@ -2464,7 +2464,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 35 | #endif |
| 36 | |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 37 | if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) |
| 38 | - mtk_ppe_check_skb(eth->ppe, skb, hash); |
| 39 | + mtk_ppe_check_skb(eth->ppe[0], skb, hash); |
| 40 | |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 41 | if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) { |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 42 | if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_RX_V2)) { |
| 43 | @@ -4112,8 +4112,12 @@ static int mtk_open(struct net_device *dev) |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 44 | regmap_write(eth->sgmii->pcs[id].regmap, |
| 45 | SGMSYS_QPHY_PWR_STATE_CTRL, 0); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 46 | |
developer | 780b915 | 2022-12-15 14:09:45 +0800 | [diff] [blame] | 47 | - if (eth->soc->offload_version && mtk_ppe_start(ð->ppe) == 0) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 48 | - gdm_config = MTK_GDMA_TO_PPE; |
developer | 780b915 | 2022-12-15 14:09:45 +0800 | [diff] [blame] | 49 | + if (eth->soc->offload_version) { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 50 | + gdm_config = MTK_GDMA_TO_PPE0; |
| 51 | + |
| 52 | + for (i = 0; i < eth->ppe_num; i++) |
| 53 | + mtk_ppe_start(eth->ppe[i]); |
| 54 | + } |
| 55 | |
developer | 780b915 | 2022-12-15 14:09:45 +0800 | [diff] [blame] | 56 | mtk_gdm_config(eth, mac->id, gdm_config); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 57 | |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 58 | @@ -4202,8 +4206,10 @@ static int mtk_stop(struct net_device *dev) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 59 | |
| 60 | mtk_dma_free(eth); |
| 61 | |
| 62 | - if (eth->soc->offload_version) |
| 63 | - mtk_ppe_stop(eth->ppe); |
| 64 | + if (eth->soc->offload_version) { |
| 65 | + for (i = 0; i < eth->ppe_num; i++) |
| 66 | + mtk_ppe_stop(eth->ppe[i]); |
| 67 | + } |
| 68 | |
| 69 | return 0; |
| 70 | } |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 71 | @@ -5762,15 +5768,35 @@ static int mtk_probe(struct platform_device *pdev) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 72 | } |
| 73 | |
| 74 | if (eth->soc->offload_version) { |
| 75 | - eth->ppe = mtk_ppe_init(eth, eth->base + MTK_ETH_PPE_BASE, 2); |
| 76 | - if (!eth->ppe) { |
| 77 | - err = -ENOMEM; |
| 78 | - goto err_free_dev; |
| 79 | + unsigned int val; |
| 80 | + |
| 81 | + err = of_property_read_u32_index(pdev->dev.of_node, "mtketh-ppe-num", 0, &val); |
| 82 | + if (err < 0) |
| 83 | + eth->ppe_num = 1; |
| 84 | + else |
| 85 | + eth->ppe_num = val; |
| 86 | + |
| 87 | + if (eth->ppe_num > MTK_MAX_PPE_NUM) { |
| 88 | + dev_warn(&pdev->dev, "%d is not a valid ppe num, please check mtketh-ppe-num in dts !", eth->ppe_num); |
| 89 | + eth->ppe_num = MTK_MAX_PPE_NUM; |
| 90 | } |
| 91 | |
| 92 | - err = mtk_eth_offload_init(eth); |
| 93 | - if (err) |
| 94 | - goto err_free_dev; |
| 95 | + dev_info(&pdev->dev, "ppe num = %d\n", eth->ppe_num); |
| 96 | + |
| 97 | + for (i = 0; i < eth->ppe_num; i++) { |
| 98 | + eth->ppe[i] = mtk_ppe_init(eth, |
| 99 | + eth->base + MTK_ETH_PPE_BASE + i * 0x400, 2, i); |
| 100 | + if (!eth->ppe[i]) { |
| 101 | + err = -ENOMEM; |
| 102 | + goto err_free_dev; |
| 103 | + } |
| 104 | + |
| 105 | + err = mtk_eth_offload_init(eth, i); |
| 106 | + if (err) |
| 107 | + goto err_free_dev; |
| 108 | + } |
| 109 | + |
| 110 | + mtk_ppe_debugfs_init(eth); |
| 111 | } |
| 112 | |
| 113 | for (i = 0; i < MTK_MAX_DEVS; i++) { |
| 114 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 115 | index 910baaf..3995608 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 116 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 117 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 118 | @@ -137,7 +137,12 @@ |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 119 | #define MTK_GDMA_UCS_EN BIT(20) |
developer | 780b915 | 2022-12-15 14:09:45 +0800 | [diff] [blame] | 120 | #define MTK_GDMA_STRP_CRC BIT(16) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 121 | #define MTK_GDMA_TO_PDMA 0x0 |
| 122 | -#define MTK_GDMA_TO_PPE 0x3333 |
| 123 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
| 124 | +#define MTK_GDMA_TO_PPE0 0x3333 |
| 125 | +#define MTK_GDMA_TO_PPE1 0x4444 |
| 126 | +#else |
| 127 | +#define MTK_GDMA_TO_PPE0 0x4444 |
| 128 | +#endif |
| 129 | #define MTK_GDMA_DROP_ALL 0x7777 |
| 130 | |
developer | 780b915 | 2022-12-15 14:09:45 +0800 | [diff] [blame] | 131 | /* GDM Egress Control Register */ |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 132 | @@ -1936,7 +1941,8 @@ struct mtk_eth { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 133 | spinlock_t syscfg0_lock; |
| 134 | struct timer_list mtk_dma_monitor_timer; |
| 135 | |
| 136 | - struct mtk_ppe *ppe; |
| 137 | + u8 ppe_num; |
| 138 | + struct mtk_ppe *ppe[MTK_MAX_PPE_NUM]; |
| 139 | struct rhashtable flow_table; |
| 140 | }; |
| 141 | |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 142 | @@ -2019,9 +2025,11 @@ int mtk_toprgu_init(struct mtk_eth *eth, struct device_node *r); |
developer | b35f4fa | 2023-03-14 13:24:47 +0800 | [diff] [blame] | 143 | int mtk_dump_usxgmii(struct regmap *pmap, char *name, u32 offset, u32 range); |
developer | 740bee8 | 2023-10-16 10:58:43 +0800 | [diff] [blame] | 144 | void mtk_usxgmii_link_poll(struct work_struct *work); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 145 | |
| 146 | -int mtk_eth_offload_init(struct mtk_eth *eth); |
| 147 | +int mtk_eth_offload_init(struct mtk_eth *eth, int id); |
| 148 | int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| 149 | void *type_data); |
| 150 | void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev); |
developer | 55392d1 | 2023-07-10 12:54:02 +0800 | [diff] [blame] | 151 | u32 mtk_rss_indr_table(struct mtk_rss_params *rss_params, int index); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 152 | + |
developer | b35f4fa | 2023-03-14 13:24:47 +0800 | [diff] [blame] | 153 | +int mtk_ppe_debugfs_init(struct mtk_eth *eth); |
| 154 | #endif /* MTK_ETH_H */ |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 155 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 156 | index e195fb3..c9ee505 100755 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 157 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 158 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 159 | @@ -696,7 +696,7 @@ int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 160 | } |
| 161 | |
| 162 | struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
| 163 | - int version) |
| 164 | + int version, int id) |
| 165 | { |
| 166 | struct device *dev = eth->dev; |
| 167 | struct mtk_foe_entry *foe; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 168 | @@ -715,6 +715,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 169 | ppe->eth = eth; |
| 170 | ppe->dev = dev; |
| 171 | ppe->version = version; |
| 172 | + ppe->id = id; |
| 173 | |
| 174 | foe = dmam_alloc_coherent(ppe->dev, MTK_PPE_ENTRIES * sizeof(*foe), |
| 175 | &ppe->foe_phys, GFP_KERNEL); |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 176 | @@ -723,8 +724,6 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 177 | |
| 178 | ppe->foe_table = foe; |
| 179 | |
| 180 | - mtk_ppe_debugfs_init(ppe); |
| 181 | - |
| 182 | return ppe; |
| 183 | } |
| 184 | |
| 185 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 186 | index 7012351..86bbac8 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 187 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.h |
| 188 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 189 | @@ -9,8 +9,10 @@ |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 190 | #include <linux/rhashtable.h> |
| 191 | |
developer | 4df64ba | 2022-09-01 14:44:55 +0800 | [diff] [blame] | 192 | #if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 193 | +#define MTK_MAX_PPE_NUM 2 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 194 | #define MTK_ETH_PPE_BASE 0x2000 |
developer | 4df64ba | 2022-09-01 14:44:55 +0800 | [diff] [blame] | 195 | #else |
| 196 | +#define MTK_MAX_PPE_NUM 1 |
| 197 | #define MTK_ETH_PPE_BASE 0xc00 |
| 198 | #endif |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 199 | |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 200 | @@ -299,6 +301,7 @@ struct mtk_flow_entry { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 201 | }; |
| 202 | }; |
| 203 | u8 type; |
| 204 | + s8 ppe_index; |
| 205 | s8 wed_index; |
| 206 | u16 hash; |
| 207 | union { |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 208 | @@ -318,6 +321,7 @@ struct mtk_ppe { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 209 | struct device *dev; |
| 210 | void __iomem *base; |
| 211 | int version; |
| 212 | + int id; |
| 213 | |
| 214 | struct mtk_foe_entry *foe_table; |
| 215 | dma_addr_t foe_phys; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 216 | @@ -330,7 +334,7 @@ struct mtk_ppe { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 217 | void *acct_table; |
| 218 | }; |
| 219 | |
| 220 | -struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int version); |
| 221 | +struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int version, int id); |
| 222 | int mtk_ppe_start(struct mtk_ppe *ppe); |
| 223 | int mtk_ppe_stop(struct mtk_ppe *ppe); |
| 224 | |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 225 | @@ -381,6 +385,5 @@ int mtk_foe_entry_set_wdma(struct mtk_foe_entry *entry, int wdma_idx, int txq, |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 226 | int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 227 | void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 228 | int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 229 | -int mtk_ppe_debugfs_init(struct mtk_ppe *ppe); |
| 230 | |
| 231 | #endif |
| 232 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 233 | index a591ab1..f4ebe59 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 234 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| 235 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| 236 | @@ -73,9 +73,8 @@ mtk_print_addr_info(struct seq_file *m, struct mtk_flow_addr_info *ai) |
| 237 | } |
| 238 | |
| 239 | static int |
| 240 | -mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 241 | +mtk_ppe_debugfs_foe_show(struct seq_file *m, struct mtk_ppe *ppe, bool bind) |
| 242 | { |
| 243 | - struct mtk_ppe *ppe = m->private; |
| 244 | int i; |
| 245 | |
| 246 | for (i = 0; i < MTK_PPE_ENTRIES; i++) { |
| 247 | @@ -122,6 +121,8 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 248 | break; |
| 249 | } |
| 250 | |
| 251 | + seq_printf(m, " ppe=%d", ppe->id); |
| 252 | + |
| 253 | seq_printf(m, " orig="); |
| 254 | mtk_print_addr_info(m, &ai); |
| 255 | |
| 256 | @@ -164,13 +165,25 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 257 | static int |
| 258 | mtk_ppe_debugfs_foe_show_all(struct seq_file *m, void *private) |
| 259 | { |
| 260 | - return mtk_ppe_debugfs_foe_show(m, private, false); |
| 261 | + struct mtk_eth *eth = m->private; |
| 262 | + int i; |
| 263 | + |
| 264 | + for (i = 0; i < eth->ppe_num; i++) |
| 265 | + mtk_ppe_debugfs_foe_show(m, eth->ppe[i], false); |
| 266 | + |
| 267 | + return 0; |
| 268 | } |
| 269 | |
| 270 | static int |
| 271 | mtk_ppe_debugfs_foe_show_bind(struct seq_file *m, void *private) |
| 272 | { |
| 273 | - return mtk_ppe_debugfs_foe_show(m, private, true); |
| 274 | + struct mtk_eth *eth = m->private; |
| 275 | + int i; |
| 276 | + |
| 277 | + for (i = 0; i < eth->ppe_num; i++) |
| 278 | + mtk_ppe_debugfs_foe_show(m, eth->ppe[i], true); |
| 279 | + |
| 280 | + return 0; |
| 281 | } |
| 282 | |
| 283 | static int |
| 284 | @@ -187,7 +200,7 @@ mtk_ppe_debugfs_foe_open_bind(struct inode *inode, struct file *file) |
| 285 | inode->i_private); |
| 286 | } |
| 287 | |
| 288 | -int mtk_ppe_debugfs_init(struct mtk_ppe *ppe) |
| 289 | +int mtk_ppe_debugfs_init(struct mtk_eth *eth) |
| 290 | { |
| 291 | static const struct file_operations fops_all = { |
| 292 | .open = mtk_ppe_debugfs_foe_open_all, |
| 293 | @@ -209,8 +222,8 @@ int mtk_ppe_debugfs_init(struct mtk_ppe *ppe) |
| 294 | if (!root) |
| 295 | return -ENOMEM; |
| 296 | |
| 297 | - debugfs_create_file("entries", S_IRUGO, root, ppe, &fops_all); |
| 298 | - debugfs_create_file("bind", S_IRUGO, root, ppe, &fops_bind); |
| 299 | + debugfs_create_file("entries", S_IRUGO, root, eth, &fops_all); |
| 300 | + debugfs_create_file("bind", S_IRUGO, root, eth, &fops_bind); |
| 301 | |
| 302 | return 0; |
| 303 | } |
| 304 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 305 | old mode 100644 |
| 306 | new mode 100755 |
developer | 740bee8 | 2023-10-16 10:58:43 +0800 | [diff] [blame] | 307 | index 77594f3..f256607 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 308 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 309 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 310 | @@ -229,9 +229,12 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 311 | struct flow_action_entry *act; |
| 312 | struct mtk_flow_data data = {}; |
| 313 | struct mtk_foe_entry foe; |
| 314 | - struct net_device *odev = NULL; |
| 315 | + struct net_device *idev = NULL, *odev = NULL; |
| 316 | struct mtk_flow_entry *entry; |
| 317 | + struct net_device_path_ctx ctx = {}; |
| 318 | + struct net_device_path path = {}; |
| 319 | int offload_type = 0; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 320 | + int ppe_index = 0; |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 321 | int wed_index = -1; |
| 322 | u16 addr_type = 0; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 323 | u8 l4proto = 0; |
| 324 | @@ -245,6 +248,10 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 325 | struct flow_match_meta match; |
| 326 | |
| 327 | flow_rule_match_meta(rule, &match); |
| 328 | + idev = __dev_get_by_index(&init_net, match.key->ingress_ifindex); |
| 329 | + |
| 330 | + if (!idev) |
| 331 | + pr_info("[%s] idev doesn't exist !\n", __func__); |
| 332 | } else { |
| 333 | return -EOPNOTSUPP; |
| 334 | } |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 335 | @@ -347,6 +354,20 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 336 | if (err) |
| 337 | return err; |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 338 | |
developer | 4df64ba | 2022-09-01 14:44:55 +0800 | [diff] [blame] | 339 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 340 | + if (idev && idev->netdev_ops->ndo_fill_receive_path) { |
| 341 | + ctx.dev = idev; |
| 342 | + idev->netdev_ops->ndo_fill_receive_path(&ctx, &path); |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 343 | + ppe_index = path.mtk_wdma.wdma_idx; |
| 344 | + if (ppe_index >= eth->ppe_num) { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 345 | + if (printk_ratelimit()) |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 346 | + pr_info("[%s] PPE%d doesn't exist, please check mtketh-ppe-num in dts !\n", __func__, ppe_index); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 347 | + |
| 348 | + return -EINVAL; |
| 349 | + } |
| 350 | + } |
developer | 4df64ba | 2022-09-01 14:44:55 +0800 | [diff] [blame] | 351 | +#endif |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 352 | + |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 353 | if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_PORTS)) { |
| 354 | struct flow_match_ports ports; |
| 355 | |
| 356 | @@ -440,9 +461,10 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 357 | |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 358 | entry->cookie = f->cookie; |
| 359 | memcpy(&entry->data, &foe, sizeof(entry->data)); |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 360 | + entry->ppe_index = ppe_index; |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 361 | entry->wed_index = wed_index; |
| 362 | |
| 363 | - if (mtk_foe_entry_commit(eth->ppe, entry) < 0) |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 364 | + if (mtk_foe_entry_commit(eth->ppe[ppe_index], entry) < 0) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 365 | goto free; |
| 366 | |
| 367 | err = rhashtable_insert_fast(ð->flow_table, &entry->node, |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 368 | @@ -453,7 +475,7 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 369 | return 0; |
| 370 | |
| 371 | clear: |
| 372 | - mtk_foe_entry_clear(eth->ppe, entry); |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 373 | + mtk_foe_entry_clear(eth->ppe[ppe_index], entry); |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 374 | free: |
| 375 | kfree(entry); |
| 376 | if (wed_index >= 0) |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 377 | @@ -465,13 +487,15 @@ static int |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 378 | mtk_flow_offload_destroy(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 379 | { |
| 380 | struct mtk_flow_entry *entry; |
| 381 | + int i; |
| 382 | |
| 383 | entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| 384 | mtk_flow_ht_params); |
| 385 | if (!entry) |
| 386 | return -ENOENT; |
| 387 | |
| 388 | - mtk_foe_entry_clear(eth->ppe, entry); |
| 389 | + i = entry->ppe_index; |
| 390 | + mtk_foe_entry_clear(eth->ppe[i], entry); |
| 391 | rhashtable_remove_fast(ð->flow_table, &entry->node, |
| 392 | mtk_flow_ht_params); |
| 393 | if (entry->wed_index >= 0) |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 394 | @@ -486,13 +510,15 @@ mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 395 | { |
| 396 | struct mtk_flow_entry *entry; |
| 397 | u32 idle; |
| 398 | + int i; |
| 399 | |
| 400 | entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| 401 | mtk_flow_ht_params); |
| 402 | if (!entry) |
| 403 | return -ENOENT; |
| 404 | |
| 405 | - idle = mtk_foe_entry_idle_time(eth->ppe, entry); |
| 406 | + i = entry->ppe_index; |
| 407 | + idle = mtk_foe_entry_idle_time(eth->ppe[i], entry); |
| 408 | f->stats.lastused = jiffies - idle * HZ; |
| 409 | |
| 410 | return 0; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 411 | @@ -543,10 +569,12 @@ mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f) |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 412 | static LIST_HEAD(block_cb_list); |
| 413 | struct flow_block_cb *block_cb; |
| 414 | flow_setup_cb_t *cb; |
developer | f131310 | 2022-10-11 11:02:55 +0800 | [diff] [blame] | 415 | - int err = 0; |
| 416 | + int i, err = 0; |
| 417 | |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 418 | - if (!eth->ppe || !eth->ppe->foe_table) |
| 419 | - return -EOPNOTSUPP; |
| 420 | + for (i = 0; i < eth->ppe_num; i++) { |
| 421 | + if (!eth->ppe[i] || !eth->ppe[i]->foe_table) |
| 422 | + return -EOPNOTSUPP; |
| 423 | + } |
| 424 | |
| 425 | if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) |
| 426 | return -EOPNOTSUPP; |
developer | 3c9c74d | 2023-09-11 11:36:12 +0800 | [diff] [blame] | 427 | @@ -603,9 +631,9 @@ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 428 | } |
| 429 | } |
| 430 | |
| 431 | -int mtk_eth_offload_init(struct mtk_eth *eth) |
| 432 | +int mtk_eth_offload_init(struct mtk_eth *eth, int id) |
| 433 | { |
| 434 | - if (!eth->ppe || !eth->ppe->foe_table) |
| 435 | + if (!eth->ppe[id] || !eth->ppe[id]->foe_table) |
| 436 | return 0; |
| 437 | |
| 438 | return rhashtable_init(ð->flow_table, &mtk_flow_ht_params); |
| 439 | diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 440 | index 5305384..b2abebe 100644 |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 441 | --- a/include/linux/netdevice.h |
| 442 | +++ b/include/linux/netdevice.h |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 443 | @@ -1316,6 +1316,8 @@ struct tlsdev_ops; |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 444 | * rtnl_lock is not held. |
| 445 | * int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); |
| 446 | * Get the forwarding path to reach the real device from the HW destination address |
| 447 | + * int (*ndo_fill_receive_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); |
| 448 | + * Get the receiving path to reach the real device from the HW source address |
| 449 | */ |
| 450 | struct net_device_ops { |
| 451 | int (*ndo_init)(struct net_device *dev); |
developer | 69bcd59 | 2024-03-25 14:26:39 +0800 | [diff] [blame^] | 452 | @@ -1515,6 +1517,8 @@ struct net_device_ops { |
developer | 3262bf8 | 2022-07-12 11:37:54 +0800 | [diff] [blame] | 453 | struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev); |
| 454 | int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, |
| 455 | struct net_device_path *path); |
| 456 | + int (*ndo_fill_receive_path)(struct net_device_path_ctx *ctx, |
| 457 | + struct net_device_path *path); |
| 458 | }; |
| 459 | |
| 460 | /** |
| 461 | -- |
| 462 | 2.18.0 |
| 463 | |