developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 1 | From d86af0076cbf7d99bdb4f28115159643b79ad3fa Mon Sep 17 00:00:00 2001 |
| 2 | From: Sujuan Chen <sujuan.chen@mediatek.com> |
| 3 | Date: Wed, 18 May 2022 11:08:15 +0800 |
| 4 | Subject: [PATCH 5/8] 9994-ethernet-update-ppe-from-mt7622-to-mt7986 |
| 5 | |
| 6 | Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> |
| 7 | --- |
| 8 | drivers/net/ethernet/mediatek/mtk_eth_soc.c | 14 +++- |
| 9 | drivers/net/ethernet/mediatek/mtk_eth_soc.h | 7 +- |
| 10 | drivers/net/ethernet/mediatek/mtk_ppe.c | 24 ++++--- |
| 11 | drivers/net/ethernet/mediatek/mtk_ppe.h | 69 ++++++++++--------- |
| 12 | .../net/ethernet/mediatek/mtk_ppe_offload.c | 7 +- |
| 13 | drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 10 +++ |
| 14 | 6 files changed, 86 insertions(+), 45 deletions(-) |
| 15 | |
| 16 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| 17 | index 2121335a1..01fc1e5c0 100644 |
| 18 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| 19 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c |
| 20 | @@ -1467,16 +1467,27 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, |
| 21 | skb_checksum_none_assert(skb); |
| 22 | skb->protocol = eth_type_trans(skb, netdev); |
| 23 | |
| 24 | - hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY; |
| 25 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
| 26 | + hash = trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2; |
| 27 | +#else |
| 28 | + hash = trxd.rxd4 & MTK_RXD4_FOE_ENTRY; |
| 29 | +#endif |
| 30 | if (hash != MTK_RXD4_FOE_ENTRY) { |
| 31 | hash = jhash_1word(hash, 0); |
| 32 | skb_set_hash(skb, hash, PKT_HASH_TYPE_L4); |
| 33 | } |
| 34 | |
| 35 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
| 36 | + reason = FIELD_GET(MTK_RXD5_PPE_CPU_REASON_V2, trxd.rxd5); |
| 37 | + if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) |
| 38 | + mtk_ppe_check_skb(eth->ppe, skb, |
| 39 | + trxd.rxd5 & MTK_RXD5_FOE_ENTRY_V2); |
| 40 | +#else |
| 41 | reason = FIELD_GET(MTK_RXD4_PPE_CPU_REASON, trxd.rxd4); |
| 42 | if (reason == MTK_PPE_CPU_REASON_HIT_UNBIND_RATE_REACHED) |
| 43 | mtk_ppe_check_skb(eth->ppe, skb, |
| 44 | trxd.rxd4 & MTK_RXD4_FOE_ENTRY); |
| 45 | +#endif |
| 46 | |
| 47 | if (netdev->features & NETIF_F_HW_VLAN_CTAG_RX) { |
| 48 | if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) { |
developer | 0c6c525 | 2022-07-12 11:59:21 +0800 | [diff] [blame] | 49 | @@ -3926,12 +3937,13 @@ static const struct mtk_soc_data mt7986_data = { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 50 | .required_clks = MT7986_CLKS_BITMAP, |
| 51 | .required_pctl = false, |
| 52 | .has_sram = true, |
| 53 | + .offload_version = 2, |
developer | 0c6c525 | 2022-07-12 11:59:21 +0800 | [diff] [blame] | 54 | .txrx = { |
| 55 | .txd_size = sizeof(struct mtk_tx_dma_v2), |
| 56 | .rxd_size = sizeof(struct mtk_rx_dma_v2), |
| 57 | .dma_max_len = MTK_TX_DMA_BUF_LEN_V2, |
| 58 | .dma_len_offset = MTK_TX_DMA_BUF_SHIFT_V2, |
| 59 | }, |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 60 | }; |
| 61 | |
| 62 | static const struct mtk_soc_data mt7981_data = { |
| 63 | diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 64 | index b52378bd6..fce1a7172 100644 |
| 65 | --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 66 | +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h |
| 67 | @@ -110,7 +110,7 @@ |
| 68 | #define MTK_GDMA_TCS_EN BIT(21) |
| 69 | #define MTK_GDMA_UCS_EN BIT(20) |
| 70 | #define MTK_GDMA_TO_PDMA 0x0 |
| 71 | -#define MTK_GDMA_TO_PPE 0x4444 |
| 72 | +#define MTK_GDMA_TO_PPE 0x3333 |
| 73 | #define MTK_GDMA_DROP_ALL 0x7777 |
| 74 | |
| 75 | /* Unicast Filter MAC Address Register - Low */ |
| 76 | @@ -560,6 +560,11 @@ |
| 77 | #define MTK_RXD4_SRC_PORT GENMASK(21, 19) |
| 78 | #define MTK_RXD4_ALG GENMASK(31, 22) |
| 79 | |
| 80 | +/* QDMA descriptor rxd4 */ |
| 81 | +#define MTK_RXD5_FOE_ENTRY_V2 GENMASK(14, 0) |
| 82 | +#define MTK_RXD5_PPE_CPU_REASON_V2 GENMASK(22, 18) |
| 83 | +#define MTK_RXD5_SRC_PORT_V2 GENMASK(29, 26) |
| 84 | + |
| 85 | /* QDMA descriptor rxd4 */ |
| 86 | #define RX_DMA_L4_VALID BIT(24) |
| 87 | #define RX_DMA_L4_VALID_PDMA BIT(30) /* when PDMA is used */ |
| 88 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 89 | index 3d75c22be..d46e91178 100755 |
| 90 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 91 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c |
| 92 | @@ -122,7 +122,7 @@ static u32 mtk_ppe_hash_entry(struct mtk_foe_entry *e) |
| 93 | hash = (hash >> 24) | ((hash & 0xffffff) << 8); |
| 94 | hash ^= hv1 ^ hv2 ^ hv3; |
| 95 | hash ^= hash >> 16; |
| 96 | - hash <<= 1; |
| 97 | + hash <<= 2; |
| 98 | hash &= MTK_PPE_ENTRIES - 1; |
| 99 | |
| 100 | return hash; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 101 | @@ -171,8 +171,12 @@ int mtk_foe_entry_prepare(struct mtk_foe_entry *entry, int type, int l4proto, |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 102 | MTK_FOE_IB1_BIND_CACHE; |
| 103 | entry->ib1 = val; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 104 | |
| 105 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 106 | + val = FIELD_PREP(MTK_FOE_IB2_PORT_AG, 0xf) | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 107 | +#else |
| 108 | val = FIELD_PREP(MTK_FOE_IB2_PORT_MG, 0x3f) | |
| 109 | FIELD_PREP(MTK_FOE_IB2_PORT_AG, 0x1f) | |
| 110 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 111 | FIELD_PREP(MTK_FOE_IB2_DEST_PORT, pse_port); |
| 112 | |
| 113 | if (is_multicast_ether_addr(dest_mac)) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 114 | @@ -359,12 +358,19 @@ int mtk_foe_entry_set_wdma(struct mtk_foe_entry *entry, int wdma_idx, int txq, |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 115 | |
| 116 | *ib2 &= ~MTK_FOE_IB2_PORT_MG; |
| 117 | *ib2 |= MTK_FOE_IB2_WDMA_WINFO; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 118 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 119 | + *ib2 |= FIELD_PREP(MTK_FOE_IB2_RX_IDX, txq); |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 120 | + |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 121 | + l2->winfo = FIELD_PREP(MTK_FOE_WINFO_WCID, wcid) | |
| 122 | + FIELD_PREP(MTK_FOE_WINFO_BSS, bss); |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 123 | +#else |
| 124 | if (wdma_idx) |
| 125 | *ib2 |= MTK_FOE_IB2_WDMA_DEVIDX; |
| 126 | |
| 127 | l2->vlan2 = FIELD_PREP(MTK_FOE_VLAN2_WINFO_BSS, bss) | |
| 128 | FIELD_PREP(MTK_FOE_VLAN2_WINFO_WCID, wcid) | |
| 129 | FIELD_PREP(MTK_FOE_VLAN2_WINFO_RING, txq); |
| 130 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 131 | |
| 132 | return 0; |
| 133 | } |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 134 | @@ -741,6 +738,9 @@ int mtk_ppe_start(struct mtk_ppe *ppe) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 135 | MTK_PPE_TB_CFG_AGE_TCP | |
| 136 | MTK_PPE_TB_CFG_AGE_UDP | |
| 137 | MTK_PPE_TB_CFG_AGE_TCP_FIN | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 138 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 139 | + MTK_PPE_TB_CFG_INFO_SEL | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 140 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 141 | FIELD_PREP(MTK_PPE_TB_CFG_SEARCH_MISS, |
| 142 | MTK_PPE_SEARCH_MISS_ACTION_FORWARD_BUILD) | |
| 143 | FIELD_PREP(MTK_PPE_TB_CFG_KEEPALIVE, |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 144 | @@ -757,7 +755,8 @@ int mtk_ppe_start(struct mtk_ppe *ppe) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 145 | |
| 146 | mtk_ppe_cache_enable(ppe, true); |
| 147 | |
| 148 | - val = MTK_PPE_FLOW_CFG_IP4_TCP_FRAG | |
| 149 | + val = MTK_PPE_MD_TOAP_BYP_CRSN0 | |
| 150 | + MTK_PPE_MD_TOAP_BYP_CRSN1 | |
| 151 | + MTK_PPE_MD_TOAP_BYP_CRSN2 | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 152 | - MTK_PPE_FLOW_CFG_IP4_UDP_FRAG | |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 153 | MTK_PPE_FLOW_CFG_IP6_3T_ROUTE | |
| 154 | MTK_PPE_FLOW_CFG_IP6_5T_ROUTE | |
| 155 | @@ -765,7 +765,8 @@ int mtk_ppe_start(struct mtk_ppe *ppe) |
| 156 | MTK_PPE_FLOW_CFG_IP4_NAT | |
| 157 | MTK_PPE_FLOW_CFG_IP4_NAPT | |
| 158 | MTK_PPE_FLOW_CFG_IP4_DSLITE | |
| 159 | - MTK_PPE_FLOW_CFG_IP4_NAT_FRAG; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 160 | + MTK_PPE_FLOW_CFG_IP4_NAT_FRAG | |
| 161 | + MTK_PPE_FLOW_CFG_IP4_HASH_GRE_KEY; |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 162 | ppe_w32(ppe, MTK_PPE_FLOW_CFG, val); |
| 163 | |
| 164 | val = FIELD_PREP(MTK_PPE_UNBIND_AGE_MIN_PACKETS, 1000) | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 165 | @@ -800,6 +801,11 @@ int mtk_ppe_start(struct mtk_ppe *ppe) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 166 | |
| 167 | ppe_w32(ppe, MTK_PPE_DEFAULT_CPU_PORT, 0); |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 168 | |
| 169 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 170 | + ppe_w32(ppe, MTK_PPE_DEFAULT_CPU_PORT1, 0xcb777); |
| 171 | + ppe_w32(ppe, MTK_PPE_SBW_CTRL, 0x7f); |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 172 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 173 | + |
| 174 | return 0; |
| 175 | } |
| 176 | |
| 177 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.h b/drivers/net/ethernet/mediatek/mtk_ppe.h |
| 178 | index 1f5cf1c9a..a76f4b0ac 100644 |
| 179 | --- a/drivers/net/ethernet/mediatek/mtk_ppe.h |
| 180 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe.h |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 181 | @@ -8,7 +8,11 @@ |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 182 | #include <linux/bitfield.h> |
| 183 | #include <linux/rhashtable.h> |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 184 | |
| 185 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 186 | +#define MTK_ETH_PPE_BASE 0x2000 |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 187 | +#else |
| 188 | #define MTK_ETH_PPE_BASE 0xc00 |
| 189 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 190 | |
| 191 | #define MTK_PPE_ENTRIES_SHIFT 3 |
| 192 | #define MTK_PPE_ENTRIES (1024 << MTK_PPE_ENTRIES_SHIFT) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 193 | @@ -16,20 +16,40 @@ |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 194 | #define MTK_PPE_WAIT_TIMEOUT_US 1000000 |
| 195 | |
| 196 | #define MTK_FOE_IB1_UNBIND_TIMESTAMP GENMASK(7, 0) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 197 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 198 | +#define MTK_FOE_IB1_UNBIND_SRC_PORT GENMASK(11, 8) |
| 199 | +#define MTK_FOE_IB1_UNBIND_PACKETS GENMASK(19, 12) |
| 200 | +#define MTK_FOE_IB1_UNBIND_PREBIND BIT(22) |
| 201 | +#define MTK_FOE_IB1_UNBIND_PACKET_TYPE GENMASK(27, 23) |
| 202 | +#define MTK_FOE_IB1_BIND_TIMESTAMP GENMASK(7, 0) |
| 203 | +#define MTK_FOE_IB1_BIND_SRC_PORT GENMASK(11, 8) |
| 204 | +#define MTK_FOE_IB1_BIND_MC BIT(12) |
| 205 | +#define MTK_FOE_IB1_BIND_KEEPALIVE BIT(13) |
| 206 | +#define MTK_FOE_IB1_BIND_VLAN_LAYER GENMASK(16, 14) |
| 207 | +#define MTK_FOE_IB1_BIND_PPPOE BIT(17) |
| 208 | +#define MTK_FOE_IB1_BIND_VLAN_TAG BIT(18) |
| 209 | +#define MTK_FOE_IB1_BIND_PKT_SAMPLE BIT(19) |
| 210 | +#define MTK_FOE_IB1_BIND_CACHE BIT(20) |
| 211 | +#define MTK_FOE_IB1_BIND_TUNNEL_DECAP BIT(21) |
| 212 | +#define MTK_FOE_IB1_BIND_TTL BIT(22) |
| 213 | +#define MTK_FOE_IB1_PACKET_TYPE GENMASK(27, 23) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 214 | +#else |
| 215 | #define MTK_FOE_IB1_UNBIND_PACKETS GENMASK(23, 8) |
| 216 | #define MTK_FOE_IB1_UNBIND_PREBIND BIT(24) |
| 217 | |
| 218 | #define MTK_FOE_IB1_BIND_TIMESTAMP GENMASK(14, 0) |
| 219 | #define MTK_FOE_IB1_BIND_KEEPALIVE BIT(15) |
| 220 | #define MTK_FOE_IB1_BIND_VLAN_LAYER GENMASK(18, 16) |
| 221 | #define MTK_FOE_IB1_BIND_PPPOE BIT(19) |
| 222 | #define MTK_FOE_IB1_BIND_VLAN_TAG BIT(20) |
| 223 | #define MTK_FOE_IB1_BIND_PKT_SAMPLE BIT(21) |
| 224 | #define MTK_FOE_IB1_BIND_CACHE BIT(22) |
| 225 | #define MTK_FOE_IB1_BIND_TUNNEL_DECAP BIT(23) |
| 226 | #define MTK_FOE_IB1_BIND_TTL BIT(24) |
| 227 | |
| 228 | #define MTK_FOE_IB1_PACKET_TYPE GENMASK(27, 25) |
| 229 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 230 | + |
| 231 | #define MTK_FOE_IB1_STATE GENMASK(29, 28) |
| 232 | #define MTK_FOE_IB1_UDP BIT(30) |
| 233 | #define MTK_FOE_IB1_STATIC BIT(31) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 234 | @@ -44,24 +47,42 @@ enum { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 235 | MTK_PPE_PKT_TYPE_IPV6_6RD = 7, |
| 236 | }; |
| 237 | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 238 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 239 | +#define MTK_FOE_IB2_QID GENMASK(6, 0) |
| 240 | +#define MTK_FOE_IB2_PORT_MG BIT(7) |
| 241 | +#define MTK_FOE_IB2_PSE_QOS BIT(8) |
| 242 | +#define MTK_FOE_IB2_DEST_PORT GENMASK(12, 9) |
| 243 | +#define MTK_FOE_IB2_MULTICAST BIT(13) |
| 244 | +#define MTK_FOE_IB2_MIB_CNT BIT(15) |
| 245 | +#define MTK_FOE_IB2_RX_IDX GENMASK(18, 17) |
| 246 | +#define MTK_FOE_IB2_WDMA_WINFO BIT(19) |
| 247 | +#define MTK_FOE_IB2_PORT_AG GENMASK(23, 20) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 248 | +#else |
| 249 | #define MTK_FOE_IB2_QID GENMASK(3, 0) |
| 250 | #define MTK_FOE_IB2_PSE_QOS BIT(4) |
| 251 | #define MTK_FOE_IB2_DEST_PORT GENMASK(7, 5) |
| 252 | #define MTK_FOE_IB2_MULTICAST BIT(8) |
| 253 | |
| 254 | #define MTK_FOE_IB2_WDMA_QID2 GENMASK(13, 12) |
| 255 | +#define MTK_FOE_IB2_MIB_CNT BIT(15) |
| 256 | #define MTK_FOE_IB2_WDMA_DEVIDX BIT(16) |
| 257 | #define MTK_FOE_IB2_WDMA_WINFO BIT(17) |
| 258 | |
| 259 | #define MTK_FOE_IB2_PORT_MG GENMASK(17, 12) |
| 260 | |
| 261 | #define MTK_FOE_IB2_PORT_AG GENMASK(23, 18) |
| 262 | +#endif |
| 263 | |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 264 | #define MTK_FOE_IB2_DSCP GENMASK(31, 24) |
| 265 | |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 266 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 267 | +#define MTK_FOE_WINFO_BSS GENMASK(5, 0) |
| 268 | +#define MTK_FOE_WINFO_WCID GENMASK(15, 6) |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 269 | +#else |
| 270 | #define MTK_FOE_VLAN2_WINFO_BSS GENMASK(5, 0) |
| 271 | #define MTK_FOE_VLAN2_WINFO_WCID GENMASK(13, 6) |
| 272 | #define MTK_FOE_VLAN2_WINFO_RING GENMASK(15, 14) |
| 273 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 274 | |
| 275 | enum { |
| 276 | MTK_FOE_STATE_INVALID, |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 277 | @@ -83,6 +81,11 @@ struct mtk_foe_mac_info { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 278 | |
| 279 | u16 pppoe_id; |
| 280 | u16 src_mac_lo; |
| 281 | + |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 282 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 283 | + u16 minfo; |
| 284 | + u16 winfo; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 285 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 286 | }; |
| 287 | |
| 288 | /* software-only entry type */ |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 289 | @@ -200,7 +205,11 @@ struct mtk_foe_entry { |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 290 | struct mtk_foe_ipv4_dslite dslite; |
| 291 | struct mtk_foe_ipv6 ipv6; |
| 292 | struct mtk_foe_ipv6_6rd ipv6_6rd; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 293 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 294 | + u32 data[23]; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 295 | +#else |
| 296 | u32 data[19]; |
| 297 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 298 | }; |
| 299 | }; |
| 300 | |
| 301 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 302 | index d4a012608..5a4201447 100644 |
| 303 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
| 304 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_offload.c |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 305 | @@ -192,7 +192,15 @@ mtk_flow_set_output_device(struct mtk_eth *eth, struct mtk_foe_entry *foe, |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 306 | if (mtk_flow_get_wdma_info(dev, dest_mac, &info) == 0) { |
| 307 | mtk_foe_entry_set_wdma(foe, info.wdma_idx, info.queue, info.bss, |
| 308 | info.wcid); |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 309 | pse_port = 3; |
| 310 | +#if defined(CONFIG_MEDIATEK_NETSYS_V2) |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 311 | + if (info.wdma_idx == 0) |
| 312 | + pse_port = 8; |
| 313 | + else if (info.wdma_idx == 1) |
| 314 | + pse_port = 9; |
| 315 | + else |
| 316 | + return -EOPNOTSUPP; |
developer | 7c939fe | 2022-08-22 13:16:56 +0800 | [diff] [blame] | 317 | +#endif |
developer | 8cb3ac7 | 2022-07-04 10:55:14 +0800 | [diff] [blame] | 318 | *wed_index = info.wdma_idx; |
| 319 | goto out; |
| 320 | } |
| 321 | diff --git a/drivers/net/ethernet/mediatek/mtk_ppe_regs.h b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| 322 | index 0c45ea090..d319f1861 100644 |
| 323 | --- a/drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| 324 | +++ b/drivers/net/ethernet/mediatek/mtk_ppe_regs.h |
| 325 | @@ -21,6 +21,9 @@ |
| 326 | #define MTK_PPE_GLO_CFG_BUSY BIT(31) |
| 327 | |
| 328 | #define MTK_PPE_FLOW_CFG 0x204 |
| 329 | +#define MTK_PPE_MD_TOAP_BYP_CRSN0 BIT(1) |
| 330 | +#define MTK_PPE_MD_TOAP_BYP_CRSN1 BIT(2) |
| 331 | +#define MTK_PPE_MD_TOAP_BYP_CRSN2 BIT(3) |
| 332 | #define MTK_PPE_FLOW_CFG_IP4_TCP_FRAG BIT(6) |
| 333 | #define MTK_PPE_FLOW_CFG_IP4_UDP_FRAG BIT(7) |
| 334 | #define MTK_PPE_FLOW_CFG_IP6_3T_ROUTE BIT(8) |
| 335 | @@ -35,6 +38,8 @@ |
| 336 | #define MTK_PPE_FLOW_CFG_IP4_HASH_FLOW_LABEL BIT(18) |
| 337 | #define MTK_PPE_FLOW_CFG_IP4_HASH_GRE_KEY BIT(19) |
| 338 | #define MTK_PPE_FLOW_CFG_IP6_HASH_GRE_KEY BIT(20) |
| 339 | +#define MTK_PPE_FLOW_CFG_IPV4_MAPE_EN BIT(21) |
| 340 | +#define MTK_PPE_FLOW_CFG_IPV4_MAPT_EN BIT(22) |
| 341 | |
| 342 | #define MTK_PPE_IP_PROTO_CHK 0x208 |
| 343 | #define MTK_PPE_IP_PROTO_CHK_IPV4 GENMASK(15, 0) |
| 344 | @@ -54,6 +59,7 @@ |
| 345 | #define MTK_PPE_TB_CFG_HASH_MODE GENMASK(15, 14) |
| 346 | #define MTK_PPE_TB_CFG_SCAN_MODE GENMASK(17, 16) |
| 347 | #define MTK_PPE_TB_CFG_HASH_DEBUG GENMASK(19, 18) |
| 348 | +#define MTK_PPE_TB_CFG_INFO_SEL BIT(20) |
| 349 | |
| 350 | enum { |
| 351 | MTK_PPE_SCAN_MODE_DISABLED, |
| 352 | @@ -111,6 +117,8 @@ enum { |
| 353 | |
| 354 | #define MTK_PPE_DEFAULT_CPU_PORT 0x248 |
| 355 | #define MTK_PPE_DEFAULT_CPU_PORT_MASK(_n) (GENMASK(2, 0) << ((_n) * 4)) |
| 356 | +#define MTK_PPE_DEFAULT_CPU_PORT1 0x24C |
| 357 | +#define MTK_PPE_DEFAULT_CPU_PORT_MASK(_n) (GENMASK(2, 0) << ((_n) * 4)) |
| 358 | |
| 359 | #define MTK_PPE_MTU_DROP 0x308 |
| 360 | |
| 361 | @@ -141,4 +149,6 @@ enum { |
| 362 | #define MTK_PPE_MIB_CACHE_CTL_EN BIT(0) |
| 363 | #define MTK_PPE_MIB_CACHE_CTL_FLUSH BIT(2) |
| 364 | |
| 365 | +#define MTK_PPE_SBW_CTRL 0x374 |
| 366 | + |
| 367 | #endif |
| 368 | -- |
| 369 | 2.18.0 |
| 370 | |