Revert "net: stmmac: correct MAC propagation delay"
Subsystems (4)
Jakub Kicinski
maintainerPATCH 1/1 Revert "net: stmmac: correct MAC propagation delay"
This reverts commit 20bf98c94146eb6fe62177817cb32f53e72dd2e8.
Richard raised concerns about correctness of the code on previous generations of the HW.
---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
--- drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 -- .../ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 43 ------------------- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 4 -- .../net/ethernet/stmicro/stmmac/stmmac_ptp.h | 6 --- 4 files changed, 56 deletions(-)
drivers/net/ethernet/stmicro/stmmac/hwif.h +0 -3
@@ -532,7 +532,6 @@ struct stmmac_hwtimestamp {void (*get_systime) (void __iomem *ioaddr,u64 *systime);void (*get_ptptime)(void __iomem *ioaddr,u64 *ptp_time);void (*timestamp_interrupt)(struct stmmac_priv *priv); -void (*correct_latency)(struct stmmac_priv *priv); }; #define stmmac_config_hw_tstamping(__priv, __args...) \
@@ -551,8 +550,6 @@ struct stmmac_hwtimestamp { stmmac_do_void_callback(__priv, ptp, get_ptptime, __args) #define stmmac_timestamp_interrupt(__priv, __args...) \ stmmac_do_void_callback(__priv, ptp, timestamp_interrupt, __args) -#define stmmac_correct_latency(__priv, __args...) \ - stmmac_do_void_callback(__priv, ptp, correct_latency, __args)struct stmmac_tx_queue ;struct stmmac_rx_queue ;
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +0 -43
53 lines not on this page · raw message
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +0 -4
@@ -909,8 +909,6 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) priv->hwts_tx_en =0 ; priv->hwts_rx_en =0 ; -stmmac_correct_latency (priv, priv); -return 0 ; }
@@ -1096,8 +1094,6 @@ static void stmmac_mac_link_up(struct phylink_config *config,if (priv->dma_cap.fpesel)stmmac_fpe_link_state_handle (priv, true); - -stmmac_correct_latency (priv, priv); }static const struct phylink_mac_ops stmmac_phylink_mac_ops = {
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h +0 -6
@@ -26,12 +26,6 @@#define PTP_ACR 0x40/* Auxiliary Control Reg */ #define PTP_ATNR 0x48/* Auxiliary Timestamp - Nanoseconds Reg */ #define PTP_ATSR 0x4c/* Auxiliary Timestamp - Seconds Reg */ -#define PTP_TS_INGR_CORR_NS 0x58/* Ingress timestamp correction nanoseconds */ -#define PTP_TS_EGR_CORR_NS 0x5C/* Egress timestamp correction nanoseconds*/ -#define PTP_TS_INGR_CORR_SNS 0x60/* Ingress timestamp correction subnanoseconds */ -#define PTP_TS_EGR_CORR_SNS 0x64/* Egress timestamp correction subnanoseconds */ -#define PTP_TS_INGR_LAT 0x68/* MAC internal Ingress Latency */ -#define PTP_TS_EGR_LAT 0x6c/* MAC internal Egress Latency */ #define PTP_STNSUR_ADDSUB_SHIFT 31#define PTP_DIGITAL_ROLLOVER_MODE 0x3B9ACA00/* 10e9-1 ns */
Signature · 1 line
2.41.0
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Wed, 26 Jul 2023 15:40:54 -0700 you wrote:
This reverts commit
20bf98c94146eb6fe62177817cb32f53e72dd2e8.Richard raised concerns about correctness of the code on previous generations of the HW.
Fixes 20bf98c94146 ("net: stmmac: correct MAC propagation delay")Signed-off-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net-next] Revert "net: stmmac: correct MAC propagation delay"
https://git.kernel.org/netdev/net-next/c/81b04a800d3c
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html