From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B254F359A90 for ; Sat, 28 Feb 2026 18:14:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772302470; cv=none; b=WTmxs0kYXugqUkmKuQR7XgCcwrWR8E4nQ2HBrF0scW8x4ReG3OkbUujSzuVO7CxJRA7meH1Bd2NNc9rlL0DmQHU8MP4+Iz3oDFZ82HvJatH7csOMhWVeJSaz3oHqktZ2j1MCGRfDe8msCOxsDQsi+xSekIIdMvIaOR33Tpm/hrk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772302470; c=relaxed/simple; bh=+rnmU08mFLVvDoP1LC9A2hNwP6TH3gLj5Qpy+iXbYGU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XaJWZxUdR8eNc6pVcpLatWYvN8RmCo2ZCC/qweyvmS6n1+tgjthNiNsCmL8FIz5yaKtgPKVTsMxaBMqhAMr0bZaQblADqFli0WR6+qONbSg1p8NZL5yA4uVsbz4CUN49Exi52WgSiJKMXCfUENMInZsV3ApUur9Njjg6RNwdD+Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=snuOZJYM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="snuOZJYM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04C79C19424; Sat, 28 Feb 2026 18:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772302470; bh=+rnmU08mFLVvDoP1LC9A2hNwP6TH3gLj5Qpy+iXbYGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=snuOZJYMzWDVR/CoNXQyu0iiOMX+0ginrQCNrHF/rcj6cp5KsOY/HuqPBblj0jRea CMfDtEo2H34D4sEpnokaz6sNWU2a72RKmjPr8hyNeVAlD5M00RZ+v7bJ7zU+WFtV9A UcXFXRk8SGqsj89jkuhIp9oXk+eymUXd70edjBrmJSSiWoFTXe6ekao140Cu5JzGwC egn7HJ0MX9uBf/S7VI2/kGmGkW4ZvicvhNSqo52YqgQMCsVAeyUjtmPciTYzQeA0Yh EdmqZAYC5bNzIXAKTenPCahGzibqg8mEDNEEYM3tKKJ4PRCm1YnqwXal3ZFJs81b63 ic5N8aZgqWREQ== From: Sasha Levin To: patches@lists.linux.dev Cc: Ziyi Guo , Vladimir Oltean , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 215/232] net: mscc: ocelot: extract ocelot_xmit_timestamp() helper Date: Sat, 28 Feb 2026 13:11:08 -0500 Message-ID: <20260228181127.1592657-215-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228181127.1592657-1-sashal@kernel.org> References: <20260228181127.1592657-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Ziyi Guo [ Upstream commit 29372f07f7969a2f0490793226ecf6c8c6bde0fa ] Extract the PTP timestamp handling logic from ocelot_port_xmit() into a separate ocelot_xmit_timestamp() helper function. This is a pure refactor with no behavioral change. The helper returns false if the skb was consumed (freed) due to a timestamp request failure, and true if the caller should continue with frame injection. The rew_op value is returned via pointer. This prepares for splitting ocelot_port_xmit() into separate FDMA and register injection paths in a subsequent patch. Signed-off-by: Ziyi Guo Reviewed-by: Vladimir Oltean Link: https://patch.msgid.link/20260208225602.1339325-2-n7l8m4@u.northwestern.edu Signed-off-by: Jakub Kicinski Stable-dep-of: 026f6513c588 ("net: mscc: ocelot: add missing lock protection in ocelot_port_xmit_inj()") Signed-off-by: Sasha Levin --- drivers/net/ethernet/mscc/ocelot_net.c | 36 ++++++++++++++++---------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c index 50858cc10fef6..38d0c1af10a96 100644 --- a/drivers/net/ethernet/mscc/ocelot_net.c +++ b/drivers/net/ethernet/mscc/ocelot_net.c @@ -560,33 +560,41 @@ static int ocelot_port_stop(struct net_device *dev) return 0; } -static netdev_tx_t ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev) +static bool ocelot_xmit_timestamp(struct ocelot *ocelot, int port, + struct sk_buff *skb, u32 *rew_op) { - struct ocelot_port_private *priv = netdev_priv(dev); - struct ocelot_port *ocelot_port = &priv->port; - struct ocelot *ocelot = ocelot_port->ocelot; - int port = priv->port.index; - u32 rew_op = 0; - - if (!static_branch_unlikely(&ocelot_fdma_enabled) && - !ocelot_can_inject(ocelot, 0)) - return NETDEV_TX_BUSY; - - /* Check if timestamping is needed */ if (ocelot->ptp && (skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) { struct sk_buff *clone = NULL; if (ocelot_port_txtstamp_request(ocelot, port, skb, &clone)) { kfree_skb(skb); - return NETDEV_TX_OK; + return false; } if (clone) OCELOT_SKB_CB(skb)->clone = clone; - rew_op = ocelot_ptp_rew_op(skb); + *rew_op = ocelot_ptp_rew_op(skb); } + return true; +} + +static netdev_tx_t ocelot_port_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct ocelot_port_private *priv = netdev_priv(dev); + struct ocelot_port *ocelot_port = &priv->port; + struct ocelot *ocelot = ocelot_port->ocelot; + int port = priv->port.index; + u32 rew_op = 0; + + if (!static_branch_unlikely(&ocelot_fdma_enabled) && + !ocelot_can_inject(ocelot, 0)) + return NETDEV_TX_BUSY; + + if (!ocelot_xmit_timestamp(ocelot, port, skb, &rew_op)) + return NETDEV_TX_OK; + if (static_branch_unlikely(&ocelot_fdma_enabled)) { ocelot_fdma_inject_frame(ocelot, port, rew_op, skb, dev); } else { -- 2.51.0