Subject: Re: [PATCH net v2] net: ethernet: ti: am65-cpsw-nuss: Fix rx_filter value for PTP support: manual merge

From: Matthieu Baerts <[email-masked]>
Date: Thu, 12 Mar 2026 11:53:07 +0100

Hi Chintan,

+cc linux-next

On 10/03/2026 17:09, Chintan Vankar wrote:
> The "rx_filter" member of "hwtstamp_config" structure is an enum field and
> does not support bitwise OR combination of multiple filter values. It
> causes error while linuxptp application tries to match rx filter version.
> Fix this by storing the requested filter type in a new port field.
FYI, we got a small conflict when merging 'net' in 'net-next' in the
MPTCP tree due to this patch applied in 'net':

  840c9d13cb1c ("net: ethernet: ti: am65-cpsw-nuss: Fix rx_filter value for PTP support")

and this one from 'net-next':

  a23c657e332f ("net: ethernet: ti: am65-cpsw: Use also port number to identify timestamps")

----- Generic Message -----
The best is to avoid conflicts between 'net' and 'net-next' trees but if
they cannot be avoided when preparing patches, a note about how to fix
them is much appreciated.

The conflict has been resolved on our side [1] and the resolution we
suggest is attached to this email. Please report any issues linked to
this conflict resolution as it might be used by others. If you worked on
the mentioned patches, don't hesitate to ACK this conflict resolution.
---------------------------

Rerere cache is available in [2].

The conflict was in the context: this patch here in 'net' modified the
if condition, while the one in 'net-next' modified the line below.

----------- 8< -----------
diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
index a38bf7f4f434,265ce5479915..d9400599e80a
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@@ -1351,8 -1351,8 +1351,8 @@@ static int am65_cpsw_nuss_rx_packets(st
        ndev_priv = netdev_priv(ndev);
        am65_cpsw_nuss_set_offload_fwd_mark(skb, ndev_priv->offload_fwd_mark);
        skb_put(skb, pkt_len);
-       if (port->rx_ts_enabled)
+       if (port->rx_ts_filter)
 -              am65_cpts_rx_timestamp(common->cpts, skb);
 +              am65_cpts_rx_timestamp(common->cpts, port_id, skb);
        skb_mark_for_recycle(skb);
        skb->protocol = eth_type_trans(skb, ndev);
        am65_cpsw_nuss_rx_csum(skb, csum_info);
----------- 8< -----------

1: https://github.com/multipath-tcp/mptcp_net-next/commit/e9021220744d
2: https://github.com/multipath-tcp/mptcp-upstream-rr-cache/commit/c39c9fa

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.