Commit 0c9fbb38 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: intel: only populate plat->crosststamp when supported 



To allow the ptp_chardev code to correctly detect whether crosststamps
are supported, we need to conditionally populate the .getcrosststamp()
method. As the previous patch implements that functionality by
detecting whether the platform glue provides a crosststamp() method,
arrange for the dwmac-intel code to only populate this if the X86
ART feature is present, rather than testing for it at runtime in
intel_crosststamp().

This reflects what other x86 PTP clock drivers do, e.g.
ice_ptp_set_funcs_e830(), e1000e_ptp_init(), idpf_ptp_set_caps() etc.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uto2i-00000001seA-0lxv@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bb427fb8

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

+3 −4
Original line number Diff line number Diff line
@@ -371,9 +371,6 @@ static int intel_crosststamp(ktime_t *device, 
	u32 acr_value;

	int i;



	if (!boot_cpu_has(X86_FEATURE_ART))

		return -EOPNOTSUPP;



	intel_priv = priv->plat->bsp_priv;



	/* Both internal crosstimestamping and external triggered event
@@ -755,7 +752,9 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, 


	plat->int_snapshot_num = AUX_SNAPSHOT1;



	if (boot_cpu_has(X86_FEATURE_ART))

		plat->crosststamp = intel_crosststamp;



	plat->flags &= ~STMMAC_FLAG_INT_SNAPSHOT_EN;



	/* Setup MSI vector offset specific to Intel mGbE controller */