Commit 6d28f1d9 authored by David S. Miller's avatar David S. Miller
Browse files

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



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2019-10-25

This series contains updates to i40e only.  Several are fixes that could
go to 'net', but were intended for 'net-next'.

Sylwia changes how the driver function to read the NVM module data, so
that it is able to read the LLDP agent configuration to allow for
persistent LLDP.

Jaroslaw resolves an issue where the incorrect FEC settings were being
displayed in ethtool, by setting the proper FEC bits.

Piotr moves the hardware flags detection into a separate function, so
that the specific flags can be set based on the MAC and NVM.  Also
extends the PHY access function to include a command flag to let the
firmware know it should not change the page while accessing a OSFP module.
Updates the driver to display the driver and firmware version when in
recovery mode.

Aleksandr refactored the VF MAC filters accounting since an untrusted
VF was able to delete but not add a MAC filter, so refactor the code to
have more consistency and improved logging.

Nicholas updates the driver to use a default interval of 50 usecs,
instead of the current 100 usecs which was causing some regression
performance issues.

Damian resolved LED blinking issues for X710T*L devices by adding
specific flows for these devices in the LED operations.

Navid Emamdoost found where allocated memory is not being properly freed
upon a failure in setting up MAC VLANs, so added the missing kfree().

v2: Dropped patches 2 & 6 from the original series while we wait for the
    author to respond to community feedback.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 352b1dee 27d46133

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

+1 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi, 
					    const u8 *macaddr);

int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr);

bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);

int i40e_count_filters(struct i40e_vsi *vsi);

struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr);

void i40e_vlan_stripping_enable(struct i40e_vsi *vsi);

#ifdef CONFIG_I40E_DCB

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

+58 −13
Original line number Diff line number Diff line
@@ -507,6 +507,59 @@ shutdown_arq_out: 
	return ret_code;

}



/**

 *  i40e_set_hw_flags - set HW flags

 *  @hw: pointer to the hardware structure

 **/

static void i40e_set_hw_flags(struct i40e_hw *hw)

{

	struct i40e_adminq_info *aq = &hw->aq;



	hw->flags = 0;



	switch (hw->mac.type) {

	case I40E_MAC_XL710:

		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_GET_LINK_INFO_XL710)) {

			hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE;

			hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;

			/* The ability to RX (not drop) 802.1ad frames */

			hw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;

		}

		break;

	case I40E_MAC_X722:

		hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |

			     I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



		if (aq->api_maj_ver > 1 ||

		    (aq->api_maj_ver == 1 &&

		     aq->api_min_ver >= I40E_MINOR_VER_FW_LLDP_STOPPABLE_X722))

			hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;

		/* fall through */

	default:

		break;

	}



	/* Newer versions of firmware require lock when reading the NVM */

	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 5))

		hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 8)) {

		hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;

		hw->flags |= I40E_HW_FLAG_DROP_MODE;

	}



	if (aq->api_maj_ver > 1 ||

	    (aq->api_maj_ver == 1 &&

	     aq->api_min_ver >= 9))

		hw->flags |= I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED;

}



/**

 *  i40e_init_adminq - main initialization routine for Admin Queue

 *  @hw: pointer to the hardware structure
@@ -571,6 +624,11 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
	if (ret_code != I40E_SUCCESS)

		goto init_adminq_free_arq;



	/* Some features were introduced in different FW API version

	 * for different MAC type.

	 */

	i40e_set_hw_flags(hw);



	/* get the NVM version info */

	i40e_read_nvm_word(hw, I40E_SR_NVM_DEV_STARTER_VERSION,

			   &hw->nvm.version);
@@ -596,25 +654,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
		hw->flags |= I40E_HW_FLAG_FW_LLDP_STOPPABLE;

	}



	/* Newer versions of firmware require lock when reading the NVM */

	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

	     hw->aq.api_min_ver >= 5))

		hw->flags |= I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



	/* The ability to RX (not drop) 802.1ad frames was added in API 1.7 */

	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

	     hw->aq.api_min_ver >= 7))

		hw->flags |= I40E_HW_FLAG_802_1AD_CAPABLE;



	if (hw->aq.api_maj_ver > 1 ||

	    (hw->aq.api_maj_ver == 1 &&

	     hw->aq.api_min_ver >= 8)) {

		hw->flags |= I40E_HW_FLAG_FW_LLDP_PERSISTENT;

		hw->flags |= I40E_HW_FLAG_DROP_MODE;

	}



	if (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {

		ret_code = I40E_ERR_FIRMWARE_API_VERSION;

		goto init_adminq_free_arq;

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

+7 −1
Original line number Diff line number Diff line
@@ -2249,7 +2249,13 @@ struct i40e_aqc_phy_register_access { 
#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL	1

#define I40E_AQ_PHY_REG_ACCESS_EXTERNAL_MODULE	2

	u8	dev_address;

	u8	reserved1[2];

	u8	cmd_flags;

#define I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE	0x01

#define I40E_AQ_PHY_REG_ACCESS_SET_MDIO_IF_NUMBER	0x02

#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT	2

#define I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_MASK	(0x3 << \

		I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT)

	u8	reserved1;

	__le32	reg_address;

	__le32	reg_value;

	u8	reserved2[4];

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

+93 −23
Original line number Diff line number Diff line
@@ -933,10 +933,6 @@ i40e_status i40e_init_shared_code(struct i40e_hw *hw) 
	else

		hw->pf_id = (u8)(func_rid & 0x7);



	if (hw->mac.type == I40E_MAC_X722)

		hw->flags |= I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE |

			     I40E_HW_FLAG_NVM_READ_REQUIRES_LOCK;



	status = i40e_init_nvm(hw);

	return status;

}
@@ -1441,9 +1437,9 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) 
	u32 gpio_val = 0;

	u32 port;



	if (!hw->func_caps.led[idx])

	if (!I40E_IS_X710TL_DEVICE(hw->device_id) &&

	    !hw->func_caps.led[idx])

		return 0;



	gpio_val = rd32(hw, I40E_GLGEN_GPIO_CTL(idx));

	port = (gpio_val & I40E_GLGEN_GPIO_CTL_PRT_NUM_MASK) >>

		I40E_GLGEN_GPIO_CTL_PRT_NUM_SHIFT;
@@ -1462,8 +1458,15 @@ static u32 i40e_led_is_mine(struct i40e_hw *hw, int idx) 
#define I40E_FILTER_ACTIVITY 0xE

#define I40E_LINK_ACTIVITY 0xC

#define I40E_MAC_ACTIVITY 0xD

#define I40E_FW_LED BIT(4)

#define I40E_LED_MODE_VALID (I40E_GLGEN_GPIO_CTL_LED_MODE_MASK >> \

			     I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT)



#define I40E_LED0 22



#define I40E_PIN_FUNC_SDP 0x0

#define I40E_PIN_FUNC_LED 0x1



/**

 * i40e_led_get - return current on/off mode

 * @hw: pointer to the hw struct
@@ -1508,8 +1511,10 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 
{

	int i;



	if (mode & 0xfffffff0)

	if (mode & ~I40E_LED_MODE_VALID) {

		hw_dbg(hw, "invalid mode passed in %X\n", mode);

		return;

	}



	/* as per the documentation GPIO 22-29 are the LED

	 * GPIO pins named LED0..LED7
@@ -1519,6 +1524,20 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 


		if (!gpio_val)

			continue;



		if (I40E_IS_X710TL_DEVICE(hw->device_id)) {

			u32 pin_func = 0;



			if (mode & I40E_FW_LED)

				pin_func = I40E_PIN_FUNC_SDP;

			else

				pin_func = I40E_PIN_FUNC_LED;



			gpio_val &= ~I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK;

			gpio_val |= ((pin_func <<

				     I40E_GLGEN_GPIO_CTL_PIN_FUNC_SHIFT) &

				     I40E_GLGEN_GPIO_CTL_PIN_FUNC_MASK);

		}

		gpio_val &= ~I40E_GLGEN_GPIO_CTL_LED_MODE_MASK;

		/* this & is a bit of paranoia, but serves as a range check */

		gpio_val |= ((mode << I40E_GLGEN_GPIO_CTL_LED_MODE_SHIFT) &
@@ -2570,9 +2589,16 @@ noinline_for_stack i40e_status i40e_update_link_info(struct i40e_hw *hw) 
		if (status)

			return status;



		if (abilities.fec_cfg_curr_mod_ext_info &

		    I40E_AQ_ENABLE_FEC_AUTO)

			hw->phy.link_info.req_fec_info =

				(I40E_AQ_REQUEST_FEC_KR |

				 I40E_AQ_REQUEST_FEC_RS);

		else

			hw->phy.link_info.req_fec_info =

				abilities.fec_cfg_curr_mod_ext_info &

			(I40E_AQ_REQUEST_FEC_KR | I40E_AQ_REQUEST_FEC_RS);

				(I40E_AQ_REQUEST_FEC_KR |

				 I40E_AQ_REQUEST_FEC_RS);



		memcpy(hw->phy.link_info.module_type, &abilities.module_type,

		       sizeof(hw->phy.link_info.module_type));
@@ -5043,7 +5069,7 @@ static enum i40e_status_code i40e_led_get_reg(struct i40e_hw *hw, u16 led_addr, 
		status =

		       i40e_aq_get_phy_register(hw,

						I40E_AQ_PHY_REG_ACCESS_EXTERNAL,

						I40E_PHY_COM_REG_PAGE,

						I40E_PHY_COM_REG_PAGE, true,

						I40E_PHY_LED_PROV_REG_1,

						reg_val, NULL);

	} else {
@@ -5076,7 +5102,7 @@ static enum i40e_status_code i40e_led_set_reg(struct i40e_hw *hw, u16 led_addr, 
		status =

		       i40e_aq_set_phy_register(hw,

						I40E_AQ_PHY_REG_ACCESS_EXTERNAL,

						I40E_PHY_COM_REG_PAGE,

						I40E_PHY_COM_REG_PAGE, true,

						I40E_PHY_LED_PROV_REG_1,

						reg_val, NULL);

	} else {
@@ -5115,7 +5141,7 @@ i40e_status i40e_led_get_phy(struct i40e_hw *hw, u16 *led_addr, 
		status =

		      i40e_aq_get_phy_register(hw,

					       I40E_AQ_PHY_REG_ACCESS_EXTERNAL,

					       I40E_PHY_COM_REG_PAGE,

					       I40E_PHY_COM_REG_PAGE, true,

					       I40E_PHY_LED_PROV_REG_1,

					       &reg_val_aq, NULL);

		if (status == I40E_SUCCESS)
@@ -5320,18 +5346,47 @@ do_retry: 
}



/**

 * i40e_aq_set_phy_register

 * i40e_mdio_if_number_selection - MDIO I/F number selection

 * @hw: pointer to the hw struct

 * @set_mdio: use MDIO I/F number specified by mdio_num

 * @mdio_num: MDIO I/F number

 * @cmd: pointer to PHY Register command structure

 **/

static void i40e_mdio_if_number_selection(struct i40e_hw *hw, bool set_mdio,

					  u8 mdio_num,

					  struct i40e_aqc_phy_register_access *cmd)

{

	if (set_mdio && cmd->phy_interface == I40E_AQ_PHY_REG_ACCESS_EXTERNAL) {

		if (hw->flags & I40E_HW_FLAG_AQ_PHY_ACCESS_EXTENDED)

			cmd->cmd_flags |=

				I40E_AQ_PHY_REG_ACCESS_SET_MDIO_IF_NUMBER |

				((mdio_num <<

				I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_SHIFT) &

				I40E_AQ_PHY_REG_ACCESS_MDIO_IF_NUMBER_MASK);

		else

			i40e_debug(hw, I40E_DEBUG_PHY,

				   "MDIO I/F number selection not supported by current FW version.\n");

	}

}



/**

 * i40e_aq_set_phy_register_ext

 * @hw: pointer to the hw struct

 * @phy_select: select which phy should be accessed

 * @dev_addr: PHY device address

 * @set_mdio: use MDIO I/F number specified by mdio_num

 * @mdio_num: MDIO I/F number

 * @reg_addr: PHY register address

 * @reg_val: new register value

 * @cmd_details: pointer to command details structure or NULL

 *

 * Write the external PHY register.

 * NOTE: In common cases MDIO I/F number should not be changed, thats why you

 * may use simple wrapper i40e_aq_set_phy_register.

 **/

i40e_status i40e_aq_set_phy_register(struct i40e_hw *hw,

				     u8 phy_select, u8 dev_addr,

enum i40e_status_code i40e_aq_set_phy_register_ext(struct i40e_hw *hw,

			     u8 phy_select, u8 dev_addr, bool page_change,

			     bool set_mdio, u8 mdio_num,

			     u32 reg_addr, u32 reg_val,

			     struct i40e_asq_cmd_details *cmd_details)

{
@@ -5348,24 +5403,34 @@ i40e_status i40e_aq_set_phy_register(struct i40e_hw *hw, 
	cmd->reg_address = cpu_to_le32(reg_addr);

	cmd->reg_value = cpu_to_le32(reg_val);



	i40e_mdio_if_number_selection(hw, set_mdio, mdio_num, cmd);



	if (!page_change)

		cmd->cmd_flags = I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE;



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



	return status;

}



/**

 * i40e_aq_get_phy_register

 * i40e_aq_get_phy_register_ext

 * @hw: pointer to the hw struct

 * @phy_select: select which phy should be accessed

 * @dev_addr: PHY device address

 * @set_mdio: use MDIO I/F number specified by mdio_num

 * @mdio_num: MDIO I/F number

 * @reg_addr: PHY register address

 * @reg_val: read register value

 * @cmd_details: pointer to command details structure or NULL

 *

 * Read the external PHY register.

 * NOTE: In common cases MDIO I/F number should not be changed, thats why you

 * may use simple wrapper i40e_aq_get_phy_register.

 **/

i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw,

				     u8 phy_select, u8 dev_addr,

enum i40e_status_code i40e_aq_get_phy_register_ext(struct i40e_hw *hw,

			     u8 phy_select, u8 dev_addr, bool page_change,

			     bool set_mdio, u8 mdio_num,

			     u32 reg_addr, u32 *reg_val,

			     struct i40e_asq_cmd_details *cmd_details)

{
@@ -5381,6 +5446,11 @@ i40e_status i40e_aq_get_phy_register(struct i40e_hw *hw, 
	cmd->dev_address = dev_addr;

	cmd->reg_address = cpu_to_le32(reg_addr);



	i40e_mdio_if_number_selection(hw, set_mdio, mdio_num, cmd);



	if (!page_change)

		cmd->cmd_flags = I40E_AQ_PHY_REG_ACCESS_DONT_CHANGE_QSFP_PAGE;



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

	if (!status)

		*reg_val = le32_to_cpu(cmd->reg_value);

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

+3 −1
Original line number Diff line number Diff line
@@ -889,7 +889,9 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change) 


		ret = i40e_read_nvm_module_data(hw,

						I40E_SR_EMP_SR_SETTINGS_PTR,

						offset, 1,

						offset,

						I40E_LLDP_CURRENT_STATUS_OFFSET,

						I40E_LLDP_CURRENT_STATUS_SIZE,

						&lldp_cfg.adminstatus);

	} else {

		ret = i40e_read_lldp_cfg(hw, &lldp_cfg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE