bnx2x: Add timestamping and PTP hardware clock support (eeed018c) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/ethernet/broadcom/bnx2x/bnx2x.h

+27 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,10 @@
		#include <linux/types.h>
		#include <linux/pci_regs.h>

		#include <linux/ptp_clock_kernel.h>
		#include <linux/net_tstamp.h>
		#include <linux/clocksource.h>

		/* compilation time flags */

		/* define this to make the driver freeze on error to allow getting debug info
		@@ -70,6 +74,7 @@ enum bnx2x_int_mode {
		#define BNX2X_MSG_SP 0x0100000 /* was: NETIF_MSG_INTR */
		#define BNX2X_MSG_FP 0x0200000 /* was: NETIF_MSG_INTR */
		#define BNX2X_MSG_IOV 0x0800000
		#define BNX2X_MSG_PTP 0x1000000
		#define BNX2X_MSG_IDLE 0x2000000 /* used for idle check*/
		#define BNX2X_MSG_ETHTOOL 0x4000000
		#define BNX2X_MSG_DCB 0x8000000
		@@ -1591,6 +1596,8 @@ struct bnx2x {
		#define BC_SUPPORTS_RMMOD_CMD (1 << 24)
		#define HAS_PHYS_PORT_ID (1 << 25)
		#define AER_ENABLED (1 << 26)
		#define PTP_SUPPORTED (1 << 27)
		#define TX_TIMESTAMPING_EN (1 << 28)

		#define BP_NOMCP(bp) ((bp)->flags & NO_MCP_FLAG)

		@@ -1933,6 +1940,19 @@ struct bnx2x {

		u8 phys_port_id[ETH_ALEN];

		/* PTP related context */
		struct ptp_clock *ptp_clock;
		struct ptp_clock_info ptp_clock_info;
		struct work_struct ptp_task;
		struct cyclecounter cyclecounter;
		struct timecounter timecounter;
		bool timecounter_init_done;
		struct sk_buff *ptp_tx_skb;
		unsigned long ptp_tx_start;
		bool hwtstamp_ioctl_called;
		u16 tx_type;
		u16 rx_filter;

		struct bnx2x_link_report_data vf_link_vars;
		};

		@@ -2559,4 +2579,11 @@ void bnx2x_update_mng_version(struct bnx2x *bp);

		#define E1H_MAX_MF_SB_COUNT (HC_SB_MAX_SB_E1X/(E1HVN_MAX * PORT_MAX))

		void bnx2x_init_ptp(struct bnx2x *bp);
		int bnx2x_configure_ptp_filters(struct bnx2x *bp);
		void bnx2x_set_rx_ts(struct bnx2x bp, struct sk_buff skb);

		#define BNX2X_MAX_PHC_DRIFT 31000000
		#define BNX2X_PTP_TX_TIMEOUT

		#endif /* bnx2x.h */

drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

+24 −1

Original line number	Diff line number	Diff line
		@@ -1067,6 +1067,11 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)

		skb_record_rx_queue(skb, fp->rx_queue);

		/* Check if this packet was timestamped */
		if (unlikely(le16_to_cpu(cqe->fast_path_cqe.type_error_flags) &
		(1 << ETH_FAST_PATH_RX_CQE_PTP_PKT_SHIFT)))
		bnx2x_set_rx_ts(bp, skb);

		if (le16_to_cpu(cqe_fp->pars_flags.flags) &
		PARSING_FLAGS_VLAN)
		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
		@@ -2808,7 +2813,11 @@ int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
		/* Initialize Rx filter. */
		bnx2x_set_rx_mode_inner(bp);

		/* Start the Tx */
		if (bp->flags & PTP_SUPPORTED) {
		bnx2x_init_ptp(bp);
		bnx2x_configure_ptp_filters(bp);
		}
		/* Start Tx */
		switch (load_mode) {
		case LOAD_NORMAL:
		/* Tx queue should be only re-enabled */
		@@ -3833,6 +3842,20 @@ netdev_tx_t bnx2x_start_xmit(struct sk_buff skb, struct net_device dev)

		tx_start_bd->bd_flags.as_bitfield = ETH_TX_BD_FLAGS_START_BD;

		if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
		if (!(bp->flags & TX_TIMESTAMPING_EN)) {
		BNX2X_ERR("Tx timestamping was not enabled, this packet will not be timestamped\n");
		} else if (bp->ptp_tx_skb) {
		BNX2X_ERR("The device supports only a single outstanding packet to timestamp, this packet will not be timestamped\n");
		} else {
		skb_shinfo(skb)->tx_flags \|= SKBTX_IN_PROGRESS;
		/* schedule check for Tx timestamp */
		bp->ptp_tx_skb = skb_get(skb);
		bp->ptp_tx_start = jiffies;
		schedule_work(&bp->ptp_task);
		}
		}

		/* header nbd: indirectly zero other flags! */
		tx_start_bd->general_data = 1 << ETH_TX_START_BD_HDR_NBDS_SHIFT;

drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c

+41 −1

Original line number	Diff line number	Diff line
		@@ -3481,6 +3481,46 @@ static int bnx2x_set_channels(struct net_device *dev,
		return bnx2x_nic_load(bp, LOAD_NORMAL);
		}

		static int bnx2x_get_ts_info(struct net_device *dev,
		struct ethtool_ts_info *info)
		{
		struct bnx2x *bp = netdev_priv(dev);

		if (bp->flags & PTP_SUPPORTED) {
		info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE \|
		SOF_TIMESTAMPING_RX_SOFTWARE \|
		SOF_TIMESTAMPING_SOFTWARE \|
		SOF_TIMESTAMPING_TX_HARDWARE \|
		SOF_TIMESTAMPING_RX_HARDWARE \|
		SOF_TIMESTAMPING_RAW_HARDWARE;

		if (bp->ptp_clock)
		info->phc_index = ptp_clock_index(bp->ptp_clock);
		else
		info->phc_index = -1;

		info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) \|
		(1 << HWTSTAMP_FILTER_PTP_V1_L4_EVENT) \|
		(1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) \|
		(1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L4_SYNC) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L2_SYNC) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_EVENT) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_SYNC) \|
		(1 << HWTSTAMP_FILTER_PTP_V2_DELAY_REQ);

		info->tx_types = (1 << HWTSTAMP_TX_OFF)\|(1 << HWTSTAMP_TX_ON);

		return 0;
		}

		return ethtool_op_get_ts_info(dev, info);
		}

		static const struct ethtool_ops bnx2x_ethtool_ops = {
		.get_settings = bnx2x_get_settings,
		.set_settings = bnx2x_set_settings,
		@@ -3522,7 +3562,7 @@ static const struct ethtool_ops bnx2x_ethtool_ops = {
		.get_module_eeprom = bnx2x_get_module_eeprom,
		.get_eee = bnx2x_get_eee,
		.set_eee = bnx2x_set_eee,
		.get_ts_info = ethtool_op_get_ts_info,
		.get_ts_info = bnx2x_get_ts_info,
		};

		static const struct ethtool_ops bnx2x_vf_ethtool_ops = {

drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h

+43 −4

Original line number	Diff line number	Diff line
		@@ -3547,7 +3547,9 @@ struct client_init_rx_data {
		__le16 rx_cos_mask;
		__le16 silent_vlan_value;
		__le16 silent_vlan_mask;
		__le32 reserved6[2];
		u8 handle_ptp_pkts_flg;
		u8 reserved6[3];
		__le32 reserved7;
		};

		/*
		@@ -3616,7 +3618,9 @@ struct client_update_ramrod_data {
		u8 refuse_outband_vlan_change_flg;
		u8 tx_switching_flg;
		u8 tx_switching_change_flg;
		__le32 reserved1;
		u8 handle_ptp_pkts_flg;
		u8 handle_ptp_pkts_change_flg;
		__le16 reserved1;
		__le32 echo;
		};

		@@ -3850,8 +3854,10 @@ struct eth_fast_path_rx_cqe {
		#define ETH_FAST_PATH_RX_CQE_IP_BAD_XSUM_FLG_SHIFT 4
		#define ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG (0x1<<5)
		#define ETH_FAST_PATH_RX_CQE_L4_BAD_XSUM_FLG_SHIFT 5
		#define ETH_FAST_PATH_RX_CQE_RESERVED0 (0x3<<6)
		#define ETH_FAST_PATH_RX_CQE_RESERVED0_SHIFT 6
		#define ETH_FAST_PATH_RX_CQE_PTP_PKT (0x1<<6)
		#define ETH_FAST_PATH_RX_CQE_PTP_PKT_SHIFT 6
		#define ETH_FAST_PATH_RX_CQE_RESERVED0 (0x1<<7)
		#define ETH_FAST_PATH_RX_CQE_RESERVED0_SHIFT 7
		u8 status_flags;
		#define ETH_FAST_PATH_RX_CQE_RSS_HASH_TYPE (0x7<<0)
		#define ETH_FAST_PATH_RX_CQE_RSS_HASH_TYPE_SHIFT 0
		@@ -5658,6 +5664,16 @@ struct protocol_common_spe {
		union protocol_common_specific_data data;
		};

		/* The data for the Set Timesync Ramrod */
		struct set_timesync_ramrod_data {
		u8 drift_adjust_cmd;
		u8 offset_cmd;
		u8 add_sub_drift_adjust_value;
		u8 drift_adjust_value;
		u32 drift_adjust_period;
		struct regpair offset_delta;
		};

		/*
		* The send queue element
		*/
		@@ -5780,6 +5796,29 @@ struct tstorm_vf_zone_data {
		struct regpair reserved;
		};

		/* Add or Subtract Value for Set Timesync Ramrod */
		enum ts_add_sub_value {
		TS_SUB_VALUE,
		TS_ADD_VALUE,
		MAX_TS_ADD_SUB_VALUE
		};

		/* Drift-Adjust Commands for Set Timesync Ramrod */
		enum ts_drift_adjust_cmd {
		TS_DRIFT_ADJUST_KEEP,
		TS_DRIFT_ADJUST_SET,
		TS_DRIFT_ADJUST_RESET,
		MAX_TS_DRIFT_ADJUST_CMD
		};

		/* Offset Commands for Set Timesync Ramrod */
		enum ts_offset_cmd {
		TS_OFFSET_KEEP,
		TS_OFFSET_INC,
		TS_OFFSET_DEC,
		MAX_TS_OFFSET_CMD
		};

		/* Tunnel Mode */
		enum tunnel_mode {
		TUNN_MODE_NONE,

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+594 −5

File changed.

Preview size limit exceeded, changes collapsed.