From nobody Mon Jun 8 03:21:19 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 9822B3D75D5; Tue, 2 Jun 2026 09:46:08 +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=1780393570; cv=none; b=PwFcNe7l+aoijw2oocQVKvY3mh3CBkdLOrmZcoiwj3v5EjeuwmXr6S20njcEQMXNFtiefwY7CheuaRcOa5WNMZfLb0PxdKtIaUcrimwgv2qyOjBSQp46UGaDN7ieD+dW+91RG0ARz0f0NGN7KJHrmDtl5J3B1EUGX0i1m0A0jVc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780393570; c=relaxed/simple; bh=6FGQy89CosdC2fSDJnxzAwHF7ovGrjSyz/aIgm2jA1I=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=tu7ngl/+IPgVy5rsAPmIZODtbV9yvHIcuTCu6YC1JTFq6sOndewsFxcIMA0Cfw7j62SQ+T2JiKoP771s4P8gS8Oo5+xsTz6z5Jriuj5MrA0oOdftWOiz8Gzi/bvHo/Gm7DCheTtvP/+jHqoUHqFJFIfLQFeOzuDAhH9mJE56O3s= 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=fNqCIq70; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=GjLD1tHT; 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="fNqCIq70"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="GjLD1tHT" Date: Tue, 02 Jun 2026 09:46:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780393567; 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=4Mr4Vkz6J4+UBDj9EarpJrjA4NvK2BpuI9vN7QYxce0=; b=fNqCIq70MgmfzcRvBfLg5Uk8e5ck1TKbFwYxUcg7arjKDtA47Hx0TpvgEmWASHp8m2QcW3 UuO1LqLQHHlzqI5fBQnK+CHt5c7ozBb4oIRnkVH7bLDYmnaeUWXr6hvESjOmnL5fm22CZK cECCU9OuXqJm5l5e6Xm4eOOhScnsH7rA/0NS6gTSaUpeo/kU2iQSMjx4Px5ERVpOPsD+Pm uixWxBaE28aprUBvmV1Gc02zT6xU957FuIoHFt64ohMiSMYsHHkzLp5HvZoH6FawCdIkF3 ps1/9skWYYEk5zVVumP67kFQ0XTI6yn8UKQSSN3mWK16sR7JLYyHCUa0/9aXPg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780393567; 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=4Mr4Vkz6J4+UBDj9EarpJrjA4NvK2BpuI9vN7QYxce0=; b=GjLD1tHTmflRGZacKua0rZV3oTrFG7E1Sie40fTKpTJTA8hXPCePQKXTNvn0IWBX6jzFPU EVcauEq2XdXq6BBQ== 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] timekeeping: Add CLOCK ID to system_device_crosststamp Cc: Thomas Gleixner , David Woodhouse , Arthur Kiyanovski , Jacob Keller , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260529195557.482153523@kernel.org> References: <20260529195557.482153523@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178039356573.2140988.8610924712696117859.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: 98a8a67b497263441c0b6562d95fe01e80527fd1 Gitweb: https://git.kernel.org/tip/98a8a67b497263441c0b6562d95fe01e8= 0527fd1 Author: Thomas Gleixner AuthorDate: Fri, 29 May 2026 22:00:32 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 02 Jun 2026 11:39:58 +02:00 timekeeping: Add CLOCK ID to system_device_crosststamp The normal capture for system/device cross timestamps is CLOCK_REALTIME, but that's meaningless for AUX clocks. Add a clock_id field to struct system_device_crosststamp and initialize it with CLOCK_REALTIME at the two places which prepare for cross timestamps. After the related code has been cleaned up, the core code will honor the clock_id field when calculating the system time from the system counter snapshot. No functional change. Signed-off-by: Thomas Gleixner Tested-by: David Woodhouse Tested-by: Arthur Kiyanovski Reviewed-by: David Woodhouse Reviewed-by: Jacob Keller Link: https://patch.msgid.link/20260529195557.482153523@kernel.org --- drivers/ptp/ptp_chardev.c | 2 +- include/linux/timekeeping.h | 2 ++ sound/hda/common/controller.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index c61cf9e..da964c3 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -317,8 +317,8 @@ typedef int (*ptp_crosststamp_fn)(struct ptp_clock_info= *, static long ptp_sys_offset_precise(struct ptp_clock *ptp, void __user *arg, ptp_crosststamp_fn crosststamp_fn) { + struct system_device_crosststamp xtstamp =3D { .clock_id =3D CLOCK_REALTI= ME }; struct ptp_sys_offset_precise precise_offset; - struct system_device_crosststamp xtstamp; struct timespec64 ts; int err; =20 diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 3867db6..fff6d9e 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -315,12 +315,14 @@ struct system_counterval_t { /** * struct system_device_crosststamp - system/device cross-timestamp * (synchronized capture) + * @clock_id: System time Clock ID to capture * @device: Device time * @sys_counter: Clocksource counter value simultaneous with device time * @sys_realtime: Realtime simultaneous with device time * @sys_monoraw: Monotonic raw simultaneous with device time */ struct system_device_crosststamp { + clockid_t clock_id; ktime_t device; struct system_counterval_t sys_counter; ktime_t sys_realtime; diff --git a/sound/hda/common/controller.c b/sound/hda/common/controller.c index 5934e5c..a880dcd 100644 --- a/sound/hda/common/controller.c +++ b/sound/hda/common/controller.c @@ -489,9 +489,9 @@ static int azx_get_time_info(struct snd_pcm_substream *= substream, struct snd_pcm_audio_tstamp_config *audio_tstamp_config, struct snd_pcm_audio_tstamp_report *audio_tstamp_report) { + struct system_device_crosststamp xtstamp =3D { .clock_id =3D CLOCK_REALTI= ME }; struct azx_dev *azx_dev =3D get_azx_dev(substream); struct snd_pcm_runtime *runtime =3D substream->runtime; - struct system_device_crosststamp xtstamp; int ret; u64 nsec; =20