i40e: add support for PTP external synchronization clock
Subsystems (2)
PATCH v3 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 | 76 +- 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 | 31 +- 4 files changed, 845 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +74 -2
@@ -196,6 +196,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. */
@@ -344,7 +349,6 @@ struct i40e_ddp_old_profile_list { I40E_FLEX_SET_FSIZE(fsize) | \ I40E_FLEX_SET_SRC_WORD(src)) -#define I40E_MAX_FLEX_SRC_OFFSET 0x1F/* macros related to GLQF_ORT */
@@ -414,6 +418,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;
@@ -623,12 +629,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;
@@ -636,10 +702,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;
@@ -772,7 +842,6 @@ struct i40e_vsi {u8 *rss_hkey_user;/* User configured hash keys */ u8 *rss_lut_user;/* User configured lookup table entries */ -u16 max_frame;u16 rx_buf_len;
@@ -1135,10 +1204,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
@@ -2689,7 +2689,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 ; }
@@ -4038,10 +4046,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
@@ -15126,6 +15137,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
845 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_register.h +26 -5
@@ -57,11 +57,18 @@#define I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK I40E_MASK(0x3, I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT)#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT 3#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_MASK I40E_MASK(0x1, I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT 4 +#define I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT 5 +#define I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT 6#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT 7#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK I40E_MASK(0x7, I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT)#define I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT 11#define I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT 12#define I40E_GLGEN_GPIO_CTL_LED_MODE_MASK I40E_MASK(0x1F, I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT 20 +#define I40E_GLGEN_GPIO_SET 0x00088184/* Reset: POR */ +#define I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT 5 +#define I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT 6#define I40E_GLGEN_MDIO_I2C_SEL (_i) (0x000881C0 + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA (_i) (0x0008818C + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA_MDIADD_SHIFT 0
@@ -570,6 +577,8 @@#define I40E_PRTTSYN_CTL0 0x001E4200/* Reset: GLOBR */ #define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT 1#define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT) +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT 2 +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT)#define I40E_PRTTSYN_CTL0_PF_ID_SHIFT 8#define I40E_PRTTSYN_CTL0_PF_ID_MASK I40E_MASK(0xF, I40E_PRTTSYN_CTL0_PF_ID_SHIFT)#define I40E_PRTTSYN_CTL0_TSYNENA_SHIFT 31
@@ -588,7 +597,10 @@#define I40E_PRTTSYN_INC_L 0x001E4040/* Reset: GLOBR */ #define I40E_PRTTSYN_RXTIME_H (_i) (0x00085040 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ #define I40E_PRTTSYN_RXTIME_L (_i) (0x000850C0 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ +#define I40E_PRTTSYN_RXTIME_L_MAX_INDEX 3#define I40E_PRTTSYN_STAT_0 0x001E4220/* Reset: GLOBR */ +#define I40E_PRTTSYN_STAT_0_EVENT0_SHIFT 0 +#define I40E_PRTTSYN_STAT_0_EVENT0_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_EVENT0_SHIFT)#define I40E_PRTTSYN_STAT_0_TXTIME_SHIFT 4#define I40E_PRTTSYN_STAT_0_TXTIME_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_TXTIME_SHIFT)#define I40E_PRTTSYN_STAT_1 0x00085140/* Reset: CORER */
@@ -596,6 +608,20 @@#define I40E_PRTTSYN_TIME_L 0x001E4100/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_H 0x001E41E0/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_L 0x001E41C0/* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_H (_i) (0x001E40C0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_L (_i) (0x001E4080 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0 (_i) (0x001E42A0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT 0 +#define I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT 1 +#define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16 +#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_INSTNT_SHIFT 0 +#define I40E_PRTTSYN_TGT_H (_i) (0x001E4180 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_TGT_L (_i) (0x001E4140 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_CLKO (_i) (0x001E4240 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_ADJ 0x001E4280/* Reset: GLOBR */ #define I40E_GL_MDET_RX 0x0012A510/* Reset: CORER */ #define I40E_GL_MDET_RX_FUNCTION_SHIFT 0#define I40E_GL_MDET_RX_FUNCTION_MASK I40E_MASK(0xFF, I40E_GL_MDET_RX_FUNCTION_SHIFT)
@@ -653,9 +679,6 @@#define I40E_VF_ATQT1 0x00008400/* Reset: EMPR */ #define I40E_VFQF_HLUT_MAX_INDEX 15 - - -#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT 30#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_MASK I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT)#define I40E_PFINT_DYN_CTLN_WB_ON_ITR_SHIFT 30
@@ -666,8 +689,6 @@#define I40E_GLNVM_ULD 0x000B6008/* Reset: POR */ - -#define I40E_GLQF_HASH_INSET (_i, _j) (0x00267600 + ((_i) * 4 + (_j) * 8))/* _i=0...1, _j=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT (_i) (0x00268900 + ((_i) * 4))/* _i=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT_PIT_INDX_SHIFT 0
Signature · 1 line
2.17.1
Bowers
PATCH v3 1/1 i40e: add support for PTP external synchronization clock
Quoted 17 lines
-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Piotr Kwapulinski
Sent: Tuesday, July 28, 2020 6:48 AM
To: intel-wired-lan at lists.osuosl.org
Cc: Kwapulinski, Piotr <[email protected]>
Subject: [Intel-wired-lan] [PATCH v3] i40e: add support for PTP external synchronization clockAdd 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
--- drivers/net/ethernet/intel/i40e/i40e.h | 76 +- 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 | 31 +- 4 files changed, 845 insertions(+), 27 deletions(-)
PATCH v5 1/1 i40e: add support for PTP external synchronization clock
In reply to Piotr KwapulinskiAdd 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 | 76 +- 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 | 31 +- 4 files changed, 846 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +74 -2
@@ -196,6 +196,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. */
@@ -344,7 +349,6 @@ struct i40e_ddp_old_profile_list { I40E_FLEX_SET_FSIZE(fsize) | \ I40E_FLEX_SET_SRC_WORD(src)) -#define I40E_MAX_FLEX_SRC_OFFSET 0x1F/* macros related to GLQF_ORT */
@@ -414,6 +418,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;
@@ -623,12 +629,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;
@@ -636,10 +702,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;
@@ -772,7 +842,6 @@ struct i40e_vsi {u8 *rss_hkey_user;/* User configured hash keys */ u8 *rss_lut_user;/* User configured lookup table entries */ -u16 max_frame;u16 rx_buf_len;
@@ -1135,10 +1204,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
@@ -2689,7 +2689,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 ; }
@@ -4039,10 +4047,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
@@ -15124,6 +15135,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 +26 -5
@@ -57,11 +57,18 @@#define I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK I40E_MASK(0x3, I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT)#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT 3#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_MASK I40E_MASK(0x1, I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT 4 +#define I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT 5 +#define I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT 6#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT 7#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK I40E_MASK(0x7, I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT)#define I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT 11#define I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT 12#define I40E_GLGEN_GPIO_CTL_LED_MODE_MASK I40E_MASK(0x1F, I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT 20 +#define I40E_GLGEN_GPIO_SET 0x00088184/* Reset: POR */ +#define I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT 5 +#define I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT 6#define I40E_GLGEN_MDIO_I2C_SEL (_i) (0x000881C0 + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA (_i) (0x0008818C + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA_MDIADD_SHIFT 0
@@ -570,6 +577,8 @@#define I40E_PRTTSYN_CTL0 0x001E4200/* Reset: GLOBR */ #define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT 1#define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT) +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT 2 +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT)#define I40E_PRTTSYN_CTL0_PF_ID_SHIFT 8#define I40E_PRTTSYN_CTL0_PF_ID_MASK I40E_MASK(0xF, I40E_PRTTSYN_CTL0_PF_ID_SHIFT)#define I40E_PRTTSYN_CTL0_TSYNENA_SHIFT 31
@@ -588,7 +597,10 @@#define I40E_PRTTSYN_INC_L 0x001E4040/* Reset: GLOBR */ #define I40E_PRTTSYN_RXTIME_H (_i) (0x00085040 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ #define I40E_PRTTSYN_RXTIME_L (_i) (0x000850C0 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ +#define I40E_PRTTSYN_RXTIME_L_MAX_INDEX 3#define I40E_PRTTSYN_STAT_0 0x001E4220/* Reset: GLOBR */ +#define I40E_PRTTSYN_STAT_0_EVENT0_SHIFT 0 +#define I40E_PRTTSYN_STAT_0_EVENT0_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_EVENT0_SHIFT)#define I40E_PRTTSYN_STAT_0_TXTIME_SHIFT 4#define I40E_PRTTSYN_STAT_0_TXTIME_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_TXTIME_SHIFT)#define I40E_PRTTSYN_STAT_1 0x00085140/* Reset: CORER */
@@ -596,6 +608,20 @@#define I40E_PRTTSYN_TIME_L 0x001E4100/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_H 0x001E41E0/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_L 0x001E41C0/* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_H (_i) (0x001E40C0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_L (_i) (0x001E4080 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0 (_i) (0x001E42A0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT 0 +#define I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT 1 +#define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16 +#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_INSTNT_SHIFT 0 +#define I40E_PRTTSYN_TGT_H (_i) (0x001E4180 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_TGT_L (_i) (0x001E4140 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_CLKO (_i) (0x001E4240 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_ADJ 0x001E4280/* Reset: GLOBR */ #define I40E_GL_MDET_RX 0x0012A510/* Reset: CORER */ #define I40E_GL_MDET_RX_FUNCTION_SHIFT 0#define I40E_GL_MDET_RX_FUNCTION_MASK I40E_MASK(0xFF, I40E_GL_MDET_RX_FUNCTION_SHIFT)
@@ -653,9 +679,6 @@#define I40E_VF_ATQT1 0x00008400/* Reset: EMPR */ #define I40E_VFQF_HLUT_MAX_INDEX 15 - - -#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT 30#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_MASK I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT)#define I40E_PFINT_DYN_CTLN_WB_ON_ITR_SHIFT 30
@@ -666,8 +689,6 @@#define I40E_GLNVM_ULD 0x000B6008/* Reset: POR */ - -#define I40E_GLQF_HASH_INSET (_i, _j) (0x00267600 + ((_i) * 4 + (_j) * 8))/* _i=0...1, _j=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT (_i) (0x00268900 + ((_i) * 4))/* _i=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT_PIT_INDX_SHIFT 0
Signature · 1 line
2.17.1
PATCH v5 1/1 i40e: add support for PTP external synchronization clock
Quoted 6 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.
Where is the changelog?
Quoted 9 lines
Reviewed-by Aleksandr Loktionov <[email protected]>Reviewed-by Arkadiusz Kubalewski <[email protected]>Signed-off-by Piotr Kwapulinski <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e.h | 76 +- 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 | 31 +- 4 files changed, 846 insertions(+), 27 deletions(-)
PATCH v6 1/1 i40e: add support for PTP external synchronization clock
In reply to Piotr KwapulinskiAdd 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.
---
v6:
- fix argument type in i40e_ptp_set_led_hw(i40e_ptp_led_pin_state)
drivers/net/ethernet/intel/i40e/i40e.h | 76 +- 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 | 31 +- 4 files changed, 846 insertions(+), 27 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +74 -2
@@ -196,6 +196,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. */
@@ -344,7 +349,6 @@ struct i40e_ddp_old_profile_list { I40E_FLEX_SET_FSIZE(fsize) | \ I40E_FLEX_SET_SRC_WORD(src)) -#define I40E_MAX_FLEX_SRC_OFFSET 0x1F/* macros related to GLQF_ORT */
@@ -414,6 +418,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;
@@ -623,12 +629,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;
@@ -636,10 +702,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;
@@ -772,7 +842,6 @@ struct i40e_vsi {u8 *rss_hkey_user;/* User configured hash keys */ u8 *rss_lut_user;/* User configured lookup table entries */ -u16 max_frame;u16 rx_buf_len;
@@ -1135,10 +1204,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
@@ -2689,7 +2689,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 ; }
@@ -4039,10 +4047,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
@@ -15124,6 +15135,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 +26 -5
@@ -57,11 +57,18 @@#define I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK I40E_MASK(0x3, I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT)#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT 3#define I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_MASK I40E_MASK(0x1, I40E_GLGEN_GPIO_CTL_PRT_NUM_NA_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PIN_DIR_SHIFT 4 +#define I40E_GLGEN_GPIO_CTL_TRI_CTL_SHIFT 5 +#define I40E_GLGEN_GPIO_CTL_OUT_CTL_SHIFT 6#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT 7#define I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK I40E_MASK(0x7, I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT)#define I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT 11#define I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT 12#define I40E_GLGEN_GPIO_CTL_LED_MODE_MASK I40E_MASK(0x1F, I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) +#define I40E_GLGEN_GPIO_CTL_PHY_PIN_NAME_SHIFT 20 +#define I40E_GLGEN_GPIO_SET 0x00088184/* Reset: POR */ +#define I40E_GLGEN_GPIO_SET_SDP_DATA_SHIFT 5 +#define I40E_GLGEN_GPIO_SET_DRIVE_SDP_SHIFT 6#define I40E_GLGEN_MDIO_I2C_SEL (_i) (0x000881C0 + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA (_i) (0x0008818C + ((_i) * 4))/* _i=0...3 */ /* Reset: POR */ #define I40E_GLGEN_MSCA_MDIADD_SHIFT 0
@@ -570,6 +577,8 @@#define I40E_PRTTSYN_CTL0 0x001E4200/* Reset: GLOBR */ #define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT 1#define I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_TXTIME_INT_ENA_SHIFT) +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT 2 +#define I40E_PRTTSYN_CTL0_EVENT_INT_ENA_MASK I40E_MASK(0x1, I40E_PRTTSYN_CTL0_EVENT_INT_ENA_SHIFT)#define I40E_PRTTSYN_CTL0_PF_ID_SHIFT 8#define I40E_PRTTSYN_CTL0_PF_ID_MASK I40E_MASK(0xF, I40E_PRTTSYN_CTL0_PF_ID_SHIFT)#define I40E_PRTTSYN_CTL0_TSYNENA_SHIFT 31
@@ -588,7 +597,10 @@#define I40E_PRTTSYN_INC_L 0x001E4040/* Reset: GLOBR */ #define I40E_PRTTSYN_RXTIME_H (_i) (0x00085040 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ #define I40E_PRTTSYN_RXTIME_L (_i) (0x000850C0 + ((_i) * 32))/* _i=0...3 */ /* Reset: CORER */ +#define I40E_PRTTSYN_RXTIME_L_MAX_INDEX 3#define I40E_PRTTSYN_STAT_0 0x001E4220/* Reset: GLOBR */ +#define I40E_PRTTSYN_STAT_0_EVENT0_SHIFT 0 +#define I40E_PRTTSYN_STAT_0_EVENT0_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_EVENT0_SHIFT)#define I40E_PRTTSYN_STAT_0_TXTIME_SHIFT 4#define I40E_PRTTSYN_STAT_0_TXTIME_MASK I40E_MASK(0x1, I40E_PRTTSYN_STAT_0_TXTIME_SHIFT)#define I40E_PRTTSYN_STAT_1 0x00085140/* Reset: CORER */
@@ -596,6 +608,20 @@#define I40E_PRTTSYN_TIME_L 0x001E4100/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_H 0x001E41E0/* Reset: GLOBR */ #define I40E_PRTTSYN_TXTIME_L 0x001E41C0/* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_H (_i) (0x001E40C0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_EVNT_L (_i) (0x001E4080 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0 (_i) (0x001E42A0 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_AUX_0_OUT_ENA_SHIFT 0 +#define I40E_PRTTSYN_AUX_0_OUTMOD_SHIFT 1 +#define I40E_PRTTSYN_AUX_0_EVNTLVL_SHIFT 16 +#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_INSTNT_SHIFT 0 +#define I40E_PRTTSYN_TGT_H (_i) (0x001E4180 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_TGT_L (_i) (0x001E4140 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_CLKO (_i) (0x001E4240 + ((_i) * 32))/* _i=0...1 */ /* Reset: GLOBR */ +#define I40E_PRTTSYN_ADJ 0x001E4280/* Reset: GLOBR */ #define I40E_GL_MDET_RX 0x0012A510/* Reset: CORER */ #define I40E_GL_MDET_RX_FUNCTION_SHIFT 0#define I40E_GL_MDET_RX_FUNCTION_MASK I40E_MASK(0xFF, I40E_GL_MDET_RX_FUNCTION_SHIFT)
@@ -653,9 +679,6 @@#define I40E_VF_ATQT1 0x00008400/* Reset: EMPR */ #define I40E_VFQF_HLUT_MAX_INDEX 15 - - -#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT 30#define I40E_PFINT_DYN_CTL0_WB_ON_ITR_MASK I40E_MASK(0x1, I40E_PFINT_DYN_CTL0_WB_ON_ITR_SHIFT)#define I40E_PFINT_DYN_CTLN_WB_ON_ITR_SHIFT 30
@@ -666,8 +689,6 @@#define I40E_GLNVM_ULD 0x000B6008/* Reset: POR */ - -#define I40E_GLQF_HASH_INSET (_i, _j) (0x00267600 + ((_i) * 4 + (_j) * 8))/* _i=0...1, _j=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT (_i) (0x00268900 + ((_i) * 4))/* _i=0...63 */ /* Reset: CORER */ #define I40E_GLQF_ORT_PIT_INDX_SHIFT 0
Signature · 1 line
2.17.1