Commit f4f2970d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2021-12-21

This series contains updates to igc, igb, igbvf, and fm10k drivers.

Sasha removes unused defines and enum values from igc driver.

Jason Wang removes a variable whose value never changes and, instead,
returns the value directly for igb.

Karen adjusts a reset message from warning to info for igbvf.

Xiang wangx removes a repeated word for fm10k.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  fm10k: Fix syntax errors in comments
  igbvf: Refactor trace
  igb: remove never changed variable `ret_val'
  igc: Remove obsolete define
  igc: Remove obsolete mask
  igc: Remove obsolete nvm type
  igc: Remove unused phy type
  igc: Remove unused _I_PHY_ID define
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b3ec7248 37cf276d

drivers/net/ethernet/intel/fm10k/fm10k_tlv.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ s32 fm10k_tlv_attr_put_mac_vlan(u32 *msg, u16 attr_id, 
 *  @vlan: location of buffer to store VLAN

 *

 *  This function pulls the MAC address back out of the attribute and will

 *  place it in the array pointed by by mac_addr.  It will return success

 *  place it in the array pointed by mac_addr.  It will return success

 *  if provided with a valid pointers.

 **/

s32 fm10k_tlv_attr_get_mac_vlan(u32 *attr, u8 *mac_addr, u16 *vlan)

drivers/net/ethernet/intel/igb/e1000_i210.c

+1 −2
Original line number Diff line number Diff line
@@ -792,7 +792,6 @@ s32 igb_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data) 
 **/

s32 igb_init_nvm_params_i210(struct e1000_hw *hw)

{

	s32 ret_val = 0;

	struct e1000_nvm_info *nvm = &hw->nvm;



	nvm->ops.acquire = igb_acquire_nvm_i210;
@@ -813,7 +812,7 @@ s32 igb_init_nvm_params_i210(struct e1000_hw *hw) 
		nvm->ops.validate = NULL;

		nvm->ops.update   = NULL;

	}

	return ret_val;

	return 0;

}



/**

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

+1 −1
Original line number Diff line number Diff line
@@ -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_warn(&adapter->pdev->dev, "PF still resetting\n");

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



	mac->ops.init_hw(hw);

drivers/net/ethernet/intel/igc/igc_defines.h

+0 −7
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ 


#define IGC_WUFC_EXT_FILTER_MASK GENMASK(31, 8)



/* Physical Func Reset Done Indication */

#define IGC_CTRL_EXT_LINK_MODE_MASK	0x00C00000



/* Loop limit on how long we wait for auto-negotiation to complete */

#define COPPER_LINK_UP_LIMIT		10

#define PHY_AUTO_NEG_LIMIT		45
@@ -584,7 +581,6 @@ 
#define IGC_GEN_POLL_TIMEOUT	1920



/* PHY Control Register */

#define MII_CR_FULL_DUPLEX	0x0100  /* FDX =1, half duplex =0 */

#define MII_CR_RESTART_AUTO_NEG	0x0200  /* Restart auto negotiation */

#define MII_CR_POWER_DOWN	0x0800  /* Power down */

#define MII_CR_AUTO_NEG_EN	0x1000  /* Auto Neg Enable */
@@ -605,9 +601,6 @@ 
#define PHY_1000T_CTRL		0x09 /* 1000Base-T Control Reg */

#define PHY_1000T_STATUS	0x0A /* 1000Base-T Status Reg */



/* Bit definitions for valid PHY IDs. I = Integrated E = External */

#define I225_I_PHY_ID		0x67C9DC00



/* MDI Control */

#define IGC_MDIC_DATA_MASK	0x0000FFFF

#define IGC_MDIC_REG_MASK	0x001F0000

drivers/net/ethernet/intel/igc/igc_hw.h

+0 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ enum igc_mac_type { 


enum igc_phy_type {

	igc_phy_unknown = 0,

	igc_phy_none,

	igc_phy_i225,

};
@@ -68,8 +67,6 @@ enum igc_media_type { 
enum igc_nvm_type {

	igc_nvm_unknown = 0,

	igc_nvm_eeprom_spi,

	igc_nvm_flash_hw,

	igc_nvm_invm,

};



struct igc_info {