From: Takahiro Itazuri <itazur@amazon.com>
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>, Babis Chalios <mail@bchalios.io>,
"Alexander Graf" <graf@amazon.de>, <mzxreary@0pointer.de>,
Marco Cali <xmarcalx@amazon.co.uk>,
David Woodhouse <dwmw@amazon.co.uk>,
"Takahiro Itazuri" <itazur@amazon.co.uk>
Subject: [PATCH v6 4/7] ptp: ptp_vmclock: Add device tree support
Date: Wed, 21 Jan 2026 14:33:41 +0000 [thread overview]
Message-ID: <20260121143402.3092-5-itazur@amazon.com> (raw)
In-Reply-To: <20260121143402.3092-1-itazur@amazon.com>
From: David Woodhouse <dwmw@amazon.co.uk>
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 <dwmw@amazon.co.uk>
Signed-off-by: Babis Chalios <bchalios@amazon.es>
---
drivers/ptp/ptp_vmclock.c | 70 ++++++++++++++++++++++++++++++++++-----
1 file changed, 62 insertions(+), 8 deletions(-)
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c
index 38b2bacb755e..8605e441fad7 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -14,10 +14,13 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/mm.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
@@ -535,7 +538,7 @@ vmclock_acpi_notification_handler(acpi_handle __always_unused handle,
wake_up_interruptible(&st->disrupt_wait);
}
-static int vmclock_setup_notification(struct device *dev, struct vmclock_state *st)
+static int vmclock_setup_acpi_notification(struct device *dev)
{
struct acpi_device *adev = ACPI_COMPANION(dev);
acpi_status status;
@@ -548,10 +551,6 @@ static int vmclock_setup_notification(struct device *dev, struct vmclock_state *
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 = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY,
vmclock_acpi_notification_handler,
dev);
@@ -586,6 +585,55 @@ static int vmclock_probe_acpi(struct device *dev, struct vmclock_state *st)
return 0;
}
+static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *_st)
+{
+ struct vmclock_state *st = _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 = to_platform_device(dev);
+ struct resource *res;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ st->res = *res;
+
+ return 0;
+}
+
+static int vmclock_setup_of_notification(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ int irq;
+
+ irq = 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 = data;
@@ -606,7 +654,7 @@ static int vmclock_probe(struct platform_device *pdev)
if (has_acpi_companion(dev))
ret = vmclock_probe_acpi(dev, st);
else
- ret = -EINVAL; /* Only ACPI for now */
+ ret = vmclock_probe_dt(dev, st);
if (ret) {
dev_info(dev, "Failed to obtain physical address: %d\n", ret);
@@ -654,6 +702,7 @@ static int vmclock_probe(struct platform_device *pdev)
return ret;
init_waitqueue_head(&st->disrupt_wait);
+ dev->driver_data = st;
ret = vmclock_setup_notification(dev, st);
if (ret)
return ret;
@@ -690,8 +739,6 @@ static int vmclock_probe(struct platform_device *pdev)
return -ENODEV;
}
- dev->driver_data = st;
-
dev_info(dev, "%s: registered %s%s%s\n", st->name,
st->miscdev.minor ? "miscdev" : "",
(st->miscdev.minor && st->ptp_clock) ? ", " : "",
@@ -706,11 +753,18 @@ static const struct acpi_device_id vmclock_acpi_ids[] = {
};
MODULE_DEVICE_TABLE(acpi, vmclock_acpi_ids);
+static const struct of_device_id vmclock_of_ids[] = {
+ { .compatible = "amazon,vmclock", },
+ { },
+};
+MODULE_DEVICE_TABLE(of, vmclock_of_ids);
+
static struct platform_driver vmclock_platform_driver = {
.probe = vmclock_probe,
.driver = {
.name = "vmclock",
.acpi_match_table = vmclock_acpi_ids,
+ .of_match_table = vmclock_of_ids,
},
};
--
2.47.3
next prev parent reply other threads:[~2026-01-21 14:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-21 14:33 [PATCH v6 0/7] ptp: vmclock: Add VM generation counter and ACPI notification Takahiro Itazuri
2026-01-21 14:33 ` [PATCH v6 1/7] ptp: vmclock: add vm generation counter Takahiro Itazuri
2026-01-21 14:33 ` [PATCH v6 2/7] ptp: vmclock: support device notifications Takahiro Itazuri
2026-01-23 3:11 ` [v6,2/7] " Jakub Kicinski
2026-01-23 20:16 ` David Woodhouse
2026-01-21 14:33 ` [PATCH v6 3/7] dt-bindings: ptp: Add amazon,vmclock Takahiro Itazuri
2026-01-21 14:33 ` Takahiro Itazuri [this message]
2026-01-21 14:33 ` [PATCH v6 5/7] ptp: ptp_vmclock: add 'VMCLOCK' to ACPI device match Takahiro Itazuri
2026-01-21 14:33 ` [PATCH v6 6/7] ptp: ptp_vmclock: remove dependency on CONFIG_ACPI Takahiro Itazuri
2026-01-21 14:33 ` [PATCH v6 7/7] ptp: ptp_vmclock: return TAI not UTC Takahiro Itazuri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260121143402.3092-5-itazur@amazon.com \
--to=itazur@amazon.com \
--cc=andrew+netdev@lunn.ch \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dwmw2@infradead.org \
--cc=dwmw@amazon.co.uk \
--cc=edumazet@google.com \
--cc=graf@amazon.de \
--cc=itazur@amazon.co.uk \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mail@bchalios.io \
--cc=mzxreary@0pointer.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=xmarcalx@amazon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox