Commit dfb011d2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-ptp' 



Yuval Mintz says:

====================
qed*: Add support for PTP

This patch series adds required changes for qed/qede drivers for
supporting the IEEE Precision Time Protocol (PTP).

Changes from previous versions:
v7: Fixed Kbuild robot warnings.

v6: Corrected broken loop iteration in previous version.
    Reduced approximation error of adjfreq.

v5: Removed two divisions from the adjust-frequency loop.
    Resulting logic would use 8 divisions [instead of 24].

v4: Remove the loop iteration for value '0' in the qed_ptp_hw_adjfreq()
    implementation.

v3: Use div_s64 for 64-bit divisions as do_div gives error for signed
    types.
    Incorporated review comments from Richard Cochran.
      - Clear timestamp resgisters as soon as timestamp is read.
      - Use shift operation in the place of 'divide by 16'.

v2: Use do_div for 64-bit divisions.
====================

Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b93f79be 4c55215c

drivers/net/ethernet/qlogic/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ config QED_SRIOV 
config QEDE

	tristate "QLogic QED 25/40/100Gb Ethernet NIC"

	depends on QED

	imply PTP_1588_CLOCK

	---help---

	  This enables the support for ...

drivers/net/ethernet/qlogic/qed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ obj-$(CONFIG_QED) := qed.o 


qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \

	 qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o \

	 qed_selftest.o qed_dcbx.o qed_debug.o

	 qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o

qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o

qed-$(CONFIG_QED_LL2) += qed_ll2.o

qed-$(CONFIG_QED_RDMA) += qed_roce.o

drivers/net/ethernet/qlogic/qed/qed.h

+2 −0
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ struct qed_hwfn { 
	u8 dcbx_no_edpm;

	u8 db_bar_no_edpm;



	/* p_ptp_ptt is valid for leading HWFN only */

	struct qed_ptt *p_ptp_ptt;

	struct qed_simd_fp_handler	simd_proto_handler[64];



#ifdef CONFIG_QED_SRIOV

drivers/net/ethernet/qlogic/qed/qed_l2.c

+5 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ int qed_sp_eth_vport_start(struct qed_hwfn *p_hwfn, 
	p_ramrod->vport_id	= abs_vport_id;



	p_ramrod->mtu			= cpu_to_le16(p_params->mtu);

	p_ramrod->handle_ptp_pkts	= p_params->handle_ptp_pkts;

	p_ramrod->inner_vlan_removal_en	= p_params->remove_inner_vlan;

	p_ramrod->drop_ttl0_en		= p_params->drop_ttl0;

	p_ramrod->untagged		= p_params->only_untagged;
@@ -1886,6 +1887,7 @@ static int qed_start_vport(struct qed_dev *cdev, 
		start.drop_ttl0 = params->drop_ttl0;

		start.opaque_fid = p_hwfn->hw_info.opaque_fid;

		start.concrete_fid = p_hwfn->hw_info.concrete_fid;

		start.handle_ptp_pkts = params->handle_ptp_pkts;

		start.vport_id = params->vport_id;

		start.max_buffers_per_cqe = 16;

		start.mtu = params->mtu;
@@ -2328,6 +2330,8 @@ extern const struct qed_iov_hv_ops qed_iov_ops_pass; 
extern const struct qed_eth_dcbnl_ops qed_dcbnl_ops_pass;

#endif



extern const struct qed_eth_ptp_ops qed_ptp_ops_pass;



static const struct qed_eth_ops qed_eth_ops_pass = {

	.common = &qed_common_ops_pass,

#ifdef CONFIG_QED_SRIOV
@@ -2336,6 +2340,7 @@ static const struct qed_eth_ops qed_eth_ops_pass = { 
#ifdef CONFIG_DCB

	.dcb = &qed_dcbnl_ops_pass,

#endif

	.ptp = &qed_ptp_ops_pass,

	.fill_dev_info = &qed_fill_eth_dev_info,

	.register_ops = &qed_register_eth_ops,

	.check_mac = &qed_check_mac,

drivers/net/ethernet/qlogic/qed/qed_l2.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ struct qed_sp_vport_start_params { 
	enum qed_tpa_mode tpa_mode;

	bool remove_inner_vlan;

	bool tx_switching;

	bool handle_ptp_pkts;

	bool only_untagged;

	bool drop_ttl0;

	u8 max_buffers_per_cqe;

CRA Git | Maintained and supported by SUSTech CRA and CCSE