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

Since commit dfb073d32cac ("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: Nathan Chancellor <nathan@kernel.org>
Closes: https://lore.kernel.org/all/20251108044822.GA3262936@ax162/
Signed-off-by: Yao Zi <ziyao@disroot.org>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Simon Horman <horms@kernel.org>
tested-by: damian Tometzki damian@riscv-rocks.de
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Acked-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20251204123204.9316-1-ziyao@disroot.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
index ffeb37a7f830ebe834f75f9e58f244644d5e6450..231920425c066ec53c01030885f1c9e8d03e69f2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c
@@ -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;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
index 06a4c9f74797a4c107a6f48956889a37906ebb64..ad156b82eaa943fdb7c1cb00068e6bdcb2cbc8c6 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c
@@ -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 */