Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e only.

Majority of this series contains patches from Greg and Mitch to fix
up or add functionality to the PF/VF driver interactions.  Notably,
a fix for SR-IOV VF port VLAN which resolved the problem of port VLAN
configurations not being persistent across VF driver loads and unloads
and enable/disable of the feature.  Also do not enable the default port
on the VEB, which is designed only to bridge the PF to an Open vSwitch
or bridge.  Another fix to resolve a possible memory corruption
condition where ARQ messages are written to random memory locations.
Fix a problem where the 'ip link show' command would display stale
link address information after the link address was set via the 'ip
link set' command.

Anjali provides several patches, one which saves information that can
be used while cleaning the Tx ring and useful in detecting Tx hangs.
Then provides a fixes to the admin queue shutdown function to ensure
we are shutting down the queue in the shutdown path and ensure ASQ is
alive before issuing the admin queue command.

Shannon provides a fix for get/update vsi params where the incorrect
struct was being used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b912b2f8 80f6428f

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

+3 −0
Original line number Diff line number Diff line
@@ -609,6 +609,9 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;



	if (i40e_check_asq_alive(hw))

		i40e_aq_queue_shutdown(hw, true);



	i40e_shutdown_asq(hw);

	i40e_shutdown_arq(hw);

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

+44 −31
Original line number Diff line number Diff line
@@ -125,6 +125,44 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
	}

}



/**

 * i40e_check_asq_alive

 * @hw: pointer to the hw struct

 *

 * Returns true if Queue is enabled else false.

 **/

bool i40e_check_asq_alive(struct i40e_hw *hw)

{

	return !!(rd32(hw, hw->aq.asq.len) & I40E_PF_ATQLEN_ATQENABLE_MASK);

}



/**

 * i40e_aq_queue_shutdown

 * @hw: pointer to the hw struct

 * @unloading: is the driver unloading itself

 *

 * Tell the Firmware that we're shutting down the AdminQ and whether

 * or not the driver is unloading as well.

 **/

i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw,

					     bool unloading)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_queue_shutdown *cmd =

		(struct i40e_aqc_queue_shutdown *)&desc.params.raw;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_queue_shutdown);



	if (unloading)

		cmd->driver_unloading = cpu_to_le32(I40E_AQ_DRIVER_UNLOADING);

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



	return status;

}





/**

 * i40e_init_shared_code - Initialize the shared code

 * @hw: pointer to hardware structure
@@ -478,31 +516,6 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 
}



/* Admin command wrappers */

/**

 * i40e_aq_queue_shutdown

 * @hw: pointer to the hw struct

 * @unloading: is the driver unloading itself

 *

 * Tell the Firmware that we're shutting down the AdminQ and whether

 * or not the driver is unloading as well.

 **/

i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw,

					     bool unloading)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_queue_shutdown *cmd =

		(struct i40e_aqc_queue_shutdown *)&desc.params.raw;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_queue_shutdown);



	if (unloading)

		cmd->driver_unloading = cpu_to_le32(I40E_AQ_DRIVER_UNLOADING);

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



	return status;

}



/**

 * i40e_aq_set_link_restart_an
@@ -748,8 +761,8 @@ i40e_status i40e_aq_get_vsi_params(struct i40e_hw *hw, 
				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_switch_seid *cmd =

		(struct i40e_aqc_switch_seid *)&desc.params.raw;

	struct i40e_aqc_add_get_update_vsi *cmd =

		(struct i40e_aqc_add_get_update_vsi *)&desc.params.raw;

	struct i40e_aqc_add_get_update_vsi_completion *resp =

		(struct i40e_aqc_add_get_update_vsi_completion *)

		&desc.params.raw;
@@ -758,7 +771,7 @@ i40e_status i40e_aq_get_vsi_params(struct i40e_hw *hw, 
	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_get_vsi_parameters);



	cmd->seid = cpu_to_le16(vsi_ctx->seid);

	cmd->uplink_seid = cpu_to_le16(vsi_ctx->seid);



	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);

	if (sizeof(vsi_ctx->info) > I40E_AQ_LARGE_BUF)
@@ -792,13 +805,13 @@ i40e_status i40e_aq_update_vsi_params(struct i40e_hw *hw, 
				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_switch_seid *cmd =

		(struct i40e_aqc_switch_seid *)&desc.params.raw;

	struct i40e_aqc_add_get_update_vsi *cmd =

		(struct i40e_aqc_add_get_update_vsi *)&desc.params.raw;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_update_vsi_parameters);

	cmd->seid = cpu_to_le16(vsi_ctx->seid);

	cmd->uplink_seid = cpu_to_le16(vsi_ctx->seid);



	desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));

	if (sizeof(vsi_ctx->info) > I40E_AQ_LARGE_BUF)

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

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
		struct i40e_ring *tx_ring = ACCESS_ONCE(vsi->tx_rings[i]);

		if (!tx_ring)

			continue;



		dev_info(&pf->pdev->dev,

			 "    tx_rings[%i]: desc = %p\n",

			 i, tx_ring->desc);

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

+22 −23
Original line number Diff line number Diff line
@@ -1215,6 +1215,10 @@ static int i40e_set_mac(struct net_device *netdev, void *p) 
	if (ether_addr_equal(netdev->dev_addr, addr->sa_data))

		return 0;



	if (test_bit(__I40E_DOWN, &vsi->back->state) ||

	    test_bit(__I40E_RESET_RECOVERY_PENDING, &vsi->back->state))

		return -EADDRNOTAVAIL;



	if (vsi->type == I40E_VSI_MAIN) {

		i40e_status ret;

		ret = i40e_aq_mac_address_write(&vsi->back->hw,
@@ -1779,7 +1783,6 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid) 
{

	struct i40e_mac_filter *f, *add_f;

	bool is_netdev, is_vf;

	int ret;



	is_vf = (vsi->type == I40E_VSI_SRIOV);

	is_netdev = !!(vsi->netdev);
@@ -1805,13 +1808,6 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid) 
		}

	}



	ret = i40e_sync_vsi_filters(vsi);

	if (ret) {

		dev_info(&vsi->back->pdev->dev,

			 "Could not sync filters for vid %d\n", vid);

		return ret;

	}



	/* Now if we add a vlan tag, make sure to check if it is the first

	 * tag (i.e. a "tag" -1 does exist) and if so replace the -1 "tag"

	 * with 0, so we now accept untagged and specified tagged traffic
@@ -1848,10 +1844,13 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid) 
				}

			}

		}

		ret = i40e_sync_vsi_filters(vsi);

	}



	return ret;

	if (test_bit(__I40E_DOWN, &vsi->back->state) ||

	    test_bit(__I40E_RESET_RECOVERY_PENDING, &vsi->back->state))

		return 0;



	return i40e_sync_vsi_filters(vsi);

}



/**
@@ -1867,7 +1866,6 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid) 
	struct i40e_mac_filter *f, *add_f;

	bool is_vf, is_netdev;

	int filter_count = 0;

	int ret;



	is_vf = (vsi->type == I40E_VSI_SRIOV);

	is_netdev = !!(netdev);
@@ -1878,12 +1876,6 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid) 
	list_for_each_entry(f, &vsi->mac_filter_list, list)

		i40e_del_filter(vsi, f->macaddr, vid, is_vf, is_netdev);



	ret = i40e_sync_vsi_filters(vsi);

	if (ret) {

		dev_info(&vsi->back->pdev->dev, "Could not sync filters\n");

		return ret;

	}



	/* go through all the filters for this VSI and if there is only

	 * vid == 0 it means there are no other filters, so vid 0 must

	 * be replaced with -1. This signifies that we should from now
@@ -1926,6 +1918,10 @@ int i40e_vsi_kill_vlan(struct i40e_vsi *vsi, s16 vid) 
		}

	}



	if (test_bit(__I40E_DOWN, &vsi->back->state) ||

	    test_bit(__I40E_RESET_RECOVERY_PENDING, &vsi->back->state))

		return 0;



	return i40e_sync_vsi_filters(vsi);

}
@@ -2016,8 +2012,9 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid) 


	vsi->info.valid_sections = cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID);

	vsi->info.pvid = cpu_to_le16(vid);

	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_INSERT_PVID;

	vsi->info.port_vlan_flags |= I40E_AQ_VSI_PVLAN_MODE_UNTAGGED;

	vsi->info.port_vlan_flags = I40E_AQ_VSI_PVLAN_MODE_TAGGED |

				    I40E_AQ_VSI_PVLAN_INSERT_PVID |

				    I40E_AQ_VSI_PVLAN_EMOD_STR;



	ctxt.seid = vsi->seid;

	memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
@@ -2040,8 +2037,9 @@ int i40e_vsi_add_pvid(struct i40e_vsi *vsi, u16 vid) 
 **/

void i40e_vsi_remove_pvid(struct i40e_vsi *vsi)

{

	i40e_vlan_stripping_disable(vsi);



	vsi->info.pvid = 0;

	i40e_vlan_rx_register(vsi->netdev, vsi->netdev->features);

}



/**
@@ -4490,6 +4488,7 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf) 
	if (!test_bit(__I40E_ADMINQ_EVENT_PENDING, &pf->state))

		return;



	event.msg_size = I40E_MAX_AQ_BUF_SIZE;

	event.msg_buf = kzalloc(event.msg_size, GFP_KERNEL);

	if (!event.msg_buf)

		return;
@@ -4773,6 +4772,7 @@ static int i40e_prep_for_reset(struct i40e_pf *pf) 


	dev_info(&pf->pdev->dev, "Tearing down internal switch for reset\n");



	if (i40e_check_asq_alive(hw))

		i40e_vc_notify_reset(pf);



	/* quiesce the VSIs and their queues that are not already DOWN */
@@ -6901,7 +6901,7 @@ void i40e_veb_release(struct i40e_veb *veb) 
 **/

static int i40e_add_veb(struct i40e_veb *veb, struct i40e_vsi *vsi)

{

	bool is_default = (vsi->idx == vsi->back->lan_vsi);

	bool is_default = false;

	bool is_cloud = false;

	int ret;
@@ -7851,7 +7851,6 @@ static void i40e_remove(struct pci_dev *pdev) 
			 "Failed to destroy the HMC resources: %d\n", ret_code);



	/* shutdown the adminq */

	i40e_aq_queue_shutdown(&pf->hw, true);

	ret_code = i40e_shutdown_adminq(&pf->hw);

	if (ret_code)

		dev_warn(&pdev->dev,

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

+3 −2
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ void i40e_debug_aq(struct i40e_hw *hw, 
		   void *buffer);



void i40e_idle_aq(struct i40e_hw *hw);

bool i40e_check_asq_alive(struct i40e_hw *hw);

i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw,

				   bool unloading);



u32 i40e_led_get(struct i40e_hw *hw);

void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink);
@@ -69,8 +72,6 @@ i40e_status i40e_aq_get_firmware_version(struct i40e_hw *hw, 
				u16 *fw_major_version, u16 *fw_minor_version,

				u16 *api_major_version, u16 *api_minor_version,

				struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw,

					     bool unloading);

i40e_status i40e_aq_set_phy_reset(struct i40e_hw *hw,

				struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_set_default_vsi(struct i40e_hw *hw, u16 vsi_id,