Commit b3ef1550 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-06-07

This series contains updates to virtchnl header file and ice driver.

Brett adds capability bits to virtchnl to specify whether a primary or
secondary MAC address is being requested and adds the implementation to
ice. He also adds storing of VF MAC address so that it will be preserved
across reboots of VM and refactors VF queue configuration to remove the
expectation that configuration be done all at once.

Krzysztof refactors ice_setup_rx_ctx() to remove configuration not
related to Rx context into a new function, ice_vsi_cfg_rxq().

Liwei Song extends the wait time for the global config timeout.

Salil Mehta refactors code in ice_vsi_set_num_qs() to remove an
unnecessary call when the user has requested specific number of Rx or Tx
queues.

Jesse converts define macros to static inlines for NOP configurations.

Jake adds messaging when devlink fails to read device capabilities and
when pldmfw cannot find the requested firmware. Adds a wait for reset
completion when reporting devlink info and reinitializes NVM during
rebuild to ensure values are current.

Ani adds detection and reporting of modules exceeding supported power
levels and changes an error message to a debug message.

Paul fixes a clang warning for deadcode.DeadStores.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8c3f3362 7e94090a

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

+3 −0
Original line number Diff line number Diff line
@@ -393,6 +393,7 @@ enum ice_pf_flags { 
	ICE_FLAG_TOTAL_PORT_SHUTDOWN_ENA,

	ICE_FLAG_NO_MEDIA,

	ICE_FLAG_FW_LLDP_AGENT,

	ICE_FLAG_MOD_POWER_UNSUPPORTED,

	ICE_FLAG_ETHTOOL_CTXT,		/* set when ethtool holds RTNL lock */

	ICE_FLAG_LEGACY_RX,

	ICE_FLAG_VF_TRUE_PROMISC_ENA,
@@ -456,6 +457,8 @@ struct ice_pf { 
	struct hlist_head aq_wait_list;

	wait_queue_head_t aq_wait_queue;



	wait_queue_head_t reset_wait_queue;



	u32 hw_csum_rx_error;

	u16 oicr_idx;		/* Other interrupt cause MSIX vector index */

	u16 num_avail_sw_msix;	/* remaining MSIX SW vectors left unclaimed */

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

+4 −2
Original line number Diff line number Diff line
@@ -1123,7 +1123,9 @@ struct ice_aqc_get_link_status_data { 
#define ICE_AQ_LINK_TOPO_UNDRUTIL_PRT	BIT(5)

#define ICE_AQ_LINK_TOPO_UNDRUTIL_MEDIA	BIT(6)

#define ICE_AQ_LINK_TOPO_UNSUPP_MEDIA	BIT(7)

	u8 reserved1;

	u8 link_cfg_err;

#define ICE_AQ_LINK_MODULE_POWER_UNSUPPORTED	BIT(5)

#define ICE_AQ_LINK_INVAL_MAX_POWER_LIMIT	BIT(7)

	u8 link_info;

#define ICE_AQ_LINK_UP			BIT(0)	/* Link Status */

#define ICE_AQ_LINK_FAULT		BIT(1)
@@ -1166,7 +1168,7 @@ struct ice_aqc_get_link_status_data { 
#define ICE_AQ_CFG_PACING_TYPE_FIXED	ICE_AQ_CFG_PACING_TYPE_M

	/* External Device Power Ability */

	u8 power_desc;

#define ICE_AQ_PWR_CLASS_M		0x3

#define ICE_AQ_PWR_CLASS_M		0x3F

#define ICE_AQ_LINK_PWR_BASET_LOW_HIGH	0

#define ICE_AQ_LINK_PWR_BASET_HIGH	1

#define ICE_AQ_LINK_PWR_QSFP_CLASS_1	0

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

+6 −6
Original line number Diff line number Diff line
@@ -52,12 +52,12 @@ bool 
ice_is_arfs_using_perfect_flow(struct ice_hw *hw,

			       enum ice_fltr_ptype flow_type);

#else

#define ice_sync_arfs_fltrs(pf) do {} while (0)

#define ice_init_arfs(vsi) do {} while (0)

#define ice_clear_arfs(vsi) do {} while (0)

#define ice_remove_arfs(pf) do {} while (0)

#define ice_free_cpu_rx_rmap(vsi) do {} while (0)

#define ice_rebuild_arfs(pf) do {} while (0)

static inline void ice_clear_arfs(struct ice_vsi *vsi) { }

static inline void ice_free_cpu_rx_rmap(struct ice_vsi *vsi) { }

static inline void ice_init_arfs(struct ice_vsi *vsi) { }

static inline void ice_sync_arfs_fltrs(struct ice_pf *pf) { }

static inline void ice_remove_arfs(struct ice_pf *pf) { }

static inline void ice_rebuild_arfs(struct ice_pf *pf) { }



static inline int ice_set_cpu_rx_rmap(struct ice_vsi __always_unused *vsi)

{

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

+73 −47
Original line number Diff line number Diff line
@@ -319,11 +319,9 @@ static unsigned int ice_rx_offset(struct ice_ring *rx_ring) 
 *

 * Configure the Rx descriptor ring in RLAN context.

 */

int ice_setup_rx_ctx(struct ice_ring *ring)

static int ice_setup_rx_ctx(struct ice_ring *ring)

{

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

	int chain_len = ICE_MAX_CHAINED_RX_BUFS;

	u16 num_bufs = ICE_DESC_UNUSED(ring);

	struct ice_vsi *vsi = ring->vsi;

	u32 rxdid = ICE_RXDID_FLEX_NIC;

	struct ice_rlan_ctx rlan_ctx;
@@ -339,48 +337,6 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	/* clear the context structure first */

	memset(&rlan_ctx, 0, sizeof(rlan_ctx));



	ring->rx_buf_len = vsi->rx_buf_len;



	if (ring->vsi->type == ICE_VSI_PF) {

		if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

			/* coverity[check_return] */

			xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,

					 ring->q_index, ring->q_vector->napi.napi_id);



		ring->xsk_pool = ice_xsk_pool(ring);

		if (ring->xsk_pool) {

			xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);



			ring->rx_buf_len =

				xsk_pool_get_rx_frame_size(ring->xsk_pool);

			/* For AF_XDP ZC, we disallow packets to span on

			 * multiple buffers, thus letting us skip that

			 * handling in the fast-path.

			 */

			chain_len = 1;

			err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

							 MEM_TYPE_XSK_BUFF_POOL,

							 NULL);

			if (err)

				return err;

			xsk_pool_set_rxq_info(ring->xsk_pool, &ring->xdp_rxq);



			dev_info(dev, "Registered XDP mem model MEM_TYPE_XSK_BUFF_POOL on Rx ring %d\n",

				 ring->q_index);

		} else {

			if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

				/* coverity[check_return] */

				xdp_rxq_info_reg(&ring->xdp_rxq,

						 ring->netdev,

						 ring->q_index, ring->q_vector->napi.napi_id);



			err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

							 MEM_TYPE_PAGE_SHARED,

							 NULL);

			if (err)

				return err;

		}

	}

	/* Receive Queue Base Address.

	 * Indicates the starting address of the descriptor queue defined in

	 * 128 Byte units.
@@ -415,6 +371,12 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	 */

	rlan_ctx.showiv = 0;



	/* For AF_XDP ZC, we disallow packets to span on

	 * multiple buffers, thus letting us skip that

	 * handling in the fast-path.

	 */

	if (ring->xsk_pool)

		chain_len = 1;

	/* Max packet size for this queue - must not be set to a larger value

	 * than 5 x DBUF

	 */
@@ -438,7 +400,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	/* Absolute queue number out of 2K needs to be passed */

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

	if (err) {

		dev_err(dev, "Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",

		dev_err(ice_pf_to_dev(vsi->back), "Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\n",

			pf_q, err);

		return -EIO;

	}
@@ -458,6 +420,66 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	ring->tail = hw->hw_addr + QRX_TAIL(pf_q);

	writel(0, ring->tail);



	return 0;

}



/**

 * ice_vsi_cfg_rxq - Configure an Rx queue

 * @ring: the ring being configured

 *

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

 */

int ice_vsi_cfg_rxq(struct ice_ring *ring)

{

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

	u16 num_bufs = ICE_DESC_UNUSED(ring);

	int err;



	ring->rx_buf_len = ring->vsi->rx_buf_len;



	if (ring->vsi->type == ICE_VSI_PF) {

		if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

			/* coverity[check_return] */

			xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,

					 ring->q_index, ring->q_vector->napi.napi_id);



		ring->xsk_pool = ice_xsk_pool(ring);

		if (ring->xsk_pool) {

			xdp_rxq_info_unreg_mem_model(&ring->xdp_rxq);



			ring->rx_buf_len =

				xsk_pool_get_rx_frame_size(ring->xsk_pool);

			err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

							 MEM_TYPE_XSK_BUFF_POOL,

							 NULL);

			if (err)

				return err;

			xsk_pool_set_rxq_info(ring->xsk_pool, &ring->xdp_rxq);



			dev_info(dev, "Registered XDP mem model MEM_TYPE_XSK_BUFF_POOL on Rx ring %d\n",

				 ring->q_index);

		} else {

			if (!xdp_rxq_info_is_reg(&ring->xdp_rxq))

				/* coverity[check_return] */

				xdp_rxq_info_reg(&ring->xdp_rxq,

						 ring->netdev,

						 ring->q_index, ring->q_vector->napi.napi_id);



			err = xdp_rxq_info_reg_mem_model(&ring->xdp_rxq,

							 MEM_TYPE_PAGE_SHARED,

							 NULL);

			if (err)

				return err;

		}

	}



	err = ice_setup_rx_ctx(ring);

	if (err) {

		dev_err(dev, "ice_setup_rx_ctx failed for RxQ %d, err %d\n",

			ring->q_index, err);

		return err;

	}



	if (ring->xsk_pool) {

		bool ok;
@@ -470,9 +492,13 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
		}



		ok = ice_alloc_rx_bufs_zc(ring, num_bufs);

		if (!ok)

		if (!ok) {

			u16 pf_q = ring->vsi->rxq_map[ring->q_index];



			dev_info(dev, "Failed to allocate some buffers on XSK buffer pool enabled Rx ring %d (pf_q %d)\n",

				 ring->q_index, pf_q);

		}



		return 0;

	}

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

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


#include "ice.h"



int ice_setup_rx_ctx(struct ice_ring *ring);

int ice_vsi_cfg_rxq(struct ice_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);