Commit 0097c419 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

net: airoha: Add PPPoE offload support 



Introduce flowtable hw acceleration for PPPoE traffic.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250609-b4-airoha-flowtable-pppoe-v1-1-1520fa7711b4@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 265c6ff0

drivers/net/ethernet/airoha/airoha_ppe.c

+23 −8
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth, 
	      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(struct airoha_eth *eth, 
		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_replace(struct airoha_gdm_port *port, 
		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;