From nobody Mon Jun 8 03:20:49 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 14EDD401A36; Thu, 4 Jun 2026 09:07:53 +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=1780564075; cv=none; b=LIuCzZumY9rR2ilZy48e3QKx76XaC8NkyJ5ZOEL6XdDTXCLeXgMtdWOUWe2hslwOqmmBYGgRbZG93of4e87Uv+TCUQK01h+cQDN75VhwSsbYFTRnyn/B2KDlllHvmhCaxmTiI8/QmEyWp2LVJc7wgsLeVNtTKWML4it7kZQcCnM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780564075; c=relaxed/simple; bh=OPQAWHI8KstRd+9G8nMJvwKk9DJoX5agUsn0K+WuUN8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Z5WeIQGdZ6LajSRs6sNl5nm9dxLQdCHy1tdj+xapCGxqXTJHxb47JdM1qvrk/nLregsKyMi43WRsmnqN6PunZG6PsPbG2y5NdKxuZxJtO+j3iBn1mqHTdGgzOUHYcp6noW2uR0Vxm/4HH9BNwzLILL++waY+BxEKqPQ2Ksz7SNA= 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=LvzVyOav; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=X2UNB/Gy; 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="LvzVyOav"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="X2UNB/Gy" Date: Thu, 04 Jun 2026 09:07:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780564072; 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=DrunlsHJxktYfboBPx9kpUrA6p0TAWwu8jI0kL0eo88=; b=LvzVyOavQu9lHminj2PunRY0p+lp38Gb4Bd1h7/SiF04DTZVETSYIfM+/i5wo7qiH/TBl4 oDKkCbxPRe/33H6tWGDYJ7iaXTFRZNWhgrWaCpbAaPho+JCKuqiqu25N3TOebHW6Sd5FQK SkpnSL/OnbQJSGcMR3cyjSNGVNbd/SkljgpJ8ZF+y3kwP9FLHTPaffOWwqon06MmIeY2V9 90gD4yknm/tTqYX7eIGOxfHjjp/0VkU2bJFQDBBPE9LwUf6l/c9nW6ks1EohL6vdVO2o5/ 9PXJQqCagHs5l26bjTxq2D6RwotuFkkkAJhiI8YNQbH4KCMzaD/3qyzztCcurQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780564072; 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=DrunlsHJxktYfboBPx9kpUrA6p0TAWwu8jI0kL0eo88=; b=X2UNB/GyXi/C8KBXn/tPK8T98gcOBlKQGCf06/d+giRRrZRgySYdIWllZdbI+RMnSaLWY3 n7Lg/w//xGsYCeDg== 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] ice/ptp: Use provided clock ID for history snapshot Cc: Thomas Gleixner , Arthur Kiyanovski , David Woodhouse , Jacob Keller , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260529195557.587226681@kernel.org> References: <20260529195557.587226681@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178056407119.710.18372875078554662363.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: 23bc637750e4142ef9e86a06872fdf32e74a9050 Gitweb: https://git.kernel.org/tip/23bc637750e4142ef9e86a06872fdf32e= 74a9050 Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:40 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 04 Jun 2026 11:04:16 +02:00 ice/ptp: Use provided clock ID for history snapshot The PTP core indicates in system_device_crosststamp::clock_id the clock ID for which then system time stamp should be taken. That allows to utilize hardware timestamps with e.g. AUX clocks. Save the provided clock ID and use it in ice_capture_crosststamp() for taking the history snapshot. No functional change. Signed-off-by: Thomas Gleixner Tested-by: Arthur Kiyanovski Reviewed-by: David Woodhouse Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20260529195557.587226681@kernel.org --- drivers/net/ethernet/intel/ice/ice_ptp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/etherne= t/intel/ice/ice_ptp.c index 36df742..f9e4ec6 100644 --- a/drivers/net/ethernet/intel/ice/ice_ptp.c +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c @@ -2065,11 +2065,13 @@ static const struct ice_crosststamp_cfg ice_crossts= tamp_cfg_e830 =3D { /** * struct ice_crosststamp_ctx - Device cross timestamp context * @snapshot: snapshot of system clocks for historic interpolation + * @snapshot_clock_id: System clock ID for @snapshot * @pf: pointer to the PF private structure * @cfg: pointer to hardware configuration for cross timestamp */ struct ice_crosststamp_ctx { struct system_time_snapshot snapshot; + clockid_t snapshot_clock_id; struct ice_pf *pf; const struct ice_crosststamp_cfg *cfg; }; @@ -2115,7 +2117,7 @@ static int ice_capture_crosststamp(ktime_t *device, } =20 /* Snapshot system time for historic interpolation */ - ktime_get_snapshot(&ctx->snapshot); + ktime_get_snapshot_id(ctx->snapshot_clock_id, &ctx->snapshot); =20 /* Program cmd to master timer */ ice_ptp_src_cmd(hw, ICE_PTP_READ_TIME); @@ -2176,6 +2178,7 @@ static int ice_ptp_getcrosststamp(struct ptp_clock_in= fo *info, { struct ice_pf *pf =3D ptp_info_to_pf(info); struct ice_crosststamp_ctx ctx =3D { + .snapshot_clock_id =3D cts->clock_id, .pf =3D pf, }; =20