Commit 52ede1bc authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-stmmac-further-ptp-cleanups' 

Russell King says:

====================
net: stmmac: further ptp cleanups

The first uses a local variable when setting n_ext_ts which is a minor
simplification of the code. The second removes the now unnecessary
"available" flag for the PPS outputs.
====================

Link: https://patch.msgid.link/aawDiK7DjcSXSs1X@shell.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c127d408 687e7863

drivers/net/ethernet/stmicro/stmmac/dwmac5.c

+0 −2
Original line number Diff line number Diff line
@@ -525,8 +525,6 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, 
	u32 val = readl(ioaddr + MAC_PPS_CONTROL);

	u64 period;



	if (!cfg->available)

		return -EINVAL;

	if (tnsec & TRGTBUSY0)

		return -EBUSY;

	if (!sub_second_inc || !systime_flags)

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1162,8 +1162,6 @@ static int dwxgmac2_flex_pps_config(void __iomem *ioaddr, int index, 
	u32 val = readl(ioaddr + XGMAC_PPS_CONTROL);

	u64 period;



	if (!cfg->available)

		return -EINVAL;

	if (tnsec & XGMAC_TRGTBUSY0)

		return -EBUSY;

	if (!sub_second_inc || !systime_flags)

drivers/net/ethernet/stmicro/stmmac/stmmac.h

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ struct stmmac_tc_entry { 


#define STMMAC_PPS_MAX		4

struct stmmac_pps_cfg {

	bool available;

	struct timespec64 start;

	struct timespec64 period;

};

drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c

+4 −6
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ const struct ptp_clock_info dwmac1000_ptp_clock_ops = { 
void stmmac_ptp_register(struct stmmac_priv *priv)

{

	unsigned int pps_out_num = priv->dma_cap.pps_out_num;

	int i;

	unsigned int n_ext_ts;



	if (pps_out_num > STMMAC_PPS_MAX) {

		dev_warn(priv->device,
@@ -344,9 +344,6 @@ void stmmac_ptp_register(struct stmmac_priv *priv) 
		pps_out_num = STMMAC_PPS_MAX;

	}



	for (i = 0; i < pps_out_num; i++)

		priv->pps[i].available = true;



	/* Calculate the clock domain crossing (CDC) error if necessary */

	priv->plat->cdc_error_adj = 0;

	if (priv->plat->core_type == DWMAC_CORE_GMAC4)
@@ -358,8 +355,9 @@ void stmmac_ptp_register(struct stmmac_priv *priv) 
	if (pps_out_num)

		priv->ptp_clock_ops.n_per_out = pps_out_num;



	if (priv->dma_cap.aux_snapshot_n)

		priv->ptp_clock_ops.n_ext_ts = priv->dma_cap.aux_snapshot_n;

	n_ext_ts = priv->dma_cap.aux_snapshot_n;

	if (n_ext_ts)

		priv->ptp_clock_ops.n_ext_ts = n_ext_ts;



	if (priv->plat->ptp_max_adj)

		priv->ptp_clock_ops.max_adj = priv->plat->ptp_max_adj;