ptp: Add ioctl commands to expose raw cycle counter values

Introduce two new ioctl commands, PTP_SYS_OFFSET_PRECISE_CYCLES and
PTP_SYS_OFFSET_EXTENDED_CYCLES, to allow user space to access the
raw free-running cycle counter from PTP devices.

These ioctls are variants of the existing PRECISE and EXTENDED
offset queries, but instead of returning device time in realtime,
they return the raw cycle counter value.

Signed-off-by: Carolina Jubran <cjubran@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Link: https://patch.msgid.link/1755008228-88881-2-git-send-email-tariqt@nvidia.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index 4ca5a464a46a8d66340ec8660d1f532352ca06fa..e9719f365aabd86fed3ee52e9a377ea250262feb 100644 (file)
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -285,17 +285,21 @@ static long ptp_enable_pps(struct ptp_clock *ptp, bool enable)
                return ops->enable(ops, &req, enable);
 }
 
-static long ptp_sys_offset_precise(struct ptp_clock *ptp, void __user *arg)
+typedef int (*ptp_crosststamp_fn)(struct ptp_clock_info *,
+                                 struct system_device_crosststamp *);
+
+static long ptp_sys_offset_precise(struct ptp_clock *ptp, void __user *arg,
+                                  ptp_crosststamp_fn crosststamp_fn)
 {
        struct ptp_sys_offset_precise precise_offset;
        struct system_device_crosststamp xtstamp;
        struct timespec64 ts;
        int err;
 
-       if (!ptp->info->getcrosststamp)
+       if (!crosststamp_fn)
                return -EOPNOTSUPP;
 
-       err = ptp->info->getcrosststamp(ptp->info, &xtstamp);
+       err = crosststamp_fn(ptp->info, &xtstamp);
        if (err)
                return err;
 
@@ -313,12 +317,17 @@ static long ptp_sys_offset_precise(struct ptp_clock *ptp, void __user *arg)
        return copy_to_user(arg, &precise_offset, sizeof(precise_offset)) ? -EFAULT : 0;
 }
 
-static long ptp_sys_offset_extended(struct ptp_clock *ptp, void __user *arg)
+typedef int (*ptp_gettimex_fn)(struct ptp_clock_info *,
+                              struct timespec64 *,
+                              struct ptp_system_timestamp *);
+
+static long ptp_sys_offset_extended(struct ptp_clock *ptp, void __user *arg,
+                                   ptp_gettimex_fn gettimex_fn)
 {
        struct ptp_sys_offset_extended *extoff __free(kfree) = NULL;
        struct ptp_system_timestamp sts;
 
-       if (!ptp->info->gettimex64)
+       if (!gettimex_fn)
                return -EOPNOTSUPP;
 
        extoff = memdup_user(arg, sizeof(*extoff));
@@ -346,7 +355,7 @@ static long ptp_sys_offset_extended(struct ptp_clock *ptp, void __user *arg)
                struct timespec64 ts;
                int err;
 
-               err = ptp->info->gettimex64(ptp->info, &ts, &sts);
+               err = gettimex_fn(ptp->info, &ts, &sts);
                if (err)
                        return err;
 
@@ -497,11 +506,13 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
 
        case PTP_SYS_OFFSET_PRECISE:
        case PTP_SYS_OFFSET_PRECISE2:
-               return ptp_sys_offset_precise(ptp, argptr);
+               return ptp_sys_offset_precise(ptp, argptr,
+                                             ptp->info->getcrosststamp);
 
        case PTP_SYS_OFFSET_EXTENDED:
        case PTP_SYS_OFFSET_EXTENDED2:
-               return ptp_sys_offset_extended(ptp, argptr);
+               return ptp_sys_offset_extended(ptp, argptr,
+                                              ptp->info->gettimex64);
 
        case PTP_SYS_OFFSET:
        case PTP_SYS_OFFSET2:
@@ -523,6 +534,13 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
        case PTP_MASK_EN_SINGLE:
                return ptp_mask_en_single(pccontext->private_clkdata, argptr);
 
+       case PTP_SYS_OFFSET_PRECISE_CYCLES:
+               return ptp_sys_offset_precise(ptp, argptr,
+                                             ptp->info->getcrosscycles);
+
+       case PTP_SYS_OFFSET_EXTENDED_CYCLES:
+               return ptp_sys_offset_extended(ptp, argptr,
+                                              ptp->info->getcyclesx64);
        default:
                return -ENOTTY;
        }

diff --git a/include/uapi/linux/ptp_clock.h b/include/uapi/linux/ptp_clock.h
index 18eefa6d93d62fc34edae8ae904db8cfad978c83..65f187b5f0d0155bb10ba28feaa0b9fbb5494eaa 100644 (file)
--- a/include/uapi/linux/ptp_clock.h
+++ b/include/uapi/linux/ptp_clock.h
@@ -245,6 +245,10 @@ struct ptp_pin_desc {
        _IOWR(PTP_CLK_MAGIC, 18, struct ptp_sys_offset_extended)
 #define PTP_MASK_CLEAR_ALL  _IO(PTP_CLK_MAGIC, 19)
 #define PTP_MASK_EN_SINGLE  _IOW(PTP_CLK_MAGIC, 20, unsigned int)
+#define PTP_SYS_OFFSET_PRECISE_CYCLES \
+       _IOWR(PTP_CLK_MAGIC, 21, struct ptp_sys_offset_precise)
+#define PTP_SYS_OFFSET_EXTENDED_CYCLES \
+       _IOWR(PTP_CLK_MAGIC, 22, struct ptp_sys_offset_extended)
 
 struct ptp_extts_event {
        struct ptp_clock_time t; /* Time event occurred. */