Decode ptp ioctls

* defs.h (ptp_ioctl): New prototype.
* ioctl.c (ioctl_decode): Call ptp_ioctl when code is '='.
* Makefile.am (strace_SOURCES): Add ptp.c.
(EXTRA_DIST): Add linux/ptp_clock.h.
* ptp.c: New file.
* linux/ptp_clock.h: New file.

Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/Makefile.am b/Makefile.am
index c98d8b98f2e110241507ae75bee9493f8a8ae03b..90f333db62f6438cffa1c945e56b83794bd09007 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ strace_SOURCES =      \
        net.c           \
        pathtrace.c     \
        process.c       \
+       ptp.c           \
        quota.c         \
        resource.c      \
        scsi.c          \
@@ -130,6 +131,7 @@ EXTRA_DIST =                                \
        linux/powerpc/signalent1.h      \
        linux/powerpc/syscallent.h      \
        linux/powerpc/syscallent1.h     \
+       linux/ptp_clock.h               \
        linux/s390/ioctlent.h.in        \
        linux/s390/syscallent.h         \
        linux/s390x/ioctlent.h.in       \

diff --git a/defs.h b/defs.h
index 95d257162cd6a3dd85f4722af3a28e89c62f0173..330441fac26ae3dcfdd958eb8e9fe6e8073b2091 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -703,6 +703,7 @@ extern int block_ioctl(struct tcb *, long, long);
 extern int mtd_ioctl(struct tcb *, long, long);
 extern int ubi_ioctl(struct tcb *, long, long);
 extern int loop_ioctl(struct tcb *, long, long);
+extern int ptp_ioctl(struct tcb *, long, long);
 
 extern int tv_nz(struct timeval *);
 extern int tv_cmp(struct timeval *, struct timeval *);

diff --git a/ioctl.c b/ioctl.c
index 22804395627fecdc2bc8581e62fced1b9812e97c..e9a503da7d5bff0d19548ff29ea966155992eea5 100644 (file)
--- a/ioctl.c
+++ b/ioctl.c
@@ -95,6 +95,8 @@ ioctl_decode(struct tcb *tcp, long code, long arg)
        case 'o':
        case 'O':
                return ubi_ioctl(tcp, code, arg);
+       case '=':
+               return ptp_ioctl(tcp, code, arg);
        default:
                break;
        }

diff --git a/linux/ptp_clock.h b/linux/ptp_clock.h
new file mode 100644 (file)
index 0000000..b65c834
--- /dev/null
+++ b/linux/ptp_clock.h
@@ -0,0 +1,98 @@
+/*
+ * PTP 1588 clock support - user space interface
+ *
+ * Copyright (C) 2010 OMICRON electronics GmbH
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef _PTP_CLOCK_H_
+#define _PTP_CLOCK_H_
+
+#include <linux/ioctl.h>
+#include <linux/types.h>
+
+/* PTP_xxx bits, for the flags field within the request structures. */
+#define PTP_ENABLE_FEATURE (1<<0)
+#define PTP_RISING_EDGE    (1<<1)
+#define PTP_FALLING_EDGE   (1<<2)
+
+/*
+ * struct ptp_clock_time - represents a time value
+ *
+ * The sign of the seconds field applies to the whole value. The
+ * nanoseconds field is always unsigned. The reserved field is
+ * included for sub-nanosecond resolution, should the demand for
+ * this ever appear.
+ *
+ */
+struct ptp_clock_time {
+       __s64 sec;  /* seconds */
+       __u32 nsec; /* nanoseconds */
+       __u32 reserved;
+};
+
+struct ptp_clock_caps {
+       int max_adj;   /* Maximum frequency adjustment in parts per billon. */
+       int n_alarm;   /* Number of programmable alarms. */
+       int n_ext_ts;  /* Number of external time stamp channels. */
+       int n_per_out; /* Number of programmable periodic signals. */
+       int pps;       /* Whether the clock supports a PPS callback. */
+       int rsv[15];   /* Reserved for future use. */
+};
+
+struct ptp_extts_request {
+       unsigned int index;  /* Which channel to configure. */
+       unsigned int flags;  /* Bit field for PTP_xxx flags. */
+       unsigned int rsv[2]; /* Reserved for future use. */
+};
+
+struct ptp_perout_request {
+       struct ptp_clock_time start;  /* Absolute start time. */
+       struct ptp_clock_time period; /* Desired period, zero means disable. */
+       unsigned int index;           /* Which channel to configure. */
+       unsigned int flags;           /* Reserved for future use. */
+       unsigned int rsv[4];          /* Reserved for future use. */
+};
+
+#define PTP_MAX_SAMPLES 25 /* Maximum allowed offset measurement samples. */
+
+struct ptp_sys_offset {
+       unsigned int n_samples; /* Desired number of measurements. */
+       unsigned int rsv[3];    /* Reserved for future use. */
+       /*
+        * Array of interleaved system/phc time stamps. The kernel
+        * will provide 2*n_samples + 1 time stamps, with the last
+        * one as a system time stamp.
+        */
+       struct ptp_clock_time ts[2 * PTP_MAX_SAMPLES + 1];
+};
+
+#define PTP_CLK_MAGIC '='
+
+#define PTP_CLOCK_GETCAPS  _IOR(PTP_CLK_MAGIC, 1, struct ptp_clock_caps)
+#define PTP_EXTTS_REQUEST  _IOW(PTP_CLK_MAGIC, 2, struct ptp_extts_request)
+#define PTP_PEROUT_REQUEST _IOW(PTP_CLK_MAGIC, 3, struct ptp_perout_request)
+#define PTP_ENABLE_PPS     _IOW(PTP_CLK_MAGIC, 4, int)
+#define PTP_SYS_OFFSET     _IOW(PTP_CLK_MAGIC, 5, struct ptp_sys_offset)
+
+struct ptp_extts_event {
+       struct ptp_clock_time t; /* Time event occured. */
+       unsigned int index;      /* Which channel produced the event. */
+       unsigned int flags;      /* Reserved for future use. */
+       unsigned int rsv[2];     /* Reserved for future use. */
+};
+
+#endif

diff --git a/ptp.c b/ptp.c
new file mode 100644 (file)
index 0000000..119b167
--- /dev/null
+++ b/ptp.c
@@ -0,0 +1,103 @@
+#include "defs.h"
+#include <sys/ioctl.h>
+#include <linux/ptp_clock.h>
+
+static const struct xlat ptp_flags_options[] = {
+       { PTP_ENABLE_FEATURE,   "PTP_ENABLE_FEATURE"    },
+       { PTP_RISING_EDGE,      "PTP_RISING_EDGE"       },
+       { PTP_FALLING_EDGE,     "PTP_FALLING_EDGE"      },
+       { 0,                    NULL                    }
+};
+
+
+int ptp_ioctl(struct tcb *tcp, long code, long arg)
+{
+       if (!verbose(tcp))
+               return 0;
+
+       switch (code) {
+               case PTP_CLOCK_GETCAPS: /* decode on exit */
+               {
+                       struct ptp_clock_caps caps;
+
+                       if (entering(tcp) || syserror(tcp) ||
+                           umove(tcp, arg, &caps) < 0)
+                               return 0;
+
+                       tprintf(", {max_adj=%d, n_alarm=%d, n_ext_ts=%d, n_per_out=%d, pps=%d}",
+                               caps.max_adj, caps.n_alarm, caps.n_ext_ts,
+                               caps.n_per_out, caps.pps);
+                       return 1;
+               }
+
+               case PTP_EXTTS_REQUEST: /* decode on enter */
+               {
+                       struct ptp_extts_request extts;
+
+                       if (exiting(tcp))
+                               return 1;
+                       if (umove(tcp, arg, &extts) < 0) {
+                               tprintf(", %#lx", arg);
+                               return 0;
+                       }
+                       tprintf(", {index=%d, flags=", extts.index);
+                       printflags(ptp_flags_options, extts.flags, "PTP_???");
+                       tprints("}");
+                       return 1;
+               }
+
+               case PTP_PEROUT_REQUEST: /* decode on enter */
+               {
+                       struct ptp_perout_request perout;
+
+                       if (exiting(tcp))
+                               return 1;
+                       if (umove(tcp, arg, &perout) < 0) {
+                               tprintf(", %#lx", arg);
+                               return 0;
+                       }
+
+                       tprintf(", {start={%" PRId64 ", %" PRIu32 "}"
+                                  ", period={%" PRId64 ", %" PRIu32 "}"
+                                  ", index=%d, flags=",
+                               (int64_t)perout.start.sec, perout.start.nsec,
+                               (int64_t)perout.period.sec, perout.period.nsec,
+                               perout.index);
+                       printflags(ptp_flags_options, perout.flags, "PTP_???");
+                       tprints("}");
+                       return 1;
+               }
+
+               case PTP_ENABLE_PPS: /* decode on enter */
+                       if (entering(tcp))
+                               tprintf(", %ld", arg);
+                       return 1;
+
+               case PTP_SYS_OFFSET: /* decode on exit */
+               {
+                       struct ptp_sys_offset sysoff;
+                       unsigned int i;
+
+                       if (entering(tcp) || umove(tcp, arg, &sysoff) < 0)
+                               return 0;
+
+                       tprintf(", {n_samples=%u, ts={", sysoff.n_samples);
+                       if (syserror(tcp)) {
+                               tprints("...}}");
+                               return 1;
+                       }
+                       if (sysoff.n_samples > PTP_MAX_SAMPLES)
+                               sysoff.n_samples = PTP_MAX_SAMPLES;
+                       tprintf("{%" PRId64 ", %" PRIu32 "}",
+                               (int64_t)sysoff.ts[0].sec, sysoff.ts[0].nsec);
+                       for (i = 1; i < 2*sysoff.n_samples+1; ++i)
+                               tprintf(", {%" PRId64 ", %" PRIu32 "}",
+                                       (int64_t)sysoff.ts[i].sec, sysoff.ts[i].nsec);
+                       tprints("}}");
+                       return 1;
+               }
+
+               default: /* decode on exit */
+                       return 0;
+       }
+}