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=1795053443; b=woF41vt8ZsgRKAs6cRNh1G3gctSpUCgrIU4FD7ffEX6ITH2KwtHIDBgxyxFX6rqi6hcT T5rQsSDG8FhKkdNygEl/817Z2VtQ0ZfCaLH7ZPawIQe75loQGeKkP/iVonqPAn7V5Uc1w z+oHugdPhOCvDPrnby6rKNF4dLd/anIkOnO/nbz++mWP1Y6948CsEphJ0La5XKtP1ebQH bxuU5YQyusYeRSei8uvxanv7fpaiokJMK3J0aNsjEvXi2u0wMKR8JFyrBNMjJW846sKxo wu040GZ/l50Qc8dyJrGguTErt337E719d6E9W2DfcTSKXGDfNVlva7kO/p/guIk+rOg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053443; 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=C01nAjsOKihvvEjYkq8OIzYkZw5Jb3CCYhiXHvJ4aE4=; b=m0bdkGDoBDWVoy8osrqptPMu2OcYowWMwwGIpZy9MbhGTlBW0U7/u6Eg+li4GtgVn3wX m2XjikQ9q1p5KxGwz00V6PgBLyIS6u8j94mKZ4WHwQO8Off8Bby4JnUEr6UHc7dlIW7H4 tbDjxXXFZrMpPe5AE4CDFcKGrA2ap71bt8xX/5PHFrvu3QUw3oHZFxsgZNXOFfuYR2cZ5 HHWW/dRlzv3WvCMs5oVhfR9na/8NBTusCqmWux7hF94tPrpBLEdhjcQP0ekkewzkmw0NH XP5AoMzMaF2+d8xDYOuKa2xg7oK15F/8/3/xKv0EurcsdOU9ycnTa/j43b7n5v8mDOQ== 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=vb9a9Xec; 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 37C34606A31C; Thu, 19 Nov 2026 01:57:23 +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=vb9a9Xec Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FFE41F000C4; Thu, 19 Nov 2026 01:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053443; bh=C01nAjsOKihvvEjYkq8OIzYkZw5Jb3CCYhiXHvJ4aE4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vb9a9XeceyVlK7yYTf2la+pAqdqtqNPCsPZDZxKFLLRPgbaSENuYxA1FHKWr9GzMx jyER1x9tpT1awof9o481Fz4baeZTjIXGeCFuE//wl+D/NIwSX7x3NuGGQ1cZNcj4JS fSXzk67F8wmkCNUXyuqE+hJLD2GtgjfBtKMl1vhw= 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 5.15 0920/2214] net: ethernet: ti: am65-cpsw-nuss: Enable timestamping of unicast PTP packets Date: Wed, 18 Nov 2026 15:43:16 +0100 Message-ID: <20261118150049.140569680@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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 719465373395c..fc20b81dab02d 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -105,6 +105,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)) @@ -1388,7 +1389,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