From nobody Mon Jun 8 03:19:35 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 B88DE3FBB77; Thu, 4 Jun 2026 09:07:52 +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=1780564074; cv=none; b=ed7EbTArN9UWU4PIWNuVY0wjaHUD0De7IYFi/9p1rWIFKAQ6FIch+Ok4GztVysZM8ZOowY+r8rVjs8LSDTjxHmzpe10488vue3LN51HgwHOBvQbIBCeQ2smH1t1l9r56Sl55oZwRnzof8H0N0YhB1Ug01Gm22G6qowSxLNNIxHw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780564074; c=relaxed/simple; bh=+VF1+LYar80a3Buc3TQN7hF4M7tQZfWabB8T8f4epT4=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=N6YBTctomBcmy030ZsDSdvW5ETaPnLMWdsCf2g0lcO+ZVB7JaVJmB47IbiJ5qeHxCJH3bTd1lS5Te8mhSf2RjQKntPjnwRXyKO7vcyidFVdm6j84TBVMbDaA53d8lgdJnE/aIhQYJpLVDDL1ZZ/1lpM1Mgk9tKyykENK95kZO74= 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=nfy4qUBb; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=7mVcV02Z; 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="nfy4qUBb"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="7mVcV02Z" Date: Thu, 04 Jun 2026 09:07:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780564071; 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=Xr81wAtIijUxyh8H/gVycwOW3QEErxBOxCiayZnpSf8=; b=nfy4qUBb06huMy/2VJPp6DUtkH8hIh8HbXPP1ms8/JaKIXp3K26koSKi2hPlcN2izaRK3Q yRJXHYMQe3WBbIFyf6MmTR8Ru0ZeRFZ3gfULUdtxdBa5ObwGkLXlA/t1u/TQm8IP8jvrbx CaWckieyfVNCcDhrmHN2y7kri9cOM6Ar/B/FygIP4o0/fivrGVmHtGEFo6kSu/drdUCe6A Tb2C9YNWsj+OJgo8wVM7M+SI3T/q6aKIVYnlHlIVhHO4G4Cz4G08txyHetoldv4vZHgZgu cK3kwmjiFhu8xkTPV+vT8A8bNtTmzcSK+L62xPa3sZhm7psXvMgjxLjSziT8kQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780564071; 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=Xr81wAtIijUxyh8H/gVycwOW3QEErxBOxCiayZnpSf8=; b=7mVcV02ZYKnTtnN9PeKU1AUNRs89ZsRVkyZHpyIXAtjHYRWBqGoDk2EGkjNl3Qh2xLCKco I90yHFP+MkVs8QDg== 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] igc: 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.637381831@kernel.org> References: <20260529195557.637381831@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178056406990.710.9110448740104493870.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: af1816babcd9eff5c40eaf0de149b469debdfdb4 Gitweb: https://git.kernel.org/tip/af1816babcd9eff5c40eaf0de149b469d= ebdfdb4 Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:44 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 04 Jun 2026 11:04:17 +02:00 igc: Use provided clock ID for history snapshot The PTP core indicates in system_device_crosststamp::clock_id the clock ID for which the 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 igc_phc_get_syncdevicetime() 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.637381831@kernel.org --- drivers/net/ethernet/intel/igc/igc.h | 1 + drivers/net/ethernet/intel/igc/igc_ptp.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/in= tel/igc/igc.h index 1723681..46d625b 100644 --- a/drivers/net/ethernet/intel/igc/igc.h +++ b/drivers/net/ethernet/intel/igc/igc.h @@ -326,6 +326,7 @@ struct igc_adapter { struct timespec64 prev_ptp_time; /* Pre-reset PTP clock */ ktime_t ptp_reset_start; /* Reset time in clock mono */ struct system_time_snapshot snapshot; + clockid_t snapshot_clock_id; struct mutex ptm_lock; /* Only allow one PTM transaction at a time */ =20 char fw_version[32]; diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/etherne= t/intel/igc/igc_ptp.c index 3d6b226..b40aba9 100644 --- a/drivers/net/ethernet/intel/igc/igc_ptp.c +++ b/drivers/net/ethernet/intel/igc/igc_ptp.c @@ -1049,7 +1049,7 @@ static int igc_phc_get_syncdevicetime(ktime_t *device, */ do { /* Get a snapshot of system clocks to use as historic value. */ - ktime_get_snapshot(&adapter->snapshot); + ktime_get_snapshot_id(adapter->snapshot_clock_id, &adapter->snapshot); =20 igc_ptm_trigger(hw); =20 @@ -1103,6 +1103,8 @@ static int igc_ptp_getcrosststamp(struct ptp_clock_in= fo *ptp, /* This blocks until any in progress PTM transactions complete */ mutex_lock(&adapter->ptm_lock); =20 + adapter->snapshot_clock_id =3D cts->clock_id; + ret =3D get_device_system_crosststamp(igc_phc_get_syncdevicetime, adapter, &adapter->snapshot, cts); mutex_unlock(&adapter->ptm_lock);