From nobody Mon Jun 8 03:19:48 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 4E6A9402443; Thu, 4 Jun 2026 09:07:55 +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=1780564076; cv=none; b=cQGiCxs4o6Pw29EkAcuPTThpUyRxIw3E8QrC0Q2RgTu/Wg8zvjD4k+NkDu/LXp+/5inwD7oUnaYDB/h3nk3E1SvRS5iWt7zVL4EUqvp+Gop3b4Pa+W88Bm5ZPPowt88QWMmrO9m+mNyxwuYji65tlYXhjRRp4nZjZZSAIdVAWLE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780564076; c=relaxed/simple; bh=imaY66JrmxYWOhvX6FmLa5IwLlM8UtwYZ+moB8iLn1s=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=KWV+53sWL7JfUYimik8OrOFEH3Igue9PWK+BxFeh1DY09mpMq/Xx2GinjhBxtqqjZhUyrNKoG9A5rIaVOcYXHBsf21YOP+gQhzDwbB3IuGdXNBldQRXAu5VXUdP8PWITyJb819jnI/AAeJOERPVw4eDqJYUUWKEOFvt+ms99Jg0= 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=sOZkaLVg; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=+r6mWSWX; 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="sOZkaLVg"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="+r6mWSWX" Date: Thu, 04 Jun 2026 09:07:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780564073; 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=C5xhq1PlvtPJhBs8GVQCUQJwNtr+gnFTopABJR0+izM=; b=sOZkaLVgrqXdI4OsLYYt0vOILDOyR+YkHw1NywofAYCi9z5ZBfzyMl7QHWOG6cfakmrB2S mP9UVSNT/+WCKdjQPYBO68slJxNQ1RxAJocscf0UQgnGiL02lLRKWlgWFrLNLZJkdmuAZd Uf9VP8+6Gtqcx5KVXzeLlbfBABzMIX4G7G1wOXyubFPLqWx8xg7qrlVNKkmvhKf56aT9Qr 07cRQSMQIXk7XdW6qOynIPr1AP2DXO03ZnI541tXLgLhBoWyHDIW5TsToewmeugRbW6eln dohM4m6EHuFwKQoWrj5RC0cNHj7S+pUU8qX+NucB8G48ckXHua5EpFaKvwNz+A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780564073; 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=C5xhq1PlvtPJhBs8GVQCUQJwNtr+gnFTopABJR0+izM=; b=+r6mWSWXP2iGl7cKuZh/+ufszuCq9mEZ7doKAG6R5GM096UovgcnFldvTrlFBXpqdFiOJE iSUjEZMOkQ6YJYBQ== 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: <178056407254.710.12789337931568700792.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: 570cf418bfc9d7d0ab662794dd2e2f4eeb79dfe5 Gitweb: https://git.kernel.org/tip/570cf418bfc9d7d0ab662794dd2e2f4ee= b79dfe5 Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:36 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 04 Jun 2026 11:04:16 +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);