Commit 594e31bc 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 2020-11-24

This series contains updates to i40e and igbvf drivers.

Marek removes a redundant assignment for i40e.

Stefan Assmann corrects reporting of VF link speed for i40e.

Karen revises a couple of error messages to warnings for igbvf as they
could be misinterpreted as issues when they are not.

v2: Dropped PTP patch as it's being updated.

* '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  igbvf: Refactor traces
  i40e: report correct VF link speed when link state is set to enable
  i40e: remove redundant assignment
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 64088b2a 24453a84

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

+3 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void i40e_vc_notify_vf_link_state(struct i40e_vf *vf) 
	} else if (vf->link_forced) {

		pfe.event_data.link_event.link_status = vf->link_up;

		pfe.event_data.link_event.link_speed =

			(vf->link_up ? VIRTCHNL_LINK_SPEED_40GB : 0);

			(vf->link_up ? i40e_virtchnl_link_speed(ls->link_speed) : 0);

	} else {

		pfe.event_data.link_event.link_status =

			ls->link_info & I40E_AQ_LINK_UP;
@@ -4437,6 +4437,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) 
{

	struct i40e_netdev_priv *np = netdev_priv(netdev);

	struct i40e_pf *pf = np->vsi->back;

	struct i40e_link_status *ls = &pf->hw.phy.link_info;

	struct virtchnl_pf_event pfe;

	struct i40e_hw *hw = &pf->hw;

	struct i40e_vf *vf;
@@ -4474,7 +4475,7 @@ int i40e_ndo_set_vf_link_state(struct net_device *netdev, int vf_id, int link) 
		vf->link_forced = true;

		vf->link_up = true;

		pfe.event_data.link_event.link_status = true;

		pfe.event_data.link_event.link_speed = VIRTCHNL_LINK_SPEED_40GB;

		pfe.event_data.link_event.link_speed = i40e_virtchnl_link_speed(ls->link_speed);

		break;

	case IFLA_VF_LINK_STATE_DISABLE:

		vf->link_forced = true;

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

+0 −1
Original line number Diff line number Diff line
@@ -311,7 +311,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget) 
			continue;

		}



		bi = i40e_rx_bi(rx_ring, rx_ring->next_to_clean);

		size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>

		       I40E_RXD_QW1_LENGTH_PBUF_SHIFT;

		if (!size)

drivers/net/ethernet/intel/igbvf/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ static int igbvf_vlan_rx_add_vid(struct net_device *netdev, 
	spin_lock_bh(&hw->mbx_lock);



	if (hw->mac.ops.set_vfta(hw, vid, true)) {

		dev_err(&adapter->pdev->dev, "Failed to add vlan id %d\n", vid);

		dev_warn(&adapter->pdev->dev, "Vlan id %d\n is not added", vid);

		spin_unlock_bh(&hw->mbx_lock);

		return -EINVAL;

	}
@@ -1520,7 +1520,7 @@ static void igbvf_reset(struct igbvf_adapter *adapter) 


	/* Allow time for pending master requests to run */

	if (mac->ops.reset_hw(hw))

		dev_err(&adapter->pdev->dev, "PF still resetting\n");

		dev_warn(&adapter->pdev->dev, "PF still resetting\n");



	mac->ops.init_hw(hw);

CRA Git | Maintained and supported by SUSTech CRA and CCSE