From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.132.221]) (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 1C7D6274FE8; Thu, 18 Dec 2025 14:24:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.178.132.221 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067883; cv=none; b=a/3fDJ3IqXCYWXfXq4kLNkh34M6ne01FkGSROsxyVaQhKpRs/r8UDPkKx4jJpmsnJP4h+NHdOCh3+wOv7HppmdWeXPhYzF6AbTTYVXmE3GXWGCoZc8i6Seg7ep4Qkc9ohZRebMoUnCACDVoqM3rVHm2UlqEjxXeHgaxBd8HPBro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067883; c=relaxed/simple; bh=K9PWfOsr2URHViwINyOwCX3J3UQ1Ltgw6a13juuLadA=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=vE3kMAuH/JdSE9Yacsm/jS0+XYKaq5SmyRhwuU6CSMajy+ETZY154IFB+SgQG8FPhXwyxe5INFpGVTOpXEL6yV88j7O9JZMPU06d8ka6gP1miecRcAlUCcgS1ECHraX+B/lvoAf+p1EOqdPF931ylqE6iN0m/x/nxQm1oHlGXW8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=kc2S88A4; arc=none smtp.client-ip=63.178.132.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="kc2S88A4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067881; x=1797603881; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=iKrltbaD/Drhq8kMDPgbTPux36kEXGe0gvAIL/BeBmI=; b=kc2S88A4zrIGLuEh8fb3W3ZFtSEE6FzK8lY6Em8EoLzKfFEJop/iml2c 2P4h/pCX3aauB8bz58soIb7+7XmuZW/SYDjfFUVoc35uRkws4qfKqp/Tz RTcNzL9jKgSGUrw4o1sEDoYMje5U5rK1XFpfr3BzAUohUsMlnqRp1f0lm X4z+60LrPR/23ABfxf3NjZ0My0pTHRlj99esEPU/QFgH9qc8XNY0jdoXg vAETpkGVAn/l00p9nxBXHB12yD/WYNBsx1Dd6tvTdWCpFT1dULkhMS2O1 Tb3MGXmhH95Ydy0YEFtJi/FMbULJ9TicEyas3tkRe2MDQIKsJax4IYCnt A==; X-CSE-ConnectionGUID: v/ySFvy/QBq0lzqgpmQLMA== X-CSE-MsgGUID: VXlcMyENRS6EuyaQK4cZAA== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6787979" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:24:22 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:15173] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.12.153:2525] with esmtp (Farcaster) id b8e9a253-10d9-4617-9a75-3cd1f6a0b577; Thu, 18 Dec 2025 14:24:22 +0000 (UTC) X-Farcaster-Flow-ID: b8e9a253-10d9-4617-9a75-3cd1f6a0b577 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19MTAEUA002.ant.amazon.com (10.252.50.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:24:21 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA001.ant.amazon.com (10.252.50.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:24:21 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:24:21 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 1/7] ptp: vmclock: add vm generation counter Thread-Topic: [PATCH v4 1/7] ptp: vmclock: add vm generation counter Thread-Index: AQHccCoA8Zlu7ja/r0auHBzyScVYrg== Date: Thu, 18 Dec 2025 14:24:21 +0000 Message-ID: <20251218142408.8395-2-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Similar to live migration, loading a VM from some saved state (aka snapshot) is also an event that calls for clock adjustments in the guest. However, guests might want to take more actions as a response to such events, e.g. as discarding UUIDs, resetting network connections, reseeding entropy pools, etc. These are actions that guests don't typically take during live migration, so add a new field in the vmclock_abi called vm_generation_counter which informs the guest about such events. Hypervisor advertises support for vm_generation_counter through the VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT flag. Users need to check the presence of this bit in vmclock_abi flags field before using this flag. Signed-off-by: Babis Chalios Reviewed-by: David Woodhouse --- include/uapi/linux/vmclock-abi.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/uapi/linux/vmclock-abi.h b/include/uapi/linux/vmclock-= abi.h index 2d99b29ac44a..937fe00e4f33 100644 --- a/include/uapi/linux/vmclock-abi.h +++ b/include/uapi/linux/vmclock-abi.h @@ -115,6 +115,12 @@ struct vmclock_abi { * bit again after the update, using the about-to-be-valid fields. */ #define VMCLOCK_FLAG_TIME_MONOTONIC (1 << 7) + /* + * If the VM_GEN_COUNTER_PRESENT flag is set, the hypervisor will + * bump the vm_generation_counter field every time the guest is + * loaded from some save state (restored from a snapshot). + */ +#define VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT (1 << 8) =20 __u8 pad[2]; __u8 clock_status; @@ -177,6 +183,15 @@ struct vmclock_abi { __le64 time_frac_sec; /* Units of 1/2^64 of a second */ __le64 time_esterror_nanosec; __le64 time_maxerror_nanosec; + + /* + * This field changes to another non-repeating value when the guest + * has been loaded from a snapshot. In addition to handling a + * disruption in time (which will also be signalled through the + * disruption_marker field), a guest may wish to discard UUIDs, + * reset network connections, reseed entropy, etc. + */ + __le64 vm_generation_counter; }; =20 #endif /* __VMCLOCK_ABI_H__ */ --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.132.221]) (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 9FA0729BD8E; Thu, 18 Dec 2025 14:24:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.178.132.221 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067887; cv=none; b=jz3U8h4MiZcbJcmppedTP0Gn55fCEydtIlwU6V/9RcV8DBBWkOItAYEXRpODWbfsXp6dapdUJkfMm5BdTUP+bLeL38cetxHGROeWXxtlLCvXMRy9FQ7igUDnMqs+zhp+BZLiyCkhInEaSH7iM2Hf/S7pWqUc4CAtPU2gfPr97iA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067887; c=relaxed/simple; bh=hjwSoy8zmoMoaKvz6nQHQMNV76rOwUAzQhcp/Thndhc=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=AtiYgf6CKQr8RvdBHlh+zT5AzAu6oBGyRb0mYtQelE9tou+2fi0/eYIIh4xfTgfLpn8tBEi3AM+Py233jwmntnS0T0wEAmYFprGghzGe3btZfyMxa0BOzD9oboPcXG8uVkBHYyhLi3PoF+FqD9yXSPET6lIKkPwM8lXQPf/AVc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=tUGbPr+y; arc=none smtp.client-ip=63.178.132.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="tUGbPr+y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067885; x=1797603885; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-id:content-transfer-encoding: mime-version; bh=hjwSoy8zmoMoaKvz6nQHQMNV76rOwUAzQhcp/Thndhc=; b=tUGbPr+yIYki4DTC5Wo90eyieZByauytEDRo7lSFLKTQigDPOpgJQ1uP Mp3kWoorI66b/FzXk/rohsEfNECpu9zHqqT0WrlEZf9cOgvJJvoNEbLbc J+f6gJN9s8ql04rXeoDvAJ9GJZYv4xE5sKLwi2iLHMsnXCM9SYY0mKSKp k2aBPPS9c6nC4RSasx6yhNrROglWrCpZECmgEt3wXYLwWxI5UH1U1Pg4l CdctTl/fnZ8X/cGJCuIyyDhIeRSMHFew04qRYzLLc4bvRe5+YkONIIzM+ sV8yhZ0vgM2LJVAMpwc7XGYai5vYtbgNhblOTj7hMn+3zJ9eKSswQJPv1 g==; X-CSE-ConnectionGUID: jlTlvtX5QD6S9F+zKfBUUw== X-CSE-MsgGUID: JT/F+cT1SdWklO7O0fbH3Q== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6788029" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:24:44 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:1270] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.34.225:2525] with esmtp (Farcaster) id 38b9f7c4-1405-49fe-8164-21a6b99d6ff7; Thu, 18 Dec 2025 14:24:41 +0000 (UTC) X-Farcaster-Flow-ID: 38b9f7c4-1405-49fe-8164-21a6b99d6ff7 Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUA001.ant.amazon.com (10.252.50.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:24:33 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:24:32 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:24:32 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 2/7] ptp: vmclock: support device notifications Thread-Topic: [PATCH v4 2/7] ptp: vmclock: support device notifications Thread-Index: AQHccCoHKiqhmMqx2kixR300dKT0fQ== Date: Thu, 18 Dec 2025 14:24:32 +0000 Message-ID: <20251218142408.8395-3-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="utf-8" Content-ID: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add optional support for device notifications in VMClock. When supported, the hypervisor will send a device notification every time it updates the seq_count to a new even value. Moreover, add support for poll() in VMClock as a means to propagate this notification to user space. poll() will return a POLLIN event to listeners every time seq_count changes to a value different than the one last seen (since open() or last read()/pread()). This means that when poll() returns a POLLIN event, listeners need to use read() to observe what has changed and update the reader's view of seq_count. In other words, after a poll() returned, all subsequent calls to poll() will immediately return with a POLLIN event until the listener calls read(). The device advertises support for the notification mechanism by setting flag VMCLOCK_FLAG_NOTIFICATION_PRESENT in vmclock_abi flags field. If the flag is not present the driver won't setup the ACPI notification handler and poll() will always immediately return POLLHUP. Signed-off-by: Babis Chalios Reviewed-by: David Woodhouse --- drivers/ptp/ptp_vmclock.c | 126 +++++++++++++++++++++++++++++-- include/uapi/linux/vmclock-abi.h | 5 ++ 2 files changed, 124 insertions(+), 7 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index b3a83b03d9c1..a203386c4b09 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -5,6 +5,9 @@ * Copyright =C2=A9 2024 Amazon.com, Inc. or its affiliates. */ =20 +#include "linux/poll.h" +#include "linux/types.h" +#include "linux/wait.h" #include #include #include @@ -39,6 +42,7 @@ struct vmclock_state { struct resource res; struct vmclock_abi *clk; struct miscdevice miscdev; + wait_queue_head_t disrupt_wait; struct ptp_clock_info ptp_clock_info; struct ptp_clock *ptp_clock; enum clocksource_ids cs_id, sys_cs_id; @@ -357,10 +361,15 @@ static struct ptp_clock *vmclock_ptp_register(struct = device *dev, return ptp_clock_register(&st->ptp_clock_info, dev); } =20 +struct vmclock_file_state { + struct vmclock_state *st; + atomic_t seq; +}; + static int vmclock_miscdev_mmap(struct file *fp, struct vm_area_struct *vm= a) { - struct vmclock_state *st =3D container_of(fp->private_data, - struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; =20 if ((vma->vm_flags & (VM_READ|VM_WRITE)) !=3D VM_READ) return -EROFS; @@ -379,11 +388,12 @@ static int vmclock_miscdev_mmap(struct file *fp, stru= ct vm_area_struct *vma) static ssize_t vmclock_miscdev_read(struct file *fp, char __user *buf, size_t count, loff_t *ppos) { - struct vmclock_state *st =3D container_of(fp->private_data, - struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; + ktime_t deadline =3D ktime_add(ktime_get(), VMCLOCK_MAX_WAIT); size_t max_count; - uint32_t seq; + uint32_t seq, old_seq; =20 if (*ppos >=3D PAGE_SIZE) return 0; @@ -392,6 +402,7 @@ static ssize_t vmclock_miscdev_read(struct file *fp, ch= ar __user *buf, if (count > max_count) count =3D max_count; =20 + old_seq =3D atomic_read(&fst->seq); while (1) { seq =3D le32_to_cpu(st->clk->seq_count) & ~1U; /* Pairs with hypervisor wmb */ @@ -402,8 +413,16 @@ static ssize_t vmclock_miscdev_read(struct file *fp, c= har __user *buf, =20 /* Pairs with hypervisor wmb */ virt_rmb(); - if (seq =3D=3D le32_to_cpu(st->clk->seq_count)) - break; + if (seq =3D=3D le32_to_cpu(st->clk->seq_count)) { + /* + * Either we updated fst->seq to seq (the latest version we observed) + * or someone else did (old_seq =3D=3D seq), so we can break. + */ + if (atomic_try_cmpxchg(&fst->seq, &old_seq, seq) || + old_seq =3D=3D seq) { + break; + } + } =20 if (ktime_after(ktime_get(), deadline)) return -ETIMEDOUT; @@ -413,10 +432,58 @@ static ssize_t vmclock_miscdev_read(struct file *fp, = char __user *buf, return count; } =20 +static __poll_t vmclock_miscdev_poll(struct file *fp, poll_table *wait) +{ + struct vmclock_file_state *fst =3D fp->private_data; + struct vmclock_state *st =3D fst->st; + uint32_t seq; + + /* + * Hypervisor will not send us any notifications, so fail immediately + * to avoid having caller sleeping for ever. + */ + if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return POLLHUP; + + poll_wait(fp, &st->disrupt_wait, wait); + + seq =3D le32_to_cpu(st->clk->seq_count); + if (atomic_read(&fst->seq) !=3D seq) + return POLLIN | POLLRDNORM; + + return 0; +} + +static int vmclock_miscdev_open(struct inode *inode, struct file *fp) +{ + struct vmclock_state *st =3D container_of(fp->private_data, + struct vmclock_state, miscdev); + struct vmclock_file_state *fst =3D kzalloc(sizeof(*fst), GFP_KERNEL); + + if (!fst) + return -ENOMEM; + + fst->st =3D st; + atomic_set(&fst->seq, 0); + + fp->private_data =3D fst; + + return 0; +} + +static int vmclock_miscdev_release(struct inode *inode, struct file *fp) +{ + kfree(fp->private_data); + return 0; +} + static const struct file_operations vmclock_miscdev_fops =3D { .owner =3D THIS_MODULE, + .open =3D vmclock_miscdev_open, + .release =3D vmclock_miscdev_release, .mmap =3D vmclock_miscdev_mmap, .read =3D vmclock_miscdev_read, + .poll =3D vmclock_miscdev_poll, }; =20 /* module operations */ @@ -459,6 +526,44 @@ static acpi_status vmclock_acpi_resources(struct acpi_= resource *ares, void *data return AE_ERROR; } =20 +static void +vmclock_acpi_notification_handler(acpi_handle __always_unused handle, + u32 __always_unused event, void *dev) +{ + struct device *device =3D dev; + struct vmclock_state *st =3D device->driver_data; + + wake_up_interruptible(&st->disrupt_wait); +} + +static int vmclock_setup_notification(struct device *dev, struct vmclock_s= tate *st) +{ + struct acpi_device *adev =3D ACPI_COMPANION(dev); + acpi_status status; + + /* + * This should never happen as this function is only called when + * has_acpi_companion(dev) is true, but the logic is sufficiently + * complex that Coverity can't see the tautology. + */ + if (!adev) + return -ENODEV; + + /* The device does not support notifications. Nothing else to do */ + if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return 0; + + status =3D acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vmclock_acpi_notification_handler, + dev); + if (ACPI_FAILURE(status)) { + dev_err(dev, "failed to install notification handler"); + return -ENODEV; + } + + return 0; +} + static int vmclock_probe_acpi(struct device *dev, struct vmclock_state *st) { struct acpi_device *adev =3D ACPI_COMPANION(dev); @@ -549,6 +654,11 @@ static int vmclock_probe(struct platform_device *pdev) if (ret) return ret; =20 + init_waitqueue_head(&st->disrupt_wait); + ret =3D vmclock_setup_notification(dev, st); + if (ret) + return ret; + /* * If the structure is big enough, it can be mapped to userspace. * Theoretically a guest OS even using larger pages could still @@ -581,6 +691,8 @@ static int vmclock_probe(struct platform_device *pdev) return -ENODEV; } =20 + dev->driver_data =3D st; + dev_info(dev, "%s: registered %s%s%s\n", st->name, st->miscdev.minor ? "miscdev" : "", (st->miscdev.minor && st->ptp_clock) ? ", " : "", diff --git a/include/uapi/linux/vmclock-abi.h b/include/uapi/linux/vmclock-= abi.h index 937fe00e4f33..d320623b0118 100644 --- a/include/uapi/linux/vmclock-abi.h +++ b/include/uapi/linux/vmclock-abi.h @@ -121,6 +121,11 @@ struct vmclock_abi { * loaded from some save state (restored from a snapshot). */ #define VMCLOCK_FLAG_VM_GEN_COUNTER_PRESENT (1 << 8) + /* + * If the NOTIFICATION_PRESENT flag is set, the hypervisor will send + * a notification every time it updates seq_count to a new even number. + */ +#define VMCLOCK_FLAG_NOTIFICATION_PRESENT (1 << 9) =20 __u8 pad[2]; __u8 clock_status; --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-012.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-012.esa.eu-central-1.outbound.mail-perimeter.amazon.com [52.57.120.243]) (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 05F3728F935; Thu, 18 Dec 2025 14:25:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=52.57.120.243 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067911; cv=none; b=MXQi9ozko2wWQK1mZH44TRoGhM/PuTLA9Go6uKGYEBM89mKvS9rZMQyln63iYF8yF+0/XAAZPgGcvGjnHXeEPjQeWFhxF97u6ViK5/1nqgoKv8hGHBoSsq7FK9FzPCF3nl6M0Oxv7MDjpUByzJodYRK/Dc3b7Hqw2XTwBtc8vS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067911; c=relaxed/simple; bh=CMePqU7fDA/wHXd5/nycVWAvieQKAaHLSa+FSiuP0+0=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=t2qD90m77l6eL7EqZXXtljYRwK7ZyfeiKaoYpzuwZKY750qTmj6gPh4O5zg1vSfHW6ocjc+q4xE/BVkVe4x249iEoTPMV0dXu/HYiqDn7Ae61AWLchkoDs9oFZe4SM7sp5iyyGycGvGjmK3bsZsH9Y3RltE2/XTcEejpFs2dTsQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=YTHdQhGS; arc=none smtp.client-ip=52.57.120.243 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="YTHdQhGS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067909; x=1797603909; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=yIJepOPX3arqb5MyazZ+94RAcXRQ7bSmHnzahqj+Zso=; b=YTHdQhGS7MEfNuakoyeEMm9pSj/7m+viAiPtziJVw7VGjTcyLNkhlY4q iHo8VNrZp6jJXZpE+b0MzEXAI01PWVGT4PbbX/Oh6nYJHSPDc4UxHtscO JyuSFBhtwRA/VGywHvx/N93999JrlAgjVg5qj2OIfgwHoiN8vNDIdnXKG zTXG8YZhNLvVdKFPF4XyCbzPzw8ziRIQrBk9Gc2JQA3mjKraLNEodOh2S 9dyOr4JRgp9ZhsnbJYDFAC0z0rOJBdxxkmDbgMvRk6ylDgVlxn/BOW4Yg 0pNQuaknvndYm2w+lKRu5Dki3WT6QumZBhqqBT/ipG1//Vd8HYFPdXQaZ Q==; X-CSE-ConnectionGUID: rgQK+gdMTs2pAUFYGqkPsw== X-CSE-MsgGUID: qkRuJN0+RpGrXpcNDRiDJQ== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6789740" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-012.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:24:50 +0000 Received: from EX19MTAEUC001.ant.amazon.com [54.240.197.233:1950] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.6.239:2525] with esmtp (Farcaster) id d3207552-f9d3-450f-ae81-f228cd5aab97; Thu, 18 Dec 2025 14:24:50 +0000 (UTC) X-Farcaster-Flow-ID: d3207552-f9d3-450f-ae81-f228cd5aab97 Received: from EX19D012EUA002.ant.amazon.com (10.252.50.32) by EX19MTAEUC001.ant.amazon.com (10.252.51.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:24:44 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA002.ant.amazon.com (10.252.50.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:24:44 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:24:44 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" , "Krzysztof Kozlowski" Subject: [PATCH v4 3/7] dt-bindings: ptp: Add amazon,vmclock Thread-Topic: [PATCH v4 3/7] dt-bindings: ptp: Add amazon,vmclock Thread-Index: AQHccCoORHkz0txS5kuznCiIu4jEzA== Date: Thu, 18 Dec 2025 14:24:44 +0000 Message-ID: <20251218142408.8395-4-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse The vmclock device provides a PTP clock source and precise timekeeping across live migration and snapshot/restore operations. The binding has a required memory region containing the vmclock_abi structure and an optional interrupt for clock disruption notifications. The full spec is at https://uapi-group.org/specifications/specs/vmclock/ Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios Reviewed-by: Krzysztof Kozlowski --- .../bindings/ptp/amazon,vmclock.yaml | 46 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 47 insertions(+) create mode 100644 Documentation/devicetree/bindings/ptp/amazon,vmclock.ya= ml diff --git a/Documentation/devicetree/bindings/ptp/amazon,vmclock.yaml b/Do= cumentation/devicetree/bindings/ptp/amazon,vmclock.yaml new file mode 100644 index 000000000000..357790df876f --- /dev/null +++ b/Documentation/devicetree/bindings/ptp/amazon,vmclock.yaml @@ -0,0 +1,46 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/ptp/amazon,vmclock.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Virtual Machine Clock + +maintainers: + - David Woodhouse + +description: + The vmclock device provides a precise clock source and allows for + accurate timekeeping across live migration and snapshot/restore + operations. The full specification of the shared data structure is + available at https://uapi-group.org/specifications/specs/vmclock/ + +properties: + compatible: + const: amazon,vmclock + + reg: + description: + Specifies the shared memory region containing the vmclock_abi struct= ure. + maxItems: 1 + + interrupts: + description: + Interrupt used to notify when the contents of the vmclock_abi struct= ure + have been updated. + maxItems: 1 + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include + ptp@80000000 { + compatible =3D "amazon,vmclock"; + reg =3D <0x80000000 0x1000>; + interrupts =3D ; + }; diff --git a/MAINTAINERS b/MAINTAINERS index e8f06145fb54..171813ea76a3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20728,6 +20728,7 @@ PTP VMCLOCK SUPPORT M: David Woodhouse L: netdev@vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/ptp/amazon,vmclock.yaml F: drivers/ptp/ptp_vmclock.c F: include/uapi/linux/vmclock-abi.h =20 --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.132.221]) (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 7CB20288525; Thu, 18 Dec 2025 14:24:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.178.132.221 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067900; cv=none; b=h2vu02x8DTtvVnqYmaCb3Pn/RHZ2Lz69b/Rt8/7oZouUc1CzbhZ2FqnQ7G+rYMPrI7v4G7W1hcDa+oWkerWL8cqkguW1KBd6d2fC7QEaiQmWokMqTl0If9bKQW5Rr50Gyzoa7jed+//ALXaCsOBr3RfUdiLa4cxwx+HPuiLY1Ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067900; c=relaxed/simple; bh=ZM8Mh6XKcsp85XAh9FBxfHZ8zVIs/Lxiy8Bb1gYMLjo=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=hcRIZrOXvWPr6pn1cBUBGOUq5cxnBQ0RBlG5anlx+6vHKmnXGimDmgUavBP/P3ZvuGwAKuEz0ZUSNuOX1My+UoyJVKZEAf0vGaHxncKM2b5KMyLRg/uCJCVibtGXYaUdYHgr80YUmcTImwWQ+IWZR8EStOIlGRFjk7Z0AITleAs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=N+Z5RQsS; arc=none smtp.client-ip=63.178.132.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="N+Z5RQsS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067899; x=1797603899; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=4EMiDSjVmu6In/15EIdW1ZCQ9T5sq65f9TosluRSB3o=; b=N+Z5RQsSR8fizOQWkSc37bV4JNuzWquIcS0ykF+cMOjCAuIMiV7hrvD/ j6ttRJA1EtIEywabmI69MDnD9DVRVZifLJz5Ia5JSG/F9Z0wJJ0qeLZ5N 2zP/8KggVm4Vp4yYGFYH8SEOGJ1hI8eRbY6F+tzFF9V4F1lWDnhAUET+E vrD1LmzcmEinDORfjZFTSFVDeUJlZkLM/gk8N2H2/vA9QOCv/r4NBz2eh gZgpco0fgd37rXiFW9IYIrvH82zi4BYLovFkwIFPsAYAoCsARsiGg+oai 7ccTz14aFw9y2sThqDj8Q2d6pi3Y3q5+i5AtKarFOupuHaqKBb0bZabUE A==; X-CSE-ConnectionGUID: JvH0Y+z8ROKVVzxNkI8f2w== X-CSE-MsgGUID: O0y7q97IQHOjYe8TbSGq0A== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6788051" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:24:56 +0000 Received: from EX19MTAEUA002.ant.amazon.com [54.240.197.232:21201] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.13.110:2525] with esmtp (Farcaster) id e04a56a0-8669-4218-8405-6a88111be484; Thu, 18 Dec 2025 14:24:56 +0000 (UTC) X-Farcaster-Flow-ID: e04a56a0-8669-4218-8405-6a88111be484 Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUA002.ant.amazon.com (10.252.50.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:24:56 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:24:55 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:24:55 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 4/7] ptp: ptp_vmclock: Add device tree support Thread-Topic: [PATCH v4 4/7] ptp: ptp_vmclock: Add device tree support Thread-Index: AQHccCoUx7x4E5wAHEOFKrzcDiL5jA== Date: Thu, 18 Dec 2025 14:24:55 +0000 Message-ID: <20251218142408.8395-5-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Add device tree support to the ptp_vmclock driver, allowing it to probe via device tree in addition to ACPI. Handle optional interrupt for clock disruption notifications, mirroring the ACPI notification behaviour. Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- drivers/ptp/ptp_vmclock.c | 71 ++++++++++++++++++++++++++++++++++----- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index a203386c4b09..831668efabf9 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -14,10 +14,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include =20 @@ -536,7 +538,7 @@ vmclock_acpi_notification_handler(acpi_handle __always_= unused handle, wake_up_interruptible(&st->disrupt_wait); } =20 -static int vmclock_setup_notification(struct device *dev, struct vmclock_s= tate *st) +static int vmclock_setup_acpi_notification(struct device *dev) { struct acpi_device *adev =3D ACPI_COMPANION(dev); acpi_status status; @@ -549,10 +551,6 @@ static int vmclock_setup_notification(struct device *d= ev, struct vmclock_state * if (!adev) return -ENODEV; =20 - /* The device does not support notifications. Nothing else to do */ - if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) - return 0; - status =3D acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, vmclock_acpi_notification_handler, dev); @@ -587,6 +585,57 @@ static int vmclock_probe_acpi(struct device *dev, stru= ct vmclock_state *st) return 0; } =20 +static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *_= st) +{ + struct vmclock_state *st =3D _st; + + wake_up_interruptible(&st->disrupt_wait); + return IRQ_HANDLED; +} + +static int vmclock_probe_dt(struct device *dev, struct vmclock_state *st) +{ + struct platform_device *pdev =3D to_platform_device(dev); + struct resource *res; + + res =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!res) + return -ENODEV; + + st->res =3D *res; + + return 0; +} + +static int vmclock_setup_of_notification(struct device *dev) +{ + struct platform_device *pdev =3D to_platform_device(dev); + int irq; + + irq =3D platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + + return devm_request_irq(dev, irq, vmclock_of_irq_handler, IRQF_SHARED, + "vmclock", dev->driver_data); +} + +static int vmclock_setup_notification(struct device *dev, + struct vmclock_state *st) +{ + /* The device does not support notifications. Nothing else to do */ + if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) + return 0; + + if (has_acpi_companion(dev)) { + return vmclock_setup_acpi_notification(dev); + } else { + return vmclock_setup_of_notification(dev); + } + +} + + static void vmclock_put_idx(void *data) { struct vmclock_state *st =3D data; @@ -607,7 +656,7 @@ static int vmclock_probe(struct platform_device *pdev) if (has_acpi_companion(dev)) ret =3D vmclock_probe_acpi(dev, st); else - ret =3D -EINVAL; /* Only ACPI for now */ + ret =3D vmclock_probe_dt(dev, st); =20 if (ret) { dev_info(dev, "Failed to obtain physical address: %d\n", ret); @@ -655,6 +704,7 @@ static int vmclock_probe(struct platform_device *pdev) return ret; =20 init_waitqueue_head(&st->disrupt_wait); + dev->driver_data =3D st; ret =3D vmclock_setup_notification(dev, st); if (ret) return ret; @@ -691,8 +741,6 @@ static int vmclock_probe(struct platform_device *pdev) return -ENODEV; } =20 - dev->driver_data =3D st; - dev_info(dev, "%s: registered %s%s%s\n", st->name, st->miscdev.minor ? "miscdev" : "", (st->miscdev.minor && st->ptp_clock) ? ", " : "", @@ -707,11 +755,18 @@ static const struct acpi_device_id vmclock_acpi_ids[]= =3D { }; MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids); =20 +static const struct of_device_id vmclock_of_ids[] =3D { + { .compatible =3D "amazon,vmclock", }, + { }, +}; +MODULE_DEVICE_TABLE(of, vmclock_of_ids); + static struct platform_driver vmclock_platform_driver =3D { .probe =3D vmclock_probe, .driver =3D { .name =3D "vmclock", .acpi_match_table =3D vmclock_acpi_ids, + .of_match_table =3D vmclock_of_ids, }, }; =20 --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com [63.178.132.221]) (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 1317629C327; Thu, 18 Dec 2025 14:25:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=63.178.132.221 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067912; cv=none; b=Rc7aJCErVnSTmpMMsMD25xBu+wiBNsZxb9JlUrqTjelzxgo2JNp7U/gD08EnlcvntizslaZmwgaPOo3EcTr6wsY9lAUAx/yhhnapyhY++rROsDs2foiNid48pktBnPBXala9NzStGqv7GmzQ+/y7Q4L3GCez+jEcGGdLgKtFiCo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067912; c=relaxed/simple; bh=rZbLgidIM3+HrebdCV2ZR5lmgjX6NxwxhzppiQE+BTI=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=KnIN3TIFqobQvNGUZQRLF5chydkqdcOC18k7Va8G/tEQ5NMbJSuT1Lyod3kXg1v1WXwkHVZ1BJWTy0zSf04XQElk0NfI5USB/uoePISQ/vZNOjh9udwUF/Qzm+xnBMkT+nxOVMOO7L5bjkekYD+Jss+ko32nJJ2HVCKntjqdk0o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=X56JXGMc; arc=none smtp.client-ip=63.178.132.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="X56JXGMc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067910; x=1797603910; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=eQVcPXCVTyfQJrZ5j9C7RBuxBjEPEvuy4/PnTzMRykU=; b=X56JXGMcRb8NZ1mpgtHHoWD3cyrFHAD1OB4hN/rNIlIaR3ju4PNySDCy tLRtvcF7CcGtsU9JUY6m2aKJ/S+gIKVqbllnhckQHJABeam6LKx3lKvVu SuEl8ARUDNKFk1YaATIqSUcZ0bh8p8Mu+53pwa6EV3akhS+oLRNRJDtfR syO/Kl+Rsq4L0IAR+MqoysogrPWyUtbwSTtgQNw9zgWAORBYp7N1A8PYJ QT33ijXQwOXfsmu740IN36rQpSmrAUZrULJQqHRErUwecTdHSx1SfNJ5r fOAVvwpCeOoXJ38wcpIDJEm/SfVU6cwUFBQ6I5eJBgYbSpwA01+hGBAHI w==; X-CSE-ConnectionGUID: qEm9jclsSFa1/LnObgnADQ== X-CSE-MsgGUID: NgMdOnTnQWangsL0NMcZFw== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6788069" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-013.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:25:08 +0000 Received: from EX19MTAEUB001.ant.amazon.com [54.240.197.226:18791] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.30.66:2525] with esmtp (Farcaster) id ecd63384-cc56-4ac0-9ea6-ebd6a2affd1e; Thu, 18 Dec 2025 14:25:08 +0000 (UTC) X-Farcaster-Flow-ID: ecd63384-cc56-4ac0-9ea6-ebd6a2affd1e Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19MTAEUB001.ant.amazon.com (10.252.51.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:25:07 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA001.ant.amazon.com (10.252.50.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:25:07 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:25:07 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 5/7] ptp: ptp_vmclock: add 'VMCLOCK' to ACPI device match Thread-Topic: [PATCH v4 5/7] ptp: ptp_vmclock: add 'VMCLOCK' to ACPI device match Thread-Index: AQHccCobWUl/1dNwk0mSqnawk23WYA== Date: Thu, 18 Dec 2025 14:25:07 +0000 Message-ID: <20251218142408.8395-6-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse As we finalised the spec, we spotted that vmgenid actually says that the _HID is supposed to be hypervisor-specific. Although in the 13 years since the original vmgenid doc was published, nobody seems to have cared about using _HID to distinguish between implementations on different hypervisors, and we only ever use the _CID. For consistency, match the _CID of "VMCLOCK" too. Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- drivers/ptp/ptp_vmclock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 831668efabf9..ef945e8248ee 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -751,6 +751,7 @@ static int vmclock_probe(struct platform_device *pdev) =20 static const struct acpi_device_id vmclock_acpi_ids[] =3D { { "AMZNC10C", 0 }, + { "VMCLOCK", 0 }, {} }; MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids); --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.74.81.189]) (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 172342DC32B; Thu, 18 Dec 2025 14:25:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.74.81.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067951; cv=none; b=ct4JgHvnTxVfQvkpvG2Ur6D8dOowZR0cVTsoRuAxWeUSa8ILvHo3nJWoKd3RdUmBe1AsPvKwxoAUmHv8CSqVz0aWxzVyhClJofytZhuTkk4uyCG6ZwF0G3xdTH3kWnWrrLBoV4F+tGcDcCP2ktypsyvIzS9JHhWpEVWceunFvww= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067951; c=relaxed/simple; bh=T2ggPKYPQPRgI74dDuIowfmH1GVhGWrmf+5GD2Vzkww=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=MXFLpgNZVQwQNA8O5dedgDW6zwyux2TTgr6HJ2w1aaJ05Cc7woCrhPAj43C2qqxqeuih0KAhcSIWC3O3/thEibBDs+VGG8HQ9slPWVLbkrrdBZFmLHhfwP+U0/vyLRK3r9dB2crLeremd94slzaIAGqyzRu03Ty3Mp44iVKdEhg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=d9JrvEcO; arc=none smtp.client-ip=3.74.81.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="d9JrvEcO" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067937; x=1797603937; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=eX1BlzBZcpcq5UCX3he8NfSe96USHRMlSLSkgG/gw8c=; b=d9JrvEcOMeoVZ5f1eBBS6QHy+BfjFMwz807ap/6Nkg3BO3Y1KybB7r2r yptq2prjNQ3CeOSAZuC4sBsSIcRF54FJUF5XQsd8DIO0SqOp9hQkg+FYU U9aMNYzc+W8vnvWxBl5FxcIEXf2GT83L4LaET6xNuS1qOYsiMAOQSmJmM nL5LMBSItarNfGCjmLEG/TFRdY+UAl2lO6v74LCmDwrgW8Y9wwBcjh1Ay R8valW7UFokqHE4LrHVh5TWMuj4ZTlWU8p2vMJ+5bfva/5i29JEAt60tY KnpoCxVDFpzDq7bUtwV66qYYkfyM4NiUoaS8N5Yh4jvQwtStIsNUSUrxP g==; X-CSE-ConnectionGUID: OBFXa7PWTtKfiKhmAEm5HA== X-CSE-MsgGUID: YGQfgYgtTJWUWeU9AYno4A== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6900376" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:25:19 +0000 Received: from EX19MTAEUB001.ant.amazon.com [54.240.197.226:16366] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.34.225:2525] with esmtp (Farcaster) id 1c7f2c05-75bd-4440-af85-932141dcb152; Thu, 18 Dec 2025 14:25:19 +0000 (UTC) X-Farcaster-Flow-ID: 1c7f2c05-75bd-4440-af85-932141dcb152 Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUB001.ant.amazon.com (10.252.51.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:25:18 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:25:18 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:25:18 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 6/7] ptp: ptp_vmclock: remove dependency on CONFIG_ACPI Thread-Topic: [PATCH v4 6/7] ptp: ptp_vmclock: remove dependency on CONFIG_ACPI Thread-Index: AQHccCoi/1qVrFTZe0SEBwT77yHXiw== Date: Thu, 18 Dec 2025 14:25:18 +0000 Message-ID: <20251218142408.8395-7-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- drivers/ptp/Kconfig | 2 +- drivers/ptp/ptp_vmclock.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 5f8ea34d11d6..b93640ca08b7 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -134,7 +134,7 @@ config PTP_1588_CLOCK_KVM config PTP_1588_CLOCK_VMCLOCK tristate "Virtual machine PTP clock" depends on X86_TSC || ARM_ARCH_TIMER - depends on PTP_1588_CLOCK && ACPI && ARCH_SUPPORTS_INT128 + depends on PTP_1588_CLOCK && ARCH_SUPPORTS_INT128 default PTP_1588_CLOCK_KVM help This driver adds support for using a virtual precision clock diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index ef945e8248ee..7f342e5a6a92 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -501,6 +501,7 @@ static void vmclock_remove(void *data) misc_deregister(&st->miscdev); } =20 +#ifdef CONFIG_ACPI static acpi_status vmclock_acpi_resources(struct acpi_resource *ares, void= *data) { struct vmclock_state *st =3D data; @@ -584,6 +585,7 @@ static int vmclock_probe_acpi(struct device *dev, struc= t vmclock_state *st) =20 return 0; } +#endif /* CONFIG_ACPI */ =20 static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *_= st) { @@ -627,12 +629,11 @@ static int vmclock_setup_notification(struct device *= dev, if (!(le64_to_cpu(st->clk->flags) & VMCLOCK_FLAG_NOTIFICATION_PRESENT)) return 0; =20 - if (has_acpi_companion(dev)) { +#ifdef CONFIG_ACPI + if (has_acpi_companion(dev)) return vmclock_setup_acpi_notification(dev); - } else { - return vmclock_setup_of_notification(dev); - } - +#endif + return vmclock_setup_of_notification(dev); } =20 =20 @@ -653,9 +654,11 @@ static int vmclock_probe(struct platform_device *pdev) if (!st) return -ENOMEM; =20 +#ifdef CONFIG_ACPI if (has_acpi_companion(dev)) ret =3D vmclock_probe_acpi(dev, st); else +#endif ret =3D vmclock_probe_dt(dev, st); =20 if (ret) { --=20 2.34.1 From nobody Fri Dec 19 21:11:52 2025 Received: from fra-out-007.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-007.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.75.33.185]) (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 0392F2D5C76; Thu, 18 Dec 2025 14:25:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.75.33.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067958; cv=none; b=fMhfJpqI/CXIWE5C2dNwL6Vj7tThdGN897Ty8+y2r+YU6OoS8f1VRtOoj4DqoLSW/N0xzhDSv/Xf6nKznKRoW+LaRscAWpHDHzlcwlVYAwL8CKvte4YGk2cYSdUlphqKCCjUTF1rQsWO7BanTwAbwal+rOm8Gk5RpGcxYBjnLlk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766067958; c=relaxed/simple; bh=aO7Tjufb11f1PRoAcbnABTZ6OyV5Uo9litZK8tNvmQU=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=p1gPFd4VAHPLyV9rqDoe7K5TV6FoQ8rzmDoOwfNhustnOJ1FUasaKNYgOV4bdMSxFhv/VUqpLJ/JiToI8ODNwimgBOaWGDwUMOxQmsN7PBBhctBHqvRg/kDTF29HTRqmQ60+NXBIax4WMr4zhRIS6RHTWAJT018EIzTQwAVdrjw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es; spf=pass smtp.mailfrom=amazon.es; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b=DIcv+qqq; arc=none smtp.client-ip=3.75.33.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.es Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.es Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.es header.i=@amazon.es header.b="DIcv+qqq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.es; i=@amazon.es; q=dns/txt; s=amazoncorp2; t=1766067953; x=1797603953; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=j5lreQ2PPRNioC4Ff/bYXCd9XELkpenySvD+fVUVl7A=; b=DIcv+qqqgtH7N1IBbV5qF45xq0EEIHMnCG0uB27WTFrv4EaLpP4ec46P K7JUtS2heI3a5JnySqL/pXcPQyTZYHEpjWlwtoUG93de965eFe1dHgRsg 4vBKLwNKjD9/dcrW6BD3/h390zYYeOFeYN8YmzYBs8C4dYtVWsmLPhCEf CLu7RFkQ+rkmimsQ+XbsKoe98SZf5Mg9ZH77abl0YUjFyXzCQOcAzpBZh 4vSsgAnary1uLD17F2jsNsBb3o1KqyZMAFI0uGyUJ0KXkSf6bo4y8n+3i CIZ2xMC2tr1yjWYYK2XsOuIo0StBE+AgnXhtP29LKC/SUc7+AIyOwRv4M A==; X-CSE-ConnectionGUID: +241mf1WQw2VURsOcYEdcg== X-CSE-MsgGUID: h7iyYJ67Qwu5mFAfndW9FA== X-IronPort-AV: E=Sophos;i="6.21,158,1763424000"; d="scan'208";a="6890564" Received: from ip-10-6-11-83.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.11.83]) by internal-fra-out-007.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Dec 2025 14:25:34 +0000 Received: from EX19MTAEUB002.ant.amazon.com [54.240.197.224:19954] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.26.54:2525] with esmtp (Farcaster) id 910e6f9f-c171-4e3b-8480-8772ca7173c0; Thu, 18 Dec 2025 14:25:34 +0000 (UTC) X-Farcaster-Flow-ID: 910e6f9f-c171-4e3b-8480-8772ca7173c0 Received: from EX19D012EUA003.ant.amazon.com (10.252.50.98) by EX19MTAEUB002.ant.amazon.com (10.252.51.79) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.29; Thu, 18 Dec 2025 14:25:30 +0000 Received: from EX19D012EUA001.ant.amazon.com (10.252.50.122) by EX19D012EUA003.ant.amazon.com (10.252.50.98) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 18 Dec 2025 14:25:29 +0000 Received: from EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719]) by EX19D012EUA001.ant.amazon.com ([fe80::b7ea:84f7:2c4b:2719%3]) with mapi id 15.02.2562.035; Thu, 18 Dec 2025 14:25:29 +0000 From: "Chalios, Babis" To: "robh@kernel.org" , "krzk+dt@kernel.org" , "conor+dt@kernel.org" , "richardcochran@gmail.com" , "dwmw2@infradead.org" , "andrew+netdev@lunn.ch" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" CC: "devicetree@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "Chalios, Babis" , "Graf (AWS), Alexander" , "mzxreary@0pointer.de" , "Cali, Marco" , "Woodhouse, David" Subject: [PATCH v4 7/7] ptp: ptp_vmclock: return TAI not UTC Thread-Topic: [PATCH v4 7/7] ptp: ptp_vmclock: return TAI not UTC Thread-Index: AQHccCopy5YWVTK0WEK/jBfWAHQ0Lw== Date: Thu, 18 Dec 2025 14:25:29 +0000 Message-ID: <20251218142408.8395-8-bchalios@amazon.es> References: <20251218142408.8395-1-bchalios@amazon.es> In-Reply-To: <20251218142408.8395-1-bchalios@amazon.es> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Woodhouse To output UTC would involve complex calculations about whether the time elapsed since the reference time has crossed the end of the month when a leap second takes effect. I've prototyped that, but it made me sad. Much better to report TAI, which is what PHCs should do anyway. And much much simpler. Signed-off-by: David Woodhouse Signed-off-by: Babis Chalios --- drivers/ptp/ptp_vmclock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index 7f342e5a6a92..deab3205601b 100644 --- a/drivers/ptp/ptp_vmclock.c +++ b/drivers/ptp/ptp_vmclock.c @@ -82,13 +82,13 @@ static uint64_t mul_u64_u64_shr_add_u64(uint64_t *res_h= i, uint64_t delta, =20 static bool tai_adjust(struct vmclock_abi *clk, uint64_t *sec) { - if (likely(clk->time_type =3D=3D VMCLOCK_TIME_UTC)) + if (clk->time_type =3D=3D VMCLOCK_TIME_TAI) return true; =20 - if (clk->time_type =3D=3D VMCLOCK_TIME_TAI && + if (clk->time_type =3D=3D VMCLOCK_TIME_UTC && (le64_to_cpu(clk->flags) & VMCLOCK_FLAG_TAI_OFFSET_VALID)) { if (sec) - *sec +=3D (int16_t)le16_to_cpu(clk->tai_offset_sec); + *sec -=3D (int16_t)le16_to_cpu(clk->tai_offset_sec); return true; } return false; @@ -349,9 +349,9 @@ static struct ptp_clock *vmclock_ptp_register(struct de= vice *dev, return NULL; } =20 - /* Only UTC, or TAI with offset */ + /* Accept TAI directly, or UTC with valid offset for conversion to TAI */ if (!tai_adjust(st->clk, NULL)) { - dev_info(dev, "vmclock does not provide unambiguous UTC\n"); + dev_info(dev, "vmclock does not provide unambiguous time\n"); return NULL; } =20 --=20 2.34.1