From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 E4602229B18 for ; Thu, 12 Jun 2025 14:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738315; cv=none; b=nIMXPey9hb6H0cS6tm2wKEL70nXJ7f2vPSTV9YhQcyP9Rh+t4xVM+o2t+A6bSgv0GCrRuESoTF9h590islCs/Vx8De9dg6QfnfPyKfa9ZHgpjtqe30z5wZu8MQmhhYTwYq1GjEB9qzItUu1UIaEuH2te1qNOxWsfFucC6vTc/r8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738315; c=relaxed/simple; bh=fM3DJ0fKp+s7JwVePf1s77eQbBcgW9+yZWYcLMCuBf4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PL0p2pQ2sVjk/ZmHPDkp3BDz0y7rzxfUuJL81PmomDePNGhBXHprx0e8E8OAfifP8vNGvIWiPxvI4WLignw3q76T29ARcBPOgS3LhfrkCYaxsWtKwJwxZUz+D8hu7bRQZ1taiD8nLgStwcgGbJ5JubvBcZnAa+wJQA+IlUlBTQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id D61D566BB9B for ; Thu, 12 Jun 2025 14:16:21 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 98DE9426469 for ; Thu, 12 Jun 2025 14:16:21 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id EB8AE42641E; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 8943e361; Thu, 12 Jun 2025 14:16:16 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:54 +0200 Subject: [PATCH net-next v2 01/10] net: fec: fix typos found by codespell Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-1-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=3701; i=mkl@pengutronix.de; h=from:subject:message-id; bh=fM3DJ0fKp+s7JwVePf1s77eQbBcgW9+yZWYcLMCuBf4=; b=kA0DAAoBDHRl3/mQkZwByyZiAGhK4R6gqFFCBHaQvogqFti7YA5JQXQfKIZcAtO9hIekE3OuC IkBMwQAAQoAHRYhBJ/7DNivZ6hf/BVs8wx0Zd/5kJGcBQJoSuEeAAoJEAx0Zd/5kJGcDYIIAJAU k3788reIO3/4DKGBNdI+KFFLuE1qVm4nWKMUqJwCpPNO9kTRaiVxNALjxiDYJOygv+sGJgMXX// hNhUAXkCEQ2YmXrw5FARiWbJJV4zOtwj0UYBe5QIJ76mkz2JEDiT8ad3tbHrQxvjeK4eZkRFBk8 BCu50JOJsKRkx99cqfAF8o5hHScJdR/muYvLNzHLHym4STWIGtt02aJTbGmj9qfEjEZTYBjLHe8 k3pwD3CWHtbyA0UG+fwMu4rrTy631QWjCMVrqQ86lSgGERF76XO/opjN5CUwQ3cZmyfJ3llEq8y eEMRncEJwp8AzoGQ7nSsBbE03zaxvOw3EJ4c5dA= X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 codespell has found some typos in the comments, fix them. Reviewed-by: Wei Fang Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec.h | 8 ++++---- drivers/net/ethernet/freescale/fec_ptp.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index c81f2ea588f2..3cce9bba5dee 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -115,7 +115,7 @@ #define IEEE_T_MCOL 0x254 /* Frames tx'd with multiple collision */ #define IEEE_T_DEF 0x258 /* Frames tx'd after deferral delay */ #define IEEE_T_LCOL 0x25c /* Frames tx'd with late collision */ -#define IEEE_T_EXCOL 0x260 /* Frames tx'd with excesv collisions */ +#define IEEE_T_EXCOL 0x260 /* Frames tx'd with excessive collisions */ #define IEEE_T_MACERR 0x264 /* Frames tx'd with TX FIFO underrun */ #define IEEE_T_CSERR 0x268 /* Frames tx'd with carrier sense err */ #define IEEE_T_SQE 0x26c /* Frames tx'd with SQE err */ @@ -342,7 +342,7 @@ struct bufdesc_ex { #define FEC_TX_BD_FTYPE(X) (((X) & 0xf) << 20) =20 /* The number of Tx and Rx buffers. These are allocated from the page - * pool. The code may assume these are power of two, so it it best + * pool. The code may assume these are power of two, so it is best * to keep them that size. * We don't need to allocate pages for the transmitter. We just use * the skbuffer directly. @@ -460,7 +460,7 @@ struct bufdesc_ex { #define FEC_QUIRK_SINGLE_MDIO (1 << 11) /* Controller supports RACC register */ #define FEC_QUIRK_HAS_RACC (1 << 12) -/* Controller supports interrupt coalesc */ +/* Controller supports interrupt coalesce */ #define FEC_QUIRK_HAS_COALESCE (1 << 13) /* Interrupt doesn't wake CPU from deep idle */ #define FEC_QUIRK_ERR006687 (1 << 14) @@ -495,7 +495,7 @@ struct bufdesc_ex { */ #define FEC_QUIRK_HAS_EEE (1 << 20) =20 -/* i.MX8QM ENET IP version add new feture to generate delayed TXC/RXC +/* i.MX8QM ENET IP version add new feature to generate delayed TXC/RXC * as an alternative option to make sure it works well with various PHYs. * For the implementation of delayed clock, ENET takes synchronized 250MHz * clocks to generate 2ns delay. diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/etherne= t/freescale/fec_ptp.c index 876d90832596..3aacd64c9e73 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -117,7 +117,7 @@ static u64 fec_ptp_read(const struct cyclecounter *cc) * @fep: the fec_enet_private structure handle * @enable: enable the channel pps output * - * This function enble the PPS ouput on the timer channel. + * This function enable the PPS output on the timer channel. */ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) { @@ -172,7 +172,7 @@ static int fec_ptp_enable_pps(struct fec_enet_private *= fep, uint enable) * very close to the second point, which means NSEC_PER_SEC * - ts.tv_nsec is close to be zero(For example 20ns); Since the timer * is still running when we calculate the first compare event, it is - * possible that the remaining nanoseonds run out before the compare + * possible that the remaining nanoseconds run out before the compare * counter is calculated and written into TCCR register. To avoid * this possibility, we will set the compare event to be the next * of next second. The current setting is 31-bit timer and wrap --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 02FD12475E8 for ; Thu, 12 Jun 2025 14:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738315; cv=none; b=AASr5ObgGLUHYTS6DTa1eJmJ2p9xHNCxJEbTKnT+NH/HQgI14JeVQ2riEfFjJ5ub0F/fOy9JFdXTtS7jRK5U23QYB4PN4t4RBLDOhilNc6wMqJGgj0E1Aw6TILm8pwRKgb/w2VzfidVHhVJtxvxjzSaNweIBXFzbM7fVtuV8FWQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738315; c=relaxed/simple; bh=V8ff7fDbtrBpOwcc2k1XD/2X9ZfI4Jix++SEAjR5Wf0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IKqWZ+y3tecet0a5nlBeJ7+ibybf+Pz9beLjj9WeIppqFfqvJyyJ0R/Zo/T1O6at9+1XBhTZDdxQ/pvhdcX9k09Cx0BkyLvM7Y1wDH9AeJP7reYi4/8kwOwb2haAkJ3NODQXEx9eGP07RAmSX6rkxgUE6kq7y0rSOSfLn0ljhuU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id DD13466BB9C for ; Thu, 12 Jun 2025 14:16:21 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id AD0CA42646A for ; Thu, 12 Jun 2025 14:16:21 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 0B04F42641F; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id fcc4cc8b; Thu, 12 Jun 2025 14:16:16 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:55 +0200 Subject: [PATCH net-next v2 02/10] net: fec: struct fec_enet_private: remove obsolete comment Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-2-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=970; i=mkl@pengutronix.de; h=from:subject:message-id; bh=V8ff7fDbtrBpOwcc2k1XD/2X9ZfI4Jix++SEAjR5Wf0=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEgGxr/m2fNxi/tQG3/OmRmy2aYxJwSlpKms T5J1yjvkvGJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhIAAKCRAMdGXf+ZCR nNnKCACNGqT+Oob2vRXPlWR+BG/fc1lVEPu+6PMdLRFkxb/KyykjSOLo83N0uDlPovLcH4zrpKi xTmtuExPhs3rDcbMeGHnCgYoUOJE8uaKHl6hjd1Mgc+7m9ety0sUFJ1o3z/8Yp3R/m7MD1SAPTj +AsHYlrlRW8lD7/BthGHIDK7UAyhejA6fItZ0VQwrDFrJBk2cIdl5zAR1xSUvSLwZzC/G/DcmV+ 4F/oEAPLVzpdV5suzmiJucc8PCmSRQOm0kPTjAr1Nmrv6zCrJUGRVmKD1QA+05nbtKEnMow8Dr8 575j17y+gJcYhvFw/p8Hjvx7AI4M3GKTxQ04wtDHrdqiQ5+L X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 In commit 4d494cdc92b3 ("net: fec: change data structure to support multiqueue") the data structures were changed, so that the comment about the sent-in-place skb doesn't apply any more. Remove it. Reviewed-by: Wei Fang Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index 3cce9bba5dee..ce1e4fe4d492 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -614,7 +614,6 @@ struct fec_enet_private { unsigned int num_tx_queues; unsigned int num_rx_queues; =20 - /* The saved address of a sent-in-place packet/buffer, for skfree(). */ struct fec_enet_priv_tx_q *tx_queue[FEC_ENET_MAX_TX_QS]; struct fec_enet_priv_rx_q *rx_queue[FEC_ENET_MAX_RX_QS]; =20 --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 E46C123FC54 for ; Thu, 12 Jun 2025 14:25:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738314; cv=none; b=pRi4hEpkkErIsN7ac0klDNbmvpcnUFqgJi1dxPETnRHIrVvT1v+APXn3sBXHxY2WNmG/v9+vL9bYp+TRtzYVPo9DlpIXhwACUNKuKghmHBQhLMLSooZL3lcN2ZOzl/gKQMZX+OpsAmD1WkUfZgUGZgA0kIwkGCbQoQ+cRJR8uq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749738314; c=relaxed/simple; bh=kCODGNufEATWUsO5X4PzU2baeEaUlG0c2KOVUCs6+Sk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PhV6iEI24xvz9XZuB38o8CjnGTIPNW6LjSsYwbrWISoL97rkW/GcfyNSEq3LcExSqfYWgDajUf147lT9Z+n8z06UMV6j/T8JUMshH2Y9Y8AedihALwHpvu2OJoL1IpZZppJhcXK4LnOzGDcFmpNaX080vpGF13xwFWrzCs0csCs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 153C766BB9F for ; Thu, 12 Jun 2025 14:16:22 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id D6E6D42646D for ; Thu, 12 Jun 2025 14:16:21 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 28B3A426421; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id ff9af168; Thu, 12 Jun 2025 14:16:16 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:56 +0200 Subject: [PATCH net-next v2 03/10] net: fec: add missing header files Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-3-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=896; i=mkl@pengutronix.de; h=from:subject:message-id; bh=kCODGNufEATWUsO5X4PzU2baeEaUlG0c2KOVUCs6+Sk=; b=owGbwMvMwMXIU5J6/+eEiXMYT6slMWR4PVSat90xYf5Ul8XJ6W65P+wbOdcrZfPxHznj+pqrS CDJP6Kzk9GYhYGRi0FWTJFl/m+eG+vTV8T/Ec35DDOIlQlkCgMXpwBMxFaTg6Hby2XxApOg96kO 6hpvJtmbXCj/eu9YzaLpHxhOq+nxfPoQNZdjwpasCvX8JXNto5Y5Tov1mcOsYdemwp3JGFm2Zm/ C+1Mmcq+dDtlkRfU+Ctl0s4vzxJevnozVxzdETDVZIXBb+3WO8P3mk0slnB3e8zAW7/JRXmD6fk 1kq3K59yG7nAkczAXJE6bUReqcfWXvL9n2g8eMUSh7qVTf3aqUm65xMZV63Z8POfxgiPu5oumy8 CmByk8lCueP7HgWy+Up2z87YRfvOjOFNqUPwk+OmsouD3/RErq5yV79ktV0baeLBvo25nuVJHwb 1lUqyyvnx3xTOFG6fLOd4ZFlOoVTvX4ahO2YZ2AqP7MfAA== X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 The fec.h isn't self contained. Add missing header files, so that it can be parsed by language servers without errors. Reviewed-by: Wei Fang Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/fr= eescale/fec.h index ce1e4fe4d492..4098d439a6ff 100644 --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -15,7 +15,9 @@ /*************************************************************************= ***/ =20 #include +#include #include +#include #include #include #include --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 4F7E324887A for ; Thu, 12 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; cv=none; b=F2Pvp0IVvvoYcdjtQosAkh1iYOhsTfP+rZwrfmUa8uXfKQ4QkP/TBTPp0GNjpz0pM9SQgYFYBOW6xwh15YwpjqznAoSJKL3PxExlbaGlIGj/5D7AeX1KzoTJZ5NWptShIB0i+VqxDiNjizeWRIkQj4Eor084ywn39ZWWJ+YtpQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=Emt1YpF4s/JoqxKThhmx8HqvPvs7S3WPKPOleUx7LiE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uIIZ848YASKYKN6AsbB1vgBT+vLasvNs/pO3p17LjY5JsNT/Bew9j+xbYssjKUnMpI4i1R3wqQORlb5YxLSErISrw0L+nFxFKptkyEi7Q7gB8sfdr4r0p7Ied8HVMDoD7ZWJCHZerP0HJkP9CUes63Gv0kVN1QSecpWHvhD1oQo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 53E9B66BBA6 for ; Thu, 12 Jun 2025 14:16:22 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 1C622426472 for ; Thu, 12 Jun 2025 14:16:22 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 6A344426425; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 5ae98956; Thu, 12 Jun 2025 14:16:16 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:57 +0200 Subject: [PATCH net-next v2 04/10] net: fec: rename struct fec_devinfo fec_imx6x_info -> fec_imx6sx_info Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-4-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=1840; i=mkl@pengutronix.de; h=from:subject:message-id; bh=Emt1YpF4s/JoqxKThhmx8HqvPvs7S3WPKPOleUx7LiE=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEjAzhgxRuqvxEpMLBbgh+AaICU6MCHgMHo2 5kKMcGrg9yJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhIwAKCRAMdGXf+ZCR nFS9B/4vp5Lly4DRq8PDAm+JDAZb7FtiLjAMlJG+dTDDGymkPRwzFMtAFV1S/zvhM7bKzrctKkt D7mUQMhoCVwMhI+oN3DU/RMSTO9TXMFzLjC/u5c/bSI3wlIwdjkwXVVgtHBy6d39fkJ0cgZskPB l8f8qlaIL4yRk0IDbbAe9pfIc7ypNAas5LVmHUsOGdd0JXiwM+MeeIMzgrLezvwY/mY0w7SE75j K1hDnNWdk0gkqKv7aghmOi246/ZDoFJZsEBME+4SCJDgEvAUrLNfcWgYhLiYI3Nq0LZMbZ/Zvkz ZzN3+HTY8BBa65JjR3lM21jaYvuwvSUjVKSzWiCyMhD4u4Cu X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 In da722186f654 ("net: fec: set GPR bit on suspend by DT configuration.") the platform_device_id fec_devtype::driver_data was converted from holding the quirks to a pointing to struct fec_devinfo. The struct fec_devinfo holding the information for the i.MX6SX was named fec_imx6x_info. Rename fec_imx6x_info to fec_imx6sx_info to align with the SoC's name. Reviewed-by: Wei Fang Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 17e9bddb9ddd..e0d7365e5b4f 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -131,7 +131,7 @@ static const struct fec_devinfo fec_mvf600_info =3D { FEC_QUIRK_HAS_MDIO_C45, }; =20 -static const struct fec_devinfo fec_imx6x_info =3D { +static const struct fec_devinfo fec_imx6sx_info =3D { .quirks =3D FEC_QUIRK_ENET_MAC | FEC_QUIRK_HAS_GBIT | FEC_QUIRK_HAS_BUFDESC_EX | FEC_QUIRK_HAS_CSUM | FEC_QUIRK_HAS_VLAN | FEC_QUIRK_HAS_AVB | @@ -196,7 +196,7 @@ static const struct of_device_id fec_dt_ids[] =3D { { .compatible =3D "fsl,imx28-fec", .data =3D &fec_imx28_info, }, { .compatible =3D "fsl,imx6q-fec", .data =3D &fec_imx6q_info, }, { .compatible =3D "fsl,mvf600-fec", .data =3D &fec_mvf600_info, }, - { .compatible =3D "fsl,imx6sx-fec", .data =3D &fec_imx6x_info, }, + { .compatible =3D "fsl,imx6sx-fec", .data =3D &fec_imx6sx_info, }, { .compatible =3D "fsl,imx6ul-fec", .data =3D &fec_imx6ul_info, }, { .compatible =3D "fsl,imx8mq-fec", .data =3D &fec_imx8mq_info, }, { .compatible =3D "fsl,imx8qm-fec", .data =3D &fec_imx8qm_info, }, --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 50FAE24887E for ; Thu, 12 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; cv=none; b=ETcfLMpOB9N2PrSvXr38RAHEJVqFPUrhzXYYfaC3BbkREWInCFspDeqFlWHEAIoYPZqL+GjFaixnUF/1uPIPVwAoPxYntJikCadTwo/EvQUQXLcttNNuKcUwWXcLrP2E7JyYniTd03Jda7SWwfbuBuuF6ya89TQ+yaN11RoCauY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=YFzMRwy9IG++4sminbXVq/FQxPNDCu0SWEnO/TFE3og=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=b2j9XDW4qzV4qZ4Q1pOzYkc2RbNLqsYR3T/hMldHSZHN5989qtZWEChBHLuQedyRSVFmlUKnMroYRSBY0S7+k+ONk6zp8o1i0XVyARv8nYu8ZThuER86iN2M+ihj4yeW2Q8lvR5/bYIdmmJ4Iq8/OVVrhUMzdvBf3wS0qeu24xM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 71E7866BC0E for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 3DA634264C1 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 85DC3426427; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 20a1ad9a; Thu, 12 Jun 2025 14:16:16 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:58 +0200 Subject: [PATCH net-next v2 05/10] net: fec: fec_restart(): introduce a define for FEC_ECR_SPEED Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-5-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=1277; i=mkl@pengutronix.de; h=from:subject:message-id; bh=YFzMRwy9IG++4sminbXVq/FQxPNDCu0SWEnO/TFE3og=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuElt40k9n1UTKfWSqO6oA3qeM/XZmq2GIQuI Q43hNuSKI+JATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhJQAKCRAMdGXf+ZCR nITpB/0bNEaKUOnAETSPdWJqb3BLpec/VizA7IK4XqkH66xSO4JLX8IVlBCF8NuQZsmuhBy1qa6 5FH3bIdvgTNpTY5nLV1HIlJSfErDprRrrEYJwIKsORsEnhOLpUxeLlpe51B2bVTnmYSx8NFJwjk Z9wN6sSlFs89+szZ+3zj6PMBPhTluXSdgVrceV6T7SOgWS+FwYW2ToNHvqPXCeu56PduD0DrJ+J LCYSKAIVrzFYdmzRcWjrdD9SNqZRc0w+OrhjAk3jZq3c7mXbSQ2JmVWk/k89D6n3hLPSo2Mz1dg ZxhuNU3B9syM+p25OvMNmLoQiowDbxG0J7xOCcZ0+n5blFQq X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 Replace "1 << 5" for configuring 1000 MBit/s with a defined constant to improve code readability and maintainability. Reviewed-by: Wei Fang Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index e0d7365e5b4f..21891baa2fc5 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -276,6 +276,7 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); #define FEC_ECR_MAGICEN BIT(2) #define FEC_ECR_SLEEP BIT(3) #define FEC_ECR_EN1588 BIT(4) +#define FEC_ECR_SPEED BIT(5) #define FEC_ECR_BYTESWP BIT(8) /* FEC RCR bits definition */ #define FEC_RCR_LOOP BIT(0) @@ -1207,7 +1208,7 @@ fec_restart(struct net_device *ndev) /* 1G, 100M or 10M */ if (ndev->phydev) { if (ndev->phydev->speed =3D=3D SPEED_1000) - ecntl |=3D (1 << 5); + ecntl |=3D FEC_ECR_SPEED; else if (ndev->phydev->speed =3D=3D SPEED_100) rcntl &=3D ~FEC_RCR_10BASET; else --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 48D5142048 for ; Thu, 12 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; cv=none; b=nOYori9BinBrobzzEd3RProZjaCNiUNqNW2vIbYyz+OFyQzFcdW0bqrdpvRCI1SHuXPYTwqqchEBW5SOxSqM3hhfIGDJHcIkd/3EpSnDeka/WHI6Cmve5X2Cw795IxCfnWy+IB17uULdzRWYpDdrrdmenGmcgLt14h34/LpEelY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=zKJRpSi2K5E1hgAylyDDCR9zp/mZ0SixP6YUKJVnqJc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RBze0c/u/FDET6DDAKkJoVBDMDg8SV0tB9M6+Tz6VqIupmG9JKXc+HX3Lu52kv8C0JecGbvGN/YS3VrF9XGSGyS2VpbqWil7Pbx3ltA/5rg/tMF3RUfR1kN5oiB8Iv7TSmEMRawI5NfGtazkKu3LqdEEBrv9eYA/GnxjNjpZlXM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 3312166BC05 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id F17154264BA for ; Thu, 12 Jun 2025 14:16:24 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id B1CB542642A; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 1051a142; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:15:59 +0200 Subject: [PATCH net-next v2 06/10] net: fec: fec_enet_rx_queue(): use same signature as fec_enet_tx_queue() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-6-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=1407; i=mkl@pengutronix.de; h=from:subject:message-id; bh=zKJRpSi2K5E1hgAylyDDCR9zp/mZ0SixP6YUKJVnqJc=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEnlRyb0Zeg815xIKiHuoyDT7Z6JY9SgdOZA aK2Pm8BHXeJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhJwAKCRAMdGXf+ZCR nONHB/9BnzhHd2KAM/sZCYIbLa/W9+DNf25YI2icNtavevPsKl12cQm9uc0T7B4ilWwiVjUAhln EntT5UX8730glezJAOcm5mPqD+sp9eOQAZBs20ABovdu3FaV1Vv77iocuwS8ZM8TCruWq3FwiWN jOYeyT0VYUKGat3lsfGPwL8osmMamqlx0bD27UFC5l6XbJZP/tzE2yiEjml2XtLq0PwwDDMPPxr 61zJEJ3X/63uvGAaYrdunAxwJFJxJv6nx9CFMjSbKyPzJoYtDwPPcjhtetwpJY/WBf+x/SDsc5w SuAvtKs5m+Omj2LNGkbkVcl3DE0zzNwEEv2Rx20VKres5rEv X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 There are the functions fec_enet_rx_queue() and fec_enet_tx_queue(), one for handling the RX queue the other one handles the TX queue. However they don't have the same signature. Align fec_enet_rx_queue() argument order with fec_enet_tx_queue() to make code more readable. Signed-off-by: Marc Kleine-Budde Reviewed-by: Andrew Lunn --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 21891baa2fc5..6b456372de9a 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1713,7 +1713,7 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struct= bpf_prog *prog, * effectively tossing the packet. */ static int -fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) +fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) { struct fec_enet_private *fep =3D netdev_priv(ndev); struct fec_enet_priv_rx_q *rxq; @@ -1940,7 +1940,7 @@ static int fec_enet_rx(struct net_device *ndev, int b= udget) =20 /* Make sure that AVB queues are processed first. */ for (i =3D fep->num_rx_queues - 1; i >=3D 0; i--) - done +=3D fec_enet_rx_queue(ndev, budget - done, i); + done +=3D fec_enet_rx_queue(ndev, i, budget - done); =20 return done; } --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 48E3724886F for ; Thu, 12 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; cv=none; b=KI5ftAYZaC6IRColEZerL1+cdWqI0f+xTq5bnStQdK0xphaTFSsMKmOCqCxpkgvBjlHMFRw9O1CfSpZZz46OGl5V4XtIP/Sg82soC760RYYPP124YYldJfPKScUKqYamMoCuz0nBv+1lWF/gk5YXMuscCc1cAJ/HbkQvrkk8x3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=KcSHw1b30IZrtNMUrCtQ6+yKA56AmY/dp9ME1hDmxyU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DyN0Mj6fE575anLq3/K63V2swWK3UfgShDm32ebyGCLYPkfMrfEVff5ptnE1JAvMPwLMQyCFHUD6U6ZGh91eUUhwFE5PbLzS9rg5L1+jsOPYXIlAy3R4daxyE2qW4+GfS7E0NStFSIIMG+/z2HOrZREMQvI7hUR6yBG65s2GhVg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 855EB66BC12 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 506464264C3 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id C82C742642D; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 445b6bb7; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:16:00 +0200 Subject: [PATCH net-next v2 07/10] net: fec: fec_enet_rx_queue(): replace manual VLAN header calculation with skb_vlan_eth_hdr() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-7-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=1086; i=mkl@pengutronix.de; h=from:subject:message-id; bh=KcSHw1b30IZrtNMUrCtQ6+yKA56AmY/dp9ME1hDmxyU=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEpFhwQUjyuruadsyF86whxVy4NTFg7Z7ysd NxXeVkc+1GJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhKQAKCRAMdGXf+ZCR nNXcB/9ulSM9ha3AJbDn7/PRdbxjWITgGjRa+5wsops1wQjhWz7+dnAUI0H16zzy/5AS44J8dC1 wWgNkLImEGj1nm4FYbKMZIUsQm43bj8YPEwwcUgSqPI5UYg3PKB3QaQN6MORWURLJO7Ja2pGqAK IUbb2dcF1M4buUEARxrW8W/jYQgMxlXZkyvhWAj+bjU1HQU+K/FeQicBn0wOzI+Zo16+wFXBNCp jvsUo7MNLk1xGu8oaI4v5kb/UD1WtIifPfvrxoO/RlwiVDR+YZfCj2VNuuxgnTgryR6pYXvPshq EQ+fi38ngGRVixBt8EdjOndsWa4UlM//PxQJ7Hx3FW4rs0L5 X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 Use the provided helper function skb_vlan_eth_hdr() to replace manual VLAN header calculation for better readability and maintainability. Reviewed-by: Frank Li Reviewed-by: Wei Fang Signed-off-by: Marc Kleine-Budde --- drivers/net/ethernet/freescale/fec_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index 6b456372de9a..f238cb60aa65 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1860,8 +1860,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) fep->bufdesc_ex && (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) { /* Push and remove the vlan tag */ - struct vlan_hdr *vlan_header =3D - (struct vlan_hdr *) (data + ETH_HLEN); + struct vlan_ethhdr *vlan_header =3D skb_vlan_eth_hdr(skb); vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); =20 vlan_packet_rcvd =3D true; --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 48DD6230277 for ; Thu, 12 Jun 2025 14:16:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; cv=none; b=BjYNmd7unljL00slzFszEFi1P3gHIpmjSvCJgreU+XKxKMzUeoRQJrwl6YuzL0V3i2Qf/RYv59dYdAAQJGa8QY7FH1oGlYh1rvYvEUYKQpTZ16X5CFaKUFTS7lCwLNByJZxcxxd3zAWdVk4u5OB7AVmOC3ijIqO2/Twqb3Nqrz8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737793; c=relaxed/simple; bh=LyJrLbbVnlKXsSbL7xyqgKeGY8RTbecxMuFSWf+ZNo4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Eoz7t7nNv2lICfPNIA56w072IOflBLDmXmHo05T9+9Kd8F/Y3WMuBRaeAw2UIw5yhzD4+JUsWhaMhrMJ40kFH2a96hFj6X8Yc2Axo86dOP/V4qp19pSFsa0FUJeKavCYKQTMdfH625PDxNOCz3wOrtJLqvlD0/4qU4KSVXgXZYE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id 8E50366BC13 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 5CDBB4264C4 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id E3130426431; Thu, 12 Jun 2025 14:16:18 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 2c0caf85; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:16:01 +0200 Subject: [PATCH net-next v2 08/10] net: fec: fec_enet_rx_queue(): reduce scope of data Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-8-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=1498; i=mkl@pengutronix.de; h=from:subject:message-id; bh=LyJrLbbVnlKXsSbL7xyqgKeGY8RTbecxMuFSWf+ZNo4=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuErPL4DJ89NnHGzgWszt1Np6Y25wotvfmGAI JqA1bCHu0uJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhKwAKCRAMdGXf+ZCR nE43B/4hKlRe4t/GjGdJEjCQIRCKPlWxdEix6OqBEyWk6i1ONQjIQ12qDswsd53PtRBQGr7xGMs pqA5FBNrhJBn4SZkiSYvL7+hFxIeILhuhNByskmhD09tCZFcDdO68kkUJmyTgMFZ9h1pqiIjZHR M9g3H1b1x4NgasVyPR7ZAlZRCv4leDnKLMxagpPbJl2qmzfxAgcOLZRXp6+fLWVWX0T6EAWP8x3 HK/NKoV55umkt+LX0bwJB1zfwTPA0S1CJB/caGpfkOVYPLwJbwjAbLUBu5w0nj0n5PDLZN09VFA G0GnaULNy8QtDibyqEynGuF8EnwgDvK5NQyYcqrTveRR7Qj7 X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 In order to clean up of the VLAN handling, reduce the scope of data. Reviewed-by: Frank Li Reviewed-by: Wei Fang Signed-off-by: Marc Kleine-Budde --- drivers/net/ethernet/freescale/fec_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index f238cb60aa65..bc547be59dae 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1721,7 +1721,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) unsigned short status; struct sk_buff *skb; ushort pkt_len; - __u8 *data; int pkt_received =3D 0; struct bufdesc_ex *ebdp =3D NULL; bool vlan_packet_rcvd =3D false; @@ -1844,10 +1843,11 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queu= e_id, int budget) skb_mark_for_recycle(skb); =20 if (unlikely(need_swap)) { + u8 *data; + data =3D page_address(page) + FEC_ENET_XDP_HEADROOM; swap_buffer(data, pkt_len); } - data =3D skb->data; =20 /* Extract the enhanced buffer descriptor */ ebdp =3D NULL; @@ -1865,7 +1865,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) =20 vlan_packet_rcvd =3D true; =20 - memmove(skb->data + VLAN_HLEN, data, ETH_ALEN * 2); + memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2); skb_pull(skb, VLAN_HLEN); } =20 --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 EF87524DD1A for ; Thu, 12 Jun 2025 14:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737795; cv=none; b=svx8cWn79QnIqgseM/PiEgMIL5XTwn/2s6qjoGVxKqpPmUsHAL4sqHdN8NCevAXQ791cFAT+wjOHKP2id9HzpNDaKJXJAMjKvYS1dXzVTSTaq04pCz8XOk2/c97nKwxjOoPB+K9ovjA+1ZFsTtkXIO9Z/Ir2aZimuoCu7KO6wXw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737795; c=relaxed/simple; bh=zxr1W4n2Z/cWnxc0Gq4EvhifvDpWYxQwAgl7scCcZBk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=c87lnN8NMPu5xxKXusKxR2S4aHqyW3JpLTHoIo71bxLgptwTAVoczqyc1rrk+YWRyN5LuVvciIX7uhv5R+q97+Bv2GprWxgkXMKSM5LOMdR6nHlJavnqyIzlaKXyMacNs49j7kl7cU7Y9ZEYTXTexSxyaHXR3pL4lE+Z4zpIpr4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id A390066BC15 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 715B44264C5 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 16459426434; Thu, 12 Jun 2025 14:16:19 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id d34e7594; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:16:02 +0200 Subject: [PATCH net-next v2 09/10] net: fec: fec_enet_rx_queue(): move_call to _vlan_hwaccel_put_tag() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-9-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=2262; i=mkl@pengutronix.de; h=from:subject:message-id; bh=zxr1W4n2Z/cWnxc0Gq4EvhifvDpWYxQwAgl7scCcZBk=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEthVLCV/aRTKUvu3khrpwNKipc4CESu4EzV zqxm7rHxB2JATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhLQAKCRAMdGXf+ZCR nF2nB/9n9cK+9F8CEd0JTEHr04bWI7c9WuoKalux+7LuKoIIXtRtmhElHSJcxH0jzaShaezGvzF RuzvnRC8fOdR6UWsYm/m4af67Byv4mJ/I6jYgU1FTYBYz2m5Na72N/Ugzazo519v/jozmL1P2Zw Z7S4APKhbIg+4WMWIRzs4RHhtPd9df5eBW+0ZPqaHbKHWeEHfmIF5uf1RcOelsM/jRaMZdNzFfR /yt4q4CsRv68c8ojlmxil5eoP2fV+XQ+d8/4mh2zOoJOVFMDfOBnIi3NSH0dE7JcesxPsvvR3QB 87oQn7vBJibOzmblk0H41AV7jZ+kG/5n783Y81ul6KCUY2tx X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 Move __vlan_hwaccel_put_tag() into the if statement that sets vlan_packet_rcvd =3D true. This change eliminates the unnecessary vlan_packet_rcvd variable, simplifying the code and improving clarity. Reviewed-by: Frank Li Reviewed-by: Wei Fang Signed-off-by: Marc Kleine-Budde --- drivers/net/ethernet/freescale/fec_main.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethern= et/freescale/fec_main.c index bc547be59dae..021cf7c2dcf6 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1723,8 +1723,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_= id, int budget) ushort pkt_len; int pkt_received =3D 0; struct bufdesc_ex *ebdp =3D NULL; - bool vlan_packet_rcvd =3D false; - u16 vlan_tag; int index =3D 0; bool need_swap =3D fep->quirks & FEC_QUIRK_SWAP_FRAME; struct bpf_prog *xdp_prog =3D READ_ONCE(fep->xdp_prog); @@ -1855,18 +1853,18 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queu= e_id, int budget) ebdp =3D (struct bufdesc_ex *)bdp; =20 /* If this is a VLAN packet remove the VLAN Tag */ - vlan_packet_rcvd =3D false; 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 =3D skb_vlan_eth_hdr(skb); - vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); - - vlan_packet_rcvd =3D true; + u16 vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); =20 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); } =20 skb->protocol =3D eth_type_trans(skb, ndev); @@ -1886,12 +1884,6 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue= _id, int budget) } } =20 - /* Handle received VLAN packets */ - if (vlan_packet_rcvd) - __vlan_hwaccel_put_tag(skb, - htons(ETH_P_8021Q), - vlan_tag); - skb_record_rx_queue(skb, queue_id); napi_gro_receive(&fep->napi, skb); =20 --=20 2.47.2 From nobody Fri Oct 10 21:00:37 2025 Received: from glittertind.blackshift.org (glittertind.blackshift.org [116.203.23.228]) (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 EC7A824DCFA for ; Thu, 12 Jun 2025 14:16:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=116.203.23.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737795; cv=none; b=KEEY6yPZbGSG9PW/cHCyybJywPaOmFHrZDViNeb9S5N2Q1IxQPgVEYZdL6htyZ+ql+xK+LIZG8nK+1QnR/Z2PK5VtjlRILddJ+Fj6abLidcRbCz1FTHu1THOxoFnkW5cWDlI9sDD/k1Un4dCOoP6QDDCm0YmZIlyBRFyGSSHMMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749737795; c=relaxed/simple; bh=fQ4LxAZsa4WZr7runtQggvEmU2rQ7E01a9lhK4ivd8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WEuedF/ORz4sAHsoX+xKKqBbiPAFcYoKHZXOgDIltkRhrLzymSxhpf6oKSsEyJ19qiVM38lu4lYomFiuUZMJ//7RNoWzJ7zrZTL/RGP8oy+hb9KBsINY3Q5lFZN6YgaBo7NvFlmN8rOseSODM2h672pfnaXtTXurcR5KHSbkMYc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=none smtp.mailfrom=hardanger.blackshift.org; arc=none smtp.client-ip=116.203.23.228 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=hardanger.blackshift.org Received: from bjornoya.blackshift.org (unknown [IPv6:2003:e3:7f3d:bb00:e75c:5124:23a3:4f62]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "bjornoya.blackshift.org", Issuer "R10" (verified OK)) by glittertind.blackshift.org (Postfix) with ESMTPS id AF14566BC16 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 78A2E4264C6 for ; Thu, 12 Jun 2025 14:16:25 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id 347D7426437; Thu, 12 Jun 2025 14:16:19 +0000 (UTC) Received: from hardanger.blackshift.org (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 65aecce6; Thu, 12 Jun 2025 14:16:17 +0000 (UTC) From: Marc Kleine-Budde Date: Thu, 12 Jun 2025 16:16:03 +0200 Subject: [PATCH net-next v2 10/10] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx_vlan() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250612-fec-cleanups-v2-10-ae7c36df185e@pengutronix.de> References: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> In-Reply-To: <20250612-fec-cleanups-v2-0-ae7c36df185e@pengutronix.de> To: Wei Fang , Shenwei Wang , Clark Wang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Andrew Lunn Cc: imx@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Marc Kleine-Budde , Frank Li X-Mailer: b4 0.15-dev-6f78e X-Developer-Signature: v=1; a=openpgp-sha256; l=2287; i=mkl@pengutronix.de; h=from:subject:message-id; bh=fQ4LxAZsa4WZr7runtQggvEmU2rQ7E01a9lhK4ivd8k=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBoSuEvRz8uDo/weDp9hJlKrn7e8rgO6n7cTJi3Z DC1zYCtfUOJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaErhLwAKCRAMdGXf+ZCR nDChCACT4wUJSs2PGa5EAnIDee4f8oGrR6Oe1nd7+OAR8AhejVXzu3hmiQ7G7trRkI3LAJRJlNX lMCEtL7MgsLIOo6hR63Ly+GCXv+MRpy5N7m2Pv5alb2nAYStlozFIShEArmAhIrVgoPbXNYa9NJ FTfZK0Hhps6Tb0at+YBvBfBQlFPpTyKGpNF2aTUmFH2gTPlKUAKF6gngzOrQBXBNu/owVum3xEA S7KSx+UFVyS7D5Nrr32pIZz96QpbcFA8GBVghDZ/G2TaWdq1drGXFBERvJ+IneI4sm6K3vPV3Sn XQKQFzIkEfErfVpY+Cr4H2zXx5sJVGcus+j/My+WbpzgB82p X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 In order to clean up of the VLAN handling, factor out the VLAN handling into separate function fec_enet_rx_vlan(). Reviewed-by: Frank Li Signed-off-by: Marc Kleine-Budde --- 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/ethern= et/freescale/fec_main.c index 021cf7c2dcf6..24dd1b280da0 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1707,6 +1707,22 @@ fec_enet_run_xdp(struct fec_enet_private *fep, struc= t bpf_prog *prog, return ret; } =20 +static void fec_enet_rx_vlan(const struct net_device *ndev, struct sk_buff= *skb) +{ + if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) { + const struct vlan_ethhdr *vlan_header =3D skb_vlan_eth_hdr(skb); + const u16 vlan_tag =3D ntohs(vlan_header->h_vlan_TCI); + + /* Push and remove the vlan tag */ + + 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, @@ -1853,19 +1869,9 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue= _id, int budget) ebdp =3D (struct bufdesc_ex *)bdp; =20 /* 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 =3D skb_vlan_eth_hdr(skb); - u16 vlan_tag =3D 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); =20 skb->protocol =3D eth_type_trans(skb, ndev); =20 --=20 2.47.2