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

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 



Tony Nguyen says:

====================
Jake Keller says:

====================
100GbE Intel Wired LAN Driver Updates 2021-06-11

Extend the ice driver to support basic PTP clock functionality for E810
devices.

This includes some tangential work required to setup the sideband queue and
driver shared parameters as well.

This series only supports E810-based devices. This is because other devices
based on the E822 MAC use a different and more complex PHY.

The low level device functionality is kept within ice_ptp_hw.c and is
designed to be extensible for supporting E822 devices in a future series.

This series also only supports very basic functionality including the
ptp_clock device and timestamping. Support for configuring periodic outputs
and external input timestamps will be implemented in a future series.

There are a couple of potential "what? why?" bits in this series I want to
point out:

1) the PTP hardware functionality is shared between multiple functions. This
means that the same clock registers are shared across multiple PFs. In order
to avoid contention or clashing between PFs, firmware assigns "ownership" to
one PF, while other PFs are merely "associated" with the timer. Because we
share the hardware resource, only the clock owner will allocate and register
a PTP clock device. Other PFs determine the appropriate PTP clock index to
report by using a firmware interface to read a shared parameter that is set
by the owning PF.

2) the ice driver uses its own kthread instead of using do_aux_work. This is
because the periodic and asynchronous tasks are necessary for all PFs, but
only one PF will allocate the clock.

The series is broken up into functional pieces to allow easy review.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5aa3bd9b ea9b847c

drivers/net/ethernet/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ config ICE 
	select DIMLIB

	select NET_DEVLINK

	select PLDMFW

	imply PTP_1588_CLOCK

	help

	  This driver supports Intel(R) Ethernet Connection E800 Series of

	  devices.  For more information on how to identify your adapter, go

drivers/net/ethernet/intel/ice/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ ice-y := ice_main.o \ 
	 ice_ethtool.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_allowlist.o

ice-$(CONFIG_PCI_IOV) += ice_virtchnl_pf.o ice_sriov.o ice_virtchnl_fdir.o

ice-$(CONFIG_PTP_1588_CLOCK) += ice_ptp.o ice_ptp_hw.o

ice-$(CONFIG_DCB) += ice_dcb.o ice_dcb_nl.o ice_dcb_lib.o

ice-$(CONFIG_RFS_ACCEL) += ice_arfs.o

ice-$(CONFIG_XDP_SOCKETS) += ice_xsk.o

drivers/net/ethernet/intel/ice/ice.h

+7 −1
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "ice_idc_int.h"

#include "ice_virtchnl_pf.h"

#include "ice_sriov.h"

#include "ice_ptp.h"

#include "ice_fdir.h"

#include "ice_xsk.h"

#include "ice_arfs.h"
@@ -74,8 +75,9 @@ 


#define ICE_DFLT_TRAFFIC_CLASS	BIT(0)

#define ICE_INT_NAME_STR_LEN	(IFNAMSIZ + 16)

#define ICE_AQ_LEN		64

#define ICE_AQ_LEN		192

#define ICE_MBXSQ_LEN		64

#define ICE_SBQ_LEN		64

#define ICE_MIN_LAN_TXRX_MSIX	1

#define ICE_MIN_LAN_OICR_MSIX	1

#define ICE_MIN_MSIX		(ICE_MIN_LAN_TXRX_MSIX + ICE_MIN_LAN_OICR_MSIX)
@@ -227,6 +229,7 @@ enum ice_pf_state { 
	ICE_STATE_NOMINAL_CHECK_BITS,

	ICE_ADMINQ_EVENT_PENDING,

	ICE_MAILBOXQ_EVENT_PENDING,

	ICE_SIDEBANDQ_EVENT_PENDING,

	ICE_MDD_EVENT_PENDING,

	ICE_VFLR_EVENT_PENDING,

	ICE_FLTR_OVERFLOW_PROMISC,
@@ -387,6 +390,8 @@ enum ice_pf_flags { 
	ICE_FLAG_DCB_CAPABLE,

	ICE_FLAG_DCB_ENA,

	ICE_FLAG_FD_ENA,

	ICE_FLAG_PTP_SUPPORTED,		/* PTP is supported by NVM */

	ICE_FLAG_PTP,			/* PTP is enabled by software */

	ICE_FLAG_AUX_ENA,

	ICE_FLAG_ADV_FEATURES,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,
@@ -449,6 +454,7 @@ struct ice_pf { 
	struct mutex sw_mutex;		/* lock for protecting VSI alloc flow */

	struct mutex tc_mutex;		/* lock to protect TC changes */

	u32 msg_enable;

	struct ice_ptp ptp;

	u16 num_rdma_msix;		/* Total MSIX vectors for RDMA driver */

	u16 rdma_base_vector;

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+41 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct ice_aqc_list_caps_elem { 
#define ICE_AQC_CAPS_TXQS				0x0042

#define ICE_AQC_CAPS_MSIX				0x0043

#define ICE_AQC_CAPS_FD					0x0045

#define ICE_AQC_CAPS_1588				0x0046

#define ICE_AQC_CAPS_MAX_MTU				0x0047

#define ICE_AQC_CAPS_NVM_VER				0x0048

#define ICE_AQC_CAPS_PENDING_NVM_VER			0x0049
@@ -1611,6 +1612,15 @@ struct ice_aqc_get_set_rss_lut { 
	__le32 addr_low;

};



/* Sideband Control Interface Commands */

/* Neighbor Device Request (indirect 0x0C00); also used for the response. */

struct ice_aqc_neigh_dev_req {

	__le16 sb_data_len;

	u8 reserved[6];

	__le32 addr_high;

	__le32 addr_low;

};



/* Add Tx LAN Queues (indirect 0x0C30) */

struct ice_aqc_add_txqs {

	u8 num_qgrps;
@@ -1843,6 +1853,30 @@ struct ice_aqc_get_pkg_info_resp { 
	struct ice_aqc_get_pkg_info pkg_info[];

};



/* Driver Shared Parameters (direct, 0x0C90) */

struct ice_aqc_driver_shared_params {

	u8 set_or_get_op;

#define ICE_AQC_DRIVER_PARAM_OP_MASK		BIT(0)

#define ICE_AQC_DRIVER_PARAM_SET		0

#define ICE_AQC_DRIVER_PARAM_GET		1

	u8 param_indx;

#define ICE_AQC_DRIVER_PARAM_MAX_IDX		15

	u8 rsvd[2];

	__le32 param_val;

	__le32 addr_high;

	__le32 addr_low;

};



enum ice_aqc_driver_params {

	/* OS clock index for PTP timer Domain 0 */

	ICE_AQC_DRIVER_PARAM_CLK_IDX_TMR0 = 0,

	/* OS clock index for PTP timer Domain 1 */

	ICE_AQC_DRIVER_PARAM_CLK_IDX_TMR1,



	/* Add new parameters above */

	ICE_AQC_DRIVER_PARAM_MAX = 16,

};



/* Lan Queue Overflow Event (direct, 0x1001) */

struct ice_aqc_event_lan_overflow {

	__le32 prtdcb_ruptq;
@@ -1911,6 +1945,7 @@ struct ice_aq_desc { 
		struct ice_aqc_lldp_filter_ctrl lldp_filter_ctrl;

		struct ice_aqc_get_set_rss_lut get_set_rss_lut;

		struct ice_aqc_get_set_rss_key get_set_rss_key;

		struct ice_aqc_neigh_dev_req neigh_dev;

		struct ice_aqc_add_txqs add_txqs;

		struct ice_aqc_dis_txqs dis_txqs;

		struct ice_aqc_add_rdma_qset add_rdma_qset;
@@ -1919,6 +1954,7 @@ struct ice_aq_desc { 
		struct ice_aqc_fw_logging fw_logging;

		struct ice_aqc_get_clear_fw_log get_clear_fw_log;

		struct ice_aqc_download_pkg download_pkg;

		struct ice_aqc_driver_shared_params drv_shared_params;

		struct ice_aqc_set_mac_lb set_mac_lb;

		struct ice_aqc_alloc_free_res_cmd sw_res_ctrl;

		struct ice_aqc_set_mac_cfg set_mac_cfg;
@@ -2059,6 +2095,9 @@ enum ice_adminq_opc { 
	ice_aqc_opc_get_rss_key				= 0x0B04,

	ice_aqc_opc_get_rss_lut				= 0x0B05,



	/* Sideband Control Interface commands */

	ice_aqc_opc_neighbour_device_request		= 0x0C00,



	/* Tx queue handling commands/events */

	ice_aqc_opc_add_txqs				= 0x0C30,

	ice_aqc_opc_dis_txqs				= 0x0C31,
@@ -2069,6 +2108,8 @@ enum ice_adminq_opc { 
	ice_aqc_opc_update_pkg				= 0x0C42,

	ice_aqc_opc_get_pkg_info_list			= 0x0C43,



	ice_aqc_opc_driver_shared_params		= 0x0C90,



	/* Standalone Commands/Events */

	ice_aqc_opc_event_lan_overflow			= 0x1001,

drivers/net/ethernet/intel/ice/ice_base.c

+12 −2
Original line number Diff line number Diff line
@@ -287,6 +287,15 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	/* make sure the context is associated with the right VSI */

	tlan_ctx->src_vsi = ice_get_hw_vsi_num(hw, vsi->idx);



	/* Restrict Tx timestamps to the PF VSI */

	switch (vsi->type) {

	case ICE_VSI_PF:

		tlan_ctx->tsyn_ena = 1;

		break;

	default:

		break;

	}



	tlan_ctx->tso_ena = ICE_TX_LEGACY;

	tlan_ctx->tso_qnum = pf_q;
@@ -393,9 +402,10 @@ static int ice_setup_rx_ctx(struct ice_ring *ring) 
	 * of same priority

	 */

	if (vsi->type != ICE_VSI_VF)

		ice_write_qrxflxp_cntxt(hw, pf_q, rxdid, 0x3);

		ice_write_qrxflxp_cntxt(hw, pf_q, rxdid, 0x3, true);

	else

		ice_write_qrxflxp_cntxt(hw, pf_q, ICE_RXDID_LEGACY_1, 0x3);

		ice_write_qrxflxp_cntxt(hw, pf_q, ICE_RXDID_LEGACY_1, 0x3,

					false);



	/* Absolute queue number out of 2K needs to be passed */

	err = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);