Commit a5e7d9bb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
40GbE Intel Wired LAN Driver Updates 2022-01-07

This series contains updates to i40e and iavf drivers.

Karen limits per VF MAC filters so that one VF does not consume all
filters for i40e.

Jedrzej reduces busy wait time for admin queue calls for i40e.

Mateusz updates firmware versions to reflect new supported NVM images
and renames an error to remove non-inclusive language for i40e.

Yang Li fixes a set but not used warning for i40e.

Jason Wang removes an unneeded variable for iavf.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  iavf: remove an unneeded variable
  i40e: remove variables set but not used
  i40e: Remove non-inclusive language
  i40e: Update FW API version
  i40e: Minimize amount of busy-waiting during AQ send
  i40e: Add ensurance of MacVlan resources for every trusted VF
====================

Link: https://lore.kernel.org/r/20220107175704.438387-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ffef737f 5322c68e

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+22 −7
Original line number Diff line number Diff line
@@ -769,21 +769,22 @@ static bool i40e_asq_done(struct i40e_hw *hw) 
}



/**

 *  i40e_asq_send_command - send command to Admin Queue

 *  i40e_asq_send_command_atomic - send command to Admin Queue

 *  @hw: pointer to the hw struct

 *  @desc: prefilled descriptor describing the command (non DMA mem)

 *  @buff: buffer to use for indirect commands

 *  @buff_size: size of buffer for indirect commands

 *  @cmd_details: pointer to command details structure

 *  @is_atomic_context: is the function called in an atomic context?

 *

 *  This is the main send command driver routine for the Admin Queue send

 *  queue.  It runs the queue, cleans the queue, etc

 **/

i40e_status i40e_asq_send_command(struct i40e_hw *hw,

				struct i40e_aq_desc *desc,

				void *buff, /* can be NULL */

				u16  buff_size,

				struct i40e_asq_cmd_details *cmd_details)

i40e_status

i40e_asq_send_command_atomic(struct i40e_hw *hw, struct i40e_aq_desc *desc,

			     void *buff, /* can be NULL */ u16  buff_size,

			     struct i40e_asq_cmd_details *cmd_details,

			     bool is_atomic_context)

{

	i40e_status status = 0;

	struct i40e_dma_mem *dma_buff = NULL;
@@ -910,7 +911,12 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
			 */

			if (i40e_asq_done(hw))

				break;



			if (is_atomic_context)

				udelay(50);

			else

				usleep_range(40, 60);



			total_delay += 50;

		} while (total_delay < hw->aq.asq_cmd_timeout);

	}
@@ -967,6 +973,15 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
	return status;

}



i40e_status

i40e_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc,

		      void *buff, /* can be NULL */ u16  buff_size,

		      struct i40e_asq_cmd_details *cmd_details)

{

	return i40e_asq_send_command_atomic(hw, desc, buff, buff_size,

					    cmd_details, false);

}



/**

 *  i40e_fill_default_direct_cmd_desc - AQ descriptor helper function

 *  @desc:     pointer to the temp descriptor (non DMA mem)

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 */



#define I40E_FW_API_VERSION_MAJOR	0x0001

#define I40E_FW_API_VERSION_MINOR_X722	0x0009

#define I40E_FW_API_VERSION_MINOR_X710	0x0009

#define I40E_FW_API_VERSION_MINOR_X722	0x000C

#define I40E_FW_API_VERSION_MINOR_X710	0x000F



#define I40E_FW_MINOR_VERSION(_h) ((_h)->mac.type == I40E_MAC_XL710 ? \

					I40E_FW_API_VERSION_MINOR_X710 : \

drivers/net/ethernet/intel/i40e/i40e_common.c

+6 −9
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ const char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err) 
		return "I40E_ERR_INVALID_MAC_ADDR";

	case I40E_ERR_DEVICE_NOT_SUPPORTED:

		return "I40E_ERR_DEVICE_NOT_SUPPORTED";

	case I40E_ERR_MASTER_REQUESTS_PENDING:

		return "I40E_ERR_MASTER_REQUESTS_PENDING";

	case I40E_ERR_PRIMARY_REQUESTS_PENDING:

		return "I40E_ERR_PRIMARY_REQUESTS_PENDING";

	case I40E_ERR_INVALID_LINK_SETTINGS:

		return "I40E_ERR_INVALID_LINK_SETTINGS";

	case I40E_ERR_AUTONEG_NOT_COMPLETE:
@@ -2073,7 +2073,8 @@ enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw, 
	cmd->seid = cpu_to_le16(seid);

	cmd->vlan_tag = cpu_to_le16(vid | I40E_AQC_SET_VSI_VLAN_VALID);



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);

	status = i40e_asq_send_command_atomic(hw, &desc, NULL, 0,

					      cmd_details, true);



	return status;

}
@@ -2114,7 +2115,8 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, 
	cmd->seid = cpu_to_le16(seid);

	cmd->vlan_tag = cpu_to_le16(vid | I40E_AQC_SET_VSI_VLAN_VALID);



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);

	status = i40e_asq_send_command_atomic(hw, &desc, NULL, 0,

					      cmd_details, true);



	return status;

}
@@ -4136,7 +4138,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, 
				struct i40e_filter_control_settings *settings)

{

	u32 fcoe_cntx_size, fcoe_filt_size;

	u32 pe_cntx_size, pe_filt_size;

	u32 fcoe_fmax;

	u32 val;
@@ -4180,8 +4181,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, 
	case I40E_HASH_FILTER_SIZE_256K:

	case I40E_HASH_FILTER_SIZE_512K:

	case I40E_HASH_FILTER_SIZE_1M:

		pe_filt_size = I40E_HASH_FILTER_BASE_SIZE;

		pe_filt_size <<= (u32)settings->pe_filt_num;

		break;

	default:

		return I40E_ERR_PARAM;
@@ -4198,8 +4197,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, 
	case I40E_DMA_CNTX_SIZE_64K:

	case I40E_DMA_CNTX_SIZE_128K:

	case I40E_DMA_CNTX_SIZE_256K:

		pe_cntx_size = I40E_DMA_CNTX_BASE_SIZE;

		pe_cntx_size <<= (u32)settings->pe_cntx_num;

		break;

	default:

		return I40E_ERR_PARAM;

drivers/net/ethernet/intel/i40e/i40e_prototype.h

+9 −5
Original line number Diff line number Diff line
@@ -22,11 +22,15 @@ void i40e_adminq_init_ring_data(struct i40e_hw *hw); 
i40e_status i40e_clean_arq_element(struct i40e_hw *hw,

					     struct i40e_arq_event_info *e,

					     u16 *events_pending);

i40e_status i40e_asq_send_command(struct i40e_hw *hw,

				struct i40e_aq_desc *desc,

				void *buff, /* can be NULL */

				u16  buff_size,

i40e_status

i40e_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc,

		      void *buff, /* can be NULL */ u16  buff_size,

		      struct i40e_asq_cmd_details *cmd_details);

i40e_status

i40e_asq_send_command_atomic(struct i40e_hw *hw, struct i40e_aq_desc *desc,

			     void *buff, /* can be NULL */ u16  buff_size,

			     struct i40e_asq_cmd_details *cmd_details,

			     bool is_atomic_context);



/* debug function for adminq */

void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,

drivers/net/ethernet/intel/i40e/i40e_status.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ enum i40e_status_code { 
	I40E_ERR_ADAPTER_STOPPED		= -9,

	I40E_ERR_INVALID_MAC_ADDR		= -10,

	I40E_ERR_DEVICE_NOT_SUPPORTED		= -11,

	I40E_ERR_MASTER_REQUESTS_PENDING	= -12,

	I40E_ERR_PRIMARY_REQUESTS_PENDING	= -12,

	I40E_ERR_INVALID_LINK_SETTINGS		= -13,

	I40E_ERR_AUTONEG_NOT_COMPLETE		= -14,

	I40E_ERR_RESET_FAILED			= -15,