Commit 0b32ce68 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/net-queue 



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2020-08-14

This series contains updates to i40e and igc drivers.

Vinicius fixes an issue with PTP spinlock being accessed before
initialization.

Przemyslaw fixes an issue with trusted VFs seeing additional traffic.

Grzegorz adds a wait for pending resets on driver removal to prevent
null pointer dereference.

v2: Fix function parameter for hw/aq in patch 2. Fix fixes tag in patch 3.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 35759383 5b6d4a7f

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

+1 −1
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ struct i40e_aqc_set_vsi_promiscuous_modes { 
#define I40E_AQC_SET_VSI_PROMISC_BROADCAST	0x04

#define I40E_AQC_SET_VSI_DEFAULT		0x08

#define I40E_AQC_SET_VSI_PROMISC_VLAN		0x10

#define I40E_AQC_SET_VSI_PROMISC_TX		0x8000

#define I40E_AQC_SET_VSI_PROMISC_RX_ONLY	0x8000

	__le16	seid;

	__le16	vlan_tag;

#define I40E_AQC_SET_VSI_VLAN_VALID		0x8000

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

+27 −8
Original line number Diff line number Diff line
@@ -1966,6 +1966,21 @@ i40e_status i40e_aq_set_phy_debug(struct i40e_hw *hw, u8 cmd_flags, 
	return status;

}



/**

 * i40e_is_aq_api_ver_ge

 * @aq: pointer to AdminQ info containing HW API version to compare

 * @maj: API major value

 * @min: API minor value

 *

 * Assert whether current HW API version is greater/equal than provided.

 **/

static bool i40e_is_aq_api_ver_ge(struct i40e_adminq_info *aq, u16 maj,

				  u16 min)

{

	return (aq->api_maj_ver > maj ||

		(aq->api_maj_ver == maj && aq->api_min_ver >= min));

}



/**

 * i40e_aq_add_vsi

 * @hw: pointer to the hw struct
@@ -2091,18 +2106,16 @@ i40e_status i40e_aq_set_vsi_unicast_promiscuous(struct i40e_hw *hw, 


	if (set) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (rx_only_promisc &&

		    (((hw->aq.api_maj_ver == 1) && (hw->aq.api_min_ver >= 5)) ||

		     (hw->aq.api_maj_ver > 1)))

			flags |= I40E_AQC_SET_VSI_PROMISC_TX;

		if (rx_only_promisc && i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);



	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (((hw->aq.api_maj_ver >= 1) && (hw->aq.api_min_ver >= 5)) ||

	    (hw->aq.api_maj_ver > 1))

		cmd->valid_flags |= cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_TX);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);



	cmd->seid = cpu_to_le16(seid);

	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
@@ -2199,11 +2212,17 @@ enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw, 
	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_vsi_promiscuous_modes);



	if (enable)

	if (enable) {

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;

		if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

			flags |= I40E_AQC_SET_VSI_PROMISC_RX_ONLY;

	}



	cmd->promiscuous_flags = cpu_to_le16(flags);

	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	if (i40e_is_aq_api_ver_ge(&hw->aq, 1, 5))

		cmd->valid_flags |=

			cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_RX_ONLY);

	cmd->seid = cpu_to_le16(seid);

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

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

+3 −0
Original line number Diff line number Diff line
@@ -15463,6 +15463,9 @@ static void i40e_remove(struct pci_dev *pdev) 
	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0);

	i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0);



	while (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))

		usleep_range(1000, 2000);



	/* no more scheduling of any task */

	set_bit(__I40E_SUSPENDED, pf->state);

	set_bit(__I40E_DOWN, pf->state);

drivers/net/ethernet/intel/igc/igc_main.c

+2 −3
Original line number Diff line number Diff line
@@ -5142,6 +5142,8 @@ static int igc_probe(struct pci_dev *pdev, 
	device_set_wakeup_enable(&adapter->pdev->dev,

				 adapter->flags & IGC_FLAG_WOL_SUPPORTED);



	igc_ptp_init(adapter);



	/* reset the hardware with the new settings */

	igc_reset(adapter);
@@ -5158,9 +5160,6 @@ static int igc_probe(struct pci_dev *pdev, 
	 /* carrier off reporting is important to ethtool even BEFORE open */

	netif_carrier_off(netdev);



	/* do hw tstamp init after resetting */

	igc_ptp_init(adapter);



	/* Check if Media Autosense is enabled */

	adapter->ei = *ei;

drivers/net/ethernet/intel/igc/igc_ptp.c

+0 −2
Original line number Diff line number Diff line
@@ -496,8 +496,6 @@ void igc_ptp_init(struct igc_adapter *adapter) 
	adapter->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;

	adapter->tstamp_config.tx_type = HWTSTAMP_TX_OFF;



	igc_ptp_reset(adapter);



	adapter->ptp_clock = ptp_clock_register(&adapter->ptp_caps,

						&adapter->pdev->dev);

	if (IS_ERR(adapter->ptp_clock)) {