Commit 247ca657 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-03-31

This series contains updates to ice driver only.

Benita adds support for XPS.

Ani moves netdev registration to the end of probe to prevent use before
the interface is ready and moves up an error check to possibly avoid
an unneeded call. He also consolidates the VSI state and flag fields to
a single field.

Dan changes the segment where package information is pulled.

Paul S ensures correct ITR values are set when increasing ring size.

Paul G rewords a link misconfiguration message as this could be
expected.

Bruce removes setting an unnecessary AQ flag and corrects a memory
allocation call. Also fixes checkpatch issues for 'COMPLEX_MACRO'.

Qi aligns PTYPE bitmap naming by adding 'ptype' prefix to the bitmaps
missing it.

Brett removes limiting Rx queue mapping to RSS size as there is not a
dependency on this. He also refactors RSS configuration by introducing
individual functions for LUT and key configuration and by passing a
structure containing pertinent information instead of individual
arguments.

Tony corrects a comment block to follow netdev style.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 04080634 a07cc178

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

+16 −12
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#define ICE_INVAL_Q_INDEX	0xffff

#define ICE_INVAL_VFID		256



#define ICE_MAX_RXQS_PER_TC		256	/* Used when setting VSI context per TC Rx queues */

#define ICE_MAX_RESET_WAIT		20



#define ICE_VSIQF_HKEY_ARRAY_SIZE	((VSIQF_HKEY_MAX_INDEX + 1) *	4)
@@ -192,7 +193,7 @@ struct ice_sw { 
	u8 dflt_vsi_ena:1;	/* true if above dflt_vsi is enabled */

};



enum ice_state {

enum ice_pf_state {

	__ICE_TESTING,

	__ICE_DOWN,

	__ICE_NEEDS_RESTART,
@@ -235,12 +236,14 @@ enum ice_state { 
	__ICE_STATE_NBITS		/* must be last */

};



enum ice_vsi_flags {

	ICE_VSI_FLAG_UMAC_FLTR_CHANGED,

	ICE_VSI_FLAG_MMAC_FLTR_CHANGED,

	ICE_VSI_FLAG_VLAN_FLTR_CHANGED,

	ICE_VSI_FLAG_PROMISC_CHANGED,

	ICE_VSI_FLAG_NBITS		/* must be last */

enum ice_vsi_state {

	ICE_VSI_DOWN,

	ICE_VSI_NEEDS_RESTART,

	ICE_VSI_UMAC_FLTR_CHANGED,

	ICE_VSI_MMAC_FLTR_CHANGED,

	ICE_VSI_VLAN_FLTR_CHANGED,

	ICE_VSI_PROMISC_CHANGED,

	ICE_VSI_STATE_NBITS		/* must be last */

};



/* struct that defines a VSI, associated with a dev */
@@ -256,8 +259,7 @@ struct ice_vsi { 
	irqreturn_t (*irq_handler)(int irq, void *data);



	u64 tx_linearize;

	DECLARE_BITMAP(state, __ICE_STATE_NBITS);

	DECLARE_BITMAP(flags, ICE_VSI_FLAG_NBITS);

	DECLARE_BITMAP(state, ICE_VSI_STATE_NBITS);

	unsigned int current_netdev_flags;

	u32 tx_restart;

	u32 tx_busy;
@@ -503,7 +505,7 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi, 
	val = GLINT_DYN_CTL_INTENA_M | GLINT_DYN_CTL_CLEARPBA_M |

	      (itr << GLINT_DYN_CTL_ITR_INDX_S);

	if (vsi)

		if (test_bit(__ICE_DOWN, vsi->state))

		if (test_bit(ICE_VSI_DOWN, vsi->state))

			return;

	wr32(hw, GLINT_DYN_CTL(vector), val);

}
@@ -620,8 +622,10 @@ int ice_destroy_xdp_rings(struct ice_vsi *vsi); 
int

ice_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,

	     u32 flags);

int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

int ice_set_rss_lut(struct ice_vsi *vsi, u8 *lut, u16 lut_size);

int ice_get_rss_lut(struct ice_vsi *vsi, u8 *lut, u16 lut_size);

int ice_set_rss_key(struct ice_vsi *vsi, u8 *seed);

int ice_get_rss_key(struct ice_vsi *vsi, u8 *seed);

void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);

int ice_schedule_reset(struct ice_pf *pf, enum ice_reset_req reset);

void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

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

+2 −2
Original line number Diff line number Diff line
@@ -1407,8 +1407,7 @@ struct ice_aqc_nvm_comp_tbl { 
	u8 cvs[]; /* Component Version String */

} __packed;



/*

 * Send to PF command (indirect 0x0801) ID is only used by PF

/* Send to PF command (indirect 0x0801) ID is only used by PF

 *

 * Send to VF command (indirect 0x0802) ID is only used by PF

 *
@@ -1790,6 +1789,7 @@ struct ice_pkg_ver { 
};



#define ICE_PKG_NAME_SIZE	32

#define ICE_SEG_ID_SIZE		28

#define ICE_SEG_NAME_SIZE	28



struct ice_aqc_get_pkg_info {

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

+2 −4
Original line number Diff line number Diff line
@@ -581,8 +581,7 @@ void ice_free_cpu_rx_rmap(struct ice_vsi *vsi) 
		return;



	netdev = vsi->netdev;

	if (!netdev || !netdev->rx_cpu_rmap ||

	    netdev->reg_state != NETREG_REGISTERED)

	if (!netdev || !netdev->rx_cpu_rmap)

		return;



	free_irq_cpu_rmap(netdev->rx_cpu_rmap);
@@ -604,8 +603,7 @@ int ice_set_cpu_rx_rmap(struct ice_vsi *vsi) 


	pf = vsi->back;

	netdev = vsi->netdev;

	if (!pf || !netdev || !vsi->num_q_vectors ||

	    vsi->netdev->reg_state != NETREG_REGISTERED)

	if (!pf || !netdev || !vsi->num_q_vectors)

		return -EINVAL;



	netdev_dbg(netdev, "Setup CPU RMAP: vsi type 0x%x, ifname %s, q_vectors %d\n",

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

+23 −0
Original line number Diff line number Diff line
@@ -214,6 +214,26 @@ static u16 ice_calc_q_handle(struct ice_vsi *vsi, struct ice_ring *ring, u8 tc) 
	return ring->q_index - vsi->tc_cfg.tc_info[tc].qoffset;

}



/**

 * ice_cfg_xps_tx_ring - Configure XPS for a Tx ring

 * @ring: The Tx ring to configure

 *

 * 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)

{

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

		return;



	/* We only initialize XPS once, so as not to overwrite user settings */

	if (test_and_set_bit(ICE_TX_XPS_INIT_DONE, ring->xps_state))

		return;



	netif_set_xps_queue(ring->netdev, &ring->q_vector->affinity_mask,

			    ring->q_index);

}



/**

 * ice_setup_tx_ctx - setup a struct ice_tlan_ctx instance

 * @ring: The Tx ring to configure
@@ -664,6 +684,9 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring, 
	u16 pf_q;

	u8 tc;



	/* Configure XPS */

	ice_cfg_xps_tx_ring(ring);



	pf_q = ring->reg_idx;

	ice_setup_tx_ctx(ring, &tlan_ctx, pf_q);

	/* copy context contents into the qg_buf */

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

+25 −31
Original line number Diff line number Diff line
@@ -3186,7 +3186,7 @@ ice_aq_sff_eeprom(struct ice_hw *hw, u16 lport, u8 bus_addr, 


	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_sff_eeprom);

	cmd = &desc.params.read_write_sff_param;

	desc.flags = cpu_to_le16(ICE_AQ_FLAG_RD | ICE_AQ_FLAG_BUF);

	desc.flags = cpu_to_le16(ICE_AQ_FLAG_RD);

	cmd->lport_num = (u8)(lport & 0xff);

	cmd->lport_num_valid = (u8)((lport >> 8) & 0x01);

	cmd->i2c_bus_addr = cpu_to_le16(((bus_addr >> 1) &
@@ -3206,23 +3206,33 @@ ice_aq_sff_eeprom(struct ice_hw *hw, u16 lport, u8 bus_addr, 
/**

 * __ice_aq_get_set_rss_lut

 * @hw: pointer to the hardware structure

 * @vsi_id: VSI FW index

 * @lut_type: LUT table type

 * @lut: pointer to the LUT buffer provided by the caller

 * @lut_size: size of the LUT buffer

 * @glob_lut_idx: global LUT index

 * @params: RSS LUT parameters

 * @set: set true to set the table, false to get the table

 *

 * Internal function to get (0x0B05) or set (0x0B03) RSS look up table

 */

static enum ice_status

__ice_aq_get_set_rss_lut(struct ice_hw *hw, u16 vsi_id, u8 lut_type, u8 *lut,

			 u16 lut_size, u8 glob_lut_idx, bool set)

__ice_aq_get_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params *params, bool set)

{

	u16 flags = 0, vsi_id, lut_type, lut_size, glob_lut_idx, vsi_handle;

	struct ice_aqc_get_set_rss_lut *cmd_resp;

	struct ice_aq_desc desc;

	enum ice_status status;

	u16 flags = 0;

	u8 *lut;



	if (!params)

		return ICE_ERR_PARAM;



	vsi_handle = params->vsi_handle;

	lut = params->lut;



	if (!ice_is_vsi_valid(hw, vsi_handle) || !lut)

		return ICE_ERR_PARAM;



	lut_size = params->lut_size;

	lut_type = params->lut_type;

	glob_lut_idx = params->global_lut_id;

	vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);



	cmd_resp = &desc.params.get_set_rss_lut;
@@ -3296,43 +3306,27 @@ __ice_aq_get_set_rss_lut(struct ice_hw *hw, u16 vsi_id, u8 lut_type, u8 *lut, 
/**

 * ice_aq_get_rss_lut

 * @hw: pointer to the hardware structure

 * @vsi_handle: software VSI handle

 * @lut_type: LUT table type

 * @lut: pointer to the LUT buffer provided by the caller

 * @lut_size: size of the LUT buffer

 * @get_params: RSS LUT parameters used to specify which RSS LUT to get

 *

 * get the RSS lookup table, PF or VSI type

 */

enum ice_status

ice_aq_get_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type,

		   u8 *lut, u16 lut_size)

ice_aq_get_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params *get_params)

{

	if (!ice_is_vsi_valid(hw, vsi_handle) || !lut)

		return ICE_ERR_PARAM;



	return __ice_aq_get_set_rss_lut(hw, ice_get_hw_vsi_num(hw, vsi_handle),

					lut_type, lut, lut_size, 0, false);

	return __ice_aq_get_set_rss_lut(hw, get_params, false);

}



/**

 * ice_aq_set_rss_lut

 * @hw: pointer to the hardware structure

 * @vsi_handle: software VSI handle

 * @lut_type: LUT table type

 * @lut: pointer to the LUT buffer provided by the caller

 * @lut_size: size of the LUT buffer

 * @set_params: RSS LUT parameters used to specify how to set the RSS LUT

 *

 * set the RSS lookup table, PF or VSI type

 */

enum ice_status

ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type,

		   u8 *lut, u16 lut_size)

ice_aq_set_rss_lut(struct ice_hw *hw, struct ice_aq_get_set_rss_lut_params *set_params)

{

	if (!ice_is_vsi_valid(hw, vsi_handle) || !lut)

		return ICE_ERR_PARAM;



	return __ice_aq_get_set_rss_lut(hw, ice_get_hw_vsi_num(hw, vsi_handle),

					lut_type, lut, lut_size, 0, true);

	return __ice_aq_get_set_rss_lut(hw, set_params, true);

}



/**