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

Merge branch '1GbE' of https://github.com/anguy11/next-queue 



Tony Nguyen says:

====================
1GbE Intel Wired LAN Driver Updates 2020-09-28

This series contains updates to igb, igc, and e1000e drivers.

Sven Auhagen adds XDP support for igb.

Gal Hammer allows for 82576 to display part number string correctly for
igb.

Sasha adds device IDs for i221 and i226 parts. Exposes LPI counters and
removes unused fields in structures for igc. He also adds Meteor Lake
support for e1000e.

For igc, Andre renames IGC_TSYNCTXCTL_VALID to IGC_TSYNCTXCTL_TXTT_0 to
match the datasheet and adds a warning if it's not set when expected.
Removes the PTP Tx timestamp check in igc_ptp_tx_work() as it's already
checked in the watchdog_task. Cleans up some code by removing invalid error
bits, renaming a bit to match datasheet naming, and removing a, now
unneeded, macro.

Vinicius makes changes for igc PTP: removes calling SYSTIMR to latch timer
value, stores PTP time before a reset, and rejects schedules with times in
the future.

v2: Remove 'inline' from igb_xdp_tx_queue_mapping() and igb_rx_offset()
for patch 1
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bcbf1be0 cc23f4f0

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

+2 −0
Original line number Diff line number Diff line
@@ -895,6 +895,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		mask |= BIT(18);

		break;

	default:
@@ -1560,6 +1561,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		fext_nvm11 = er32(FEXTNVM11);

		fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX;

		ew32(FEXTNVM11, fext_nvm11);

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

+5 −0
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ struct e1000_hw; 
#define E1000_DEV_ID_PCH_ADP_I219_V16		0x1A1F

#define E1000_DEV_ID_PCH_ADP_I219_LM17		0x1A1C

#define E1000_DEV_ID_PCH_ADP_I219_V17		0x1A1D

#define E1000_DEV_ID_PCH_MTP_I219_LM18		0x550A

#define E1000_DEV_ID_PCH_MTP_I219_V18		0x550B

#define E1000_DEV_ID_PCH_MTP_I219_LM19		0x550C

#define E1000_DEV_ID_PCH_MTP_I219_V19		0x550D



#define E1000_REVISION_4	4
@@ -127,6 +131,7 @@ enum e1000_mac_type { 
	e1000_pch_cnp,

	e1000_pch_tgp,

	e1000_pch_adp,

	e1000_pch_mtp,

};



enum e1000_media_type {

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

+7 −0
Original line number Diff line number Diff line
@@ -320,6 +320,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		if (e1000_phy_is_accessible_pchlan(hw))

			break;
@@ -464,6 +465,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw) 
		case e1000_pch_cnp:

		case e1000_pch_tgp:

		case e1000_pch_adp:

		case e1000_pch_mtp:

			/* In case the PHY needs to be in mdio slow mode,

			 * set slow mode and try to get the PHY id again.

			 */
@@ -708,6 +710,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_hw *hw) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

	case e1000_pchlan:

		/* check management mode */

		mac->ops.check_mng_mode = e1000_check_mng_mode_pchlan;
@@ -1648,6 +1651,7 @@ static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		rc = e1000_init_phy_params_pchlan(hw);

		break;

	default:
@@ -2102,6 +2106,7 @@ static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		sw_cfg_mask = E1000_FEXTNVM_SW_CONFIG_ICH8M;

		break;

	default:
@@ -3145,6 +3150,7 @@ static s32 e1000_valid_nvm_bank_detect_ich8lan(struct e1000_hw *hw, u32 *bank) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		bank1_offset = nvm->flash_bank_size;

		act_offset = E1000_ICH_NVM_SIG_WORD;
@@ -4090,6 +4096,7 @@ static s32 e1000_validate_nvm_checksum_ich8lan(struct e1000_hw *hw) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		word = NVM_COMPAT;

		valid_csum_mask = NVM_COMPAT_VALID_CSUM;

		break;

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

+6 −0
Original line number Diff line number Diff line
@@ -3587,6 +3587,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {

			/* Stable 24MHz frequency */

			incperiod = INCPERIOD_24MHZ;
@@ -4104,6 +4105,7 @@ void e1000e_reset(struct e1000_adapter *adapter) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		fc->refresh_time = 0xFFFF;

		fc->pause_time = 0xFFFF;
@@ -7877,6 +7879,10 @@ static const struct pci_device_id e1000_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_cnp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_cnp },



	{ 0, 0, 0, 0, 0, 0, 0 }	/* terminate list */

};

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

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ void e1000e_ptp_init(struct e1000_adapter *adapter) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

		if ((hw->mac.type < e1000_pch_lpt) ||

		    (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)) {

			adapter->ptp_clock_info.max_adj = 24000000 - 1;