Commit 688a0d61 authored by Vitaly Lifshits's avatar Vitaly Lifshits Committed by Tony Nguyen
Browse files

e1000e: set fixed clock frequency indication for Nahum 11 and Nahum 13 



On some systems with Nahum 11 and Nahum 13 the value of the XTAL clock in
the software STRAP is incorrect. This causes the PTP timer to run at the
wrong rate and can lead to synchronization issues.

The STRAP value is configured by the system firmware, and a firmware
update is not always possible. Since the XTAL clock on these systems
always runs at 38.4MHz, the driver may ignore the STRAP and just set
the correct value.

Fixes: cc23f4f0 ("e1000e: Add support for Meteor Lake")
Signed-off-by: default avatarVitaly Lifshits <vitaly.lifshits@intel.com>
Tested-by: default avatarMor Bar-Gabay <morx.bar.gabay@intel.com>
Reviewed-by: default avatarGil Fine <gil.fine@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 48c8b214

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

+11 −3
Original line number Diff line number Diff line
@@ -3534,9 +3534,6 @@ 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:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

	case e1000_pch_nvp:

		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI) {

			/* Stable 24MHz frequency */
@@ -3552,6 +3549,17 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) 
			adapter->cc.shift = shift;

		}

		break;

	case e1000_pch_mtp:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

		/* System firmware can misreport this value, so set it to a

		 * stable 38400KHz frequency.

		 */

		incperiod = INCPERIOD_38400KHZ;

		incvalue = INCVALUE_38400KHZ;

		shift = INCVALUE_SHIFT_38400KHZ;

		adapter->cc.shift = shift;

		break;

	case e1000_82574:

	case e1000_82583:

		/* Stable 25MHz frequency */

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

+5 −3
Original line number Diff line number Diff line
@@ -295,15 +295,17 @@ void e1000e_ptp_init(struct e1000_adapter *adapter) 
	case e1000_pch_cnp:

	case e1000_pch_tgp:

	case e1000_pch_adp:

	case e1000_pch_mtp:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

	case e1000_pch_nvp:

		if (er32(TSYNCRXCTL) & E1000_TSYNCRXCTL_SYSCFI)

			adapter->ptp_clock_info.max_adj = MAX_PPB_24MHZ;

		else

			adapter->ptp_clock_info.max_adj = MAX_PPB_38400KHZ;

		break;

	case e1000_pch_mtp:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

		adapter->ptp_clock_info.max_adj = MAX_PPB_38400KHZ;

		break;

	case e1000_82574:

	case e1000_82583:

		adapter->ptp_clock_info.max_adj = MAX_PPB_25MHZ;