From nobody Mon Jun 8 03:21:17 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3CC53D4107; Tue, 2 Jun 2026 09:46:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780393569; cv=none; b=QDpzX15g9VqVV/vuRhJBzq0jvhgjv4hijRR5KxOwwWvGQxT9ObspIwKjetsUQpwAEH+L0397T7Nl7O8dL2laIcvyUYD2sKwTZQGqmTFnpO4a9/2aQ2f3cTQ9ZkPQdTPvqI1uqQsXyo61Pq8AmoRAPWI1WOkYspouTjavFcJpbUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780393569; c=relaxed/simple; bh=uhOaBYAEtsrtdsST25IebUr4zx29zKSUZzsm1gMd6kY=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=S/crqgiV9CGcRJgOuJO1j51S2TL8KgtfunE/76GKjQyos0bhTxcr2CvHdkJQyQoGa1swr9juu8o6NyoK81G9QCg3uJjQr1PbTdRY5HW6lxcb36JjS2FT3Tmtz+znHB3Y/rWoibHSEIw+nGZ1InEHQHckh9yuEpsVvFMV0ORJ9ww= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Ey7Kexp3; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ew9VgGBZ; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Ey7Kexp3"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ew9VgGBZ" Date: Tue, 02 Jun 2026 09:46:04 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780393565; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LSZat373EFQcxUwSQMOusXbUz32mrhLmw4kkfS8WDaU=; b=Ey7Kexp3e0KVp7cUwB2Tfz3df/AZmxH02B+oaGV5hq5WJnkuwRcruC2VCFAqz5AEn/uszK Lpk3WpFc9+PYTt7fuGU3uvUdrFbUkocXO0f/PS81AJOI/64bMWcqdxFgy78U3udFLbFvRB Zs0bgyQk+vgGRB+JkoHiPLDfZDg5hsN2XodUQnfODjEnh9R3QXLpb/rNi45lkalaRvfNnT GPim851cT4G+l+bZ/QsoEJX60rD8MVgFXOchFZOUlUbl7S59QiVRzQ9x9R6/iJ3uz7sNVL QQCuicRlbZLzYwBufeth+0sGmut7qJfPASGOwdPvUdbdd7hK2M3wiCzkVdrhdQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780393565; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LSZat373EFQcxUwSQMOusXbUz32mrhLmw4kkfS8WDaU=; b=ew9VgGBZ/XUlbV3udml5HXbyT1GMQDg1tACRwAT+zn0vsmSq2O2DUk3tW6yCFnx7+JFEKb 1ZTdAUPDqAz/psBA== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/ptp] wifi: iwlwifi: Adopt PTP cross timestamps to core changes Cc: Thomas Gleixner , Arthur Kiyanovski , David Woodhouse , Jacob Keller , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260529195557.535447186@kernel.org> References: <20260529195557.535447186@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178039356448.2140988.12198782248150305711.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/ptp branch of tip: Commit-ID: 6a5d1d6b447f4ead15133730b92141707c61832b Gitweb: https://git.kernel.org/tip/6a5d1d6b447f4ead15133730b92141707= c61832b Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:36 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 02 Jun 2026 11:39:58 +02:00 wifi: iwlwifi: Adopt PTP cross timestamps to core changes iwlwifi only supports CLOCK_REALTIME timestamps and provides an incomplete result without system counter values etc. It also zeros struct system_device_crosststamp, which is already zeroed in the core and initialized with the clock ID. Remove the zeroing and reject any request for a clock ID other than REALTIM= E. Signed-off-by: Thomas Gleixner Tested-by: Arthur Kiyanovski Reviewed-by: David Woodhouse Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20260529195557.535447186@kernel.org --- drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 3 ++- drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c b/drivers/net/wir= eless/intel/iwlwifi/mld/ptp.c index c65f4b5..921b93c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mld/ptp.c +++ b/drivers/net/wireless/intel/iwlwifi/mld/ptp.c @@ -250,7 +250,8 @@ iwl_mld_phc_get_crosstimestamp(struct ptp_clock_info *p= tp, /* System (wall) time */ ktime_t sys_time; =20 - memset(xtstamp, 0, sizeof(struct system_device_crosststamp)); + if (xtstamp->clock_id !=3D CLOCK_REALTIME) + return -ENOTSUPP; =20 ret =3D iwl_mld_get_crosstimestamp_fw(mld, &gp2, &sys_time); if (ret) { diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c b/drivers/net/wir= eless/intel/iwlwifi/mvm/ptp.c index f7b6201..4c40a52 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ptp.c @@ -160,13 +160,14 @@ iwl_mvm_phc_get_crosstimestamp(struct ptp_clock_info = *ptp, /* System (wall) time */ ktime_t sys_time; =20 - memset(xtstamp, 0, sizeof(struct system_device_crosststamp)); - if (!mvm->ptp_data.ptp_clock) { IWL_ERR(mvm, "No PHC clock registered\n"); return -ENODEV; } =20 + if (xtstamp->clock_id !=3D CLOCK_REALTIME) + return -ENOTSUPP; + mutex_lock(&mvm->mutex); if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_SYNCED_TIME)) { ret =3D iwl_mvm_get_crosstimestamp_fw(mvm, &gp2, &sys_time);