mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-11-01 12:48:52 +00:00
39ae0f972d
This is an automatically generated commit. When doing `git bisect`, consider `git bisect --skip`. Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/19038 Signed-off-by: Robert Marko <robimarko@gmail.com>
88 lines
2.8 KiB
Diff
88 lines
2.8 KiB
Diff
From 0097c4195b1d0ca57d15979626c769c74747b5a0 Mon Sep 17 00:00:00 2001
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Mon, 9 Jun 2025 22:28:40 +0200
|
|
Subject: [PATCH] net: airoha: Add PPPoE offload support
|
|
|
|
Introduce flowtable hw acceleration for PPPoE traffic.
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/20250609-b4-airoha-flowtable-pppoe-v1-1-1520fa7711b4@kernel.org
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_ppe.c | 31 ++++++++++++++++++------
|
|
1 file changed, 23 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_ppe.c
|
|
@@ -232,6 +232,7 @@ static int airoha_ppe_foe_entry_prepare(
|
|
FIELD_PREP(AIROHA_FOE_IB1_BIND_UDP, l4proto == IPPROTO_UDP) |
|
|
FIELD_PREP(AIROHA_FOE_IB1_BIND_VLAN_LAYER, data->vlan.num) |
|
|
FIELD_PREP(AIROHA_FOE_IB1_BIND_VPM, data->vlan.num) |
|
|
+ FIELD_PREP(AIROHA_FOE_IB1_BIND_PPPOE, data->pppoe.num) |
|
|
AIROHA_FOE_IB1_BIND_TTL;
|
|
hwe->ib1 = val;
|
|
|
|
@@ -281,33 +282,42 @@ static int airoha_ppe_foe_entry_prepare(
|
|
hwe->ipv6.data = qdata;
|
|
hwe->ipv6.ib2 = val;
|
|
l2 = &hwe->ipv6.l2;
|
|
+ l2->etype = ETH_P_IPV6;
|
|
} else {
|
|
hwe->ipv4.data = qdata;
|
|
hwe->ipv4.ib2 = val;
|
|
l2 = &hwe->ipv4.l2.common;
|
|
+ l2->etype = ETH_P_IP;
|
|
}
|
|
|
|
l2->dest_mac_hi = get_unaligned_be32(data->eth.h_dest);
|
|
l2->dest_mac_lo = get_unaligned_be16(data->eth.h_dest + 4);
|
|
if (type <= PPE_PKT_TYPE_IPV4_DSLITE) {
|
|
+ struct airoha_foe_mac_info *mac_info;
|
|
+
|
|
l2->src_mac_hi = get_unaligned_be32(data->eth.h_source);
|
|
hwe->ipv4.l2.src_mac_lo =
|
|
get_unaligned_be16(data->eth.h_source + 4);
|
|
+
|
|
+ mac_info = (struct airoha_foe_mac_info *)l2;
|
|
+ mac_info->pppoe_id = data->pppoe.sid;
|
|
} else {
|
|
- l2->src_mac_hi = FIELD_PREP(AIROHA_FOE_MAC_SMAC_ID, smac_id);
|
|
+ l2->src_mac_hi = FIELD_PREP(AIROHA_FOE_MAC_SMAC_ID, smac_id) |
|
|
+ FIELD_PREP(AIROHA_FOE_MAC_PPPOE_ID,
|
|
+ data->pppoe.sid);
|
|
}
|
|
|
|
if (data->vlan.num) {
|
|
- l2->etype = dsa_port >= 0 ? BIT(dsa_port) : 0;
|
|
l2->vlan1 = data->vlan.hdr[0].id;
|
|
if (data->vlan.num == 2)
|
|
l2->vlan2 = data->vlan.hdr[1].id;
|
|
- } else if (dsa_port >= 0) {
|
|
- l2->etype = BIT(15) | BIT(dsa_port);
|
|
- } else if (type >= PPE_PKT_TYPE_IPV6_ROUTE_3T) {
|
|
- l2->etype = ETH_P_IPV6;
|
|
- } else {
|
|
- l2->etype = ETH_P_IP;
|
|
+ }
|
|
+
|
|
+ if (dsa_port >= 0) {
|
|
+ l2->etype = BIT(dsa_port);
|
|
+ l2->etype |= !data->vlan.num ? BIT(15) : 0;
|
|
+ } else if (data->pppoe.num) {
|
|
+ l2->etype = ETH_P_PPP_SES;
|
|
}
|
|
|
|
return 0;
|
|
@@ -957,6 +967,11 @@ static int airoha_ppe_flow_offload_repla
|
|
case FLOW_ACTION_VLAN_POP:
|
|
break;
|
|
case FLOW_ACTION_PPPOE_PUSH:
|
|
+ if (data.pppoe.num == 1 || data.vlan.num == 2)
|
|
+ return -EOPNOTSUPP;
|
|
+
|
|
+ data.pppoe.sid = act->pppoe.sid;
|
|
+ data.pppoe.num++;
|
|
break;
|
|
default:
|
|
return -EOPNOTSUPP;
|