i40e: add support for PTP external synchronization clock
Subsystems (2)
PATCH 1/1 i40e: add support for PTP external synchronization clock
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs: SDP3_2, SDP3_3 and GPIO_4.
Previously it was not possible to use the external PTP synchronization clock.
--- drivers/net/ethernet/intel/i40e/i40e.h | 74 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 747 +++++++++++++++++- .../net/ethernet/intel/i40e/i40e_register.h | 2 + 4 files changed, 821 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +74 -0
@@ -206,6 +206,11 @@ enum i40e_fd_stat_idx {#define I40E_FD_ATR_TUNNEL_STAT_IDX (pf_id) \ (I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL) +/* get PTP pins for ioctl */ +#define SIOCGPINS (SIOCDEVPRIVATE + 0) +/* set PTP pins for ioctl */ +#define SIOCSPINS (SIOCDEVPRIVATE + 1) +/* The following structure contains the data parsed from the user-defined * field of the ethtool_rx_flow_spec structure. */
@@ -437,6 +442,8 @@ struct i40e_channel {struct i40e_vsi *parent_vsi; }; +struct i40e_ptp_pins_settings ; +static inline bool i40e_is_channel_macvlan (struct i40e_channel *ch) {return !!ch->fwd;
@@ -625,12 +632,72 @@ struct i40e_pf {struct i40e_filter_control_settings filter_settings; +/* GPIO defines used by PTP */ +#define I40E_SDP3_2 18 +#define I40E_SDP3_3 19 +#define I40E_GPIO_4 20 +#define I40E_LED2_0 26 +#define I40E_LED2_1 27 +#define I40E_LED3_0 28 +#define I40E_LED3_1 29 +#define I40E_GLGEN_GPIO_SET_SDP_DATA_HI \ + (1 << I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT) +#define I40E_GLGEN_GPIO_SET_DRV_SDP_DATA \ + (1 << I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_0 \ + (0 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_1 \ + (1 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_RESERVED BIT(2) +#define I40E_GLGEN_GPIO_CTL_DIR_OUT \ + (1 << I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TRI_DRV_HI \ + (1 << I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_OUT_HI_RST \ + (1 << I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_0 \ + (3 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_1 \ + (4 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN \ + (0x3F << I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PORT_0_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_GLGEN_GPIO_CTL_PORT_0_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_PRTTSYN_AUX_1_INSTNT \ + (1 << I40E_PRTTSYN_AUX_1_INSTNT_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE \ + (1 << I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_CLK_MOD (3 << I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD \ + (I40E_PRTTSYN_AUX_0_OUT_ENABLE | I40E_PRTTSYN_AUX_0_OUT_CLK_MOD) +#define I40E_PTP_HALF_SECOND 500000000LL/* nano seconds */ +#define I40E_PTP_2_SEC_DELAY 2 +struct ptp_clock *ptp_clock;struct ptp_clock_info ptp_caps;struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config;struct timespec64 ptp_prev_hw_time; +struct work_struct ptp_pps_work; +struct work_struct ptp_extts0_work; +struct work_struct ptp_extts1_work;ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */ u32 ptp_adj_mult;
@@ -638,10 +705,14 @@ struct i40e_pf {u32 tx_hwtstamp_skipped;u32 rx_hwtstamp_cleared;u32 latch_event_flags; +u64 ptp_pps_start; +u32 pps_delay;spinlock_t ptp_rx_lock;/* Used to protect Rx timestamp registers. */ +struct ptp_pin_desc ptp_pin[3 ];unsigned long latch_events[4 ];bool ptp_tx;bool ptp_rx; +struct i40e_ptp_pins_settings *ptp_pins;u16 rss_table_size;/* HW RSS table size */ u32 max_bw;u32 min_bw;
@@ -1138,10 +1209,13 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);void i40e_ptp_set_increment (struct i40e_pf *pf);int i40e_ptp_set_ts_config (struct i40e_pf *pf,struct ifreq *ifr);int i40e_ptp_get_ts_config (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_set_pins_ioctl (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_get_pins (struct i40e_pf *pf,struct ifreq *ifr);void i40e_ptp_save_hw_time (struct i40e_pf *pf);void i40e_ptp_restore_hw_time (struct i40e_pf *pf);void i40e_ptp_init (struct i40e_pf *pf);void i40e_ptp_stop (struct i40e_pf *pf); +int i40e_ptp_alloc_pins (struct i40e_pf *pf);int i40e_is_vsi_uplink_mode_veb (struct i40e_vsi *vsi);i40e_status i40e_get_partition_bw_setting (struct i40e_pf *pf);i40e_status i40e_set_partition_bw_setting (struct i40e_pf *pf);
drivers/net/ethernet/intel/i40e/i40e_main.c +15 -3
@@ -2679,7 +2679,15 @@ int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)case SIOCGHWTSTAMP :return i40e_ptp_get_ts_config (pf, ifr);case SIOCSHWTSTAMP : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ;return i40e_ptp_set_ts_config (pf, ifr); +case SIOCSPINS : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +return i40e_ptp_set_pins_ioctl (pf, ifr); +case SIOCGPINS : +return i40e_ptp_get_pins (pf, ifr);default :return -EOPNOTSUPP ; }
@@ -4028,10 +4036,13 @@ static irqreturn_t i40e_intr(int irq, void *data)if (icr0 &I40E_PFINT_ICR0_TIMESYNC_MASK ) {u32 prttsyn_stat =rd32 (hw,I40E_PRTTSYN_STAT_0 ); -if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK ) { - icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_EVENT0_MASK ) +schedule_work (&pf->ptp_extts0_work); + +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK )i40e_ptp_tx_hwtstamp (pf); - } + + icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; }/* If a critical error is pending we have no choice but to reset the
@@ -15007,6 +15018,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (is_valid_ether_addr (hw->mac.port_addr)) pf->hw_features |=I40E_HW_PORT_ID_VALID ; +i40e_ptp_alloc_pins (pf);pci_set_drvdata (pdev, pf);pci_save_state (pdev);
drivers/net/ethernet/intel/i40e/i40e_ptp.c +730 -17
846 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_register.h +2 -0
@@ -2897,6 +2897,8 @@#define I40E_PRTTSYN_AUX_0_PULSEW_MASK I40E_MASK(0xF, I40E_PRTTSYN_AUX_0_PULSEW_SHIFT)#define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16#define I40E_PRTTSYN_AUX_0_EVNTLVL_MASK I40E_MASK(0x3, I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT) +#define I40E_PRTTSYN_AUX_0_PTPFLAG_SHIFT 17 +#define I40E_PRTTSYN_AUX_0_PTPFLAG_MASK I40E_MASK(0x1, I40E_PRTTSYN_AUX_0_PTPFLAG_SHIFT)#define I40E_PRTTSYN_AUX_1 (_i) (0x001E42E0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ #define I40E_PRTTSYN_AUX_1_MAX_INDEX 1#define I40E_PRTTSYN_AUX_1_INSTNT_SHIFT 0
Signature · 1 line
2.17.1
Nguyen
PATCH 1/1 i40e: add support for PTP external synchronization clock
Quoted 9 lines · Piotr Kwapulinski
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs:
SDP3_2,SDP3_3andGPIO_4.
Previously it was not possible to use the external PTP synchronization clock.Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]>Signed-off-by Piotr Kwapulinski <[email protected]>
This doesn't apply, can you update to one that applies to dev-queue.
Quoted 575 lines
--- drivers/net/ethernet/intel/i40e/i40e.h | 74 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 747 +++++++++++++++++- .../net/ethernet/intel/i40e/i40e_register.h | 2 + 4 files changed, 821 insertions(+), 20 deletions(-)drivers/net/ethernet/intel/i40e/i40e.h +5
-0@@ -206,6 +206,11 @@ enum i40e_fd_stat_idx {#define I40E_FD_ATR_TUNNEL_STAT_IDX (pf_id) \ (I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL) +/* get PTP pins for ioctl */ +#define SIOCGPINS (SIOCDEVPRIVATE + 0) +/* set PTP pins for ioctl */ +#define SIOCSPINS (SIOCDEVPRIVATE + 1) +/* The following structure contains the data parsed from the user- defined
* field of theethtool_rx_flow_specstructure.
*/drivers/net/ethernet/intel/i40e/i40e.h +62
-0@@ -437,6 +442,8 @@ struct i40e_channel {struct i40e_vsi *parent_vsi; }; +struct i40e_ptp_pins_settings ; +static inline bool i40e_is_channel_macvlan (struct i40e_channel *ch) {return !!ch->fwd;@@ -625,12 +632,72 @@ struct i40e_pf {struct i40e_filter_control_settings filter_settings; +/* GPIO defines used by PTP */ +#define I40E_SDP3_2 18 +#define I40E_SDP3_3 19 +#define I40E_GPIO_4 20 +#define I40E_LED2_0 26 +#define I40E_LED2_1 27 +#define I40E_LED3_0 28 +#define I40E_LED3_1 29 +#define I40E_GLGEN_GPIO_SET_SDP_DATA_HI \ + (1 << I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT) +#define I40E_GLGEN_GPIO_SET_DRV_SDP_DATA \ + (1 << I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_0 \ + (0 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_1 \ + (1 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_RESERVED BIT(2) +#define I40E_GLGEN_GPIO_CTL_DIR_OUT \ + (1 << I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TRI_DRV_HI \ + (1 << I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_OUT_HI_RST \ + (1 << I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_0 \ + (3 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_1 \ + (4 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN \ + (0x3F << I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PORT_0_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_GLGEN_GPIO_CTL_PORT_0_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_PRTTSYN_AUX_1_INSTNT \ + (1 << I40E_PRTTSYN_AUX_1_INSTNT_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE \ + (1 << I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_CLK_MOD (3 << I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD \ + (I40E_PRTTSYN_AUX_0_OUT_ENABLE | I40E_PRTTSYN_AUX_0_OUT_CLK_MOD) +#define I40E_PTP_HALF_SECOND 500000000LL/* nano seconds */ +#define I40E_PTP_2_SEC_DELAY 2 +struct ptp_clock *ptp_clock;struct ptp_clock_info ptp_caps;struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config;struct timespec64 ptp_prev_hw_time; +struct work_struct ptp_pps_work; +struct work_struct ptp_extts0_work; +struct work_struct ptp_extts1_work;ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */
drivers/net/ethernet/intel/i40e/i40e.h +2
-0u32 ptp_adj_mult;@@ -638,10 +705,14 @@ struct i40e_pf {u32 tx_hwtstamp_skipped;u32 rx_hwtstamp_cleared;u32 latch_event_flags; +u64 ptp_pps_start; +u32 pps_delay;spinlock_t ptp_rx_lock;/* Used to protect Rx timestamp registers. */
drivers/net/ethernet/intel/i40e/i40e.h +5
-0+struct ptp_pin_desc ptp_pin[3 ];unsigned long latch_events[4 ];bool ptp_tx;bool ptp_rx; +struct i40e_ptp_pins_settings *ptp_pins;u16 rss_table_size;/* HW RSS table size */ u32 max_bw;u32 min_bw;@@ -1138,10 +1209,13 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);void i40e_ptp_set_increment (struct i40e_pf *pf);int i40e_ptp_set_ts_config (struct i40e_pf *pf,struct ifreq *ifr);int i40e_ptp_get_ts_config (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_set_pins_ioctl (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_get_pins (struct i40e_pf *pf,struct ifreq *ifr);void i40e_ptp_save_hw_time (struct i40e_pf *pf);void i40e_ptp_restore_hw_time (struct i40e_pf *pf);void i40e_ptp_init (struct i40e_pf *pf);void i40e_ptp_stop (struct i40e_pf *pf); +int i40e_ptp_alloc_pins (struct i40e_pf *pf);int i40e_is_vsi_uplink_mode_veb (struct i40e_vsi *vsi);i40e_status i40e_get_partition_bw_setting (struct i40e_pf *pf);
i40e_statusi40e_set_partition_bw_setting(struct i40e_pf *pf);drivers/net/ethernet/intel/i40e/i40e_main.c +8
-0@@ -2679,7 +2679,15 @@ int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)case SIOCGHWTSTAMP :return i40e_ptp_get_ts_config (pf, ifr);case SIOCSHWTSTAMP : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ;return i40e_ptp_set_ts_config (pf, ifr); +case SIOCSPINS : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +return i40e_ptp_set_pins_ioctl (pf, ifr); +case SIOCGPINS : +return i40e_ptp_get_pins (pf, ifr);default :return -EOPNOTSUPP ;drivers/net/ethernet/intel/i40e/i40e_main.c +6
-3}@@ -4028,10 +4036,13 @@ static irqreturn_t i40e_intr(int irq, void *data)if (icr0 &I40E_PFINT_ICR0_TIMESYNC_MASK ) {u32 prttsyn_stat =rd32 (hw,I40E_PRTTSYN_STAT_0 ); -if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK ) { - icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_EVENT0_MASK ) +schedule_work (&pf->ptp_extts0_work); + +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK )i40e_ptp_tx_hwtstamp (pf); - } + + icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; }/* If a critical error is pending we have no choice but to
reset thedrivers/net/ethernet/intel/i40e/i40e_main.c +1
-0@@ -15007,6 +15018,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (is_valid_ether_addr (hw->mac.port_addr)) pf->hw_features |=I40E_HW_PORT_ID_VALID ; +i40e_ptp_alloc_pins (pf);pci_set_drvdata (pdev, pf);pci_save_state (pdev);drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0@@ -3,6 +3,7 @@#include "i40e.h" #include <linux/ptp_classify.h> +#include <linux/posix-clock.h> /* The XL710 timesync is very much like Intel's 82599 design when it comes to
* the fundamental clock design. However, the clock operations are
much simplerdrivers/net/ethernet/intel/i40e/i40e_ptp.c +51
-0@@ -19,10 +20,229 @@#define I40E_PTP_40GB_INCVAL 0x0199999999ULL#define I40E_PTP_10GB_INCVAL_MULT 2#define I40E_PTP_1GB_INCVAL_MULT 20 +#define I40E_ISGN 0x80000000#define I40E_PRTTSYN_CTL1_TSYNTYPE_V1 BIT(I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)#define I40E_PRTTSYN_CTL1_TSYNTYPE_V2 (2 << \ I40E_PRTTSYN_CTL1_TSYNTYPE_SHIF T) +#define I40E_SUBDEV_ID_25G_PTP_PIN 0xB +#define to_dev (obj) container_of(obj, struct device, kobj) + +enum i40e_ptp_pin { +SDP3_2 =0 , +SDP3_3 , +GPIO_4 +}; + +static struct ptp_pin_desc sdp_desc[] = { +/* name idx func chan */ + {"SDP3_2" ,SDP3_2 ,PTP_PF_NONE ,0 }, + {"SDP3_3" ,SDP3_3 ,PTP_PF_NONE ,1 }, + {"GPIO_4" ,GPIO_4 ,PTP_PF_NONE ,1 }, +}; + +enum i40e_ptp_gpio_pin_state { + end =-2 , + invalid, + off, + in_A, + in_B, + out_A, + out_B, +}; + +static const char *const i40e_ptp_gpio_pin_state2str[] = { +"off" ,"in_A" ,"in_B" ,"out_A" ,"out_B" +}; + +enum i40e_ptp_led_pin_state { + low =0 , + high, +}; + +struct i40e_ptp_pins_settings { +enum i40e_ptp_gpio_pin_state sdp3_2; +enum i40e_ptp_gpio_pin_state sdp3_3; +enum i40e_ptp_gpio_pin_state gpio_4; +enum i40e_ptp_led_pin_state led2_0; +enum i40e_ptp_led_pin_state led2_1; +enum i40e_ptp_led_pin_state led3_0; +enum i40e_ptp_led_pin_state led3_1; +}; + +static const struct i40e_ptp_pins_settings + i40e_ptp_pin_led_allowed_states[] = { + {off, off, off, high, high, high, high} , + {off, in_A, off, high, high, high, low}, + {off, out_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_B, off, high, high, high, low}, + {off, out_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_A, off, off, high, high, high, low}, + {in_A, in_B, off, high, high, high, low}, + {in_A, out_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, off, high, high, high, low}, + {in_B, in_A, off, high, high, high, low}, + {in_B, out_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, in_A, high, high, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, out_A, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_B, in_A, high, high, low, low}, + {off, out_B, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {in_B, off, in_A, high, high, low, low}, + {in_B, out_A, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, out_A, low, high, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {off, in_A, out_A, low, high, high, low}, + {off, in_B, out_A, low, high, high, low}, + {off, out_B, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_A, off, out_A, low, high, high, low}, + {in_A, in_B, out_A, low, high, high, low}, + {in_A, out_B, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, out_A, low, high, high, low}, + {in_B, in_A, out_A, low, high, high, low}, + {out_B, off, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, in_B, high, high, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_A, in_B, high, high, low, low}, + {off, out_A, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, out_B, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {in_A, off, in_B, high, high, low, low}, + {in_A, out_B, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, out_B, low, high, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_A, out_B, low, high, high, low}, + {off, out_A, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +4
-0+ {off, in_B, out_B, low, high, high, low}, + {in_A, off, out_B, low, high, high, low}, + {in_A, in_B, out_B, low, high, high, low}, + {out_A, off, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, out_B, low, high, high, low}, + {in_B, in_A, out_B, low, high, high, low}, + {in_B, out_A, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +86
-0+ {end, end, end, end, end, end, end} +}; + +static int i40e_ptp_set_pins (struct i40e_pf *pf, +struct i40e_ptp_pins_settings *pins); + +/** +* i40e_ptp_extts0_work - workqueue task function +* @work: workqueue task structure +* +* Service for PTP external clock event +**/ +static void i40e_ptp_extts0_work (struct work_struct *work) +{ + struct i40e_pf *pf = container_of(work, struct i40e_pf, + ptp_extts0_work); +struct i40e_hw *hw = &pf->hw; +struct ptp_clock_event event; +u32 hi, lo; + +/* Event time is captured by one of the two matched registers +* PRTTSYN_EVNT_L: 32 LSB of sampled time event +* PRTTSYN_EVNT_H: 32 MSB of sampled time event +* Event is defined in PRTTSYN_EVNT_0 register +*/ + lo =rd32 (hw,I40E_PRTTSYN_EVNT_L (0 )); + hi =rd32 (hw,I40E_PRTTSYN_EVNT_H (0 )); + + event.timestamp = (((u64 )hi) <<32 ) | lo; + + event.type =PTP_CLOCK_EXTTS ; + event.index =0 ; + +/* fire event */ +ptp_clock_event (pf->ptp_clock, &event); +} + +/** +* i40e_is_ptp_pin_dev - check if device supports PTP pins +* @hw: pointer to the hardware structure +* +* Return true if device supports PTP pins, false otherwise. +**/ +static bool i40e_is_ptp_pin_dev (struct i40e_hw *hw) +{ +return hw->device_id ==I40E_DEV_ID_25G_SFP28 && + hw->subsystem_device_id ==I40E_SUBDEV_ID_25G_PTP_PIN ; +} + +/** +* i40e_can_do_pins - check possibility of manipulating the pins +* @pf: board private structure +* +* Check if all conditions are satisfied to manipulate PTP pins. +* Return true if pins can be manipulated or false otherwise. +**/ +static bool i40e_can_do_pins (struct i40e_pf *pf) +{ +if (!i40e_is_ptp_pin_dev (&pf->hw)) { +dev_warn (&pf->pdev->dev, +"PTP external clock not supported.\n" ); +return false; + } + +if (!pf->ptp_pins || pf->hw.pf_id) { +dev_warn (&pf->pdev->dev, +"PTP PIN reading allowed for PF0 only.\n" ); +return false; + } + +return true; +} + +/** +* i40_ptp_reset_timing_events - Reset PTP timing events +* @pf: Board private structure +* +* This function resets timing events for pf. +**/ +static void i40_ptp_reset_timing_events (struct i40e_pf *pf) +{ +u32 i; + +spin_lock_bh (&pf->ptp_rx_lock); +for (i =0 ; i <=I40E_PRTTSYN_RXTIME_L_MAX_INDEX ; i++) { +/* reading and automatically clearing timing events registers */
drivers/net/ethernet/intel/i40e/i40e_ptp.c +5
-0+rd32 (&pf->hw,I40E_PRTTSYN_RXTIME_L (i)); +rd32 (&pf->hw,I40E_PRTTSYN_RXTIME_H (i)); + pf->latch_events[i] =0 ; + } +/* reading and automatically clearing timing events registers */
drivers/net/ethernet/intel/i40e/i40e_ptp.c +20
-0+rd32 (&pf->hw,I40E_PRTTSYN_TXTIME_L ); +rd32 (&pf->hw,I40E_PRTTSYN_TXTIME_H ); + + pf->tx_hwtstamp_timeouts =0 ; + pf->tx_hwtstamp_skipped =0 ; + pf->rx_hwtstamp_cleared =0 ; + pf->latch_event_flags =0 ; +spin_unlock_bh (&pf->ptp_rx_lock); +} + +/** i40e_ptp_verify - check pins +* @ptp: ptp clock +* @pin: pin index +* @func: assigned function +* @chan: channel +* +* Check pins consistency. +* Return 0 on success or error on failure. +**/ +static int i40e_ptp_verify(struct ptp_clock_info *ptp, unsigned intpin,
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ enum ptp_pin_function func, unsigned intchan)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +35
-0+{ +/* TODO: implement pin checking */ +return 0 ; +}/** * i40e_ptp_read - Read the PHC time from the device @@ -135,6 +355,37 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb) return 0; } +/** +* i40e_ptp_set_1pps_signal_hw - configure 1PPS PTP signal for pins +* @pf: the PF private data structure +* +* Configure 1PPS signal used for PTP pins +**/ +static void i40e_ptp_set_1pps_signal_hw (struct i40e_pf *pf) +{ +struct i40e_hw *hw = &pf->hw; +struct timespec64 now; +u64 ns; + +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ),0 ); +wr32 (hw,I40E_PRTTSYN_AUX_1 (1 ),I40E_PRTTSYN_AUX_1_INSTNT ); +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ),I40E_PRTTSYN_AUX_0_OUT_ENABLE ); + +i40e_ptp_read (pf, &now,NULL ); + now.tv_sec +=I40E_PTP_2_SEC_DELAY ; + now.tv_nsec =0 ; + ns =timespec64_to_ns (&now); + +/* I40E_PRTTSYN_TGT_L(1) */ +wr32 (hw,I40E_PRTTSYN_TGT_L (1 ), ns &0xFFFFFFFF ); +/* I40E_PRTTSYN_TGT_H(1) */ +wr32 (hw,I40E_PRTTSYN_TGT_H (1 ), ns >>32 ); +wr32 (hw,I40E_PRTTSYN_CLKO (1 ),I40E_PTP_HALF_SECOND ); +wr32 (hw,I40E_PRTTSYN_AUX_1 (1 ),I40E_PRTTSYN_AUX_1_INSTNT ); +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ), +I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD ); +} +/** * i40e_ptp_adjtime - Adjust the PHC time * @ptp: The PTP clock structure
drivers/net/ethernet/intel/i40e/i40e_ptp.c +26
-5@@ -145,14 +396,35 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)static int i40e_ptp_adjtime (struct ptp_clock_info *ptp,s64 delta) { struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps); -struct timespec64 now, then; +struct i40e_hw *hw = &pf->hw; - then =ns_to_timespec64 (delta);mutex_lock (&pf->tmreg_lock); -i40e_ptp_read (pf, &now,NULL ); - now =timespec64_add (now, then); -i40e_ptp_write (pf, (const struct timespec64 *)&now); +if (delta >-999999900LL && delta <999999900LL ) { +int neg_adj =0 ; +u32 timadj; +u64 tohw; + +if (delta <0 ) { + neg_adj =1 ; + tohw = -delta; + }else { + tohw = delta; + } + + timadj = tohw &0x3FFFFFFF ; +if (neg_adj) + timadj |=I40E_ISGN ; +wr32 (hw,I40E_PRTTSYN_ADJ , timadj); + }else { +struct timespec64 then, now; + + then =ns_to_timespec64 (delta); +i40e_ptp_read (pf, &now,NULL ); + now =timespec64_add (now, then); +i40e_ptp_write (pf, (const struct timespec64 *)&now); +i40e_ptp_set_1pps_signal_hw (pf); + }drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-1mutex_unlock (&pf->tmreg_lock);@@ -183,7 +455,7 @@ static int i40e_ptp_gettimex(struct ptp_clock_info *ptp, struct timespec64 *ts,/** * i40e_ptp_settime - Set the time of the PHC * @ptp: The PTP clock structure -* @ts: timespec structure that holds the new time value +* @ts: timespec64 structure that holds the new time value * * Set the device clock to the user input value. The conversion from timespec
* to ns happens in the write function.
drivers/net/ethernet/intel/i40e/i40e_ptp.c static int i40e_ptp_settime(struct · line 477
Quoted 6 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0@@ -200,19 +472,141 @@ static int i40e_ptp_settime(structptp_clock_info *ptp, return 0; } + +/** i40e_pps_configure - configure PPS events
Extra newline and format is not correct.
Kwapulinski
PATCH 1/1 i40e: add support for PTP external synchronization clock
Quoted 11 lines
From: Nguyen, Anthony L <[email protected]>
Sent: Saturday, July 18, 2020 1:21 AM
To: intel-wired-lan at lists.osuosl.org; Kwapulinski, Piotr <[email protected]>
Subject: Re: [Intel-wired-lan] [PATCH] i40e: add support for PTP external synchronization clockQuoted 7 lines · Piotr Kwapulinski
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs:
SDP3_2,SDP3_3andGPIO_4.
Previously it was not possible to use the external PTP synchronization clock.
Quoted 5 lines
Quoted 3 lines
Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]>Signed-off-by Piotr Kwapulinski <[email protected]>This doesn't apply, can you update to one that applies to dev-queue.
This patch is prepared against Dave's net-next tree v5.8-rc4 (most recent)
Quoted 567 lines
Quoted 567 lines
--- drivers/net/ethernet/intel/i40e/i40e.h | 74 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 747 +++++++++++++++++- .../net/ethernet/intel/i40e/i40e_register.h | 2 + 4 files changed, 821 insertions(+), 20 deletions(-)drivers/net/ethernet/intel/i40e/i40e.h +5
-0@@ -206,6 +206,11 @@ enum i40e_fd_stat_idx { #defineI40E_FD_ATR_TUNNEL_STAT_IDX (pf_id) \ (I40E_FD_STAT_PF_IDX (pf_id) +I40E_FD_STAT_ATR_TUNNEL ) +/* get PTP pins for ioctl */ +#define SIOCGPINS (SIOCDEVPRIVATE + 0) +/* set PTP pins for ioctl */ +#define SIOCSPINS (SIOCDEVPRIVATE + 1) +/* The following structure contains the data parsed from the user- defined
* field of theethtool_rx_flow_specstructure.
*/drivers/net/ethernet/intel/i40e/i40e.h +62
-0@@ -437,6 +442,8 @@ struct i40e_channel {struct i40e_vsi *parent_vsi; }; +struct i40e_ptp_pins_settings ; +static inline bool i40e_is_channel_macvlan (struct i40e_channel *ch) {return !!ch->fwd;@@ -625,12 +632,72 @@ struct i40e_pf {struct i40e_filter_control_settings filter_settings; +/* GPIO defines used by PTP */ +#define I40E_SDP3_2 18 +#define I40E_SDP3_3 19 +#define I40E_GPIO_4 20 +#define I40E_LED2_0 26 +#define I40E_LED2_1 27 +#define I40E_LED3_0 28 +#define I40E_LED3_1 29 +#define I40E_GLGEN_GPIO_SET_SDP_DATA_HI \ + (1 << I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT) +#define I40E_GLGEN_GPIO_SET_DRV_SDP_DATA \ + (1 << I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_0 \ + (0 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_1 \ + (1 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_RESERVED BIT(2) +#define I40E_GLGEN_GPIO_CTL_DIR_OUT \ + (1 << I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TRI_DRV_HI \ + (1 << I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_OUT_HI_RST \ + (1 << I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_0 \ + (3 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_1 \ + (4 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN \ + (0x3F << I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PORT_0_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_GLGEN_GPIO_CTL_PORT_0_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_PRTTSYN_AUX_1_INSTNT \ + (1 << I40E_PRTTSYN_AUX_1_INSTNT_SHIFT) #define +I40E_PRTTSYN_AUX_0_OUT_ENABLE \ + (1 << I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_CLK_MOD (3 << I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD \ + (I40E_PRTTSYN_AUX_0_OUT_ENABLE | I40E_PRTTSYN_AUX_0_OUT_CLK_MOD) +#define I40E_PTP_HALF_SECOND 500000000LL/* nano seconds */ +#define I40E_PTP_2_SEC_DELAY 2 +struct ptp_clock *ptp_clock;struct ptp_clock_info ptp_caps;struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config;struct timespec64 ptp_prev_hw_time; +struct work_struct ptp_pps_work; +struct work_struct ptp_extts0_work; +struct work_struct ptp_extts1_work;ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */
drivers/net/ethernet/intel/i40e/i40e.h +4
-0u32 ptp_adj_mult;@@ -638,10 +705,14 @@ struct i40e_pf {u32 tx_hwtstamp_skipped;u32 rx_hwtstamp_cleared;u32 latch_event_flags; +u64 ptp_pps_start; +u32 pps_delay;spinlock_t ptp_rx_lock;/* Used to protect Rx timestamp registers. */ +struct ptp_pin_desc ptp_pin[3 ];unsigned long latch_events[4 ];bool ptp_tx;bool ptp_rx; +struct i40e_ptp_pins_settings *ptp_pins;u16 rss_table_size;/* HW RSS table size */ u32 max_bw;drivers/net/ethernet/intel/i40e/i40e.h +0
-0u32 min_bw;@@ -1138,10 +1209,13 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf,struct
sk_buff*skb, u8 index); voidi40e_ptp_set_increment(struct i40e_pf *pf); inti40e_ptp_set_ts_config(struct i40e_pf *pf, struct ifreq *ifr); inti40e_ptp_get_ts_config(struct i40e_pf *pf, struct ifreq *ifr);drivers/net/ethernet/intel/i40e/i40e.h +2
-0+int i40e_ptp_set_pins_ioctl (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_get_pins (struct i40e_pf *pf,struct ifreq *ifr);void i40e_ptp_save_hw_time (struct i40e_pf *pf);void
i40e_ptp_restore_hw_time(struct i40e_pf *pf); voidi40e_ptp_init(struct i40e_pf *pf); voidi40e_ptp_stop(struct i40e_pf *pf);
+inti40e_ptp_alloc_pins(struct i40e_pf *pf);
inti40e_is_vsi_uplink_mode_veb(struct i40e_vsi *vsi);i40e_statusi40e_get_partition_bw_setting(struct i40e_pf *pf);i40e_statusi40e_set_partition_bw_setting(struct i40e_pf *pf); diff --gita/drivers/net/ethernet/intel/i40e/i40e_main.cb/drivers/net/ethernet/intel/i40e/i40e_main.c
index 56ecd6c..2a9251e 100644drivers/net/ethernet/intel/i40e/i40e_main.c +8
-0@@ -2679,7 +2679,15 @@ int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)case SIOCGHWTSTAMP :return i40e_ptp_get_ts_config (pf, ifr);case SIOCSHWTSTAMP : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ;return i40e_ptp_set_ts_config (pf, ifr); +case SIOCSPINS : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +return i40e_ptp_set_pins_ioctl (pf, ifr); +case SIOCGPINS : +return i40e_ptp_get_pins (pf, ifr);default :return -EOPNOTSUPP ;drivers/net/ethernet/intel/i40e/i40e_main.c +6
-3}@@ -4028,10 +4036,13 @@ static irqreturn_t i40e_intr(int irq, void *data)if (icr0 &I40E_PFINT_ICR0_TIMESYNC_MASK ) {u32 prttsyn_stat =rd32 (hw,I40E_PRTTSYN_STAT_0 ); -if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK ) { - icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_EVENT0_MASK ) +schedule_work (&pf->ptp_extts0_work); + +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK )i40e_ptp_tx_hwtstamp (pf); - } + + icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; }drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0/* If a critical error is pending we have no choice but to reset the @@ -15007,6 +15018,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (is_valid_ether_addr (hw->mac.port_addr)) pf->hw_features |=I40E_HW_PORT_ID_VALID ; +i40e_ptp_alloc_pins (pf);pci_set_drvdata (pdev, pf);pci_save_state (pdev);drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0@@ -3,6 +3,7 @@#include "i40e.h" #include <linux/ptp_classify.h> +#include <linux/posix-clock.h> /* The XL710 timesync is very much like Intel's 82599 design when it comes to
* the fundamental clock design. However, the clock operations are
much simpler @@ -19,10 +20,229 @@
#defineI40E_PTP_40GB_INCVAL0x0199999999ULL
#defineI40E_PTP_10GB_INCVAL_MULT2
#defineI40E_PTP_1GB_INCVAL_MULT20
+#defineI40E_ISGN0x80000000#define
I40E_PRTTSYN_CTL1_TSYNTYPE_V1BIT(I40E_PRTTSYN_CTL1_TSYNTYPE_SHIFT)
#defineI40E_PRTTSYN_CTL1_TSYNTYPE_V2(2 << \
I40E_PRTTSYN_CTL1_TSYNTYPE_SHIF
T)drivers/net/ethernet/intel/i40e/i40e_ptp.c +48
-0+#define I40E_SUBDEV_ID_25G_PTP_PIN 0xB +#define to_dev (obj) container_of(obj, struct device, kobj) + +enum i40e_ptp_pin { +SDP3_2 =0 , +SDP3_3 , +GPIO_4 +}; + +static struct ptp_pin_desc sdp_desc[] = { +/* name idx func chan */ + {"SDP3_2" ,SDP3_2 ,PTP_PF_NONE ,0 }, + {"SDP3_3" ,SDP3_3 ,PTP_PF_NONE ,1 }, + {"GPIO_4" ,GPIO_4 ,PTP_PF_NONE ,1 }, +}; + +enum i40e_ptp_gpio_pin_state { + end =-2 , + invalid, + off, + in_A, + in_B, + out_A, + out_B, +}; + +static const char *const i40e_ptp_gpio_pin_state2str[] = { +"off" ,"in_A" ,"in_B" ,"out_A" ,"out_B" +}; + +enum i40e_ptp_led_pin_state { + low =0 , + high, +}; + +struct i40e_ptp_pins_settings { +enum i40e_ptp_gpio_pin_state sdp3_2; +enum i40e_ptp_gpio_pin_state sdp3_3; +enum i40e_ptp_gpio_pin_state gpio_4; +enum i40e_ptp_led_pin_state led2_0; +enum i40e_ptp_led_pin_state led2_1; +enum i40e_ptp_led_pin_state led3_0; +enum i40e_ptp_led_pin_state led3_1; +}; + +static const struct i40e_ptp_pins_settings + i40e_ptp_pin_led_allowed_states[] = { + {off, off, off, high, high, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_A, off, high, high, high, low}, + {off, out_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_B, off, high, high, high, low}, + {off, out_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_A, off, off, high, high, high, low}, + {in_A, in_B, off, high, high, high, low}, + {in_A, out_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, off, high, high, high, low}, + {in_B, in_A, off, high, high, high, low}, + {in_B, out_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, off, high, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, in_A, high, high, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, out_A, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_B, in_A, high, high, low, low}, + {off, out_B, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {in_B, off, in_A, high, high, low, low}, + {in_B, out_A, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, in_A, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, out_A, low, high, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {off, in_A, out_A, low, high, high, low}, + {off, in_B, out_A, low, high, high, low}, + {off, out_B, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_A, off, out_A, low, high, high, low}, + {in_A, in_B, out_A, low, high, high, low}, + {in_A, out_B, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, out_A, low, high, high, low}, + {in_B, in_A, out_A, low, high, high, low}, + {out_B, off, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, out_A, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, in_B, high, high, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_A, in_B, high, high, low, low}, + {off, out_A, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, out_B, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {in_A, off, in_B, high, high, low, low}, + {in_A, out_B, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, off, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, off, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_B, in_A, in_B, high, low, low, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {off, off, out_B, low, high, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ {off, in_A, out_B, low, high, high, low}, + {off, out_A, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +4
-0+ {off, in_B, out_B, low, high, high, low}, + {in_A, off, out_B, low, high, high, low}, + {in_A, in_B, out_B, low, high, high, low}, + {out_A, off, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ {out_A, in_B, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +3
-0+ {in_B, off, out_B, low, high, high, low}, + {in_B, in_A, out_B, low, high, high, low}, + {in_B, out_A, out_B, low, low, high, high},
drivers/net/ethernet/intel/i40e/i40e_ptp.c +79
-0+ {end, end, end, end, end, end, end} +}; + +static int i40e_ptp_set_pins (struct i40e_pf *pf, +struct i40e_ptp_pins_settings *pins); + +/** +* i40e_ptp_extts0_work - workqueue task function +* @work: workqueue task structure +* +* Service for PTP external clock event **/ static void +i40e_ptp_extts0_work (struct work_struct *work) { + struct i40e_pf *pf = container_of(work, struct i40e_pf, + ptp_extts0_work); +struct i40e_hw *hw = &pf->hw; +struct ptp_clock_event event; +u32 hi, lo; + +/* Event time is captured by one of the two matched registers +* PRTTSYN_EVNT_L: 32 LSB of sampled time event +* PRTTSYN_EVNT_H: 32 MSB of sampled time event +* Event is defined in PRTTSYN_EVNT_0 register +*/ + lo =rd32 (hw,I40E_PRTTSYN_EVNT_L (0 )); + hi =rd32 (hw,I40E_PRTTSYN_EVNT_H (0 )); + + event.timestamp = (((u64 )hi) <<32 ) | lo; + + event.type =PTP_CLOCK_EXTTS ; + event.index =0 ; + +/* fire event */ +ptp_clock_event (pf->ptp_clock, &event); } + +/** +* i40e_is_ptp_pin_dev - check if device supports PTP pins +* @hw: pointer to the hardware structure +* +* Return true if device supports PTP pins, false otherwise. +**/ +static bool i40e_is_ptp_pin_dev (struct i40e_hw *hw) { +return hw->device_id ==I40E_DEV_ID_25G_SFP28 && + hw->subsystem_device_id ==I40E_SUBDEV_ID_25G_PTP_PIN ; } + +/** +* i40e_can_do_pins - check possibility of manipulating the pins +* @pf: board private structure +* +* Check if all conditions are satisfied to manipulate PTP pins. +* Return true if pins can be manipulated or false otherwise. +**/ +static bool i40e_can_do_pins (struct i40e_pf *pf) { +if (!i40e_is_ptp_pin_dev (&pf->hw)) { +dev_warn (&pf->pdev->dev, +"PTP external clock not supported.\n" ); +return false; + } + +if (!pf->ptp_pins || pf->hw.pf_id) { +dev_warn (&pf->pdev->dev, +"PTP PIN reading allowed for PF0 only.\n" ); +return false; + } + +return true; +} + +/** +* i40_ptp_reset_timing_events - Reset PTP timing events +* @pf: Board private structure +* +* This function resets timing events for pf. +**/ +static void i40_ptp_reset_timing_events (struct i40e_pf *pf) { +u32 i; + +spin_lock_bh (&pf->ptp_rx_lock); +for (i =0 ; i <=I40E_PRTTSYN_RXTIME_L_MAX_INDEX ; i++) { +/* reading and automatically clearing timing events registers */
drivers/net/ethernet/intel/i40e/i40e_ptp.c +5
-0+rd32 (&pf->hw,I40E_PRTTSYN_RXTIME_L (i)); +rd32 (&pf->hw,I40E_PRTTSYN_RXTIME_H (i)); + pf->latch_events[i] =0 ; + } +/* reading and automatically clearing timing events registers */
drivers/net/ethernet/intel/i40e/i40e_ptp.c +20
-0+rd32 (&pf->hw,I40E_PRTTSYN_TXTIME_L ); +rd32 (&pf->hw,I40E_PRTTSYN_TXTIME_H ); + + pf->tx_hwtstamp_timeouts =0 ; + pf->tx_hwtstamp_skipped =0 ; + pf->rx_hwtstamp_cleared =0 ; + pf->latch_event_flags =0 ; +spin_unlock_bh (&pf->ptp_rx_lock); +} + +/** i40e_ptp_verify - check pins +* @ptp: ptp clock +* @pin: pin index +* @func: assigned function +* @chan: channel +* +* Check pins consistency. +* Return 0 on success or error on failure. +**/ +static int i40e_ptp_verify(struct ptp_clock_info *ptp, unsigned intpin,
drivers/net/ethernet/intel/i40e/i40e_ptp.c +1
-0+ enum ptp_pin_function func, unsigned intchan)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +5
-0+{ +/* TODO: implement pin checking */ +return 0 ; +}/** * i40e_ptp_read - Read the PHC time from the device @@ -135,6 +355,37 @@ static int i40e_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb)
drivers/net/ethernet/intel/i40e/i40e_ptp.c +29
-0return 0 ; } +/** +* i40e_ptp_set_1pps_signal_hw - configure 1PPS PTP signal for pins +* @pf: the PF private data structure +* +* Configure 1PPS signal used for PTP pins **/ static void +i40e_ptp_set_1pps_signal_hw (struct i40e_pf *pf) { +struct i40e_hw *hw = &pf->hw; +struct timespec64 now; +u64 ns; + +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ),0 ); +wr32 (hw,I40E_PRTTSYN_AUX_1 (1 ),I40E_PRTTSYN_AUX_1_INSTNT ); +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ),I40E_PRTTSYN_AUX_0_OUT_ENABLE ); + +i40e_ptp_read (pf, &now,NULL ); + now.tv_sec +=I40E_PTP_2_SEC_DELAY ; + now.tv_nsec =0 ; + ns =timespec64_to_ns (&now); + +/* I40E_PRTTSYN_TGT_L(1) */ +wr32 (hw,I40E_PRTTSYN_TGT_L (1 ), ns &0xFFFFFFFF ); +/* I40E_PRTTSYN_TGT_H(1) */ +wr32 (hw,I40E_PRTTSYN_TGT_H (1 ), ns >>32 ); +wr32 (hw,I40E_PRTTSYN_CLKO (1 ),I40E_PTP_HALF_SECOND ); +wr32 (hw,I40E_PRTTSYN_AUX_1 (1 ),I40E_PRTTSYN_AUX_1_INSTNT ); +wr32 (hw,I40E_PRTTSYN_AUX_0 (1 ), +I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD ); +} +/** * i40e_ptp_adjtime - Adjust the PHC time * @ptp: The PTP clock structure @@ -145,14 +396,35 @@ static int i40e_ptp_adjfreq(struct
ptp_clock_info*ptp, s32 ppb) static inti40e_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta){drivers/net/ethernet/intel/i40e/i40e_ptp.c +27
-6struct i40e_pf *pf = container_of(ptp, struct i40e_pf, ptp_caps); -struct timespec64 now, then; +struct i40e_hw *hw = &pf->hw; - then =ns_to_timespec64 (delta);mutex_lock (&pf->tmreg_lock); -i40e_ptp_read (pf, &now,NULL ); - now =timespec64_add (now, then); -i40e_ptp_write (pf, (const struct timespec64 *)&now); +if (delta >-999999900LL && delta <999999900LL ) { +int neg_adj =0 ; +u32 timadj; +u64 tohw; + +if (delta <0 ) { + neg_adj =1 ; + tohw = -delta; + }else { + tohw = delta; + } + + timadj = tohw &0x3FFFFFFF ; +if (neg_adj) + timadj |=I40E_ISGN ; +wr32 (hw,I40E_PRTTSYN_ADJ , timadj); + }else { +struct timespec64 then, now; + + then =ns_to_timespec64 (delta); +i40e_ptp_read (pf, &now,NULL ); + now =timespec64_add (now, then); +i40e_ptp_write (pf, (const struct timespec64 *)&now); +i40e_ptp_set_1pps_signal_hw (pf); + }mutex_unlock (&pf->tmreg_lock);@@ -183,7 +455,7 @@ static int i40e_ptp_gettimex(struct ptp_clock_info *ptp, struct timespec64 *ts,/** * i40e_ptp_settime - Set the time of the PHC * @ptp: The PTP clock structure -* @ts: timespec structure that holds the new time value +* @ts: timespec64 structure that holds the new time value * * Set the device clock to the user input value. The conversion from timespec
* to ns happens in the write function.drivers/net/ethernet/intel/i40e/i40e_ptp.c +0
-0@@ -200,19 +472,141 @@ static int i40e_ptp_settime(structptp_clock_info *ptp, return 0; }
Quoted 4 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c static int i40e_ptp_settime(struct ptp_clock_info *ptp, · line 476
Quoted 2 lines
drivers/net/ethernet/intel/i40e/i40e_ptp.c +2
-0+ +/** i40e_pps_configure - configure PPS events Extra newline and format is not correct.
Fixed in "Patch v2"
Nguyen
PATCH 1/1 i40e: add support for PTP external synchronization clock
Quoted 17 lines · Piotr
Quoted 17 lines
From: Nguyen, Anthony L <[email protected]>
Sent: Saturday, July 18, 2020 1:21 AM
To: intel-wired-lan at lists.osuosl.org; Kwapulinski, Piotr < piotr.kwapulinski at intel.com>
Subject: Re: [Intel-wired-lan] [PATCH] i40e: add support for PTP external synchronization clockQuoted 11 lines · Piotr Kwapulinski
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs:
SDP3_2,SDP3_3andGPIO_4.
Previously it was not possible to use the external PTP synchronization
clock.Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]Quoted 1 line
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Piotr Kwapulinski <[email protected]>This doesn't apply, can you update to one that applies to dev- queue.
This patch is prepared against Dave's net-next tree v5.8-rc4 (most recent)
This patch should be prepared against the Intel Wired LAN next-queue, dev-queue branch.
https://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-
queue.git/
PATCH v2 1/1 i40e: add support for PTP external synchronization clock
In reply to NguyenAdd support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs: SDP3_2, SDP3_3 and GPIO_4.
Previously it was not possible to use the external PTP synchronization clock.
--- drivers/net/ethernet/intel/i40e/i40e.h | 74 ++ drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_ptp.c | 748 +++++++++++++++++- .../net/ethernet/intel/i40e/i40e_register.h | 2 + 4 files changed, 822 insertions(+), 20 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +74 -0
@@ -206,6 +206,11 @@ enum i40e_fd_stat_idx {#define I40E_FD_ATR_TUNNEL_STAT_IDX (pf_id) \ (I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL) +/* get PTP pins for ioctl */ +#define SIOCGPINS (SIOCDEVPRIVATE + 0) +/* set PTP pins for ioctl */ +#define SIOCSPINS (SIOCDEVPRIVATE + 1) +/* The following structure contains the data parsed from the user-defined * field of the ethtool_rx_flow_spec structure. */
@@ -437,6 +442,8 @@ struct i40e_channel {struct i40e_vsi *parent_vsi; }; +struct i40e_ptp_pins_settings ; +static inline bool i40e_is_channel_macvlan (struct i40e_channel *ch) {return !!ch->fwd;
@@ -625,12 +632,72 @@ struct i40e_pf {struct i40e_filter_control_settings filter_settings; +/* GPIO defines used by PTP */ +#define I40E_SDP3_2 18 +#define I40E_SDP3_3 19 +#define I40E_GPIO_4 20 +#define I40E_LED2_0 26 +#define I40E_LED2_1 27 +#define I40E_LED3_0 28 +#define I40E_LED3_1 29 +#define I40E_GLGEN_GPIO_SET_SDP_DATA_HI \ + (1 << I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT) +#define I40E_GLGEN_GPIO_SET_DRV_SDP_DATA \ + (1 << I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_0 \ + (0 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PRT_NUM_1 \ + (1 << I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT) +#define I40E_GLGEN_GPIO_CTL_RESERVED BIT(2) +#define I40E_GLGEN_GPIO_CTL_DIR_OUT \ + (1 << I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TRI_DRV_HI \ + (1 << I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_OUT_HI_RST \ + (1 << I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_0 \ + (3 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_TIMESYNC_1 \ + (4 << I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) +#define I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN \ + (0x3F << I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PORT_0_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_IN_TIMESYNC_0 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_0 | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_GLGEN_GPIO_CTL_PORT_0_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_0) +#define I40E_GLGEN_GPIO_CTL_PORT_1_OUT_TIMESYNC_1 \ + (I40E_GLGEN_GPIO_CTL_NOT_FOR_PHY_CONN | \ + I40E_GLGEN_GPIO_CTL_TIMESYNC_1 | I40E_GLGEN_GPIO_CTL_OUT_HI_RST | \ + I40E_GLGEN_GPIO_CTL_TRI_DRV_HI | I40E_GLGEN_GPIO_CTL_DIR_OUT | \ + I40E_GLGEN_GPIO_CTL_RESERVED | I40E_GLGEN_GPIO_CTL_PRT_NUM_1) +#define I40E_PRTTSYN_AUX_1_INSTNT \ + (1 << I40E_PRTTSYN_AUX_1_INSTNT_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE \ + (1 << I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_CLK_MOD (3 << I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT) +#define I40E_PRTTSYN_AUX_0_OUT_ENABLE_CLK_MOD \ + (I40E_PRTTSYN_AUX_0_OUT_ENABLE | I40E_PRTTSYN_AUX_0_OUT_CLK_MOD) +#define I40E_PTP_HALF_SECOND 500000000LL/* nano seconds */ +#define I40E_PTP_2_SEC_DELAY 2 +struct ptp_clock *ptp_clock;struct ptp_clock_info ptp_caps;struct sk_buff *ptp_tx_skb;unsigned long ptp_tx_start;struct hwtstamp_config tstamp_config;struct timespec64 ptp_prev_hw_time; +struct work_struct ptp_pps_work; +struct work_struct ptp_extts0_work; +struct work_struct ptp_extts1_work;ktime_t ptp_reset_start;struct mutex tmreg_lock;/* Used to protect the SYSTIME registers. */ u32 ptp_adj_mult;
@@ -638,10 +705,14 @@ struct i40e_pf {u32 tx_hwtstamp_skipped;u32 rx_hwtstamp_cleared;u32 latch_event_flags; +u64 ptp_pps_start; +u32 pps_delay;spinlock_t ptp_rx_lock;/* Used to protect Rx timestamp registers. */ +struct ptp_pin_desc ptp_pin[3 ];unsigned long latch_events[4 ];bool ptp_tx;bool ptp_rx; +struct i40e_ptp_pins_settings *ptp_pins;u16 rss_table_size;/* HW RSS table size */ u32 max_bw;u32 min_bw;
@@ -1138,10 +1209,13 @@ void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);void i40e_ptp_set_increment (struct i40e_pf *pf);int i40e_ptp_set_ts_config (struct i40e_pf *pf,struct ifreq *ifr);int i40e_ptp_get_ts_config (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_set_pins_ioctl (struct i40e_pf *pf,struct ifreq *ifr); +int i40e_ptp_get_pins (struct i40e_pf *pf,struct ifreq *ifr);void i40e_ptp_save_hw_time (struct i40e_pf *pf);void i40e_ptp_restore_hw_time (struct i40e_pf *pf);void i40e_ptp_init (struct i40e_pf *pf);void i40e_ptp_stop (struct i40e_pf *pf); +int i40e_ptp_alloc_pins (struct i40e_pf *pf);int i40e_is_vsi_uplink_mode_veb (struct i40e_vsi *vsi);i40e_status i40e_get_partition_bw_setting (struct i40e_pf *pf);i40e_status i40e_set_partition_bw_setting (struct i40e_pf *pf);
drivers/net/ethernet/intel/i40e/i40e_main.c +15 -3
@@ -2679,7 +2679,15 @@ int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)case SIOCGHWTSTAMP :return i40e_ptp_get_ts_config (pf, ifr);case SIOCSHWTSTAMP : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ;return i40e_ptp_set_ts_config (pf, ifr); +case SIOCSPINS : +if (!capable (CAP_SYS_ADMIN )) +return -EACCES ; +return i40e_ptp_set_pins_ioctl (pf, ifr); +case SIOCGPINS : +return i40e_ptp_get_pins (pf, ifr);default :return -EOPNOTSUPP ; }
@@ -4028,10 +4036,13 @@ static irqreturn_t i40e_intr(int irq, void *data)if (icr0 &I40E_PFINT_ICR0_TIMESYNC_MASK ) {u32 prttsyn_stat =rd32 (hw,I40E_PRTTSYN_STAT_0 ); -if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK ) { - icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_EVENT0_MASK ) +schedule_work (&pf->ptp_extts0_work); + +if (prttsyn_stat &I40E_PRTTSYN_STAT_0_TXTIME_MASK )i40e_ptp_tx_hwtstamp (pf); - } + + icr0 &= ~I40E_PFINT_ICR0_ENA_TIMESYNC_MASK ; }/* If a critical error is pending we have no choice but to reset the
@@ -15007,6 +15018,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (is_valid_ether_addr (hw->mac.port_addr)) pf->hw_features |=I40E_HW_PORT_ID_VALID ; +i40e_ptp_alloc_pins (pf);pci_set_drvdata (pdev, pf);pci_save_state (pdev);
drivers/net/ethernet/intel/i40e/i40e_ptp.c +731 -17
846 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_register.h +2 -0
@@ -2897,6 +2897,8 @@#define I40E_PRTTSYN_AUX_0_PULSEW_MASK I40E_MASK(0xF, I40E_PRTTSYN_AUX_0_PULSEW_SHIFT)#define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16#define I40E_PRTTSYN_AUX_0_EVNTLVL_MASK I40E_MASK(0x3, I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT) +#define I40E_PRTTSYN_AUX_0_PTPFLAG_SHIFT 17 +#define I40E_PRTTSYN_AUX_0_PTPFLAG_MASK I40E_MASK(0x1, I40E_PRTTSYN_AUX_0_PTPFLAG_SHIFT)#define I40E_PRTTSYN_AUX_1 (_i) (0x001E42E0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ #define I40E_PRTTSYN_AUX_1_MAX_INDEX 1#define I40E_PRTTSYN_AUX_1_INSTNT_SHIFT 0
Signature · 1 line
2.17.1
Nguyen
PATCH v2 1/1 i40e: add support for PTP external synchronization clock
Quoted 10 lines · Piotr Kwapulinski
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs:
SDP3_2,SDP3_3andGPIO_4.
Previously it was not possible to use the external PTP synchronization clock.Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]>Signed-off-by Piotr Kwapulinski <[email protected]>---
This still doesn't apply. I was able to hand merge the patch but ended up with a bunch errors when building. I'm guessing whatever this was prepared against didn't have this patch:
Please use dev-queue that I pointed you to in the other reponse.
Kwapulinski
PATCH v2 1/1 i40e: add support for PTP external synchronization clock
Quoted 18 lines
-----Original Message-----
From: Nguyen, Anthony L <[email protected]>
Sent: Tuesday, July 28, 2020 1:14 AM
To: intel-wired-lan at lists.osuosl.org; Kwapulinski, Piotr <[email protected]>
Subject: Re: [Intel-wired-lan] [PATCH v2] i40e: add support for PTP external synchronization clockQuoted 10 lines · Piotr Kwapulinski
Add support for external synchronization clock via GPIOs. 1PPS signals are handled via the dedicated 3 GPIOs:
SDP3_2,SDP3_3andGPIO_4.
Previously it was not possible to use the external PTP synchronization clock.Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]>Signed-off-by Piotr Kwapulinski <[email protected]>---
Quoted 6 lines
This still doesn't apply. I was able to hand merge the patch but ended up with a bunch errors when building. I'm guessing whatever this was prepared against didn't have this patch:
Please use dev-queue that I pointed you to in the other reponse.
Thank you. I'm aware of it. It is exactly this patch that matters. I'm rebasing it.