Commit 803a4344 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:

====================
100GbE Intel Wired LAN Driver Updates 2021-10-14

Maciej Machnikowski says:

Extend the driver implementation to support PTP pins on E810-T and
derivative devices.

E810-T adapters are equipped with:
- 2 external bidirectional SMA connectors
- 1 internal TX U.FL shared with SMA1
- 1 internal RX U.FL shared with SMA2

The SMA and U.FL configuration is controlled by the external
multiplexer.

E810-T Derivatives are equipped with:
- 2 1PPS outputs on SDP20 and SDP22
- 2 1PPS inputs on SDP21 and SDP23
---
v2:
- Remove defensive programming check and simplify return statement
  (Patch 3)
- Remove unnecessary parentheses (Patch 4)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents dcebeb8b 2faf63b6

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

+32 −9
Original line number Diff line number Diff line
@@ -125,10 +125,13 @@ 
#define ice_for_each_vsi(pf, i) \

	for ((i) = 0; (i) < (pf)->num_alloc_vsi; (i)++)



/* Macros for each Tx/Rx ring in a VSI */

/* Macros for each Tx/Xdp/Rx ring in a VSI */

#define ice_for_each_txq(vsi, i) \

	for ((i) = 0; (i) < (vsi)->num_txq; (i)++)



#define ice_for_each_xdp_txq(vsi, i) \

	for ((i) = 0; (i) < (vsi)->num_xdp_txq; (i)++)



#define ice_for_each_rxq(vsi, i) \

	for ((i) = 0; (i) < (vsi)->num_rxq; (i)++)
@@ -167,6 +170,8 @@ enum ice_feature { 
	ICE_F_MAX

};



DECLARE_STATIC_KEY_FALSE(ice_xdp_locking_key);



struct ice_txq_meta {

	u32 q_teid;	/* Tx-scheduler element identifier */

	u16 q_id;	/* Entry in VSI's txq_map bitmap */
@@ -275,8 +280,8 @@ struct ice_vsi { 
	struct ice_sw *vsw;		 /* switch this VSI is on */

	struct ice_pf *back;		 /* back pointer to PF */

	struct ice_port_info *port_info; /* back pointer to port_info */

	struct ice_ring **rx_rings;	 /* Rx ring array */

	struct ice_ring **tx_rings;	 /* Tx ring array */

	struct ice_rx_ring **rx_rings;	 /* Rx ring array */

	struct ice_tx_ring **tx_rings;	 /* Tx ring array */

	struct ice_q_vector **q_vectors; /* q_vector array */



	irqreturn_t (*irq_handler)(int irq, void *data);
@@ -349,7 +354,7 @@ struct ice_vsi { 
	u16 qset_handle[ICE_MAX_TRAFFIC_CLASS];

	struct ice_tc_cfg tc_cfg;

	struct bpf_prog *xdp_prog;

	struct ice_ring **xdp_rings;	 /* XDP ring array */

	struct ice_tx_ring **xdp_rings;	 /* XDP ring array */

	unsigned long *af_xdp_zc_qps;	 /* tracks AF_XDP ZC enabled qps */

	u16 num_xdp_txq;		 /* Used XDP queues */

	u8 xdp_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */
@@ -580,25 +585,42 @@ static inline bool ice_is_xdp_ena_vsi(struct ice_vsi *vsi) 
	return !!vsi->xdp_prog;

}



static inline void ice_set_ring_xdp(struct ice_ring *ring)

static inline void ice_set_ring_xdp(struct ice_tx_ring *ring)

{

	ring->flags |= ICE_TX_FLAGS_RING_XDP;

}



/**

 * ice_xsk_pool - get XSK buffer pool bound to a ring

 * @ring: ring to use

 * @ring: Rx ring to use

 *

 * Returns a pointer to xdp_umem structure if there is a buffer pool present,

 * NULL otherwise.

 */

static inline struct xsk_buff_pool *ice_xsk_pool(struct ice_ring *ring)

static inline struct xsk_buff_pool *ice_xsk_pool(struct ice_rx_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	u16 qid = ring->q_index;



	if (ice_ring_is_xdp(ring))

		qid -= vsi->num_xdp_txq;

	if (!ice_is_xdp_ena_vsi(vsi) || !test_bit(qid, vsi->af_xdp_zc_qps))

		return NULL;



	return xsk_get_pool_from_qid(vsi->netdev, qid);

}



/**

 * ice_tx_xsk_pool - get XSK buffer pool bound to a ring

 * @ring: Tx ring to use

 *

 * Returns a pointer to xdp_umem structure if there is a buffer pool present,

 * NULL otherwise. Tx equivalent of ice_xsk_pool.

 */

static inline struct xsk_buff_pool *ice_tx_xsk_pool(struct ice_tx_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	u16 qid;



	qid = ring->q_index - vsi->num_xdp_txq;



	if (!ice_is_xdp_ena_vsi(vsi) || !test_bit(qid, vsi->af_xdp_zc_qps))

		return NULL;
@@ -699,6 +721,7 @@ int ice_up(struct ice_vsi *vsi); 
int ice_down(struct ice_vsi *vsi);

int ice_vsi_cfg(struct ice_vsi *vsi);

struct ice_vsi *ice_lb_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi);

int ice_vsi_determine_xdp_res(struct ice_vsi *vsi);

int ice_prepare_xdp_rings(struct ice_vsi *vsi, struct bpf_prog *prog);

int ice_destroy_xdp_rings(struct ice_vsi *vsi);

int

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

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ int ice_set_cpu_rx_rmap(struct ice_vsi *vsi) 
		return -EINVAL;



	base_idx = vsi->base_vector;

	for (i = 0; i < vsi->num_q_vectors; i++)

	ice_for_each_q_vector(vsi, i)

		if (irq_cpu_rmap_add(netdev->rx_cpu_rmap,

				     pf->msix_entries[base_idx + i].vector)) {

			ice_free_cpu_rx_rmap(vsi);

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

+31 −28
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ static int ice_vsi_alloc_q_vector(struct ice_vsi *vsi, u16 v_idx) 
	q_vector->rx.itr_setting = ICE_DFLT_RX_ITR;

	q_vector->tx.itr_mode = ITR_DYNAMIC;

	q_vector->rx.itr_mode = ITR_DYNAMIC;

	q_vector->tx.type = ICE_TX_CONTAINER;

	q_vector->rx.type = ICE_RX_CONTAINER;



	if (vsi->type == ICE_VSI_VF)

		goto out;
@@ -146,7 +148,8 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx) 
{

	struct ice_q_vector *q_vector;

	struct ice_pf *pf = vsi->back;

	struct ice_ring *ring;

	struct ice_tx_ring *tx_ring;

	struct ice_rx_ring *rx_ring;

	struct device *dev;



	dev = ice_pf_to_dev(pf);
@@ -156,10 +159,10 @@ static void ice_free_q_vector(struct ice_vsi *vsi, int v_idx) 
	}

	q_vector = vsi->q_vectors[v_idx];



	ice_for_each_ring(ring, q_vector->tx)

		ring->q_vector = NULL;

	ice_for_each_ring(ring, q_vector->rx)

		ring->q_vector = NULL;

	ice_for_each_tx_ring(tx_ring, q_vector->tx)

		tx_ring->q_vector = NULL;

	ice_for_each_rx_ring(rx_ring, q_vector->rx)

		rx_ring->q_vector = NULL;



	/* only VSI with an associated netdev is set up with NAPI */

	if (vsi->netdev)
@@ -201,12 +204,12 @@ static void ice_cfg_itr_gran(struct ice_hw *hw) 
}



/**

 * ice_calc_q_handle - calculate the queue handle

 * ice_calc_txq_handle - calculate the queue handle

 * @vsi: VSI that ring belongs to

 * @ring: ring to get the absolute queue index

 * @tc: traffic class number

 */

static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc)

static u16 ice_calc_txq_handle(struct ice_vsi *vsi, struct ice_tx_ring *ring, u8 tc)

{

	WARN_ONCE(ice_ring_is_xdp(ring) && tc, "XDP ring can't belong to TC other than 0\n");
@@ -218,7 +221,7 @@ static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc) 
}



/**

 * ice_eswitch_calc_q_handle

 * ice_eswitch_calc_txq_handle

 * @ring: pointer to ring which unique index is needed

 *

 * To correctly work with many netdevs ring->q_index of Tx rings on switchdev
@@ -228,7 +231,7 @@ static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc) 
 * Return ICE_INVAL_Q_INDEX when index wasn't found. Should never happen,

 * because VSI is get from ring->vsi, so it has to be present in this VSI.

 */

static u16 ice_eswitch_calc_q_handle(struct ice_ring *ring)

static u16 ice_eswitch_calc_txq_handle(struct ice_tx_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	int i;
@@ -248,7 +251,7 @@ static u16 ice_eswitch_calc_q_handle(struct ice_ring *ring) 
 * This enables/disables XPS for a given Tx descriptor ring

 * based on the TCs enabled for the VSI that ring belongs to.

 */

static void ice_cfg_xps_tx_ring(struct ice_ring *ring)

static void ice_cfg_xps_tx_ring(struct ice_tx_ring *ring)

{

	if (!ring->q_vector || !ring->netdev)

		return;
@@ -270,7 +273,7 @@ static void ice_cfg_xps_tx_ring(struct ice_ring *ring) 
 * Configure the Tx descriptor ring in TLAN context.

 */

static void

ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)

ice_setup_tx_ctx(struct ice_tx_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)

{

	struct ice_vsi *vsi = ring->vsi;

	struct ice_hw *hw = &vsi->back->hw;
@@ -282,7 +285,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	/* Transmit Queue Length */

	tlan_ctx->qlen = ring->count;



	ice_set_cgd_num(tlan_ctx, ring);

	ice_set_cgd_num(tlan_ctx, ring->dcb_tc);



	/* PF number */

	tlan_ctx->pf_num = hw->pf_id;
@@ -339,7 +342,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int ice_rx_offset(struct ice_ring *rx_ring)

static unsigned int ice_rx_offset(struct ice_rx_ring *rx_ring)

{

	if (ice_ring_uses_build_skb(rx_ring))

		return ICE_SKB_PAD;
@@ -355,7 +358,7 @@ static unsigned int ice_rx_offset(struct ice_ring *rx_ring) 
 *

 * Configure the Rx descriptor ring in RLAN context.

 */

static int ice_setup_rx_ctx(struct ice_ring *ring)

static int ice_setup_rx_ctx(struct ice_rx_ring *ring)

{

	int chain_len = ICE_MAX_CHAINED_RX_BUFS;

	struct ice_vsi *vsi = ring->vsi;
@@ -466,7 +469,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring) 
 *

 * Return 0 on success and a negative value on error.

 */

int ice_vsi_cfg_rxq(struct ice_ring *ring)

int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)

{

	struct device *dev = ice_pf_to_dev(ring->vsi->back);

	u16 num_bufs = ICE_DESC_UNUSED(ring);
@@ -687,16 +690,16 @@ void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi) 
		tx_rings_per_v = (u8)DIV_ROUND_UP(tx_rings_rem,

						  q_vectors - v_id);

		q_vector->num_ring_tx = tx_rings_per_v;

		q_vector->tx.ring = NULL;

		q_vector->tx.tx_ring = NULL;

		q_vector->tx.itr_idx = ICE_TX_ITR;

		q_base = vsi->num_txq - tx_rings_rem;



		for (q_id = q_base; q_id < (q_base + tx_rings_per_v); q_id++) {

			struct ice_ring *tx_ring = vsi->tx_rings[q_id];

			struct ice_tx_ring *tx_ring = vsi->tx_rings[q_id];



			tx_ring->q_vector = q_vector;

			tx_ring->next = q_vector->tx.ring;

			q_vector->tx.ring = tx_ring;

			tx_ring->next = q_vector->tx.tx_ring;

			q_vector->tx.tx_ring = tx_ring;

		}

		tx_rings_rem -= tx_rings_per_v;
@@ -704,16 +707,16 @@ void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi) 
		rx_rings_per_v = (u8)DIV_ROUND_UP(rx_rings_rem,

						  q_vectors - v_id);

		q_vector->num_ring_rx = rx_rings_per_v;

		q_vector->rx.ring = NULL;

		q_vector->rx.rx_ring = NULL;

		q_vector->rx.itr_idx = ICE_RX_ITR;

		q_base = vsi->num_rxq - rx_rings_rem;



		for (q_id = q_base; q_id < (q_base + rx_rings_per_v); q_id++) {

			struct ice_ring *rx_ring = vsi->rx_rings[q_id];

			struct ice_rx_ring *rx_ring = vsi->rx_rings[q_id];



			rx_ring->q_vector = q_vector;

			rx_ring->next = q_vector->rx.ring;

			q_vector->rx.ring = rx_ring;

			rx_ring->next = q_vector->rx.rx_ring;

			q_vector->rx.rx_ring = rx_ring;

		}

		rx_rings_rem -= rx_rings_per_v;

	}
@@ -738,7 +741,7 @@ void ice_vsi_free_q_vectors(struct ice_vsi *vsi) 
 * @qg_buf: queue group buffer

 */

int

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring,

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_tx_ring *ring,

		struct ice_aqc_add_tx_qgrp *qg_buf)

{

	u8 buf_len = struct_size(qg_buf, txqs, 1);
@@ -774,12 +777,12 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, 
	 * TC into the VSI Tx ring

	 */

	if (vsi->type == ICE_VSI_SWITCHDEV_CTRL) {

		ring->q_handle = ice_eswitch_calc_q_handle(ring);

		ring->q_handle = ice_eswitch_calc_txq_handle(ring);



		if (ring->q_handle == ICE_INVAL_Q_INDEX)

			return -ENODEV;

	} else {

		ring->q_handle = ice_calc_q_handle(vsi, ring, tc);

		ring->q_handle = ice_calc_txq_handle(vsi, ring, tc);

	}



	status = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,
@@ -904,7 +907,7 @@ void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector) 
 */

int

ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

		     u16 rel_vmvf_num, struct ice_ring *ring,

		     u16 rel_vmvf_num, struct ice_tx_ring *ring,

		     struct ice_txq_meta *txq_meta)

{

	struct ice_pf *pf = vsi->back;
@@ -961,7 +964,7 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, 
 * are needed for stopping Tx queue

 */

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_ring *ring,

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_tx_ring *ring,

		  struct ice_txq_meta *txq_meta)

{

	u8 tc;

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

+4 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#include "ice.h"



int ice_vsi_cfg_rxq(struct ice_ring *ring);

int ice_vsi_cfg_rxq(struct ice_rx_ring *ring);

int __ice_vsi_get_qs(struct ice_qs_cfg *qs_cfg);

int

ice_vsi_ctrl_one_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx, bool wait);
@@ -15,7 +15,7 @@ int ice_vsi_alloc_q_vectors(struct ice_vsi *vsi); 
void ice_vsi_map_rings_to_vectors(struct ice_vsi *vsi);

void ice_vsi_free_q_vectors(struct ice_vsi *vsi);

int

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring,

ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_tx_ring *ring,

		struct ice_aqc_add_tx_qgrp *qg_buf);

void ice_cfg_itr(struct ice_hw *hw, struct ice_q_vector *q_vector);

void
@@ -25,9 +25,9 @@ ice_cfg_rxq_interrupt(struct ice_vsi *vsi, u16 rxq, u16 msix_idx, u16 itr_idx); 
void ice_trigger_sw_intr(struct ice_hw *hw, struct ice_q_vector *q_vector);

int

ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,

		     u16 rel_vmvf_num, struct ice_ring *ring,

		     u16 rel_vmvf_num, struct ice_tx_ring *ring,

		     struct ice_txq_meta *txq_meta);

void

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_ring *ring,

ice_fill_txq_meta(struct ice_vsi *vsi, struct ice_tx_ring *ring,

		  struct ice_txq_meta *txq_meta);

#endif /* _ICE_BASE_H_ */

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

+5 −4
Original line number Diff line number Diff line
@@ -194,17 +194,18 @@ u8 ice_dcb_get_tc(struct ice_vsi *vsi, int queue_index) 
 */

void ice_vsi_cfg_dcb_rings(struct ice_vsi *vsi)

{

	struct ice_ring *tx_ring, *rx_ring;

	struct ice_tx_ring *tx_ring;

	struct ice_rx_ring *rx_ring;

	u16 qoffset, qcount;

	int i, n;



	if (!test_bit(ICE_FLAG_DCB_ENA, vsi->back->flags)) {

		/* Reset the TC information */

		for (i = 0; i < vsi->num_txq; i++) {

		ice_for_each_txq(vsi, i) {

			tx_ring = vsi->tx_rings[i];

			tx_ring->dcb_tc = 0;

		}

		for (i = 0; i < vsi->num_rxq; i++) {

		ice_for_each_rxq(vsi, i) {

			rx_ring = vsi->rx_rings[i];

			rx_ring->dcb_tc = 0;

		}
@@ -824,7 +825,7 @@ void ice_update_dcb_stats(struct ice_pf *pf) 
 * tag will already be configured with the correct ID and priority bits

 */

void

ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring,

ice_tx_prepare_vlan_flags_dcb(struct ice_tx_ring *tx_ring,

			      struct ice_tx_buf *first)

{

	struct sk_buff *skb = first->skb;