Commit 81d90d93 authored by Yao Zi's avatar Yao Zi Committed by Johannes Berg
Browse files

wifi: iwlwifi: Implement settime64 as stub for MVM/MLD PTP 



Since commit dfb073d3 ("ptp: Return -EINVAL on ptp_clock_register if
required ops are NULL"), PTP clock registered through ptp_clock_register
is required to have ptp_clock_info.settime64 set, however, neither MVM
nor MLD's PTP clock implementation sets it, resulting in warnings when
the interface starts up, like

WARNING: drivers/ptp/ptp_clock.c:325 at ptp_clock_register+0x2c8/0x6b8, CPU#1: wpa_supplicant/469
CPU: 1 UID: 0 PID: 469 Comm: wpa_supplicant Not tainted 6.18.0+ #101 PREEMPT(full)
ra: ffff800002732cd4 iwl_mvm_ptp_init+0x114/0x188 [iwlmvm]
ERA: 9000000002fdc468 ptp_clock_register+0x2c8/0x6b8
iwlwifi 0000:01:00.0: Failed to register PHC clock (-22)

I don't find an appropriate firmware interface to implement settime64()
for iwlwifi MLD/MVM, thus instead create a stub that returns
-EOPTNOTSUPP only, suppressing the warning and allowing the PTP clock to
be registered.

Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/all/20251108044822.GA3262936@ax162/


Signed-off-by: default avatarYao Zi <ziyao@disroot.org>
Tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
tested-by: default avatardamian Tometzki <damian@riscv-rocks.de>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Acked-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251204123204.9316-1-ziyao@disroot.org


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ca589822

drivers/net/wireless/intel/iwlwifi/mld/ptp.c

+7 −0
Original line number Diff line number Diff line
@@ -121,6 +121,12 @@ static int iwl_mld_ptp_gettime(struct ptp_clock_info *ptp, 
	return 0;

}



static int iwl_mld_ptp_settime(struct ptp_clock_info *ptp,

			       const struct timespec64 *ts)

{

	return -EOPNOTSUPP;

}



static int iwl_mld_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)

{

	struct iwl_mld *mld = container_of(ptp, struct iwl_mld,
@@ -279,6 +285,7 @@ void iwl_mld_ptp_init(struct iwl_mld *mld) 


	mld->ptp_data.ptp_clock_info.owner = THIS_MODULE;

	mld->ptp_data.ptp_clock_info.gettime64 = iwl_mld_ptp_gettime;

	mld->ptp_data.ptp_clock_info.settime64 = iwl_mld_ptp_settime;

	mld->ptp_data.ptp_clock_info.max_adj = 0x7fffffff;

	mld->ptp_data.ptp_clock_info.adjtime = iwl_mld_ptp_adjtime;

	mld->ptp_data.ptp_clock_info.adjfine = iwl_mld_ptp_adjfine;

drivers/net/wireless/intel/iwlwifi/mvm/ptp.c

+7 −0
Original line number Diff line number Diff line
@@ -220,6 +220,12 @@ static int iwl_mvm_ptp_gettime(struct ptp_clock_info *ptp, 
	return 0;

}



static int iwl_mvm_ptp_settime(struct ptp_clock_info *ptp,

			       const struct timespec64 *ts)

{

	return -EOPNOTSUPP;

}



static int iwl_mvm_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)

{

	struct iwl_mvm *mvm = container_of(ptp, struct iwl_mvm,
@@ -281,6 +287,7 @@ void iwl_mvm_ptp_init(struct iwl_mvm *mvm) 
	mvm->ptp_data.ptp_clock_info.adjfine = iwl_mvm_ptp_adjfine;

	mvm->ptp_data.ptp_clock_info.adjtime = iwl_mvm_ptp_adjtime;

	mvm->ptp_data.ptp_clock_info.gettime64 = iwl_mvm_ptp_gettime;

	mvm->ptp_data.ptp_clock_info.settime64 = iwl_mvm_ptp_settime;

	mvm->ptp_data.scaled_freq = SCALE_FACTOR;



	/* Give a short 'friendly name' to identify the PHC clock */