From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     netdev@vger.kernel.org
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [RFC PATCH net-next 09/11] net: enetc: move setting of ENETC_TXBD_FLAGS_F flag to enetc_xdp_map_tx_buff()
Date:   Mon,  6 Feb 2023 12:08:35 +0200
Message-Id: <20230206100837.451300-10-vladimir.oltean@nxp.com>
In-Reply-To: <20230206100837.451300-1-vladimir.oltean@nxp.com>
References: <20230206100837.451300-1-vladimir.oltean@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pxzn3+oYfllVWGtm9cynO9oj5nn/Acj1SlO67KIHwfYbrnUv8ALGXqmjczzc?=
 =?us-ascii?Q?o65l2P5LyFXjdtW6obbXgStsjUdIWv8ss7asaxuUDwqwAqL6Nc3KR90U8MLc?=
 =?us-ascii?Q?VWlyFXpTsyIXFNqjsOGZxngKH5CLrns5zsviE93MIOH8tZ6cXPsusCxS2atp?=
 =?us-ascii?Q?zcB0k41turKRMuTz29f9wLpqbbo/x5pAG97f7ddyMAqlEV7Jvf8pj8F8x4A8?=
 =?us-ascii?Q?BMqL+kULol8CUvaUzjAUAooOaaLSGufgwWdXL16SzjopcOLur92wHV2ZRt+5?=
 =?us-ascii?Q?eOiDZqMfp6JffcqCVFCXTtWZ7SUU7nZtRwXT+LiGJQSi8k3xpsQDb8Yc6zOA?=
 =?us-ascii?Q?isj4vcy5xDw16LEbNmSxwbRVmeaLqPVOEhY0yJtBUh9STwsdKK7lFBEpK1cw?=
 =?us-ascii?Q?3oxgzcDX11Y1PYbk4EHr5uSCM03pa53nSa/cswiV16z6uI1gxga8Du6OPs6p?=
 =?us-ascii?Q?GkT0sZU5+m69WdxnPB3/bnN9YGW9ASHGe8+GO4N7nlgEX9ETySOUzjB6w69k?=
 =?us-ascii?Q?6YMl3YMeKLaeIoRc2b1Zjhu7S064i0B38DVvofTFlUiR352K6LmDHThRr9BG?=
 =?us-ascii?Q?pmZ6JrD2pR1WUSTWX65zMDi62NqweqQ/DOjX8yrD6TPTcCQSo5+mYKXwJwGm?=
 =?us-ascii?Q?8Jm2v1psd913Z9pL/7kQXOPOx3sjGcL7Ga1hYdqrtV/JI2w2pqthQTKkYGtY?=
 =?us-ascii?Q?A9oMWTF0vbjjpklgM14jAdil0ZvY4lb/NtMpnwqXxrZnmPntYnEJ4YQxtUrR?=
 =?us-ascii?Q?Ru6JLhDdk8GwCLZX3xpYXId4YPbE6Z63Dlt/2xoGsdn4YLZGkYUrvUvx18h3?=
 =?us-ascii?Q?B/dzJ71aXDu0ra5xf9iQlLvj4QaryLhx1UvFbU9UlPHXK0q2PFP16z2oHNYj?=
 =?us-ascii?Q?/UTc3R1yo0a21l4yfRm5wB/cI8wa5Z3SAySYk19ksreN4NkJ0i27D9XIuVh7?=
 =?us-ascii?Q?hNEAmI+bgGtpFIZ6anBa/pk45e0Ykw8b5HXRwV69QzNoYFaFk77hTXBg4ieM?=
 =?us-ascii?Q?v+DB4UuaiHI8fbklyuv/SOu1rHjsYc/JBM8sQ6yXel1fNLxR5mxyrNRNhTHS?=
 =?us-ascii?Q?5lszzd/y5Viwxpji6aylFxx9kiHO3TdiiRxIlxgitYetfJpnwtRJ9NZoIJdQ?=
 =?us-ascii?Q?RMF3MfqpMLsSsAW6/u3bvZD7dw0fyyy+aOvfLu4LyFIGD35PPalf1s6vENnD?=
 =?us-ascii?Q?Okiv7n0Mk3Uq9UdCC7Tv2ksLiV2YV0ueSSvjWaYYm6k/KSXgiC07Jm2kpZ7b?=
 =?us-ascii?Q?/EgECq44F5wXlIQJ41W1udc6Eu6ZGPbflYt6up+7ENBuzHeRU5tF+jtwQpw6?=
 =?us-ascii?Q?IRvCk3jmnQEyAJMBsZP6aX0sCKTgDhnjT+tGaTuNSIu6fVSqUGj26ajorZN7?=
 =?us-ascii?Q?FT9Vf4QmDA5x+p1mOZxIY/UqKngrydUHAVVZh5N5y5NImpg0i90zMF18CjPb?=
 =?us-ascii?Q?zmWrx1YeOhLd1i9E0/D12oH1FeOgNZ/kpavrkadXxJTwPsmhp03tV4lyhqqU?=
 =?us-ascii?Q?survXGaHW2GPmShQdQVJI8aTWaFRoVAbg9ma5ZPbYLy65/yKtM5UgmHRMyuP?=
 =?us-ascii?Q?/JXXcdLzpCJkGxgtQnAj9ZkL3L1jFFdJGp273Uf4xMnOtUU5LSeDLezrLxED?=
 =?us-ascii?Q?/g=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f9e4edd8-a7e7-48de-8cba-08db082a31c5
X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5136.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Feb 2023 10:09:12.2235
 (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: ze3xSJhzW5OWB7ni0eWP9IJwWAYADi2sWegZOUDfsJ6PB/lMLtbpq1huMty3E9vzEP4YUAToWWT7OmoJHMLXFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7735
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

XSK transmission will reuse this procedure, and will also need the logic
for setting the "final" bit of a TX BD, based on tx_swbd->is_eof.
Not sure why this was left to be done by the caller of
enetc_xdp_map_tx_buff(), but move it inside.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
 drivers/net/ethernet/freescale/enetc/enetc.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index e4552acf762c..dee432cacf85 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1263,6 +1263,10 @@ static void enetc_xdp_map_tx_buff(struct enetc_bdr *tx_ring, int i,
 	txbd->buf_len = cpu_to_le16(tx_swbd->len);
 	txbd->frm_len = cpu_to_le16(frm_len);
 
+	/* last BD needs 'F' bit set */
+	if (tx_swbd->is_eof)
+		txbd->flags = ENETC_TXBD_FLAGS_F;
+
 	memcpy(&tx_ring->tx_swbd[i], tx_swbd, sizeof(*tx_swbd));
 }
 
@@ -1286,17 +1290,7 @@ static bool enetc_xdp_tx(struct enetc_bdr *tx_ring,
 	i = tx_ring->next_to_use;
 
 	for (k = 0; k < num_tx_swbd; k++) {
-		struct enetc_tx_swbd *xdp_tx_swbd = &xdp_tx_arr[k];
-
-		enetc_xdp_map_tx_buff(tx_ring, i, xdp_tx_swbd, frm_len);
-
-		/* last BD needs 'F' bit set */
-		if (xdp_tx_swbd->is_eof) {
-			union enetc_tx_bd *txbd = ENETC_TXBD(*tx_ring, i);
-
-			txbd->flags = ENETC_TXBD_FLAGS_F;
-		}
-
+		enetc_xdp_map_tx_buff(tx_ring, i, &xdp_tx_arr[k], frm_len);
 		enetc_bdr_idx_inc(tx_ring, &i);
 	}
 
-- 
2.34.1