From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011059.outbound.protection.outlook.com [52.101.70.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13A167E111; Thu, 17 Oct 2024 03:07:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.59 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729134476; cv=fail; b=bH+A4ZCcJCaKLmeu/+WpSUZADsEmzMnrtWeVwMlr9z6TNyrjEusD8q5zvJOsttFr0I8Z0/Yz0CrCesfz1z+9JC6MEUPp5aM+SIG2+B4Nl4hK6Qu7qqtjXi3+z1zOR96MNUwjzPLXiJ5lclb5wGd//oCPasW2ojdAl1TOSR7YK6o= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729134476; c=relaxed/simple; bh=gumU9FQl1EDjZ9Qtz4+E03aId90vqBCIdcekreQJ4Dc=; h=Date:From:To:Cc:Subject:Message-ID:References:Content-Type: Content-Disposition:In-Reply-To:MIME-Version; b=ArK7NZ5lm2WU27wOs9KaGZpl8axoN1ijqAruqdXV724C7y2NGYPLbxzFivflWTwff0n0UeDwZtrBbFrIz7f6T2qPYIPC9os62dZuqpdchon/EAl8zlTUfUBoj0ycKgMQefLnA85oSDfv1p96ZcnC6MLNjrga6KMECUsRBGC+BaQ= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=j5axSQWJ; arc=fail smtp.client-ip=52.101.70.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="j5axSQWJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ylSnPygMobKcukwJhmn0ScZf3x8uB7Iez2JpYjoct/AmPDhpNclFlF4tEAvcQv66Af2zlb4PBhvqRnTRNZZvOOMp7m6HpU7mYr99k9P1raztpZKQ+fOQ0Gg74tu18F3mNGqbjRk3PcwsnHhtCsOB/8+QaCl46lb0i2oM8FRmNFvNhTgr8KOSnGO09eqbMJstpbkYOSFkfIUXsJ087JPhyeQf7UuiFbY3Sjvwzp5dxDGarKFtRlL9Ds3J7uTPS8X6hQwnYRZ0V/W53mzF7DRn6KUMKAGOUMgRtH9Ozvgzc7XsoAwLvvAVDtLJWg1wwlhrdTuIyfjuKsvYqW3xUCAX2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IjldIK5EYqO8Keq9RxsFsBLBEqxxc9UJ0JEpyGecT5w=; b=AwJqoFG6YB8lpU0Lerbwb7jnuc9uxDrtcj1sa/4a+zdE8vxS/pFz1Ql6YtdaC7bkTd3Wu4k3EZ2l+BJvByLjdrZbNifrlei15iM6fc/FhZOvCiimM4na63Y/5RzRecI3rcZS8IA8f8UuhW0NHNUPyFTtR65Cj73AavOtANV75A2tXodUwjKWj6hfREWOshf6TtgTTYW6JOlxzADZdlcOcdt81c+b0+vttTBW5aOTeIzmPZQQVsB5DqZP8LpVEneyFM8MV9oYLEj7SrqXblcHn1R6BrRdNYfW4oZUkp/48I44gagfou+rs84CrqfScd5nx60ibS+p8zTKyFr3ek0eNw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IjldIK5EYqO8Keq9RxsFsBLBEqxxc9UJ0JEpyGecT5w=; b=j5axSQWJO11b0QV0Vs73xkALu1bH1aCdyJdVrO/CTgRKVslu9L+xFHTIH5S9JNW/jFf102rq6fRmeZ2bNtfRm3bxSG5xG9H6JB+nk3m4hQCXtH35ZX+4Kb6TAjmqW5RAeCecdXHEGzfdf4EcTglQKsvxvi95TY7OJfm0RfCLjzdcu4+DepmrVIOvUFc9K336uWhUUvNkz9H/+Q+xpKPxrkvdvqhdOlGOy2GYkviLmsop+/VEVdMYSno5vUYnHbJo+Jfr6bhzF2YXBqlqvOGex1pnf4/Ov6ThE0MxDomuoyWO5HxquyaLCYJcT++Gp7f4MMdLfdmxDOFkiLQP8URQpA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) by DBBPR04MB7898.eurprd04.prod.outlook.com (2603:10a6:10:1ed::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8069.18; Thu, 17 Oct 2024 03:07:49 +0000 Received: from PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06]) by PAXPR04MB9642.eurprd04.prod.outlook.com ([fe80::9126:a61e:341d:4b06%4]) with mapi id 15.20.8069.016; Thu, 17 Oct 2024 03:07:49 +0000 Date: Wed, 16 Oct 2024 23:07:42 -0400 From: Frank Li To: Marc Kleine-Budde Cc: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx_vlan() Message-ID: References: <20241016-fec-cleanups-v1-0-de783bd15e6a@pengutronix.de> <20241016-fec-cleanups-v1-13-de783bd15e6a@pengutronix.de> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20241016-fec-cleanups-v1-13-de783bd15e6a@pengutronix.de> X-ClientProxiedBy: SJ0P220CA0012.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:41b::24) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9642:EE_|DBBPR04MB7898:EE_ X-MS-Office365-Filtering-Correlation-Id: 276473d2-f002-4205-ccde-08dcee58e1e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|366016|376014|7416014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?JAdXJ+6Zw982GHBxJ1LDbEQAl8kkWxP/g+L7f+Bj8qNEzYvV5YTNn7wepNCR?= =?us-ascii?Q?96sY5JqYaU95BIzqGth+gxp3lku+DW0yZlo4MYWk5NeyRDg25qQmFIDsLpSN?= =?us-ascii?Q?/Kw6UyPnyArZneBJsuWxP72xaoOeItyI1xT0Vz0KHQ6KtRkosHIBmkfMFl65?= =?us-ascii?Q?8Uy5w3edd+SoUVuJJgtcWJSIKVdx33RT1afTtcttQtM0/iJ/Ba1tFdshFNn5?= =?us-ascii?Q?d56CYEFU6jIpVmVJmydTFy1w9bnqkV7ktLDUcnf3Gp4JjMQjhu47dbahbksg?= =?us-ascii?Q?Xo/0Gk8NwF4a8LR9m5CyBi3kT93zw8Z0o8eEoJkEqokivA7MD97yCZNFVFoq?= =?us-ascii?Q?dldX09dqqVc0cLoirAYt3g2e5/ue5IsPUJ/aI07cGezpGZ3euiLqCgA07pYG?= =?us-ascii?Q?B8IPhe2CIE45bQ30TxR++6XpzwaK85BwkKBHHfN5Ngzan14lQ8JFjKfIKoIW?= =?us-ascii?Q?ocZ3FIwdVj1W+SplhHUq3FNwnl1QkN5kaxdTzQ7aCiDp9kNYlSVusu/cFiq+?= =?us-ascii?Q?oO3+cZIAyoqHBunG9mIxTEEt0VHy2eoGWSsCiXMIbcguootgamoyweJOfZid?= =?us-ascii?Q?9UQCKBWQ9XgV21/SIk2jN5s7fFDlfxrgyPm7howWQs3SijPRW49DZy4aqZf3?= =?us-ascii?Q?4Ofmnl9JuEjfT/nZoEEQG6m1rt8ANV7BVDOobwVlDU/fi9TWA++r+ftdYMNV?= =?us-ascii?Q?oabEfUFDsrZubF4q/JKFu0pGH791i3hUyd+NADAHM2AssVstEvwzE0gQTzdq?= =?us-ascii?Q?teZJDgS0JsyLuJDjEPJ1PLtWXrfVORMFkcJloqz7QvuDMOjI8bZEhIWX6hnr?= =?us-ascii?Q?cEooS/FCyLEcZdrQ+S5UqISemmJBzm9CQSTtQJJMiz2f8vb1xLMxFv9dRx3m?= =?us-ascii?Q?TQpkIE6Rb8oq3PZJHNWyUVySKkZrfxHaplcSCjMKe9ATR5SMFy1HJZX92Aay?= =?us-ascii?Q?xjGseY3mnBuw9Mb2VJPUhTFHT8uSSDOR2ESD7TLN0G/SA2FD4saIHWfQ0Fj2?= =?us-ascii?Q?1zVyhWIPkLxh9KpyGDZVUPeIUjF09yKV3gMag7z7AemiHbP4G0zMngLbFH//?= =?us-ascii?Q?anIfVraRjWIty/ScCd/8mujLZnOF3Ywfaz+hKb2Of6eH6tc8tcgFnzA59vsB?= =?us-ascii?Q?yHHSVXj3TM4FF8wne9HnC8jpKGTOOOn+qh3U9FBwWzL/YaNyDUNK0nWOOgnk?= =?us-ascii?Q?eMriVOJ3wy7rtbw8xIwiF5jqoNu1qUM0vlN0k3GDHiO8duJwaLt7Jl2RNi+L?= =?us-ascii?Q?k5xaSlMEC7t0Yyk/MkMOXo0M12/OqF1GFqd/lF8eTfzok7dQKP2MtEt+w2in?= =?us-ascii?Q?6CH/Ivm+5X3aRmnPR9SiN3HDkIogQu8RvDxt6EjRRckhbOoF+2oH2cZ8LHLh?= =?us-ascii?Q?0z7cVng=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9642.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(366016)(376014)(7416014)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?73MFXaM21xaNrpgQcajUPSBGJqSUccVHi6tAvcqwzWSRpUeWYbYEzlrZgcbl?= =?us-ascii?Q?wbUMmAjpmLA7wt+xlMOahg7lBf2e+jM16hsam7P9IfV8SnUWT+tsdnMfWG1m?= =?us-ascii?Q?ZfBT5F59Suk/EVn/rrIjgOZZZRPBvMfRsec+ZfE431Tds9fdidf7nryfpZ7N?= =?us-ascii?Q?Ofi1T92K1gaMxJp4CbzQRQjt7N4a90TMckoTsjwNiLmKsl+QzOiY2/Ur5Z2G?= =?us-ascii?Q?xiP7RvIWoipxOLJyN8AOiZXHXNp2iIGqhtA1wW//jobqQLOyhWXRL4VVIAGH?= =?us-ascii?Q?lQG4Ukrybj/lfHs5ITKwvlr3eMtvdpOzH6Y5fnfofhgkKEidOQ8np5RK0Un9?= =?us-ascii?Q?jBbFl6Wetfq6cTs4muyhZB0Jb+LeIplcvulPCE9WTUmRjwzVoIMGNKSf8+p0?= =?us-ascii?Q?BObE4pHnOG6NA+z7FVeopM6ihuinPW7mj5sYTsue5Qk90iW8bBJTqATj+RdK?= =?us-ascii?Q?ZGyESqmCR+9sfQDPrzEIJwMLjeBm4AjOWclZliA1ZklSaZvAxYHKhTOO/NZk?= =?us-ascii?Q?gkofrfy6VBDi450ST4oYVv7iozycUrqQE9i7mq0PVKLRxZd9MIvyrBzAfb+I?= =?us-ascii?Q?xNljiQOa6wxbVaaPm8d5IQy2fESU3rqxulAQ9OU1QZJwoiq3nPn1DQ26lkKB?= =?us-ascii?Q?+zdTMQVd6Is3YeZeLnzwONgJBvaR2NjhuifnhgdlSUXmuPnvKkz4V2ONVmC0?= =?us-ascii?Q?cGQJQnKZMwMOFBq9Xi5Lg4p8dgiHi3/R5vMWC5uUd8ZqSb61PIYeBoxo5gqB?= =?us-ascii?Q?9Mk3GP168WihJFSHSOW1+USHO0Ki8JBrRC2rU+kS56EM+0EpGFMNDEJLJuf3?= =?us-ascii?Q?1adKOr8N9tV9KmSRIRDp/tySWZq9fFXK9RhYeZB6raT46XFRSlmAXMg1kNjJ?= =?us-ascii?Q?KYg2KzUZwc5a5NDpENSF+Ym3CN4fbSfimwudThZJLw/QeLRaBKKI+5KsugoS?= =?us-ascii?Q?RhKPvXzDvjKV+5dA+990ncGye/sA5gCOeJT6FYeJk3NwJh4PtNO8pyCTqRTB?= =?us-ascii?Q?zvZM/VLlB+07GW/3iFBzLgEUdpZ8lb2biNfW/ZD4NEc6XvCXZu4dLy30F5Vt?= =?us-ascii?Q?5Ss4045v1mPCWX/pJx6Gd5wQjiuzh9Ey0xg4c31UrJVberEKtVwC90gx1Vf1?= =?us-ascii?Q?pMp3srRAXjlf/wS6sDRq519fiha9/tJ2GoKgHiEh4IVWHA5Vro2N7uQ3+hIw?= =?us-ascii?Q?sBjITwnu6VeUW4wH+uNa0+WERUNkBumMglyUZEP1tLhptsPO+m04Wn9Yto9P?= =?us-ascii?Q?W2OYcEGJkSTjFDPfmGtq3d+g8Gr/+cxpAzP3TJeVd48hafVoi+7emCMrjl8/?= =?us-ascii?Q?TNZtTs4iA1KxnGYTvi8dZeGdHSoG/Fw3adCY619w/pWa/6FoizosVKstF7zo?= =?us-ascii?Q?o9q5eG8tQ1xMQrDc+gS4i2yHKKjbhmK/ffHNjHi4B2NJcLvh77zyzsxAjxfz?= =?us-ascii?Q?ZYsXG9rB5ZZpMwOcjzCqgOKQJ0gPe9PTFTA8iKiNSjIs27AvFNaXOD2tXBhm?= =?us-ascii?Q?yjFDDgBXPZogCNIFwtz5TlHHaAUIJJagR58C6HtLvEQDQd3F8oX1oF32/mgz?= =?us-ascii?Q?sKYcEXAD0EJ4OTy8b9JlkSEvOHg+Ab6HYAC6adUY?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 276473d2-f002-4205-ccde-08dcee58e1e4 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2024 03:07:49.5650 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: E96xxGSDpZXZ0LdyY5euXzkXqdj2vGaQketmmMVWcZTPszSDrfzINYQvbMOZWBfNssvJMmR3W+IZk/Pwt55z3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7898 On Wed, Oct 16, 2024 at 11:52:01PM +0200, Marc Kleine-Budde wrote: > In order to clean up of the VLAN handling, factor out the VLAN > handling into separate function fec_enet_rx_vlan(). > > Signed-off-by: Marc Kleine-Budde Reviewed-by: Frank Li > --- > drivers/net/ethernet/freescale/fec_main.c | 32 ++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index d9415c7c16cea3fc3d91e198c21af9fe9e21747e..e14000ba85586b9cd73151e62924c3b4597bb580 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -1672,6 +1672,22 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct bpf_prog *prog, > return ret; > } > > +static void fec_enet_rx_vlan(struct net_device *ndev, struct sk_buff *skb) > +{ > + struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb); > + > + if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) { > + /* Push and remove the vlan tag */ > + u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI); > + > + memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2); > + skb_pull(skb, VLAN_HLEN); > + __vlan_hwaccel_put_tag(skb, > + htons(ETH_P_8021Q), > + vlan_tag); > + } > +} > + > /* During a receive, the bd_rx.cur points to the current incoming buffer. > * When we update through the ring, if the next incoming buffer has > * not been given to the system, we just set the empty indicator, > @@ -1812,19 +1828,9 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) > ebdp = (struct bufdesc_ex *)bdp; > > /* If this is a VLAN packet remove the VLAN Tag */ > - if ((ndev->features & NETIF_F_HW_VLAN_CTAG_RX) && > - fep->bufdesc_ex && > - (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) { > - /* Push and remove the vlan tag */ > - struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb); > - u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI); > - > - memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2); > - skb_pull(skb, VLAN_HLEN); > - __vlan_hwaccel_put_tag(skb, > - htons(ETH_P_8021Q), > - vlan_tag); > - } > + if (fep->bufdesc_ex && > + (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) > + fec_enet_rx_vlan(ndev, skb); > > skb->protocol = eth_type_trans(skb, ndev); > > > -- > 2.45.2 > >