bnxt_en: PTP enhancements
Michael Chan
maintainercover bnxt_en: PTP enhancements
This series adds two PTP enhancements. This first one is to register the PHC during probe time and keep it registered whether it is in ifup or ifdown state. It will get unregistered and possibly reregistered if the firmware PTP capability changes after firmware reset. The second one is to add the 1PPS (one pulse per second) feature to support input/output of the 1PPS signal.
Michael Chan (2):
bnxt_en: Move bnxt_ptp_init() from bnxt_open() back to bnxt_init_one()
bnxt_en: Do not read the PTP PHC during chip reset
Pavan Chebbi (4):
bnxt_en: 1PPS support for 5750X family chips
bnxt_en: 1PPS functions to configure TSIO pins
bnxt_en: Event handler for PPS events
bnxt_en: Log if an invalid signal detected on TSIO pin
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 62 +++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 11 + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 319 +++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 53 +++ 4 files changed, 423 insertions(+), 22 deletions(-)
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 1/6 bnxt_en: Move bnxt_ptp_init() from bnxt_open() back to bnxt_init_one()
It was pointed out by Richard Cochran that registering the PHC during probe is better than during ifup, so move bnxt_ptp_init() back to bnxt_init_one(). In order to work correctly after firmware reset which may result in PTP config. changes, we modify bnxt_ptp_init() to return if the PHC has been registered earlier. If PTP is no longer supported by the new firmware, we will unregister the PHC and clean up.
This partially reverts:
d7859afb6880 ("bnxt_en: Move bnxt_ptp_init() to bnxt_open()")
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 18 +++++++++--------- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 3 +++ 2 files changed, 12 insertions(+), 9 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +9 -9
@@ -7495,9 +7495,14 @@ static int __bnxt_hwrm_ptp_qcfg(struct bnxt *bp) rc = -ENODEV ; goto no_ptp; } -return 0 ; + rc =bnxt_ptp_init (bp); +if (!rc) +return 0 ; + +netdev_warn (bp->dev,"PTP initialization failed.\n" ); no_ptp: +bnxt_ptp_clear (bp);kfree (ptp); bp->ptp_cfg =NULL ;return rc;
@@ -7577,6 +7582,7 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp)if (flags &FUNC_QCAPS_RESP_FLAGS_PTP_SUPPORTED ) {__bnxt_hwrm_ptp_qcfg (bp); }else { +bnxt_ptp_clear (bp);kfree (bp->ptp_cfg); bp->ptp_cfg =NULL ; }
@@ -10277,15 +10283,9 @@ static int bnxt_open(struct net_device *dev)if (rc)return rc; -if (bnxt_ptp_init (bp)) { -netdev_warn (dev,"PTP initialization failed.\n" ); -kfree (bp->ptp_cfg); - bp->ptp_cfg =NULL ; - } rc =__bnxt_open_nic (bp, true, true);if (rc) {bnxt_hwrm_if_change (bp, false); -bnxt_ptp_clear (bp); }else {if (test_and_clear_bit (BNXT_STATE_FW_RESET_DET , &bp->state)) {if (!test_bit (BNXT_STATE_IN_FW_RESET , &bp->state)) {
@@ -10376,7 +10376,6 @@ static int bnxt_close(struct net_device *dev) {struct bnxt *bp =netdev_priv (dev); -bnxt_ptp_clear (bp);bnxt_hwmon_close (bp);bnxt_close_nic (bp, true, true);bnxt_hwrm_shutdown_link (bp);
@@ -11363,7 +11362,6 @@ static void bnxt_fw_reset_close(struct bnxt *bp)bnxt_clear_int_mode (bp);pci_disable_device (bp->pdev); } -bnxt_ptp_clear (bp);__bnxt_close_nic (bp, true, false);bnxt_vf_reps_free (bp);bnxt_clear_int_mode (bp);
@@ -12706,6 +12704,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)if (BNXT_PF (bp))devlink_port_type_clear (&bp->dl_port); +bnxt_ptp_clear (bp);pci_disable_pcie_error_reporting (pdev);unregister_netdev (dev);clear_bit (BNXT_STATE_IN_FW_RESET , &bp->state);
@@ -13318,6 +13317,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)bnxt_free_hwrm_short_cmd_req (bp);bnxt_free_hwrm_resources (bp);bnxt_ethtool_free (bp); +bnxt_ptp_clear (bp);kfree (bp->ptp_cfg); bp->ptp_cfg =NULL ;kfree (bp->fw_health);
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +3 -0
@@ -414,6 +414,9 @@ int bnxt_ptp_init(struct bnxt *bp)if (rc)return rc; +if (ptp->ptp_clock) +return 0 ; +atomic_set (&ptp->tx_avail,BNXT_MAX_TX_TS );spin_lock_init (&ptp->ptp_lock);
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 2/6 bnxt_en: Do not read the PTP PHC during chip reset
In reply to Michael ChanDuring error recovery or hot firmware upgrade, the chip may be under reset and the PHC register read cycles may cause completion timeouts. Check that the chip is not under reset condition before proceeding to read the PHC by checking the flag BNXT_STATE_IN_FW_RESET. We also need to take the ptp_lock before we set this flag to prevent race conditions.
We need this logic because the PHC now will stay registered after bnxt_close().
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 18 ++++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 28 +++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +16 -2
@@ -11397,13 +11397,20 @@ static bool is_bnxt_fw_ok(struct bnxt *bp)static void bnxt_force_fw_reset (struct bnxt *bp) {struct bnxt_fw_health *fw_health = bp->fw_health; +struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;u32 wait_dsecs;if (!test_bit (BNXT_STATE_OPEN , &bp->state) ||test_bit (BNXT_STATE_IN_FW_RESET , &bp->state))return ; -set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); +if (ptp) { +spin_lock_bh (&ptp->ptp_lock); +set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); +spin_unlock_bh (&ptp->ptp_lock); + }else { +set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); + }bnxt_fw_reset_close (bp); wait_dsecs = fw_health->master_func_wait_dsecs;if (fw_health->master) {
@@ -11459,9 +11466,16 @@ void bnxt_fw_reset(struct bnxt *bp)bnxt_rtnl_lock_sp (bp);if (test_bit (BNXT_STATE_OPEN , &bp->state) && !test_bit (BNXT_STATE_IN_FW_RESET , &bp->state)) { +struct bnxt_ptp_cfg *ptp = bp->ptp_cfg;int n =0 , tmo; -set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); +if (ptp) { +spin_lock_bh (&ptp->ptp_lock); +set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); +spin_unlock_bh (&ptp->ptp_lock); + }else { +set_bit (BNXT_STATE_IN_FW_RESET , &bp->state); + }if (bp->pf.active_vfs && !test_bit (BNXT_STATE_FW_FATAL_COND , &bp->state)) n =bnxt_get_registered_vfs (bp);
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +19 -9
@@ -55,16 +55,19 @@ static int bnxt_ptp_settime(struct ptp_clock_info *ptp_info, }/* Caller holds ptp_lock */ -static u64 bnxt_refclk_read (struct bnxt *bp,struct ptp_system_timestamp *sts) +static int bnxt_refclk_read (struct bnxt *bp,struct ptp_system_timestamp *sts, +u64 *ns) {struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; -u64 ns; + +if (test_bit (BNXT_STATE_IN_FW_RESET , &bp->state)) +return -EIO ;ptp_read_system_prets (sts); - ns =readl (bp->bar0 + ptp->refclk_mapped_regs[0 ]); + *ns =readl (bp->bar0 + ptp->refclk_mapped_regs[0 ]);ptp_read_system_postts (sts); - ns |= (u64 )readl (bp->bar0 + ptp->refclk_mapped_regs[1 ]) <<32 ; -return ns; + *ns |= (u64 )readl (bp->bar0 + ptp->refclk_mapped_regs[1 ]) <<32 ; +return 0 ; }static void bnxt_ptp_get_current_time (struct bnxt *bp)
@@ -75,7 +78,7 @@ static void bnxt_ptp_get_current_time(struct bnxt *bp)return ;spin_lock_bh (&ptp->ptp_lock);WRITE_ONCE (ptp->old_time, ptp->current_time); - ptp->current_time =bnxt_refclk_read (bp,NULL ); +bnxt_refclk_read (bp,NULL , &ptp->current_time);spin_unlock_bh (&ptp->ptp_lock); }
@@ -108,9 +111,14 @@ static int bnxt_ptp_gettimex(struct ptp_clock_info *ptp_info, struct bnxt_ptp_cfg *ptp = container_of(ptp_info, struct bnxt_ptp_cfg, ptp_info);u64 ns, cycles; +int rc;spin_lock_bh (&ptp->ptp_lock); - cycles =bnxt_refclk_read (ptp->bp, sts); + rc =bnxt_refclk_read (ptp->bp, sts, &cycles); +if (rc) { +spin_unlock_bh (&ptp->ptp_lock); +return rc; + } ns =timecounter_cyc2time (&ptp->tc, cycles);spin_unlock_bh (&ptp->ptp_lock); *ts =ns_to_timespec64 (ns);
@@ -309,8 +317,10 @@ static void bnxt_unmap_ptp_regs(struct bnxt *bp)static u64 bnxt_cc_read (const struct cyclecounter *cc) { struct bnxt_ptp_cfg *ptp = container_of(cc, struct bnxt_ptp_cfg, cc); +u64 ns =0 ; -return bnxt_refclk_read (ptp->bp,NULL ); +bnxt_refclk_read (ptp->bp,NULL , &ns); +return ns; }static void bnxt_stamp_tx_skb (struct bnxt *bp,struct sk_buff *skb)
@@ -439,7 +449,7 @@ int bnxt_ptp_init(struct bnxt *bp) }if (bp->flags &BNXT_FLAG_CHIP_P5 ) {spin_lock_bh (&ptp->ptp_lock); - ptp->current_time =bnxt_refclk_read (bp,NULL ); +bnxt_refclk_read (bp,NULL , &ptp->current_time);WRITE_ONCE (ptp->old_time, ptp->current_time);spin_unlock_bh (&ptp->ptp_lock);ptp_schedule_worker (ptp->ptp_clock,0 );
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 3/6 bnxt_en: 1PPS support for 5750X family chips
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
1PPS (One Pulse Per Second) is a signal generated either by the NIC PHC or an external timing source. Integrating the support to configure and use 1PPS using the TSIO pins along with PTP timestamps will add Grand Master capability to the 5750X family chipsets.
This patch initializes the driver data structures and registers the 1PPS with kernel, based on the TSIO pins' capability in the hardware. This will create a /dev/ppsX device which applications can use to receive PPS events.
Later patches will define functions to configure and use the pins.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 89 ++++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 22 +++++ 4 files changed, 113 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -0
@@ -7545,6 +7545,8 @@ static int __bnxt_hwrm_func_qcaps(struct bnxt *bp) flags_ext =le32_to_cpu (resp->flags_ext);if (flags_ext &FUNC_QCAPS_RESP_FLAGS_EXT_EXT_HW_STATS_SUPPORTED ) bp->fw_cap |=BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED ; +if (BNXT_PF (bp) && (flags_ext &FUNC_QCAPS_RESP_FLAGS_EXT_PTP_PPS_SUPPORTED )) + bp->fw_cap |=BNXT_FW_CAP_PTP_PPS ; bp->tx_push_thresh =0 ; if ((flags & FUNC_QCAPS_RESP_FLAGS_PUSH_MODE_SUPPORTED) &&
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1887,6 +1887,7 @@ struct bnxt {#define BNXT_FW_CAP_VLAN_RX_STRIP 0x01000000#define BNXT_FW_CAP_VLAN_TX_INSERT 0x02000000#define BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED 0x04000000 +#define BNXT_FW_CAP_PTP_PPS 0x10000000#define BNXT_FW_CAP_RING_MONITOR 0x40000000#define BNXT_NEW_RM (bp) ((bp)->fw_cap & BNXT_FW_CAP_NEW_RM)
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +88 -1
115 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +22 -0
@@ -21,11 +21,33 @@#define BNXT_PTP_QTS_TX_ENABLES (PORT_TS_QUERY_REQ_ENABLES_PTP_SEQ_ID | \ PORT_TS_QUERY_REQ_ENABLES_TS_REQ_TIMEOUT) +struct pps_pin { +u8 usage; +}; + +#define BNXT_PPS_PIN_DISABLE 0 +#define BNXT_PPS_PIN_ENABLE 1 +#define BNXT_PPS_PIN_NONE 0 +#define BNXT_PPS_PIN_PPS_IN 1 +#define BNXT_PPS_PIN_PPS_OUT 2 +#define BNXT_PPS_PIN_SYNC_IN 3 +#define BNXT_PPS_PIN_SYNC_OUT 4 + +#define BNXT_PPS_EVENT_INTERNAL 1 +#define BNXT_PPS_EVENT_EXTERNAL 2 + +struct bnxt_pps { +u8 num_pins; +#define BNXT_MAX_TSIO_PINS 4 +struct pps_pin pins[BNXT_MAX_TSIO_PINS ]; +}; +struct bnxt_ptp_cfg {struct ptp_clock_info ptp_info;struct ptp_clock *ptp_clock;struct cyclecounter cc;struct timecounter tc; +struct bnxt_pps pps_info;/* serialize timecounter access */ spinlock_t ptp_lock;struct sk_buff *tx_skb;
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 4/6 bnxt_en: 1PPS functions to configure TSIO pins
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
Application will send ioctls to set/clear PPS pin functions based on user input. This patch implements the driver callbacks that will configure the TSIO pins using firmware commands. After firmware reset, the TSIO pins will be reconfigured again.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 174 +++++++++++++++++- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 + 3 files changed, 178 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -0
@@ -12150,6 +12150,7 @@ static void bnxt_fw_reset_task(struct work_struct *work)bnxt_reenable_sriov (bp);bnxt_vf_reps_alloc (bp);bnxt_vf_reps_open (bp); +bnxt_ptp_reapply_pps (bp);bnxt_dl_health_recovery_done (bp);bnxt_dl_health_status_update (bp, true);rtnl_unlock ();
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +172 -2
182 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +5 -0
@@ -22,9 +22,13 @@ PORT_TS_QUERY_REQ_ENABLES_TS_REQ_TIMEOUT)struct pps_pin { +u8 event;u8 usage; +u8 state; }; +#define TSIO_PIN_VALID (pin) ((pin) < (BNXT_MAX_TSIO_PINS)) +#define BNXT_PPS_PIN_DISABLE 0#define BNXT_PPS_PIN_ENABLE 1#define BNXT_PPS_PIN_NONE 0
@@ -93,6 +97,7 @@ do { \#endif int bnxt_ptp_parse (struct sk_buff *skb,u16 *seq_id); +void bnxt_ptp_reapply_pps (struct bnxt *bp);int bnxt_hwtstamp_set (struct net_device *dev,struct ifreq *ifr);int bnxt_hwtstamp_get (struct net_device *dev,struct ifreq *ifr);int bnxt_get_tx_ts_p5 (struct bnxt *bp,struct sk_buff *skb);
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 5/6 bnxt_en: Event handler for PPS events
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
Once the PPS pins are configured, the FW can report PPS values using ASYNC event. This patch adds the ASYNC event handler and subsequent reporting of the events to kernel.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 5 ++++ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 27 +++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 26 ++++++++++++++++++ 3 files changed, 58 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +5 -0
@@ -277,6 +277,7 @@ static const u16 bnxt_async_events_arr[] = {ASYNC_EVENT_CMPL_EVENT_ID_DEBUG_NOTIFICATION ,ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG ,ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST , + ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP, };static struct workqueue_struct *bnxt_pf_wq;
@@ -2202,6 +2203,10 @@ static int bnxt_async_event_process(struct bnxt *bp, } goto async_event_process_exit; } +case ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP : { +bnxt_ptp_pps_event (bp, data1, data2); + goto async_event_process_exit; + }default : goto async_event_process_exit; }
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c +27 -0
@@ -155,6 +155,33 @@ static int bnxt_ptp_adjfreq(struct ptp_clock_info *ptp_info, s32 ppb)return rc; } +void bnxt_ptp_pps_event (struct bnxt *bp,u32 data1,u32 data2) +{ +struct bnxt_ptp_cfg *ptp = bp->ptp_cfg; +struct ptp_clock_event event; +u64 ns, pps_ts; + + pps_ts =EVENT_PPS_TS (data2, data1); +spin_lock_bh (&ptp->ptp_lock); + ns =timecounter_cyc2time (&ptp->tc, pps_ts); +spin_unlock_bh (&ptp->ptp_lock); + +switch (EVENT_DATA2_PPS_EVENT_TYPE (data2)) { +case ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_INTERNAL : + event.pps_times.ts_real =ns_to_timespec64 (ns); + event.type =PTP_CLOCK_PPSUSR ; + event.index =EVENT_DATA2_PPS_PIN_NUM (data2); +break ; +case ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE_EXTERNAL : + event.timestamp = ns; + event.type =PTP_CLOCK_EXTTS ; + event.index =EVENT_DATA2_PPS_PIN_NUM (data2); +break ; + } + +ptp_clock_event (bp->ptp_cfg->ptp_clock, &event); +} +static int bnxt_ptp_cfg_pin (struct bnxt *bp,u8 pin,u8 usage) {struct hwrm_func_ptp_pin_cfg_input req = {0 };
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h +26 -0
@@ -29,6 +29,31 @@ struct pps_pin {#define TSIO_PIN_VALID (pin) ((pin) < (BNXT_MAX_TSIO_PINS)) +#define EVENT_DATA2_PPS_EVENT_TYPE (data2) \ + ((data2) & ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_EVENT_TYPE) + +#define EVENT_DATA2_PPS_PIN_NUM (data2) \ + (((data2) & \ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_MASK) >>\ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PIN_NUMBER_SFT) + +#define BNXT_DATA2_UPPER_MSK \ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_MASK + +#define BNXT_DATA2_UPPER_SFT \ + (32 - \ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA2_PPS_TIMESTAMP_UPPER_SFT) + +#define BNXT_DATA1_LOWER_MSK \ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_MASK + +#define BNXT_DATA1_LOWER_SFT \ + ASYNC_EVENT_CMPL_PPS_TIMESTAMP_EVENT_DATA1_PPS_TIMESTAMP_LOWER_SFT + +#define EVENT_PPS_TS (data2, data1) \ + (((u64)((data2) & BNXT_DATA2_UPPER_MSK) << BNXT_DATA2_UPPER_SFT) |\ + (((data1) & BNXT_DATA1_LOWER_MSK) >> BNXT_DATA1_LOWER_SFT)) +#define BNXT_PPS_PIN_DISABLE 0#define BNXT_PPS_PIN_ENABLE 1#define BNXT_PPS_PIN_NONE 0
@@ -97,6 +122,7 @@ do { \#endif int bnxt_ptp_parse (struct sk_buff *skb,u16 *seq_id); +void bnxt_ptp_pps_event (struct bnxt *bp,u32 data1,u32 data2);void bnxt_ptp_reapply_pps (struct bnxt *bp);int bnxt_hwtstamp_set (struct net_device *dev,struct ifreq *ifr);int bnxt_hwtstamp_get (struct net_device *dev,struct ifreq *ifr);
Signature · 1 line
2.18.1
Michael Chan
maintainerPATCH 6/6 bnxt_en: Log if an invalid signal detected on TSIO pin
In reply to Michael ChanFrom: Pavan Chebbi <[email protected]>
FW can report to driver via ASYNC event if it encountered an invalid signal on any TSIO PIN. Driver will log this event for the user to take corrective action.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 18 ++++++++++++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 ++++++++++ 2 files changed, 28 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +18 -0
@@ -278,6 +278,7 @@ static const u16 bnxt_async_events_arr[] = {ASYNC_EVENT_CMPL_EVENT_ID_RING_MONITOR_MSG ,ASYNC_EVENT_CMPL_EVENT_ID_ECHO_REQUEST ,ASYNC_EVENT_CMPL_EVENT_ID_PPS_TIMESTAMP , + ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT, };static struct workqueue_struct *bnxt_pf_wq;
@@ -2043,6 +2044,19 @@ static u16 bnxt_agg_ring_id_to_grp_idx(struct bnxt *bp, u16 ring_id)return INVALID_HW_RING_ID ; } +static void bnxt_event_error_report (struct bnxt *bp,u32 data1,u32 data2) +{ +switch (BNXT_EVENT_ERROR_REPORT_TYPE (data1)) { +case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_INVALID_SIGNAL : +netdev_err (bp->dev,"1PPS: Received invalid signal on pin%lu from the external source. Please fix the signal and reconfigure the pin\n" , +BNXT_EVENT_INVALID_SIGNAL_DATA (data2)); +break ; +default : +netdev_err (bp->dev,"FW reported unknown error type\n" ); +break ; + } +} +#define BNXT_GET_EVENT_PORT (data) \ ((data) & \ ASYNC_EVENT_CMPL_PORT_CONN_NOT_ALLOWED_EVENT_DATA1_PORT_ID_MASK)
@@ -2207,6 +2221,10 @@ static int bnxt_async_event_process(struct bnxt *bp,bnxt_ptp_pps_event (bp, data1, data2); goto async_event_process_exit; } +case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT : { +bnxt_event_error_report (bp, data1, data2); + goto async_event_process_exit; + }default : goto async_event_process_exit; }
drivers/net/ethernet/broadcom/bnxt/bnxt.h +10 -0
@@ -496,6 +496,16 @@ struct rx_tpa_end_cmp_ext { !!((data1) & \ ASYNC_EVENT_CMPL_ERROR_RECOVERY_EVENT_DATA1_FLAGS_RECOVERY_ENABLED) +#define BNXT_EVENT_ERROR_REPORT_TYPE (data1) \ + (((data1) & \ + ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_MASK) >>\ + ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_SFT) + +#define BNXT_EVENT_INVALID_SIGNAL_DATA (data2) \ + (((data2) & \ + ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_MASK) >>\ + ASYNC_EVENT_CMPL_ERROR_REPORT_INVALID_SIGNAL_EVENT_DATA2_PIN_ID_SFT) +struct nqe_cn {__le16 type;#define NQ_CN_TYPE_MASK 0x3fUL
Signature · 1 line
2.18.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Wed, 28 Jul 2021 14:11:39 -0400 you wrote:
This series adds two PTP enhancements. This first one is to register the PHC during probe time and keep it registered whether it is in ifup or ifdown state. It will get unregistered and possibly reregistered if the firmware PTP capability changes after firmware reset. The second one is to add the 1PPS (one pulse per second) feature to support input/output of the 1PPS signal.
[...]
Here is the summary with links:
- [net-next,1/6] bnxt_en: Move bnxt_ptp_init() from bnxt_open() back to bnxt_init_one()
https://git.kernel.org/netdev/net-next/c/a521c8a01d26 - [net-next,2/6] bnxt_en: Do not read the PTP PHC during chip reset https://git.kernel.org/netdev/net-next/c/30e96f487f64 - [net-next,3/6] bnxt_en: 1PPS support for 5750X family chips https://git.kernel.org/netdev/net-next/c/caf3eedbcd8d - [net-next,4/6] bnxt_en: 1PPS functions to configure TSIO pins https://git.kernel.org/netdev/net-next/c/9e518f25802c - [net-next,5/6] bnxt_en: Event handler for PPS events https://git.kernel.org/netdev/net-next/c/099fdeda659d - [net-next,6/6] bnxt_en: Log if an invalid signal detected on TSIO pin https://git.kernel.org/netdev/net-next/c/abf90ac2c292
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html