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 0751C3D6CA5; Tue, 2 Jun 2026 09:46:06 +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=1780393568; cv=none; b=FC+Gcz1cuWgdGaN8WBUYmeV+XsZImphE1uETJ8DSvpPAOoxdH3WlPjIWd0ZNWumUNuonQ9ejah0WYMlfnGKI30zRTfAQz0YDX1u9P8O0otZfZHTw04SXDaiH1B3Nw4ee50dIrJLpwzi8JBjsw/DXobc6XFuRYF51oXzmuc9C/lA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780393568; c=relaxed/simple; bh=yE9rmzAS/B228Y/U99zFyEDU9oeYQ0js1Ot9GZgADN8=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=pnuGYpcqPiJeimURNTr408OSYGDhCymtbjbUUvd+qf37cXdQe6FKr7PRPc4OO8KLtAVHnV8EtKN8GWFJy18+qaHUthaZhMZMRYoUgX07zWvEwOKuVWlowwRcwv/mRPanzQTk8/3gUsTDPKrJ453/nIXxMv2jbdzHC9t0TmaPQq4= 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=0skz92KS; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=8XB+t830; 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="0skz92KS"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="8XB+t830" Date: Tue, 02 Jun 2026 09:46:03 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780393564; 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=OECaBy1o8M4XtmhRqbiWUUkw1+Gj4mIxOoYsOVVGqHE=; b=0skz92KSZL/XN5aEsjPkx7AHg5jsBXsAj/gR8mPFuCz7zhgJiGbdoxbfJoL6U6WlNB51rk Z4qAWyjhJBgl9YHMfgWyh5vjczEURRmHfzbixbVMULBSSy0mwR42RPyO94Xvs4eKi+hnlb rheOE/KiQCaHv+VhaFrB2i7c+YIV5BA53j44W4nu+lq0n5KnIklftwLJf8Au3uSs2B2Vr4 cvplPjoHUN2Iy0uzge2+9uKor6iuTveMW0bGuhd7SSyjxDRTvIOI11diRpS01WKxNSXIfa ddbtmtI8MJzToji4TpFzn++hkWbDtrklkxsuzHgqBFtwdrT0Xv79IoZ7KE0ycQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780393564; 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=OECaBy1o8M4XtmhRqbiWUUkw1+Gj4mIxOoYsOVVGqHE=; b=8XB+t830TKE4Qop22+G3iFa6X6Zy+7XMk/sZkxFTjoSTpSqCMgvA+RyaD69m+EP05qjnUX rkAnjECrdp9LxRAw== 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: <178039356323.2140988.12543815167910263647.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: db9e2147563fc7a19b2f187a95ddd890d374f40e Gitweb: https://git.kernel.org/tip/db9e2147563fc7a19b2f187a95ddd890d= 374f40e Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:40 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 02 Jun 2026 11:39:59 +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