Patch "net: mscc: ocelot: don't report that RX timestamping is enabled by default" has been added to the 6.4-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    net: mscc: ocelot: don't report that RX timestamping is enabled by default

to the 6.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-mscc-ocelot-don-t-report-that-rx-timestamping-is.patch
and it can be found in the queue-6.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d8225dbddc010c37d6d26e87a68a47eaa703a8a9
Author: Vladimir Oltean <vladimir.oltean@xxxxxxx>
Date:   Tue Jun 27 19:31:12 2023 +0300

    net: mscc: ocelot: don't report that RX timestamping is enabled by default
    
    [ Upstream commit 4fd44b82b7aceaa35c2901c6546d2c4198e0799d ]
    
    PTP RX timestamping should be enabled when the user requests it, not by
    default. If it is enabled by default, it can be problematic when the
    ocelot driver is a DSA master, and it sidesteps what DSA tries to avoid
    through __dsa_master_hwtstamp_validate().
    
    Additionally, after the change which made ocelot trap PTP packets only
    to the CPU at ocelot_hwtstamp_set() time, it is no longer even true that
    RX timestamping is enabled by default, because until ocelot_hwtstamp_set()
    is called, the PTP traps are actually not set up. So the rx_filter field
    of ocelot->hwtstamp_config reflects an incorrect reality.
    
    Fixes: 96ca08c05838 ("net: mscc: ocelot: set up traps for PTP packets")
    Fixes: 4e3b0468e6d7 ("net: mscc: PTP Hardware Clock (PHC) support")
    Signed-off-by: Vladimir Oltean <vladimir.oltean@xxxxxxx>
    Signed-off-by: Paolo Abeni <pabeni@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/ethernet/mscc/ocelot_ptp.c b/drivers/net/ethernet/mscc/ocelot_ptp.c
index 2180ae94c7447..673bfd70867a6 100644
--- a/drivers/net/ethernet/mscc/ocelot_ptp.c
+++ b/drivers/net/ethernet/mscc/ocelot_ptp.c
@@ -824,11 +824,6 @@ int ocelot_init_timestamp(struct ocelot *ocelot,
 
 	ocelot_write(ocelot, PTP_CFG_MISC_PTP_EN, PTP_CFG_MISC);
 
-	/* There is no device reconfiguration, PTP Rx stamping is always
-	 * enabled.
-	 */
-	ocelot->hwtstamp_config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
-
 	return 0;
 }
 EXPORT_SYMBOL(ocelot_init_timestamp);



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux