developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 1 | From a59cb5c770a694cb34ab179ec59e91ba5c39908b Mon Sep 17 00:00:00 2001 |
| 2 | From: Bo Jiao <Bo.Jiao@mediatek.com> |
| 3 | Date: Mon, 27 Jun 2022 14:48:35 +0800 |
| 4 | Subject: [PATCH 6/8] 9995-flow-offload-add-mkhnat-dual-ppe-new-v2 |
| 5 | |
| 6 | --- |
| 7 | arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 1 + |
| 8 | drivers/net/ethernet/mediatek/mtk_eth_soc.c | 67 ++++++++++++++----- |
| 9 | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 ++- |
| 10 | drivers/net/ethernet/mediatek/mtk_ppe.c | 5 +- |
| 11 | drivers/net/ethernet/mediatek/mtk_ppe.h | 7 +- |
| 12 | .../net/ethernet/mediatek/mtk_ppe_debugfs.c | 27 ++++++-- |
| 13 | .../net/ethernet/mediatek/mtk_ppe_offload.c | 45 ++++++++++--- |
| 14 | include/linux/netdevice.h | 4 ++ |
| 15 | 8 files changed, 125 insertions(+), 41 deletions(-) |
| 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 |
| 19 | index 7f78de6b9..381136c21 100644 |
| 20 | --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| 21 | +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi |
| 22 | @@ -479,6 +479,7 @@ |
| 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 |
| 31 | index 01fc1e5c0..3f67bebfe 100644 |
| 32 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| 33 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 34 | @@ -1732,6 +1732,7 @@ static int mtk_poll_rx(struct napi_struc |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 35 | u8 *data, *new_data; |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 36 | struct mtk_rx_dma_v2 *rxd, trxd; |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 37 | int done = 0; |
| 38 | + int i; |
| 39 | |
| 40 | if (unlikely(!ring)) |
| 41 | goto rx_done; |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 42 | @@ -1843,14 +1844,20 @@ static int mtk_poll_rx(struct napi_struc |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 43 | |
| 44 | #if defined(CONFIG_MEDIATEK_NETSYS_V2) |
| 45 | reason = FIELD_GET(MTK_RXD5_PPE_CPU_REASON_V2, trxd.rxd5); |
| 46 | - if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) |
| 47 | - mtk_ppe_check_skb(eth->ppe, skb, |
| 48 | - trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2); |
| 49 | + if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) { |
| 50 | + for (i = 0; i < eth->ppe_num; i++) { |
| 51 | + mtk_ppe_check_skb(eth->ppe[i], skb, |
| 52 | + trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2); |
| 53 | + } |
| 54 | + } |
| 55 | #else |
| 56 | reason = FIELD_GET(MTK_RXD4_PPE_CPU_REASON, trxd.rxd4); |
| 57 | - if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) |
| 58 | - mtk_ppe_check_skb(eth->ppe, skb, |
| 59 | - trxd.rxd4 & MTK_RXD4_FOE_ENTRY); |
| 60 | + if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) { |
| 61 | + for (i = 0; i < eth->ppe_num; i++) { |
| 62 | + mtk_ppe_check_skb(eth->ppe[i], skb, |
| 63 | + trxd.rxd4 & MTK_RXD4_FOE_ENTRY); |
| 64 | + } |
| 65 | + } |
| 66 | #endif |
| 67 | |
| 68 | if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) { |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 69 | @@ -3184,8 +3191,12 @@ static int mtk_open(struct net_device *d |
| 70 | if (!phy_node && eth->xgmii->regmap_sgmii[mac->id]) |
| 71 | regmap_write(eth->xgmii->regmap_sgmii[mac->id], SGMSYS_QPHY_PWR_STATE_CTRL, 0); |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 72 | |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 73 | - if (eth->soc->offload_version && mtk_ppe_start(ð->ppe) == 0) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 74 | - gdm_config = MTK_GDMA_TO_PPE; |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 75 | + if (eth->soc->offload_version) { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 76 | + gdm_config = MTK_GDMA_TO_PPE0; |
| 77 | + |
| 78 | + for (i = 0; i < eth->ppe_num; i++) |
| 79 | + mtk_ppe_start(eth->ppe[i]); |
| 80 | + } |
| 81 | |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 82 | mtk_gdm_config(eth, mac->id, gdm_config); |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 83 | |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 84 | @@ -3268,8 +3279,10 @@ static int mtk_stop(struct net_device *d |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 85 | |
| 86 | mtk_dma_free(eth); |
| 87 | |
| 88 | - if (eth->soc->offload_version) |
| 89 | - mtk_ppe_stop(eth->ppe); |
| 90 | + if (eth->soc->offload_version) { |
| 91 | + for (i = 0; i < eth->ppe_num; i++) |
| 92 | + mtk_ppe_stop(eth->ppe[i]); |
| 93 | + } |
| 94 | |
| 95 | return 0; |
| 96 | } |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 97 | @@ -4408,15 +4421,35 @@ static int mtk_probe(struct platform_dev |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 98 | } |
| 99 | |
| 100 | if (eth->soc->offload_version) { |
| 101 | - eth->ppe = mtk_ppe_init(eth, eth->base + MTK_ETH_PPE_BASE, 2); |
| 102 | - if (!eth->ppe) { |
| 103 | - err = -ENOMEM; |
| 104 | - goto err_free_dev; |
| 105 | + unsigned int val; |
| 106 | + |
| 107 | + err = of_property_read_u32_index(pdev->dev.of_node, "mtketh-ppe-num", 0, &val); |
| 108 | + if (err < 0) |
| 109 | + eth->ppe_num = 1; |
| 110 | + else |
| 111 | + eth->ppe_num = val; |
| 112 | + |
| 113 | + if (eth->ppe_num > MTK_MAX_PPE_NUM) { |
| 114 | + dev_warn(&pdev->dev, "%d is not a valid ppe num, please check mtketh-ppe-num in dts !", eth->ppe_num); |
| 115 | + eth->ppe_num = MTK_MAX_PPE_NUM; |
| 116 | } |
| 117 | |
| 118 | - err = mtk_eth_offload_init(eth); |
| 119 | - if (err) |
| 120 | - goto err_free_dev; |
| 121 | + dev_info(&pdev->dev, "ppe num = %d\n", eth->ppe_num); |
| 122 | + |
| 123 | + for (i = 0; i < eth->ppe_num; i++) { |
| 124 | + eth->ppe[i] = mtk_ppe_init(eth, |
| 125 | + eth->base + MTK_ETH_PPE_BASE + i * 0x400, 2, i); |
| 126 | + if (!eth->ppe[i]) { |
| 127 | + err = -ENOMEM; |
| 128 | + goto err_free_dev; |
| 129 | + } |
| 130 | + |
| 131 | + err = mtk_eth_offload_init(eth, i); |
| 132 | + if (err) |
| 133 | + goto err_free_dev; |
| 134 | + } |
| 135 | + |
| 136 | + mtk_ppe_debugfs_init(eth); |
| 137 | } |
| 138 | |
| 139 | for (i = 0; i < MTK_MAX_DEVS; i++) { |
| 140 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 141 | index fce1a7172..b4de7c0c6 100644 |
| 142 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 143 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 144 | @@ -118,7 +118,12 @@ |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 145 | #define MTK_GDMA_UCS_EN BIT(20) |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 146 | #define MTK_GDMA_STRP_CRC BIT(16) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 147 | #define MTK_GDMA_TO_PDMA 0x0 |
| 148 | -#define MTK_GDMA_TO_PPE 0x3333 |
developer | 5738253 | 2022-07-06 11:59:11 +0800 | [diff] [blame] | 149 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 150 | +#define MTK_GDMA_TO_PPE0 0x3333 |
| 151 | +#define MTK_GDMA_TO_PPE1 0x4444 |
developer | 5738253 | 2022-07-06 11:59:11 +0800 | [diff] [blame] | 152 | +#else |
| 153 | +#define MTK_GDMA_TO_PPE0 0x4444 |
| 154 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 155 | #define MTK_GDMA_DROP_ALL 0x7777 |
| 156 | |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 157 | /* GDM Egress Control Register */ |
| 158 | @@ -1612,7 +1617,8 @@ struct mtk_eth { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 159 | spinlock_t syscfg0_lock; |
| 160 | struct timer_list mtk_dma_monitor_timer; |
| 161 | |
| 162 | - struct mtk_ppe *ppe; |
| 163 | + u8 ppe_num; |
| 164 | + struct mtk_ppe *ppe[MTK_MAX_PPE_NUM]; |
| 165 | struct rhashtable flow_table; |
| 166 | }; |
| 167 | |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 168 | @@ -1668,11 +1674,13 @@ int mtk_gmac_usxgmii_path_setup(struct m |
| 169 | void mtk_gdm_config(struct mtk_eth *eth, u32 id, u32 config); |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 170 | void ethsys_reset(struct mtk_eth *eth, u32 reset_bits); |
| 171 | |
| 172 | -int mtk_eth_offload_init(struct mtk_eth *eth); |
| 173 | +int mtk_eth_offload_init(struct mtk_eth *eth, int id); |
| 174 | int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| 175 | void *type_data); |
| 176 | void mtk_eth_set_dma_device(struct mtk_eth *eth, struct device *dma_dev); |
| 177 | |
| 178 | +int mtk_ppe_debugfs_init(struct mtk_eth *eth); |
| 179 | + |
developer | 6883854 | 2022-10-03 23:42:21 +0800 | [diff] [blame] | 180 | int mtk_mac2xgmii_id(struct mtk_eth *eth, int mac_id); |
developer | dca0fde | 2022-12-14 11:40:35 +0800 | [diff] [blame] | 181 | int mtk_usxgmii_init(struct mtk_xgmii *ss, struct device_node *r); |
| 182 | int mtk_xfi_pextp_init(struct mtk_xgmii *ss, struct device_node *r); |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 183 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 184 | index d46e91178..3d6ff30ba 100755 |
| 185 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 186 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 187 | @@ -677,7 +677,7 @@ int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry) |
| 188 | } |
| 189 | |
| 190 | struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
| 191 | - int version) |
| 192 | + int version, int id) |
| 193 | { |
| 194 | struct device *dev = eth->dev; |
| 195 | struct mtk_foe_entry *foe; |
| 196 | @@ -696,6 +696,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
| 197 | ppe->eth = eth; |
| 198 | ppe->dev = dev; |
| 199 | ppe->version = version; |
| 200 | + ppe->id = id; |
| 201 | |
| 202 | foe = dmam_alloc_coherent(ppe->dev, MTK_PPE_ENTRIES * sizeof(*foe), |
| 203 | &ppe->foe_phys, GFP_KERNEL); |
| 204 | @@ -704,8 +705,6 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, |
| 205 | |
| 206 | ppe->foe_table = foe; |
| 207 | |
| 208 | - mtk_ppe_debugfs_init(ppe); |
| 209 | - |
| 210 | return ppe; |
| 211 | } |
| 212 | |
| 213 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h |
| 214 | index a76f4b0ac..21cc55145 100644 |
| 215 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.h |
| 216 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 217 | @@ -8,10 +8,12 @@ |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 218 | #include <linux/bitfield.h> |
| 219 | #include <linux/rhashtable.h> |
| 220 | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 221 | #if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 222 | +#define MTK_MAX_PPE_NUM 2 |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 223 | #define MTK_ETH_PPE_BASE 0x2000 |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 224 | #else |
| 225 | +#define MTK_MAX_PPE_NUM 1 |
| 226 | #define MTK_ETH_PPE_BASE 0xc00 |
| 227 | #endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 228 | |
| 229 | #define MTK_PPE_ENTRIES_SHIFT 3 |
| 230 | @@ -253,6 +255,7 @@ struct mtk_flow_entry { |
| 231 | }; |
| 232 | }; |
| 233 | u8 type; |
| 234 | + s8 ppe_index; |
| 235 | s8 wed_index; |
| 236 | u16 hash; |
| 237 | union { |
| 238 | @@ -272,6 +275,7 @@ struct mtk_ppe { |
| 239 | struct device *dev; |
| 240 | void __iomem *base; |
| 241 | int version; |
| 242 | + int id; |
| 243 | |
| 244 | struct mtk_foe_entry *foe_table; |
| 245 | dma_addr_t foe_phys; |
| 246 | @@ -284,7 +288,7 @@ struct mtk_ppe { |
| 247 | void *acct_table; |
| 248 | }; |
| 249 | |
| 250 | -struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int version); |
| 251 | +struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base, int version, int id); |
| 252 | int mtk_ppe_start(struct mtk_ppe *ppe); |
| 253 | int mtk_ppe_stop(struct mtk_ppe *ppe); |
| 254 | |
| 255 | @@ -335,6 +339,5 @@ int mtk_foe_entry_set_wdma(struct mtk_foe_entry *entry, int wdma_idx, int txq, |
| 256 | int mtk_foe_entry_commit(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 257 | void mtk_foe_entry_clear(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 258 | int mtk_foe_entry_idle_time(struct mtk_ppe *ppe, struct mtk_flow_entry *entry); |
| 259 | -int mtk_ppe_debugfs_init(struct mtk_ppe *ppe); |
| 260 | |
| 261 | #endif |
| 262 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| 263 | index a591ab1fd..f4ebe5944 100644 |
| 264 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| 265 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_debugfs.c |
| 266 | @@ -73,9 +73,8 @@ mtk_print_addr_info(struct seq_file *m, struct mtk_flow_addr_info *ai) |
| 267 | } |
| 268 | |
| 269 | static int |
| 270 | -mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 271 | +mtk_ppe_debugfs_foe_show(struct seq_file *m, struct mtk_ppe *ppe, bool bind) |
| 272 | { |
| 273 | - struct mtk_ppe *ppe = m->private; |
| 274 | int i; |
| 275 | |
| 276 | for (i = 0; i < MTK_PPE_ENTRIES; i++) { |
| 277 | @@ -122,6 +121,8 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 278 | break; |
| 279 | } |
| 280 | |
| 281 | + seq_printf(m, " ppe=%d", ppe->id); |
| 282 | + |
| 283 | seq_printf(m, " orig="); |
| 284 | mtk_print_addr_info(m, &ai); |
| 285 | |
| 286 | @@ -164,13 +165,25 @@ mtk_ppe_debugfs_foe_show(struct seq_file *m, void *private, bool bind) |
| 287 | static int |
| 288 | mtk_ppe_debugfs_foe_show_all(struct seq_file *m, void *private) |
| 289 | { |
| 290 | - return mtk_ppe_debugfs_foe_show(m, private, false); |
| 291 | + struct mtk_eth *eth = m->private; |
| 292 | + int i; |
| 293 | + |
| 294 | + for (i = 0; i < eth->ppe_num; i++) |
| 295 | + mtk_ppe_debugfs_foe_show(m, eth->ppe[i], false); |
| 296 | + |
| 297 | + return 0; |
| 298 | } |
| 299 | |
| 300 | static int |
| 301 | mtk_ppe_debugfs_foe_show_bind(struct seq_file *m, void *private) |
| 302 | { |
| 303 | - return mtk_ppe_debugfs_foe_show(m, private, true); |
| 304 | + struct mtk_eth *eth = m->private; |
| 305 | + int i; |
| 306 | + |
| 307 | + for (i = 0; i < eth->ppe_num; i++) |
| 308 | + mtk_ppe_debugfs_foe_show(m, eth->ppe[i], true); |
| 309 | + |
| 310 | + return 0; |
| 311 | } |
| 312 | |
| 313 | static int |
| 314 | @@ -187,7 +200,7 @@ mtk_ppe_debugfs_foe_open_bind(struct inode *inode, struct file *file) |
| 315 | inode->i_private); |
| 316 | } |
| 317 | |
| 318 | -int mtk_ppe_debugfs_init(struct mtk_ppe *ppe) |
| 319 | +int mtk_ppe_debugfs_init(struct mtk_eth *eth) |
| 320 | { |
| 321 | static const struct file_operations fops_all = { |
| 322 | .open = mtk_ppe_debugfs_foe_open_all, |
| 323 | @@ -209,8 +222,8 @@ int mtk_ppe_debugfs_init(struct mtk_ppe *ppe) |
| 324 | if (!root) |
| 325 | return -ENOMEM; |
| 326 | |
| 327 | - debugfs_create_file("entries", S_IRUGO, root, ppe, &fops_all); |
| 328 | - debugfs_create_file("bind", S_IRUGO, root, ppe, &fops_bind); |
| 329 | + debugfs_create_file("entries", S_IRUGO, root, eth, &fops_all); |
| 330 | + debugfs_create_file("bind", S_IRUGO, root, eth, &fops_bind); |
| 331 | |
| 332 | return 0; |
| 333 | } |
| 334 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 335 | old mode 100644 |
| 336 | new mode 100755 |
| 337 | index 5a4201447..2f7d76d3b |
| 338 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 339 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 340 | @@ -226,8 +226,10 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 341 | struct flow_action_entry *act; |
| 342 | struct mtk_flow_data data = {}; |
| 343 | struct mtk_foe_entry foe; |
| 344 | - struct net_device *odev = NULL; |
| 345 | + struct net_device *idev = NULL, *odev = NULL; |
| 346 | struct mtk_flow_entry *entry; |
| 347 | + struct net_device_path_ctx ctx = {}; |
| 348 | + struct net_device_path path = {}; |
| 349 | int offload_type = 0; |
| 350 | int wed_index = -1; |
| 351 | u16 addr_type = 0; |
| 352 | @@ -242,6 +244,10 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 353 | struct flow_match_meta match; |
| 354 | |
| 355 | flow_rule_match_meta(rule, &match); |
| 356 | + idev = __dev_get_by_index(&init_net, match.key->ingress_ifindex); |
| 357 | + |
| 358 | + if (!idev) |
| 359 | + pr_info("[%s] idev doesn't exist !\n", __func__); |
| 360 | } else { |
| 361 | return -EOPNOTSUPP; |
| 362 | } |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 363 | @@ -435,11 +441,27 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 364 | if (!entry) |
| 365 | return -ENOMEM; |
| 366 | |
| 367 | + i = 0; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 368 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 369 | + if (idev && idev->netdev_ops->ndo_fill_receive_path) { |
| 370 | + ctx.dev = idev; |
| 371 | + idev->netdev_ops->ndo_fill_receive_path(&ctx, &path); |
| 372 | + i = path.mtk_wdma.wdma_idx; |
| 373 | + if (i >= eth->ppe_num) { |
| 374 | + if (printk_ratelimit()) |
| 375 | + pr_info("[%s] PPE%d doesn't exist, please check mtketh-ppe-num in dts !\n", __func__, i); |
| 376 | + |
| 377 | + return -EINVAL; |
| 378 | + } |
| 379 | + } |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 380 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 381 | + |
| 382 | entry->cookie = f->cookie; |
| 383 | memcpy(&entry->data, &foe, sizeof(entry->data)); |
| 384 | + entry->ppe_index = i; |
| 385 | entry->wed_index = wed_index; |
| 386 | |
| 387 | - if (mtk_foe_entry_commit(eth->ppe, entry) < 0) |
| 388 | + if (mtk_foe_entry_commit(eth->ppe[i], entry) < 0) |
| 389 | goto free; |
| 390 | |
| 391 | err = rhashtable_insert_fast(ð->flow_table, &entry->node, |
| 392 | @@ -450,7 +470,7 @@ mtk_flow_offload_replace(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 393 | return 0; |
| 394 | |
| 395 | clear: |
| 396 | - mtk_foe_entry_clear(eth->ppe, entry); |
| 397 | + mtk_foe_entry_clear(eth->ppe[i], entry); |
| 398 | free: |
| 399 | kfree(entry); |
| 400 | if (wed_index >= 0) |
| 401 | @@ -462,13 +482,15 @@ static int |
| 402 | mtk_flow_offload_destroy(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 403 | { |
| 404 | struct mtk_flow_entry *entry; |
| 405 | + int i; |
| 406 | |
| 407 | entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| 408 | mtk_flow_ht_params); |
| 409 | if (!entry) |
| 410 | return -ENOENT; |
| 411 | |
| 412 | - mtk_foe_entry_clear(eth->ppe, entry); |
| 413 | + i = entry->ppe_index; |
| 414 | + mtk_foe_entry_clear(eth->ppe[i], entry); |
| 415 | rhashtable_remove_fast(ð->flow_table, &entry->node, |
| 416 | mtk_flow_ht_params); |
| 417 | if (entry->wed_index >= 0) |
| 418 | @@ -483,13 +505,15 @@ mtk_flow_offload_stats(struct mtk_eth *eth, struct flow_cls_offload *f) |
| 419 | { |
| 420 | struct mtk_flow_entry *entry; |
| 421 | u32 idle; |
| 422 | + int i; |
| 423 | |
| 424 | entry = rhashtable_lookup(ð->flow_table, &f->cookie, |
| 425 | mtk_flow_ht_params); |
| 426 | if (!entry) |
| 427 | return -ENOENT; |
| 428 | |
| 429 | - idle = mtk_foe_entry_idle_time(eth->ppe, entry); |
| 430 | + i = entry->ppe_index; |
| 431 | + idle = mtk_foe_entry_idle_time(eth->ppe[i], entry); |
| 432 | f->stats.lastused = jiffies - idle * HZ; |
| 433 | |
| 434 | return 0; |
developer | 207b39d | 2022-10-07 15:57:16 +0800 | [diff] [blame] | 435 | @@ -540,12 +564,14 @@ mtk_eth_setup_tc_block(struct net_device *dev, struct flow_block_offload *f) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 436 | static LIST_HEAD(block_cb_list); |
| 437 | struct flow_block_cb *block_cb; |
| 438 | flow_setup_cb_t *cb; |
developer | 207b39d | 2022-10-07 15:57:16 +0800 | [diff] [blame] | 439 | - int err = 0; |
| 440 | + int i, err = 0; |
| 441 | |
| 442 | flowtable = container_of(f->block, struct nf_flowtable, flow_block); |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 443 | |
| 444 | - if (!eth->ppe || !eth->ppe->foe_table) |
| 445 | - return -EOPNOTSUPP; |
| 446 | + for (i = 0; i < eth->ppe_num; i++) { |
| 447 | + if (!eth->ppe[i] || !eth->ppe[i]->foe_table) |
| 448 | + return -EOPNOTSUPP; |
| 449 | + } |
| 450 | |
| 451 | if (f->binder_type != FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS) |
| 452 | return -EOPNOTSUPP; |
| 453 | @@ -591,9 +618,9 @@ int mtk_eth_setup_tc(struct net_device *dev, enum tc_setup_type type, |
| 454 | } |
| 455 | } |
| 456 | |
| 457 | -int mtk_eth_offload_init(struct mtk_eth *eth) |
| 458 | +int mtk_eth_offload_init(struct mtk_eth *eth, int id) |
| 459 | { |
| 460 | - if (!eth->ppe || !eth->ppe->foe_table) |
| 461 | + if (!eth->ppe[id] || !eth->ppe[id]->foe_table) |
| 462 | return 0; |
| 463 | |
| 464 | return rhashtable_init(ð->flow_table, &mtk_flow_ht_params); |
| 465 | diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h |
| 466 | index 35998b1a7..0ada2461b 100644 |
| 467 | --- a/include/linux/netdevice.h |
| 468 | +++ b/include/linux/netdevice.h |
| 469 | @@ -1302,6 +1302,8 @@ struct tlsdev_ops; |
| 470 | * rtnl_lock is not held. |
| 471 | * int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); |
| 472 | * Get the forwarding path to reach the real device from the HW destination address |
| 473 | + * int (*ndo_fill_receive_path)(struct net_device_path_ctx *ctx, struct net_device_path *path); |
| 474 | + * Get the receiving path to reach the real device from the HW source address |
| 475 | */ |
| 476 | struct net_device_ops { |
| 477 | int (*ndo_init)(struct net_device *dev); |
| 478 | @@ -1501,6 +1503,8 @@ struct net_device_ops { |
| 479 | struct devlink_port * (*ndo_get_devlink_port)(struct net_device *dev); |
| 480 | int (*ndo_fill_forward_path)(struct net_device_path_ctx *ctx, |
| 481 | struct net_device_path *path); |
| 482 | + int (*ndo_fill_receive_path)(struct net_device_path_ctx *ctx, |
| 483 | + struct net_device_path *path); |
| 484 | }; |
| 485 | |
| 486 | /** |
| 487 | -- |
| 488 | 2.18.0 |
| 489 | |