quoted hunk ↗ jump to hunk
-----Original Message-----
From: Chalios, Babis <redacted>
Sent: Wednesday, December 3, 2025 6:06 PM
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: <redacted>; <redacted>; linux-
kernel@vger.kernel.org; Chalios, Babis [off-list ref]; Graf (AWS),
Alexander [off-list ref]; mzxreary@0pointer.de; Cali, Marco
[off-list ref]; Woodhouse, David [off-list ref]
Subject: [PATCH v3 4/4] ptp: ptp_vmclock: Add device tree
support
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
From: David Woodhouse <redacted>
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 behavior.
Signed-off-by: David Woodhouse <redacted>
Signed-off-by: Babis Chalios <redacted>
---
drivers/ptp/ptp_vmclock.c | 69 +++++++++++++++++++++++++++++++++++----
1 file changed, 63 insertions(+), 6 deletions(-)
diff --git a/drivers/ptp/ptp_vmclock.c b/drivers/ptp/ptp_vmclock.c index
49a17435bd35..349582f1ccc3 100644
--- a/drivers/ptp/ptp_vmclock.c
+++ b/drivers/ptp/ptp_vmclock.c
@@ -14,10 +14,12 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/init.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>
@@ -536,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;@@ -549,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);
@@ -587,6 +585,58 @@ 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
+*dev) {
+ struct device *device = dev;
+ struct vmclock_state *st = device->driver_data;
+
+ wake_up_interruptible(&st->disrupt_wait);
+ return IRQ_HANDLED;
+}
Minor nit: For clarity and type-safety, it would be better to pass st as the IRQ handler dev_id and cast directly:
static irqreturn_t vmclock_of_irq_handler(int __always_unused irq, void *dev_id)
{
struct vmclock_state *st = dev_id;
...
}
static int vmclock_setup_of_notification(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct vmclock_state *st = dev_get_drvdata(dev);
....
return devm_request_irq(dev, irq, vmclock_of_irq_handler, IRQF_SHARED,
"vmclock", st); /* Pass st directly */
}
quoted hunk ↗ jump to hunk
+
+static int vmclock_probe_dt(struct device *dev, struct vmclock_state
+*st) {
Also, should all functions have the opening brace on the next line, to satisfy kernel coding style.
static int vmclock_probe_dt(struct device *dev, struct vmclock_state *st)
{
...
}
quoted hunk ↗ jump to hunk
+ 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);
+}
+
+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;@@ -607,7 +657,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);@@ -707,11 +757,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.34.1