Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfd4ecdd authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: fec: consolidate hwtstamp implementation 



Both transmit and receive use the same infrastructure for calculating
the packet timestamp.  Rather than duplicating the code, provide a
function to do this common work.  Model this function in the Intel
e1000e version which avoids calling ns_to_ktime() within the spinlock;
the spinlock is critical for timecounter_cyc2time() but not
ns_to_ktime().

Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Acked-by: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96018f52

drivers/net/ethernet/freescale/fec_main.c

+19 −18
Original line number Diff line number Diff line
@@ -1064,6 +1064,21 @@ static void fec_enet_timeout_work(struct work_struct *work) 
	rtnl_unlock();

}



static void

fec_enet_hwtstamp(struct fec_enet_private *fep, unsigned ts,

	struct skb_shared_hwtstamps *hwtstamps)

{

	unsigned long flags;

	u64 ns;



	spin_lock_irqsave(&fep->tmreg_lock, flags);

	ns = timecounter_cyc2time(&fep->tc, ts);

	spin_unlock_irqrestore(&fep->tmreg_lock, flags);



	memset(hwtstamps, 0, sizeof(*hwtstamps));

	hwtstamps->hwtstamp = ns_to_ktime(ns);

}



static void

fec_enet_tx(struct net_device *ndev)

{
@@ -1122,14 +1137,9 @@ fec_enet_tx(struct net_device *ndev) 
		if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS) &&

			fep->bufdesc_ex) {

			struct skb_shared_hwtstamps shhwtstamps;

			unsigned long flags;

			struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp;



			memset(&shhwtstamps, 0, sizeof(shhwtstamps));

			spin_lock_irqsave(&fep->tmreg_lock, flags);

			shhwtstamps.hwtstamp = ns_to_ktime(

				timecounter_cyc2time(&fep->tc, ebdp->ts));

			spin_unlock_irqrestore(&fep->tmreg_lock, flags);

			fec_enet_hwtstamp(fep, ebdp->ts, &shhwtstamps);

			skb_tstamp_tx(skb, &shhwtstamps);

		}
@@ -1288,18 +1298,9 @@ fec_enet_rx(struct net_device *ndev, int budget) 
			skb->protocol = eth_type_trans(skb, ndev);



			/* Get receive timestamp from the skb */

			if (fep->hwts_rx_en && fep->bufdesc_ex) {

				struct skb_shared_hwtstamps *shhwtstamps =

							    skb_hwtstamps(skb);

				unsigned long flags;



				memset(shhwtstamps, 0, sizeof(*shhwtstamps));



				spin_lock_irqsave(&fep->tmreg_lock, flags);

				shhwtstamps->hwtstamp = ns_to_ktime(

				    timecounter_cyc2time(&fep->tc, ebdp->ts));

				spin_unlock_irqrestore(&fep->tmreg_lock, flags);

			}

			if (fep->hwts_rx_en && fep->bufdesc_ex)

				fec_enet_hwtstamp(fep, ebdp->ts,

						  skb_hwtstamps(skb));



			if (fep->bufdesc_ex &&

			    (fep->csum_flags & FLAG_RX_CSUM_ENABLED)) {