From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794590491; b=nmQtSle+1S+4amlGzybrOiFEhX/5awswx+xpFlZ5QWD3fmqPZMVYAkLghD7Hrf7VhFao +xS5R2HVUKvFcX/mP7gm8/Pm31gJKvua4zKODjJcwXMa7Em16u6e1DoI85xibS5HNXy2V 6EmW+JkK164hEQWt7AO6EBKfhRpP/LWsPigqMalUoHf/7CszMpIGInMwv+F/pCPO56gYQ CKCZigYpMv0M0h13/rhCg4cCJcGL0a+1SO5YMW3lVxdEYNCW0Gokki6+d0tiPMrf7Ld1n mHlqpzZpmDgHFvgXjgrqMtZXtlY29Rx4xSU9ilx/pfVgBJWQcjm5o1erV1fo5T3ChOQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590491; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=nJ5scjSopMuGr4pMsqQSD0qkWJyrFpKR02VwSAUiUpU=; b=o5eg+puEcqCcu8VnU9f9UjfJ8JpDthpmqzrzjI1gTsyM5BcWDUiUz5vP/s2la7/tm/Y2 Trh/TId0JuG+Jk8MlrM97h/uY1k72zZRBrdRKISDqnQ8fnD1wf0RKwyzrHcKBGpyMI2XH XX34fAV6K4RyMNvjUjAzwFH1QWK8MMqI6DU9HlShyevuJFipFrUd3PGOEk5BcA+T1BbAD URvKEE8SJhYgQhzfU0IBQ4iSsjvUE2Pb7VACMVfZ0HxMT2N4KKOQpTS9zp0Mq5nv4M721 o3pjUWkvRC8g6Xo7uth0MvJfjmwibGYOpDQ9HPw2WQJ2yl/91AV6VGkulc6CtfJzRvw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=j+2U4QRp; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 859E9606B356; Fri, 13 Nov 2026 17:21:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=j+2U4QRp Received: by smtp.kernel.org (Postfix) with ESMTPSA id 311A31F000C6; Fri, 13 Nov 2026 17:21:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590491; bh=nJ5scjSopMuGr4pMsqQSD0qkWJyrFpKR02VwSAUiUpU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j+2U4QRpqzx/hl3RdBf64YQ4QkXnwkvUdVnqtoCbwD0KQhPhAo0vprcC8lLUFZ6tq n+r6LvCxts40L/R4fyW0XMQ953OvYqCQAGs5epk8PDqh4ZgraG6Y4bM5xN6kEHwQmb zXtrc8zSDVaD4E2OOXsnZtw0nTfL8OMRVltuElMM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, James Clark , Sebastian Andrzej Siewior , Paolo Abeni , Sasha Levin Subject: [PATCH 6.18 440/686] net: ethernet: ti: am65-cpsw-nuss: Enable timestamping of unicast PTP packets Date: Fri, 13 Nov 2026 10:49:33 -0500 Message-ID: <20261113153835.802454616@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: James Clark [ Upstream commit 6887a8f98244ba4c0fbe2d2461b9b8f8a300e326 ] On a BeagleY-AI (J722S), ptp4l as a unicast master (unicast_listen) logs "received DELAY_REQ without timestamp" for each unicast Delay_Req, and its port goes to FAULTY after "timed out while polling for tx timestamp" for the first unicast Sync. am65_cpsw_nuss_hwtstamp_set() does not set the TS_UNI_EN bit (bit 24) of the port's TS_CTL_LTYPE2 register. According to the TRM (J722S TRM SPRUJB3D, 12.2.1.4.7.13.5.1 Ethernet Port Receive Event and 12.2.1.4.7.13.5.2 Ethernet Port Transmit Event), this bit must be set for the port to timestamp PTP event messages over UDP sent to a unicast address; without it, only messages sent to the PTP multicast addresses selected by the TS_107 and TS_129 to TS_132 bits are timestamped. TI's netcp_ethss driver for the Keystone 2 Ethernet switch, which has the same timestamping registers, always sets TS_UNI_EN. Set TS_UNI_EN along with the other bits. With this change, ptp4l in the same setup gets timestamps for the unicast Delay_Req and Sync messages. Fixes: b1f66a5bee07 ("net: ethernet: ti: am65-cpsw-nuss: enable packet timestamping support") Cc: stable@vger.kernel.org Signed-off-by: James Clark Reviewed-by: Sebastian Andrzej Siewior Link: https://patch.msgid.link/20261102135117.419539-1-jjc@jclark.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index 5bcf1126d627e..89fdc30d80a43 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -128,6 +128,7 @@ #define AM65_CPSW_PN_TS_CTL_LTYPE2_TS_319 BIT(21) #define AM65_CPSW_PN_TS_CTL_LTYPE2_TS_320 BIT(22) #define AM65_CPSW_PN_TS_CTL_LTYPE2_TS_TTL_NONZERO BIT(23) +#define AM65_CPSW_PN_TS_CTL_LTYPE2_TS_UNI_EN BIT(24) /* The PTP event messages - Sync, Delay_Req, Pdelay_Req, and Pdelay_Resp. */ #define AM65_CPSW_TS_EVENT_MSG_TYPE_BITS (BIT(0) | BIT(1) | BIT(2) | BIT(3)) @@ -1859,7 +1860,8 @@ static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev, AM65_CPSW_PN_TS_CTL_LTYPE2_TS_132 | AM65_CPSW_PN_TS_CTL_LTYPE2_TS_319 | AM65_CPSW_PN_TS_CTL_LTYPE2_TS_320 | - AM65_CPSW_PN_TS_CTL_LTYPE2_TS_TTL_NONZERO; + AM65_CPSW_PN_TS_CTL_LTYPE2_TS_TTL_NONZERO | + AM65_CPSW_PN_TS_CTL_LTYPE2_TS_UNI_EN; ts_ctrl = AM65_CPSW_TS_EVENT_MSG_TYPE_BITS << AM65_CPSW_PN_TS_CTL_MSG_TYPE_EN_SHIFT; -- 2.53.0