From nobody Mon Jun 8 03:20:22 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 E90863D666F; Tue, 2 Jun 2026 09:46:04 +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=1780393567; cv=none; b=Ku/q0j0qv7qd+TCbGz10vxwfiFZZIGoCwGSk2wjT69Ow64CnvD2z6SmOQm4d9gHKa1VUkUJDgEsBgV4jMRooGgH5K4h2GU8b9naDO2PWf74ANVW1d3+lBuy64iBr6o6VE2zg0sr/6TVERQlyIUWqLCsZE2px/ahqnzDK+fD17SY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780393567; c=relaxed/simple; bh=XFxYPDfmKXVg5ysHMUXjP1y2Jb9qj2vScPJPlwvMv8w=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=JF2Ji6btfAaUhWXnTsjO84MPUr89YOzwcsO39o475Ybq+xsRaa7Pmki61irixdfLP4uHSDBUBixQ6Tzr0nlHtJjFQrb1I6NAlkNljglpcuFgERyjbV4oegRU2odkqKzvOYPFGrUrhso3xqwRAe2yjnczQK/dHr9haIgbvWsI2xk= 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=GEZLfLjW; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=WXz1tPBY; 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="GEZLfLjW"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="WXz1tPBY" Date: Tue, 02 Jun 2026 09:46:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780393563; 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=6izFDiT32N479dyleOhpPsO3MThOcd952GBPkNpdX3w=; b=GEZLfLjWSR8edmHM0p99Sek4b7ot2b/59AsraaT2BhLXOLavcNFRva8PdcxEjLcOenPczJ t1DQjwh5GsLk92vsB/XjWl2aX5NjrVXy0wzaEClM8UyeXrYhzrRBhRIKhgdMD5svq7A4GD qbHUiG9xmEcXjsI9HvWRiiNUxWhizGFB6ilxKcRy+0mwmD5XzGQhb3BU7/pnDMCvXo+iZl aE9j41GEEhtuMi074K61icSF0NvBXHF04plXLaTC2/p2cC6STxoJnwGzIrDTzfdyuKjTV7 uJh31o7A2WIM4mvKLz83ts+BojRcSmzBEDoya9OE9+2RsDJ8RjnELGrzToMz0g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780393563; 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=6izFDiT32N479dyleOhpPsO3MThOcd952GBPkNpdX3w=; b=WXz1tPBYXG6HifmSMYq9Ugsa2Al17eX9DV0/J8EBhlZUKNpkjsIi8EFoqjg6/STaMFASzs 3ON2uHNaJx4t5mDA== 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: <178039356199.2140988.369316096444795212.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: 7beb75ca0c231c2f129f5e8e4a7b45980ec4d8c5 Gitweb: https://git.kernel.org/tip/7beb75ca0c231c2f129f5e8e4a7b45980= ec4d8c5 Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:44 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 02 Jun 2026 11:39:59 +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);