On Fri, Oct 26, 2018 at 06:27:41PM +0200, Miroslav Lichvar wrote: > +static int igb_ptp_gettimex(struct ptp_clock_info *ptp, > + struct ptp_system_timestamp *sts) > +{ > + struct igb_adapter *igb = container_of(ptp, struct igb_adapter, > + ptp_caps); > + struct e1000_hw *hw = &igb->hw; > + unsigned long flags; > + u32 lo, hi; > + u64 ns; > + > + spin_lock_irqsave(&igb->tmreg_lock, flags); > + > + /* 82576 doesn't have SYSTIMR */ > + if (igb->hw.mac.type == e1000_82576) {
Instead of if/then/else, can't you follow the pattern of providing different function flavors ... > + ptp_read_system_prets(sts); > + lo = rd32(E1000_SYSTIML); > + ptp_read_system_postts(sts); > + hi = rd32(E1000_SYSTIMH); > + } else { > + ptp_read_system_prets(sts); > + rd32(E1000_SYSTIMR); > + ptp_read_system_postts(sts); > + lo = rd32(E1000_SYSTIML); > + hi = rd32(E1000_SYSTIMH); > + } > + > + /* SYSTIM on I210/I211 counts time in seconds and nanoseconds */ > + if (igb->hw.mac.type == e1000_i210 || igb->hw.mac.type == e1000_i211) { > + sts->phc_ts.tv_sec = hi; > + sts->phc_ts.tv_nsec = lo; > + } else { > + ns = timecounter_cyc2time(&igb->tc, ((u64)hi << 32) | lo); > + sts->phc_ts = ns_to_timespec64(ns); > + } > + > + spin_unlock_irqrestore(&igb->tmreg_lock, flags); > + > + return 0; > +} > + > static int igb_ptp_settime_82576(struct ptp_clock_info *ptp, > const struct timespec64 *ts) > { > @@ -1125,6 +1165,7 @@ void igb_ptp_init(struct igb_adapter *adapter) > adapter->ptp_caps.adjfreq = igb_ptp_adjfreq_82576; > adapter->ptp_caps.adjtime = igb_ptp_adjtime_82576; > adapter->ptp_caps.gettime64 = igb_ptp_gettime_82576; > + adapter->ptp_caps.gettimex64 = igb_ptp_gettimex; ... here? Thanks, Richard > adapter->ptp_caps.settime64 = igb_ptp_settime_82576; > adapter->ptp_caps.enable = igb_ptp_feature_enable; > adapter->cc.read = igb_ptp_read_82576; > @@ -1144,6 +1185,7 @@ void igb_ptp_init(struct igb_adapter *adapter) > adapter->ptp_caps.adjfine = igb_ptp_adjfine_82580; > adapter->ptp_caps.adjtime = igb_ptp_adjtime_82576; > adapter->ptp_caps.gettime64 = igb_ptp_gettime_82576; > + adapter->ptp_caps.gettimex64 = igb_ptp_gettimex; > adapter->ptp_caps.settime64 = igb_ptp_settime_82576; > adapter->ptp_caps.enable = igb_ptp_feature_enable; > adapter->cc.read = igb_ptp_read_82580; > @@ -1172,6 +1214,7 @@ void igb_ptp_init(struct igb_adapter *adapter) > adapter->ptp_caps.adjfine = igb_ptp_adjfine_82580; > adapter->ptp_caps.adjtime = igb_ptp_adjtime_i210; > adapter->ptp_caps.gettime64 = igb_ptp_gettime_i210; > + adapter->ptp_caps.gettimex64 = igb_ptp_gettimex; > adapter->ptp_caps.settime64 = igb_ptp_settime_i210; > adapter->ptp_caps.enable = igb_ptp_feature_enable_i210; > adapter->ptp_caps.verify = igb_ptp_verify_pin;