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

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



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2020-05-28

This series contains updates to e1000, e1000e, igc, igb, ixgbe and i40e.

Takashi Iwai, from SUSE, replaces some uses of snprintf() with
scnprintf() since the succeeding calls may go beyond the given buffer
limit in i40e.

Jesper Dangaard Brouer fixes up code comments in i40e_xsk.c

Xie XiuQi, from Huawei, fixes a signed-integer-overflow warning ixgbe
driver.

Jason Yan, from Huawei, converts '==' expression to bool to resolve
warnings, also fixed a warning for assigning 0/1 to a bool variable in
the ixgbe driver.  Converts functions that always return 0 to void in the
igb and i40e drivers.

YueHaibing, from Hauwei, cleans up dead code in ixgbe driver.

Sasha cleans up more dead code which is not used in the igc driver.
Added receive error counter to reflect the total number of non-filtered
packets received with errors.  Fixed a register define name to properly
reflect the register address being used.

Andre updates the igc driver to reject NFC rules that have multiple
matches, which is not supported in i225 devices.  Updates the total
number of NFC rules supported and added a code comment to explain what
is supported.

Punit Agrawal, from Toshiba, relaxes the condition to trigger a reset
for ME, which was leading to inconsistency between the state of the
hardware as expected by the driver in e1000e.

Hari, from the Linux community, cleaned up a code comment in the e1000
driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36432797 6a3faa4d

drivers/net/ethernet/intel/e1000/e1000_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -3960,7 +3960,7 @@ static s32 e1000_do_read_eeprom(struct e1000_hw *hw, u16 offset, u16 words, 
 * @hw: Struct containing variables accessed by shared code

 *

 * Reads the first 64 16 bit words of the EEPROM and sums the values read.

 * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is

 * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is

 * valid.

 */

s32 e1000_validate_eeprom_checksum(struct e1000_hw *hw)

drivers/net/ethernet/intel/e1000e/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ static inline u32 __er32(struct e1000_hw *hw, unsigned long reg) 


#define er32(reg)	__er32(hw, E1000_##reg)



s32 __ew32_prepare(struct e1000_hw *hw);

void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val);



#define ew32(reg, val)	__ew32(hw, E1000_##reg, (val))

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

+5 −7
Original line number Diff line number Diff line
@@ -158,14 +158,12 @@ static bool e1000e_check_me(u16 device_id) 
 * has bit 24 set while ME is accessing MAC CSR registers, wait if it is set

 * and try again a number of times.

 **/

s32 __ew32_prepare(struct e1000_hw *hw)

static void __ew32_prepare(struct e1000_hw *hw)

{

	s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;



	while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)

		udelay(50);



	return i;

}



void __ew32(struct e1000_hw *hw, unsigned long reg, u32 val)
@@ -646,11 +644,11 @@ static void e1000e_update_rdt_wa(struct e1000_ring *rx_ring, unsigned int i) 
{

	struct e1000_adapter *adapter = rx_ring->adapter;

	struct e1000_hw *hw = &adapter->hw;

	s32 ret_val = __ew32_prepare(hw);



	__ew32_prepare(hw);

	writel(i, rx_ring->tail);



	if (unlikely(!ret_val && (i != readl(rx_ring->tail)))) {

	if (unlikely(i != readl(rx_ring->tail))) {

		u32 rctl = er32(RCTL);



		ew32(RCTL, rctl & ~E1000_RCTL_EN);
@@ -663,11 +661,11 @@ static void e1000e_update_tdt_wa(struct e1000_ring *tx_ring, unsigned int i) 
{

	struct e1000_adapter *adapter = tx_ring->adapter;

	struct e1000_hw *hw = &adapter->hw;

	s32 ret_val = __ew32_prepare(hw);



	__ew32_prepare(hw);

	writel(i, tx_ring->tail);



	if (unlikely(!ret_val && (i != readl(tx_ring->tail)))) {

	if (unlikely(i != readl(tx_ring->tail))) {

		u32 tctl = er32(TCTL);



		ew32(TCTL, tctl & ~E1000_TCTL_EN);

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

+1 −5
Original line number Diff line number Diff line
@@ -694,10 +694,8 @@ init_adminq_exit: 
 *  i40e_shutdown_adminq - shutdown routine for the Admin Queue

 *  @hw: pointer to the hardware structure

 **/

i40e_status i40e_shutdown_adminq(struct i40e_hw *hw)

void i40e_shutdown_adminq(struct i40e_hw *hw)

{

	i40e_status ret_code = 0;



	if (i40e_check_asq_alive(hw))

		i40e_aq_queue_shutdown(hw, true);
@@ -706,8 +704,6 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw) 


	if (hw->nvm_buff.va)

		i40e_free_virt_mem(hw, &hw->nvm_buff);



	return ret_code;

}



/**

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

+12 −12
Original line number Diff line number Diff line
@@ -14486,29 +14486,29 @@ static void i40e_print_features(struct i40e_pf *pf) 


	i = snprintf(buf, INFO_STRING_LEN, "Features: PF-id[%d]", hw->pf_id);

#ifdef CONFIG_PCI_IOV

	i += snprintf(&buf[i], REMAIN(i), " VFs: %d", pf->num_req_vfs);

	i += scnprintf(&buf[i], REMAIN(i), " VFs: %d", pf->num_req_vfs);

#endif

	i += snprintf(&buf[i], REMAIN(i), " VSIs: %d QP: %d",

	i += scnprintf(&buf[i], REMAIN(i), " VSIs: %d QP: %d",

		      pf->hw.func_caps.num_vsis,

		      pf->vsi[pf->lan_vsi]->num_queue_pairs);

	if (pf->flags & I40E_FLAG_RSS_ENABLED)

		i += snprintf(&buf[i], REMAIN(i), " RSS");

		i += scnprintf(&buf[i], REMAIN(i), " RSS");

	if (pf->flags & I40E_FLAG_FD_ATR_ENABLED)

		i += snprintf(&buf[i], REMAIN(i), " FD_ATR");

		i += scnprintf(&buf[i], REMAIN(i), " FD_ATR");

	if (pf->flags & I40E_FLAG_FD_SB_ENABLED) {

		i += snprintf(&buf[i], REMAIN(i), " FD_SB");

		i += snprintf(&buf[i], REMAIN(i), " NTUPLE");

		i += scnprintf(&buf[i], REMAIN(i), " FD_SB");

		i += scnprintf(&buf[i], REMAIN(i), " NTUPLE");

	}

	if (pf->flags & I40E_FLAG_DCB_CAPABLE)

		i += snprintf(&buf[i], REMAIN(i), " DCB");

	i += snprintf(&buf[i], REMAIN(i), " VxLAN");

	i += snprintf(&buf[i], REMAIN(i), " Geneve");

		i += scnprintf(&buf[i], REMAIN(i), " DCB");

	i += scnprintf(&buf[i], REMAIN(i), " VxLAN");

	i += scnprintf(&buf[i], REMAIN(i), " Geneve");

	if (pf->flags & I40E_FLAG_PTP)

		i += snprintf(&buf[i], REMAIN(i), " PTP");

		i += scnprintf(&buf[i], REMAIN(i), " PTP");

	if (pf->flags & I40E_FLAG_VEB_MODE_ENABLED)

		i += snprintf(&buf[i], REMAIN(i), " VEB");

		i += scnprintf(&buf[i], REMAIN(i), " VEB");

	else

		i += snprintf(&buf[i], REMAIN(i), " VEPA");

		i += scnprintf(&buf[i], REMAIN(i), " VEPA");



	dev_info(&pf->pdev->dev, "%s\n", buf);

	kfree(buf);

CRA Git | Maintained and supported by SUSTech CRA and CCSE