Commit 90fdd1c1 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'revert-fec-ptp-changes' 

Francesco Dolcini says:

====================
Revert fec PTP changes

Revert the last 2 FEC PTP changes from Csókás Bence, they are causing multiple
issues and we are at 6.0-rc5.
====================

Link: https://lore.kernel.org/r/20220912070143.98153-1-francesco.dolcini@toradex.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 807e5eda 01b825f9

drivers/net/ethernet/freescale/fec.h

+1 −10
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ struct fec_enet_private { 
	struct clk *clk_2x_txclk;



	bool ptp_clk_on;

	struct mutex ptp_clk_mutex;

	unsigned int num_tx_queues;

	unsigned int num_rx_queues;
@@ -638,13 +639,6 @@ struct fec_enet_private { 
	int pps_enable;

	unsigned int next_counter;



	struct {

		struct timespec64 ts_phc;

		u64 ns_sys;

		u32 at_corr;

		u8 at_inc_corr;

	} ptp_saved_state;



	u64 ethtool_stats[];

};
@@ -655,8 +649,5 @@ void fec_ptp_disable_hwts(struct net_device *ndev); 
int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr);

int fec_ptp_get(struct net_device *ndev, struct ifreq *ifr);



void fec_ptp_save_state(struct fec_enet_private *fep);

int fec_ptp_restore_state(struct fec_enet_private *fep);



/****************************************************************************/

#endif /* FEC_H */

drivers/net/ethernet/freescale/fec_main.c

+12 −47
Original line number Diff line number Diff line
@@ -286,11 +286,8 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); 
#define FEC_MMFR_TA		(2 << 16)

#define FEC_MMFR_DATA(v)	(v & 0xffff)

/* FEC ECR bits definition */

#define FEC_ECR_RESET   BIT(0)

#define FEC_ECR_ETHEREN BIT(1)

#define FEC_ECR_MAGICEN BIT(2)

#define FEC_ECR_SLEEP   BIT(3)

#define FEC_ECR_EN1588  BIT(4)

#define FEC_ECR_MAGICEN		(1 << 2)

#define FEC_ECR_SLEEP		(1 << 3)



#define FEC_MII_TIMEOUT		30000 /* us */
@@ -986,9 +983,6 @@ fec_restart(struct net_device *ndev) 
	u32 temp_mac[2];

	u32 rcntl = OPT_FRAME_SIZE | 0x04;

	u32 ecntl = 0x2; /* ETHEREN */

	struct ptp_clock_request ptp_rq = { .type = PTP_CLK_REQ_PPS };



	fec_ptp_save_state(fep);



	/* Whack a reset.  We should wait for this.

	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC
@@ -1142,7 +1136,7 @@ fec_restart(struct net_device *ndev) 
	}



	if (fep->bufdesc_ex)

		ecntl |= FEC_ECR_EN1588;

		ecntl |= (1 << 4);



	if (fep->quirks & FEC_QUIRK_DELAYED_CLKS_SUPPORT &&

	    fep->rgmii_txc_dly)
@@ -1163,14 +1157,6 @@ fec_restart(struct net_device *ndev) 
	if (fep->bufdesc_ex)

		fec_ptp_start_cyclecounter(ndev);



	/* Restart PPS if needed */

	if (fep->pps_enable) {

		/* Clear flag so fec_ptp_enable_pps() doesn't return immediately */

		fep->pps_enable = 0;

		fec_ptp_restore_state(fep);

		fep->ptp_caps.enable(&fep->ptp_caps, &ptp_rq, 1);

	}



	/* Enable interrupts we wish to service */

	if (fep->link)

		writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);
@@ -1221,8 +1207,6 @@ fec_stop(struct net_device *ndev) 
	struct fec_enet_private *fep = netdev_priv(ndev);

	u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8);

	u32 val;

	struct ptp_clock_request ptp_rq = { .type = PTP_CLK_REQ_PPS };

	u32 ecntl = 0;



	/* We cannot expect a graceful transmit stop without link !!! */

	if (fep->link) {
@@ -1232,8 +1216,6 @@ fec_stop(struct net_device *ndev) 
			netdev_err(ndev, "Graceful transmit stop did not complete!\n");

	}



	fec_ptp_save_state(fep);



	/* Whack a reset.  We should wait for this.

	 * For i.MX6SX SOC, enet use AXI bus, we use disable MAC

	 * instead of reset MAC itself.
@@ -1253,28 +1235,12 @@ fec_stop(struct net_device *ndev) 
	writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);

	writel(FEC_DEFAULT_IMASK, fep->hwp + FEC_IMASK);



	if (fep->bufdesc_ex)

		ecntl |= FEC_ECR_EN1588;



	/* We have to keep ENET enabled to have MII interrupt stay working */

	if (fep->quirks & FEC_QUIRK_ENET_MAC &&

		!(fep->wol_flag & FEC_WOL_FLAG_SLEEP_ON)) {

		ecntl |= FEC_ECR_ETHEREN;

		writel(2, fep->hwp + FEC_ECNTRL);

		writel(rmii_mode, fep->hwp + FEC_R_CNTRL);

	}



	writel(ecntl, fep->hwp + FEC_ECNTRL);



	if (fep->bufdesc_ex)

		fec_ptp_start_cyclecounter(ndev);



	/* Restart PPS if needed */

	if (fep->pps_enable) {

		/* Clear flag so fec_ptp_enable_pps() doesn't return immediately */

		fep->pps_enable = 0;

		fec_ptp_restore_state(fep);

		fep->ptp_caps.enable(&fep->ptp_caps, &ptp_rq, 1);

	}

}
@@ -2029,7 +1995,6 @@ static void fec_enet_phy_reset_after_clk_enable(struct net_device *ndev) 
static int fec_enet_clk_enable(struct net_device *ndev, bool enable)

{

	struct fec_enet_private *fep = netdev_priv(ndev);

	unsigned long flags;

	int ret;



	if (enable) {
@@ -2038,15 +2003,15 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) 
			return ret;



		if (fep->clk_ptp) {

			spin_lock_irqsave(&fep->tmreg_lock, flags);

			mutex_lock(&fep->ptp_clk_mutex);

			ret = clk_prepare_enable(fep->clk_ptp);

			if (ret) {

				spin_unlock_irqrestore(&fep->tmreg_lock, flags);

				mutex_unlock(&fep->ptp_clk_mutex);

				goto failed_clk_ptp;

			} else {

				fep->ptp_clk_on = true;

			}

			spin_unlock_irqrestore(&fep->tmreg_lock, flags);

			mutex_unlock(&fep->ptp_clk_mutex);

		}



		ret = clk_prepare_enable(fep->clk_ref);
@@ -2061,10 +2026,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) 
	} else {

		clk_disable_unprepare(fep->clk_enet_out);

		if (fep->clk_ptp) {

			spin_lock_irqsave(&fep->tmreg_lock, flags);

			mutex_lock(&fep->ptp_clk_mutex);

			clk_disable_unprepare(fep->clk_ptp);

			fep->ptp_clk_on = false;

			spin_unlock_irqrestore(&fep->tmreg_lock, flags);

			mutex_unlock(&fep->ptp_clk_mutex);

		}

		clk_disable_unprepare(fep->clk_ref);

		clk_disable_unprepare(fep->clk_2x_txclk);
@@ -2077,10 +2042,10 @@ static int fec_enet_clk_enable(struct net_device *ndev, bool enable) 
		clk_disable_unprepare(fep->clk_ref);

failed_clk_ref:

	if (fep->clk_ptp) {

		spin_lock_irqsave(&fep->tmreg_lock, flags);

		mutex_lock(&fep->ptp_clk_mutex);

		clk_disable_unprepare(fep->clk_ptp);

		fep->ptp_clk_on = false;

		spin_unlock_irqrestore(&fep->tmreg_lock, flags);

		mutex_unlock(&fep->ptp_clk_mutex);

	}

failed_clk_ptp:

	clk_disable_unprepare(fep->clk_enet_out);
@@ -3915,7 +3880,7 @@ fec_probe(struct platform_device *pdev) 
	}



	fep->ptp_clk_on = false;

	spin_lock_init(&fep->tmreg_lock);

	mutex_init(&fep->ptp_clk_mutex);



	/* clk_ref is optional, depends on board */

	fep->clk_ref = devm_clk_get_optional(&pdev->dev, "enet_clk_ref");

drivers/net/ethernet/freescale/fec_ptp.c

+18 −39
Original line number Diff line number Diff line
@@ -365,19 +365,21 @@ static int fec_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) 
 */

static int fec_ptp_gettime(struct ptp_clock_info *ptp, struct timespec64 *ts)

{

	struct fec_enet_private *fep =

	struct fec_enet_private *adapter =

	    container_of(ptp, struct fec_enet_private, ptp_caps);

	u64 ns;

	unsigned long flags;



	spin_lock_irqsave(&fep->tmreg_lock, flags);

	mutex_lock(&adapter->ptp_clk_mutex);

	/* Check the ptp clock */

	if (!fep->ptp_clk_on) {

		spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	if (!adapter->ptp_clk_on) {

		mutex_unlock(&adapter->ptp_clk_mutex);

		return -EINVAL;

	}

	ns = timecounter_read(&fep->tc);

	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	spin_lock_irqsave(&adapter->tmreg_lock, flags);

	ns = timecounter_read(&adapter->tc);

	spin_unlock_irqrestore(&adapter->tmreg_lock, flags);

	mutex_unlock(&adapter->ptp_clk_mutex);



	*ts = ns_to_timespec64(ns);
@@ -402,10 +404,10 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp, 
	unsigned long flags;

	u32 counter;



	spin_lock_irqsave(&fep->tmreg_lock, flags);

	mutex_lock(&fep->ptp_clk_mutex);

	/* Check the ptp clock */

	if (!fep->ptp_clk_on) {

		spin_unlock_irqrestore(&fep->tmreg_lock, flags);

		mutex_unlock(&fep->ptp_clk_mutex);

		return -EINVAL;

	}
@@ -415,9 +417,11 @@ static int fec_ptp_settime(struct ptp_clock_info *ptp, 
	 */

	counter = ns & fep->cc.mask;



	spin_lock_irqsave(&fep->tmreg_lock, flags);

	writel(counter, fep->hwp + FEC_ATIME);

	timecounter_init(&fep->tc, &fep->cc, ns);

	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	mutex_unlock(&fep->ptp_clk_mutex);

	return 0;

}
@@ -514,11 +518,13 @@ static void fec_time_keep(struct work_struct *work) 
	struct fec_enet_private *fep = container_of(dwork, struct fec_enet_private, time_keep);

	unsigned long flags;



	spin_lock_irqsave(&fep->tmreg_lock, flags);

	mutex_lock(&fep->ptp_clk_mutex);

	if (fep->ptp_clk_on) {

		spin_lock_irqsave(&fep->tmreg_lock, flags);

		timecounter_read(&fep->tc);

	}

		spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	}

	mutex_unlock(&fep->ptp_clk_mutex);



	schedule_delayed_work(&fep->time_keep, HZ);

}
@@ -593,6 +599,8 @@ void fec_ptp_init(struct platform_device *pdev, int irq_idx) 
	}

	fep->ptp_inc = NSEC_PER_SEC / fep->cycle_speed;



	spin_lock_init(&fep->tmreg_lock);



	fec_ptp_start_cyclecounter(ndev);



	INIT_DELAYED_WORK(&fep->time_keep, fec_time_keep);
@@ -625,36 +633,7 @@ void fec_ptp_stop(struct platform_device *pdev) 
	struct net_device *ndev = platform_get_drvdata(pdev);

	struct fec_enet_private *fep = netdev_priv(ndev);



	if (fep->pps_enable)

		fec_ptp_enable_pps(fep, 0);



	cancel_delayed_work_sync(&fep->time_keep);

	if (fep->ptp_clock)

		ptp_clock_unregister(fep->ptp_clock);

}
 


void fec_ptp_save_state(struct fec_enet_private *fep)

{

	u32 atime_inc_corr;



	fec_ptp_gettime(&fep->ptp_caps, &fep->ptp_saved_state.ts_phc);

	fep->ptp_saved_state.ns_sys = ktime_get_ns();



	fep->ptp_saved_state.at_corr = readl(fep->hwp + FEC_ATIME_CORR);

	atime_inc_corr = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_CORR_MASK;

	fep->ptp_saved_state.at_inc_corr = (u8)(atime_inc_corr >> FEC_T_INC_CORR_OFFSET);

}



int fec_ptp_restore_state(struct fec_enet_private *fep)

{

	u32 atime_inc = readl(fep->hwp + FEC_ATIME_INC) & FEC_T_INC_MASK;

	u64 ns_sys;



	writel(fep->ptp_saved_state.at_corr, fep->hwp + FEC_ATIME_CORR);

	atime_inc |= ((u32)fep->ptp_saved_state.at_inc_corr) << FEC_T_INC_CORR_OFFSET;

	writel(atime_inc, fep->hwp + FEC_ATIME_INC);



	ns_sys = ktime_get_ns() - fep->ptp_saved_state.ns_sys;

	timespec64_add_ns(&fep->ptp_saved_state.ts_phc, ns_sys);

	return fec_ptp_settime(&fep->ptp_caps, &fep->ptp_saved_state.ts_phc);

}