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

Commit a9763f3c authored by Mark Rustad's avatar Mark Rustad Committed by Jeff Kirsher
Browse files

ixgbe: Update PTP to support X550EM_x devices 



The X550EM_x devices handle clocking differently, so update the
PTP implementation to accommodate them. This involves significant
changes to ixgbe's PTP code to accommodate the new range of
behaviors including things like non-power-of-2 clock wrapping.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Tested-by: default avatarDarin Miller <darin.j.miller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2f9be166

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+34 −4
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ struct ixgbe_rx_queue_stats { 
	u64 csum_err;

};



#define IXGBE_TS_HDR_LEN 8



enum ixgbe_ring_state_t {

	__IXGBE_TX_FDIR_INIT_DONE,

	__IXGBE_TX_XPS_INIT_DONE,
@@ -282,6 +284,8 @@ struct ixgbe_ring { 
	u16 next_to_use;

	u16 next_to_clean;



	unsigned long last_rx_timestamp;



	union {

		u16 next_to_alloc;

		struct {
@@ -640,6 +644,8 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG_SRIOV_CAPABLE                (u32)(1 << 22)

#define IXGBE_FLAG_SRIOV_ENABLED                (u32)(1 << 23)

#define IXGBE_FLAG_VXLAN_OFFLOAD_CAPABLE	BIT(24)

#define IXGBE_FLAG_RX_HWTSTAMP_ENABLED		BIT(25)

#define IXGBE_FLAG_RX_HWTSTAMP_IN_REGISTER	BIT(26)



	u32 flags2;

#define IXGBE_FLAG2_RSC_CAPABLE                 (u32)(1 << 0)
@@ -756,9 +762,12 @@ struct ixgbe_adapter { 
	unsigned long last_rx_ptp_check;

	unsigned long last_rx_timestamp;

	spinlock_t tmreg_lock;

	struct cyclecounter cc;

	struct timecounter tc;

	struct cyclecounter hw_cc;

	struct timecounter hw_tc;

	u32 base_incval;

	u32 tx_hwtstamp_timeouts;

	u32 rx_hwtstamp_cleared;

	void (*ptp_setup_sdp)(struct ixgbe_adapter *);



	/* SR-IOV */

	DECLARE_BITMAP(active_vfs, IXGBE_MAX_VF_FUNCTIONS);
@@ -969,12 +978,33 @@ void ixgbe_ptp_suspend(struct ixgbe_adapter *adapter); 
void ixgbe_ptp_stop(struct ixgbe_adapter *adapter);

void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter);

void ixgbe_ptp_rx_hang(struct ixgbe_adapter *adapter);

void ixgbe_ptp_rx_hwtstamp(struct ixgbe_adapter *adapter, struct sk_buff *skb);

void ixgbe_ptp_rx_pktstamp(struct ixgbe_q_vector *, struct sk_buff *);

void ixgbe_ptp_rx_rgtstamp(struct ixgbe_q_vector *, struct sk_buff *skb);

static inline void ixgbe_ptp_rx_hwtstamp(struct ixgbe_ring *rx_ring,

					 union ixgbe_adv_rx_desc *rx_desc,

					 struct sk_buff *skb)

{

	if (unlikely(ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_TSIP))) {

		ixgbe_ptp_rx_pktstamp(rx_ring->q_vector, skb);

		return;

	}



	if (unlikely(!ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS)))

		return;



	ixgbe_ptp_rx_rgtstamp(rx_ring->q_vector, skb);



	/* Update the last_rx_timestamp timer in order to enable watchdog check

	 * for error case of latched timestamp on a dropped packet.

	 */

	rx_ring->last_rx_timestamp = jiffies;

}



int ixgbe_ptp_set_ts_config(struct ixgbe_adapter *adapter, struct ifreq *ifr);

int ixgbe_ptp_get_ts_config(struct ixgbe_adapter *adapter, struct ifreq *ifr);

void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter);

void ixgbe_ptp_reset(struct ixgbe_adapter *adapter);

void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr);

void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter);

#ifdef CONFIG_PCI_IOV

void ixgbe_sriov_reinit(struct ixgbe_adapter *adapter);

#endif

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+5 −4
Original line number Diff line number Diff line
@@ -1634,6 +1634,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, 
				     struct sk_buff *skb)

{

	struct net_device *dev = rx_ring->netdev;

	u32 flags = rx_ring->q_vector->adapter->flags;



	ixgbe_update_rsc_stats(rx_ring, skb);
@@ -1641,8 +1642,8 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, 


	ixgbe_rx_checksum(rx_ring, rx_desc, skb);



	if (unlikely(ixgbe_test_staterr(rx_desc, IXGBE_RXDADV_STAT_TS)))

		ixgbe_ptp_rx_hwtstamp(rx_ring->q_vector->adapter, skb);

	if (unlikely(flags & IXGBE_FLAG_RX_HWTSTAMP_ENABLED))

		ixgbe_ptp_rx_hwtstamp(rx_ring, rx_desc, skb);



	if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) &&

	    ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) {
@@ -2740,7 +2741,7 @@ static irqreturn_t ixgbe_msix_other(int irq, void *data) 
	ixgbe_check_fan_failure(adapter, eicr);



	if (unlikely(eicr & IXGBE_EICR_TIMESYNC))

		ixgbe_ptp_check_pps_event(adapter, eicr);

		ixgbe_ptp_check_pps_event(adapter);



	/* re-enable the original interrupt state, no lsc, no queues */

	if (!test_bit(__IXGBE_DOWN, &adapter->state))
@@ -2947,7 +2948,7 @@ static irqreturn_t ixgbe_intr(int irq, void *data) 


	ixgbe_check_fan_failure(adapter, eicr);

	if (unlikely(eicr & IXGBE_EICR_TIMESYNC))

		ixgbe_ptp_check_pps_event(adapter, eicr);

		ixgbe_ptp_check_pps_event(adapter);



	/* would disable interrupts here but EIAM disabled it */

	napi_schedule_irqoff(&q_vector->napi);

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

+531 −189

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+8 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,7 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_TXSTMPH    0x08C08 /* Tx timestamp value High - RO */

#define IXGBE_SYSTIML    0x08C0C /* System time register Low - RO */

#define IXGBE_SYSTIMH    0x08C10 /* System time register High - RO */

#define IXGBE_SYSTIMR    0x08C58 /* System time register Residue - RO */

#define IXGBE_TIMINCA    0x08C14 /* Increment attributes register - RW */

#define IXGBE_TIMADJL    0x08C18 /* Time Adjustment Offset register Low - RW */

#define IXGBE_TIMADJH    0x08C1C /* Time Adjustment Offset register High - RW */
@@ -1036,6 +1037,7 @@ struct ixgbe_thermal_sensor_data { 
#define IXGBE_AUXSTMPH0  0x08C40 /* Auxiliary Time Stamp 0 register High - RO */

#define IXGBE_AUXSTMPL1  0x08C44 /* Auxiliary Time Stamp 1 register Low - RO */

#define IXGBE_AUXSTMPH1  0x08C48 /* Auxiliary Time Stamp 1 register High - RO */

#define IXGBE_TSIM       0x08C68 /* TimeSync Interrupt Mask Register - RW */



/* Diagnostic Registers */

#define IXGBE_RDSTATCTL   0x02C20
@@ -2213,6 +2215,7 @@ enum { 
#define IXGBE_TSAUXC_EN_CLK   0x00000004

#define IXGBE_TSAUXC_SYNCLK   0x00000008

#define IXGBE_TSAUXC_SDP0_INT 0x00000040

#define IXGBE_TSAUXC_DISABLE_SYSTIME	0x80000000



#define IXGBE_TSYNCTXCTL_VALID		0x00000001 /* Tx timestamp valid */

#define IXGBE_TSYNCTXCTL_ENABLED	0x00000010 /* Tx timestamping enabled */
@@ -2222,8 +2225,12 @@ enum { 
#define IXGBE_TSYNCRXCTL_TYPE_L2_V2	0x00

#define IXGBE_TSYNCRXCTL_TYPE_L4_V1	0x02

#define IXGBE_TSYNCRXCTL_TYPE_L2_L4_V2	0x04

#define IXGBE_TSYNCRXCTL_TYPE_ALL	0x08

#define IXGBE_TSYNCRXCTL_TYPE_EVENT_V2	0x0A

#define IXGBE_TSYNCRXCTL_ENABLED	0x00000010 /* Rx Timestamping enabled */

#define IXGBE_TSYNCRXCTL_TSIP_UT_EN	0x00800000 /* Rx Timestamp in Packet */



#define IXGBE_TSIM_TXTS			0x00000002



#define IXGBE_RXMTRL_V1_CTRLT_MASK	0x000000FF

#define IXGBE_RXMTRL_V1_SYNC_MSG	0x00
@@ -2336,6 +2343,7 @@ enum { 
#define IXGBE_RXD_STAT_UDPV     0x400   /* Valid UDP checksum */

#define IXGBE_RXD_STAT_DYNINT   0x800   /* Pkt caused INT via DYNINT */

#define IXGBE_RXD_STAT_LLINT    0x800   /* Pkt caused Low Latency Interrupt */

#define IXGBE_RXD_STAT_TSIP     0x08000 /* Time Stamp in packet buffer */

#define IXGBE_RXD_STAT_TS       0x10000 /* Time Stamp */

#define IXGBE_RXD_STAT_SECP     0x20000 /* Security Processing */

#define IXGBE_RXD_STAT_LB       0x40000 /* Loopback Status */