igb: restore PPS signal on igb_ptp_reset
Subsystems (2)
PATCH 1/1 igb: restore PPS signal on igb_ptp_reset
When a reset occurs, the PPS SYS_WRAP interrupt was not re-enabled which resulted in disabling of the PPS signaling. Fix this by recording when the interrupt is on and ensuring that we re-enable it every time we reset.
--- drivers/net/ethernet/intel/igb/igb.h | 1 + drivers/net/ethernet/intel/igb/igb_ptp.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/igb/igb.h +1 -0
@@ -492,6 +492,7 @@ struct igb_adapter {struct timecounter tc;u32 tx_hwtstamp_timeouts;u32 rx_hwtstamp_cleared; +bool pps_sys_wrap_on;struct ptp_pin_desc sdp_config[IGB_N_SDP ];struct {
drivers/net/ethernet/intel/igb/igb_ptp.c +4 -1
@@ -591,6 +591,7 @@ static int igb_ptp_feature_enable_i210(struct ptp_clock_info *ptp, tsim |=TSINTR_SYS_WRAP ; else tsim &= ~TSINTR_SYS_WRAP; + igb->pps_sys_wrap_on = !!on;wr32 (E1000_TSIM , tsim);spin_unlock_irqrestore (&igb->tmreg_lock, flags);return 0 ;
@@ -1235,7 +1236,9 @@ void igb_ptp_reset(struct igb_adapter *adapter)case e1000_i211:wr32 (E1000_TSAUXC ,0x0 );wr32 (E1000_TSSDP ,0x0 ); -wr32 (E1000_TSIM ,TSYNC_INTERRUPTS ); +wr32 (E1000_TSIM , +TSYNC_INTERRUPTS | + (adapter->pps_sys_wrap_on ?TSINTR_SYS_WRAP :0 ));wr32 (E1000_IMS ,E1000_IMS_TS );break ;default :
Signature · 1 line
2.10.0.443.g7d82ce0
Brown
PATCH 1/1 igb: restore PPS signal on igb_ptp_reset
Quoted 11 lines
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Jacob Keller
Sent: Friday, September 9, 2016 9:11 AM
To: Intel Wired LAN <[email protected]>
Subject: [Intel-wired-lan] [PATCH] igb: restore PPS signal onigb_ptp_resetWhen a reset occurs, the PPS
SYS_WRAPinterrupt was not re-enabled which resulted in disabling of the PPS signaling. Fix this by recording when the interrupt is on and ensuring that we re-enable it every time we reset.
Quoted 5 lines
Signed-off-by Jacob Keller <[email protected]>--- drivers/net/ethernet/intel/igb/igb.h | 1 + drivers/net/ethernet/intel/igb/igb_ptp.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)