This follow-up patch removes the member "systime_flags" from "stmmac_priv" and the affected funtions in stmmac.
Usage of this variable becomes deprecated after the introduction of "stmmac_init_hwtstamp()", which now takes care of setting the respective register flags. Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de> Signed-off-by: Holger Assmann <h.assm...@pengutronix.de> --- drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 7 +++---- drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 2 +- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 7 +++---- drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 - drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +----- drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 3 +-- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 03e79a677c8b..53d14d660220 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c @@ -494,7 +494,7 @@ int dwmac5_rxp_config(void __iomem *ioaddr, struct stmmac_tc_entry *entries, int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, struct stmmac_pps_cfg *cfg, bool enable, - u32 sub_second_inc, u32 systime_flags) + u32 sub_second_inc) { u32 tnsec = readl(ioaddr + MAC_PPSx_TARGET_TIME_NSEC(index)); u32 val = readl(ioaddr + MAC_PPS_CONTROL); @@ -504,7 +504,7 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, return -EINVAL; if (tnsec & TRGTBUSY0) return -EBUSY; - if (!sub_second_inc || !systime_flags) + if (!sub_second_inc) return -EINVAL; val &= ~PPSx_MASK(index); @@ -522,8 +522,7 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, writel(cfg->start.tv_sec, ioaddr + MAC_PPSx_TARGET_TIME_SEC(index)); - if (!(systime_flags & PTP_TCR_TSCTRLSSR)) - cfg->start.tv_nsec = (cfg->start.tv_nsec * 1000) / 465; + /* HW timestamping init always sets PTP_TCR_TSCTRLSSR, so no conversion necessary */ writel(cfg->start.tv_nsec, ioaddr + MAC_PPSx_TARGET_TIME_NSEC(index)); period = cfg->period.tv_sec * 1000000000; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h index 56b0762c1276..f89996cc4403 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.h +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.h @@ -108,7 +108,7 @@ int dwmac5_rxp_config(void __iomem *ioaddr, struct stmmac_tc_entry *entries, unsigned int count); int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, struct stmmac_pps_cfg *cfg, bool enable, - u32 sub_second_inc, u32 systime_flags); + u32 sub_second_inc); int dwmac5_est_configure(void __iomem *ioaddr, struct stmmac_est *cfg, unsigned int ptp_rate); void dwmac5_fpe_configure(void __iomem *ioaddr, u32 num_txq, u32 num_rxq, diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c index ad4df9bddcf3..3bf3ce81dbd8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -1109,7 +1109,7 @@ static int dwxgmac2_get_mac_tx_timestamp(struct mac_device_info *hw, u64 *ts) static int dwxgmac2_flex_pps_config(void __iomem *ioaddr, int index, struct stmmac_pps_cfg *cfg, bool enable, - u32 sub_second_inc, u32 systime_flags) + u32 sub_second_inc) { u32 tnsec = readl(ioaddr + XGMAC_PPSx_TARGET_TIME_NSEC(index)); u32 val = readl(ioaddr + XGMAC_PPS_CONTROL); @@ -1119,7 +1119,7 @@ static int dwxgmac2_flex_pps_config(void __iomem *ioaddr, int index, return -EINVAL; if (tnsec & XGMAC_TRGTBUSY0) return -EBUSY; - if (!sub_second_inc || !systime_flags) + if (!sub_second_inc) return -EINVAL; val &= ~XGMAC_PPSx_MASK(index); @@ -1136,8 +1136,7 @@ static int dwxgmac2_flex_pps_config(void __iomem *ioaddr, int index, writel(cfg->start.tv_sec, ioaddr + XGMAC_PPSx_TARGET_TIME_SEC(index)); - if (!(systime_flags & PTP_TCR_TSCTRLSSR)) - cfg->start.tv_nsec = (cfg->start.tv_nsec * 1000) / 465; + /* HW timestamping init always sets PTP_TCR_TSCTRLSSR, so no conversion necessary */ writel(cfg->start.tv_nsec, ioaddr + XGMAC_PPSx_TARGET_TIME_NSEC(index)); period = cfg->period.tv_sec * 1000000000; diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index b40b2e0667bb..7d73d3206068 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -360,7 +360,7 @@ struct stmmac_ops { /* Flexible PPS */ int (*flex_pps_config)(void __iomem *ioaddr, int index, struct stmmac_pps_cfg *cfg, bool enable, - u32 sub_second_inc, u32 systime_flags); + u32 sub_second_inc); /* Loopback for selftests */ void (*set_mac_loopback)(void __iomem *ioaddr, bool enable); /* RSS */ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h index e553b9a1f785..4d0642ae55d6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -217,7 +217,6 @@ struct stmmac_priv { struct ptp_clock_info ptp_clock_ops; unsigned int default_addend; u32 sub_second_inc; - u32 systime_flags; u32 adv_ts; int use_riwt; int irq_wake; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 55f5e6cd1cad..a6e4c7c26b4d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -697,9 +697,6 @@ static int stmmac_hwtstamp_set(struct net_device *dev, struct ifreq *ifr) ptp_over_ipv6_udp | ptp_over_ipv4_udp | ts_event_en | ts_master_en | snap_type_sel); stmmac_config_hw_tstamping(priv, priv->ptpaddr, value); - - /* Store flags for later use */ - priv->systime_flags = value; } memcpy(&priv->tstamp_config, &config, sizeof(config)); @@ -806,9 +803,8 @@ static int stmmac_init_hwtstamp(struct stmmac_priv *priv) xmac, &sec_inc); temp = div_u64(1000000000ULL, sec_inc); - /* Store sub second increment and flags for later use */ + /* Store sub second increment for later use */ priv->sub_second_inc = sec_inc; - priv->systime_flags = value; /* calculate default added value: * formula is : diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 0989e2bb6ee3..70a113ab4789 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -154,8 +154,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp, spin_lock_irqsave(&priv->ptp_lock, flags); ret = stmmac_flex_pps_config(priv, priv->ioaddr, rq->perout.index, cfg, on, - priv->sub_second_inc, - priv->systime_flags); + priv->sub_second_inc); spin_unlock_irqrestore(&priv->ptp_lock, flags); break; default: -- 2.20.1