* [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
@ 2007-02-16 18:52 Rodolfo Giometti
2007-02-16 19:12 ` Russell King
` (5 more replies)
0 siblings, 6 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-16 18:52 UTC (permalink / raw)
To: linux-kernel; +Cc: linuxpps
[-- Attachment #1: Type: text/plain, Size: 2862 bytes --]
Pulse per Second (PPS) support for Linux.
Signed-off-by: Rodolfo Giometti <giometti@enneenne.com>
---
Please, note that this PPS implementation is not RFC 2783 fully
compatible since, IMHO, the RFC simply doesn't consider PPS devices
connected with special GPIOs or other ports different from serial
ports and parallele ports.
Please read the following consideratios before sending to /dev/null!
:)
RFC considerations
------------------
While implementing a PPS API as RFC 2783 defines and using an embedded
CPU GPIO-Pin as physical link to the signal, I encountered a deeper
problem:
At startup it needs a file descriptor as argument for the function
time_pps_create().
This implies that the source has a /dev/... entry. This assumption is
ok for the serial and parallel port, where you can do something
usefull beside(!) the gathering of timestamps as it is the central
task for a PPS-API. But this assumption does not work for a single
purpose GPIO line. In this case even basic file-related functionality
(like read() and write()) makes no sense at all and should not be a
precondition for the use of a PPS-API.
The problem can be simply solved if you change the original RFC 2783:
pps_handle_t type is an opaque __scalar type__ used to represent a
PPS source within the API
into a modified:
pps_handle_t type is an opaque __variable__ used to represent a PPS
source within the API and programs should not access it directly to
it due to its opacity.
This change seems to be neglibile because even the original RFC 2783
does not encourage programs to check (read: use) the pps_handle_t
variable before calling the time_pps_*() functions, since each
function should do this job internally.
If I intentionally separate the concept of "file descriptor" from the
concept of the "PPS source" I'm obliged to provide a solution to find
and register a PPS-source without using a file descriptor: it's done
by the functions time_pps_findsource() and time_pps_findpath() now.
According to this current NTPD drivers' code should be modified as
follows:
+#ifdef PPS_HAVE_FINDPATH
+ /* Get the PPS source's real name */
+ fd = readlink(link, path, STRING_LEN-1);
+ if (fd <= 0)
+ strncpy(path, link, STRING_LEN);
+ else
+ path[fd] = '\0';
+
+ /* Try to find the source */
+ fd = time_pps_findpath(path, STRING_LEN, id, STRING_LEN);
+ if (fd < 0) {
+ msyslog(LOG_ERR, "refclock: cannot find PPS source \"%s\" in the system", path);
+ return 1;
+ }
+ msyslog(LOG_INFO, "refclock: found PPS source #%d \"%s\" on \"%s\"", fd, path, id);
+#endif /* PPS_HAVE_FINDPATH */
+
+
if (time_pps_create(fd, &pps_handle) < 0) {
- pps_handle = 0;
msyslog(LOG_ERR, "refclock: time_pps_create failed: %m");
}
[-- Attachment #2: ntp-pps-2.6.20.diff --]
[-- Type: text/x-diff, Size: 70598 bytes --]
diff --git a/Documentation/pps.txt b/Documentation/pps.txt
new file mode 100644
index 0000000..a00b9d0
--- /dev/null
+++ b/Documentation/pps.txt
@@ -0,0 +1,206 @@
+
+ PPS - Pulse Per Second
+ ----------------------
+
+(C) Copyright 2007 Rodolfo Giometti <giometti@enneenne.com>
+
+
+Overview
+--------
+
+LinuxPPS provides a programming interface (API) to define into the
+system several PPS sources.
+
+PPS means "pulse per second" and a PPS source is just a device who
+provides an high and precise signal each second so that an application
+can use it to adjust time clock.
+
+A PPS source can be connected to a serial port (usually to the Data
+Carrier Detect pin) or to a parallel port (ACK-pin) or to a special
+CPU's GPIOs (this is the common case in embedded systems) but in each
+case when a new pulse comes the system must apply to it a timestamp
+and record it for the userland.
+
+Common use is the combination of the NTPD as userland program with a
+GPS receiver as PPS source to obtain a wallclock-time with
+sub-millisecond synchronisation to UTC.
+
+
+RFC considerations
+------------------
+
+While implementing a PPS API as RFC 2783 defines and using an embedded
+CPU GPIO-Pin as physical link to the signal, I encountered a deeper
+problem:
+
+ At startup it needs a file descriptor as argument for the function
+ time_pps_create().
+
+This implies that the source has a /dev/... entry. This assumption is
+ok for the serial and parallel port, where you can do something
+usefull beside(!) the gathering of timestamps as it is the central
+task for a PPS-API. But this assumption does not work for a single
+purpose GPIO line. In this case even basic file-related functionality
+(like read() and write()) makes no sense at all and should not be a
+precondition for the use of a PPS-API.
+
+The problem can be simply solved if you change the original RFC 2783:
+
+ pps_handle_t type is an opaque __scalar type__ used to represent a
+ PPS source within the API
+
+into a modified:
+
+ pps_handle_t type is an opaque __variable__ used to represent a PPS
+ source within the API and programs should not access it directly to
+ it due to its opacity.
+
+This change seems to be neglibile because even the original RFC 2783
+does not encourage programs to check (read: use) the pps_handle_t
+variable before calling the time_pps_*() functions, since each
+function should do this job internally.
+
+If I intentionally separate the concept of "file descriptor" from the
+concept of the "PPS source" I'm obliged to provide a solution to find
+and register a PPS-source without using a file descriptor: it's done
+by the functions time_pps_findsource() and time_pps_findpath() now.
+
+According to this current NTPD drivers' code should be modified as
+follows:
+
++#ifdef PPS_HAVE_FINDPATH
++ /* Get the PPS source's real name */
++ fd = readlink(link, path, STRING_LEN-1);
++ if (fd <= 0)
++ strncpy(path, link, STRING_LEN);
++ else
++ path[fd] = '\0';
++
++ /* Try to find the source */
++ fd = time_pps_findpath(path, STRING_LEN, id, STRING_LEN);
++ if (fd < 0) {
++ msyslog(LOG_ERR, "refclock: cannot find PPS source \"%s\" in the system", path);
++ return 1;
++ }
++ msyslog(LOG_INFO, "refclock: found PPS source #%d \"%s\" on \"%s\"", fd, path, id);
++#endif /* PPS_HAVE_FINDPATH */
++
++
+ if (time_pps_create(fd, &pps_handle) < 0) {
+- pps_handle = 0;
+ msyslog(LOG_ERR, "refclock: time_pps_create failed: %m");
+ }
+
+
+Coding example
+--------------
+
+To register a PPS source into the kernel you should define a struct
+linuxpps_source_info_s as follow:
+
+ static struct linuxpps_source_info_s linuxpps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : linuxpps_ktimer_echo,
+ };
+
+and then calling the function linuxpps_register_source() in your
+intialization routine as follow:
+
+ source = linuxpps_register_source(&linuxpps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+
+The linuxpps_register_source() prototype is:
+
+ int linuxpps_register_source(struct linuxpps_source_info_s *info, int default_params, int try_id)
+
+where "info" is a pointer to a structure that describes a particular
+PPS source, "default_params" tells the system what the initial default
+parameters for the device should be (is obvious that these parameters
+must be a subset of ones defined into the struct
+linuxpps_source_info_s which describe the capabilities of the driver)
+and "try_id" can be used to force a particular ID for your device into
+the system (just use -1 if you wish the system chooses one for you).
+
+Once you have registered a new PPS source into the system you can
+signal an assert event (for example in the interrupt handler routine)
+just using:
+
+ linuxpps_event(source, PPS_CAPTUREASSERT, ptr);
+
+The same function may also run the defined echo function
+(linuxpps_ktimer_echo(), passing to it the "ptr" pointer) if the user
+asked for that... etc..
+
+Please see the file drivers/pps/clients/ktimer.c for an example code.
+
+
+PROCFS support
+--------------
+
+If PROCFS support is enabled a new directory "/proc/pps" is created:
+
+ $ ls /proc/pps/
+ 00 01 sources
+
+The file "sources" holds a brief description of all PPS sources
+defined in the system:
+
+ $ cat /proc/pps/sources
+ id mode echo name path
+ ---- ------ ---- ---------------- ----------------
+ 00 1133 no serial0 /dev/ttyS0
+ 01 1133 no serial1 /dev/ttyS1
+
+The other entries are directories that hold one or two files according
+to the ability of the associated source to provide "assert" and
+"clear" timestamps:
+
+ $ ls /proc/pps/00
+ assert clear
+
+Inside each "assert" and "clear" file you can find the timestamp and a
+sequence number:
+
+ $ cat /proc/pps/00/assert
+ 1170026870.983207967 #8
+
+
+SYSFS support
+-------------
+
+The SYSFS support is enabled by default if the SYSFS filesystem is
+enabled in the kernel and it provides a new class:
+
+ $ ls /sys/class/pps/
+ 00/ 01/ 02/
+
+Every directory is the ID of a PPS sources defined into the system and
+inside you find several files:
+
+ $ ls /sys/class/pps/00/
+ assert clear echo mode name path subsystem@ uevent
+
+Files "assert" and "clear" have the same functionality as their PROCFS
+counterparts but with different syntax due to the one-value-per-file
+sysfs pragma. Other files are:
+
+* echo: reports if the PPS source has an echo function or not;
+
+* mode: reports available PPS functioning modes (in the same form as
+ PROCFS does);
+
+* name: reports the PPS source's name;
+
+* path: reports the PPS source's device path, that is the device the
+ PPS source is connected to (if it exists).
+
+
+Resources
+---------
+
+Wiki: http://wiki.enneenne.com/index.php/LinuxPPS_support and the LinuxPPS
+ML: http://ml.enneenne.com/cgi-bin/mailman/listinfo/linuxpps.
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 050323f..bb54cab 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
+source "drivers/pps/Kconfig"
+
source "drivers/w1/Kconfig"
source "drivers/hwmon/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 3a718f5..d0007f7 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/
obj-$(CONFIG_I2C) += i2c/
+obj-$(CONFIG_PPS) += pps/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_HWMON) += hwmon/
obj-$(CONFIG_PHONE) += telephony/
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index b51d08b..6185679 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -750,6 +750,27 @@ static struct console lpcons = {
#endif /* console on line printer */
+/* --- support for PPS signal on the line printer -------------- */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+
+static inline void lp_pps_echo(int source, int event, void *data)
+{
+ struct parport *port = (struct parport *) data;
+ unsigned char status = parport_read_status(port);
+
+ /* echo event via SEL bit */
+ parport_write_control(port,
+ parport_read_control(port) | PARPORT_CONTROL_SELECT);
+
+ /* signal no event */
+ if ((status & PARPORT_STATUS_ACK) != 0)
+ parport_write_control(port,
+ parport_read_control(port) & ~PARPORT_CONTROL_SELECT);
+}
+
+#endif
+
/* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
@@ -821,6 +842,36 @@ static int lp_register(int nr, struct parport *port)
}
#endif
+#ifdef CONFIG_PPS_CLIENT_LP
+ snprintf(port->pps_info.path, LINUXPPS_MAX_NAME_LEN, "/dev/lp%d", nr);
+
+ /* No PPS support if lp port has no IRQ line */
+ if (port->irq != PARPORT_IRQ_NONE) {
+ strncpy(port->pps_info.name, port->name, LINUXPPS_MAX_NAME_LEN);
+
+ port->pps_info.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT | \
+ PPS_ECHOASSERT | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ port->pps_info.echo = lp_pps_echo;
+
+ port->pps_source = linuxpps_register_source(&(port->pps_info),
+ PPS_CAPTUREASSERT | PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (port->pps_source < 0)
+ err("cannot register PPS source \"%s\"",
+ port->pps_info.path);
+ else
+ info("PPS source #%d \"%s\" added to the system",
+ port->pps_source, port->pps_info.path);
+ }
+ else {
+ port->pps_source = -1;
+ err("PPS support disabled due port \"%s\" is in polling mode",
+ port->pps_info.path);
+ }
+#endif
+
return 0;
}
@@ -864,6 +915,14 @@ static void lp_detach (struct parport *port)
console_registered = NULL;
}
#endif /* CONFIG_LP_CONSOLE */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+ if (port->pps_source >= 0) {
+ linuxpps_unregister_source(&(port->pps_info));
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, port->pps_info.path);
+ }
+#endif
}
static struct parport_driver lp_driver = {
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index b61c17b..426b0ac 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -272,6 +272,14 @@ static int clear_epp_timeout(struct parport *pb)
static irqreturn_t parport_pc_interrupt(int irq, void *dev_id)
{
+#ifdef CONFIG_PPS_CLIENT_LP_PARPORT_PC
+ struct parport *p = (struct parport *) dev_id;
+
+ linuxpps_event(p->pps_source, PPS_CAPTUREASSERT, p);
+ dbg("parport_pc: PPS assert event at %lu on source #%d",
+ jiffies, p->pps_source);
+#endif
+
parport_generic_irq(irq, (struct parport *) dev_id);
/* FIXME! Was it really ours? */
return IRQ_HANDLED;
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
new file mode 100644
index 0000000..20aa5f0
--- /dev/null
+++ b/drivers/pps/Kconfig
@@ -0,0 +1,43 @@
+#
+# Character device configuration
+#
+
+menu "PPS support"
+
+config PPS
+ tristate "PPS support"
+ depends on EXPERIMENTAL
+ ---help---
+ PPS (Pulse Per Second) is a special pulse provided by some GPS
+ antennas. Userland can use it to get an high time reference.
+
+ Some antennas' PPS signals are connected with the CD (Carrier
+ Detect) pin of the serial line they use to communicate with the
+ host. In this case use the SERIAL_LINE client support.
+
+ Some antennas' PPS signals are connected with some special host
+ inputs so you have to enable the corresponding client support.
+
+ This PPS support can also be built as a module. If so, the module
+ will be called pps-core.
+
+config PPS_PROCFS
+ bool "PPS procfs support"
+ depends on PPS
+ default y
+ help
+ Say Y here if you want the PPS support to produce a new file into
+ the "/proc" directory which holds useful information regarding
+ registered PPS clients into the system.
+
+config PPS_DEBUG
+ bool "PPS debugging messages"
+ depends on PPS
+ help
+ Say Y here if you want the PPS support to produce a bunch of debug
+ messages to the system log. Select this if you are having a
+ problem with PPS support and want to see more of what is going on.
+
+source drivers/pps/clients/Kconfig
+
+endmenu
diff --git a/drivers/pps/Makefile b/drivers/pps/Makefile
new file mode 100644
index 0000000..cc51203
--- /dev/null
+++ b/drivers/pps/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the PPS core.
+#
+
+pps_core-objs += pps.o kapi.o sysfs.o procfs.o
+obj-$(CONFIG_PPS) += pps_core.o
+obj-y += clients/
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
new file mode 100644
index 0000000..4214b52
--- /dev/null
+++ b/drivers/pps/clients/Kconfig
@@ -0,0 +1,56 @@
+#
+# LinuxPPS clients configuration
+#
+
+if PPS
+
+comment "PPS clients support"
+
+config PPS_CLIENT_KTIMER
+ tristate "Kernel timer client (Testing client, use for debug)"
+ help
+ If you say yes here you get support for a PPS debugging client
+ which uses a kernel timer to generate the PPS signal.
+
+ This driver can also be built as a module. If so, the module
+ will be called ktimer.o.
+
+comment "UART serial support (forced off)"
+ depends on SERIAL_CORE && ( PPS = m && SERIAL_CORE = y )
+
+config PPS_CLIENT_UART
+ bool "UART serial support"
+ depends on SERIAL_CORE && ! ( PPS = m && SERIAL_CORE = y )
+
+comment "8250 serial support (forced off)"
+ depends on PPS_CLIENT_UART && SERIAL_8250 && \
+ ( PPS = m && SERIAL_8250 = y )
+
+config PPS_CLIENT_UART_8250
+ bool "8250 serial support"
+ depends on PPS_CLIENT_UART && SERIAL_8250 && \
+ ! ( PPS = m && SERIAL_8250 = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the CD (Carrier Detect) pin of your 8250 serial line chip.
+
+comment "Parallel printer support (forced off)"
+ depends on PRINTER && ( PPS = m && PRINTER = y )
+
+config PPS_CLIENT_LP
+ bool "Parallel printer support"
+ depends on PRINTER && ! ( PPS = m && PRINTER = y )
+
+comment "Parport PC support (forced off)"
+ depends on PPS_CLIENT_LP && PARPORT_PC && \
+ ( PPS = m && PARPORT_PC = y )
+
+config PPS_CLIENT_LP_PARPORT_PC
+ bool "Parport PC support"
+ depends on PPS_CLIENT_LP && PARPORT_PC && \
+ ! ( PPS = m && PARPORT_PC = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the interrupt pin of your PC parallel port.
+
+endif
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
new file mode 100644
index 0000000..3ecca41
--- /dev/null
+++ b/drivers/pps/clients/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for miscellaneous I2C chip drivers.
+#
+
+obj-$(CONFIG_PPS_CLIENT_KTIMER) += ktimer.o
+
diff --git a/drivers/pps/clients/ktimer.c b/drivers/pps/clients/ktimer.c
new file mode 100644
index 0000000..e0f6989
--- /dev/null
+++ b/drivers/pps/clients/ktimer.c
@@ -0,0 +1,107 @@
+/*
+ * ktimer.c -- kernel timer test client
+ *
+ *
+ * Copyright (C) 2005-2006 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/timer.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ----------------------------------------------------- */
+
+static int source;
+static struct timer_list ktimer;
+
+/* --- The kernel timer ----------------------------------------------------- */
+
+static void linuxpps_ktimer_event(unsigned long ptr) {
+ info("PPS event at %lu", jiffies);
+
+ linuxpps_event(source, PPS_CAPTUREASSERT, NULL);
+
+ /* Rescheduling */
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+}
+
+/* --- The echo function ---------------------------------------------------- */
+
+static void linuxpps_ktimer_echo(int source, int event, void *data)
+{
+ info("echo %s %s for source %d",
+ event&PPS_CAPTUREASSERT ? "assert" : "",
+ event&PPS_CAPTURECLEAR ? "clear" : "",
+ source);
+}
+
+/* --- The PPS info struct -------------------------------------------------- */
+
+static struct linuxpps_source_info_s linuxpps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : linuxpps_ktimer_echo,
+};
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit linuxpps_ktimer_exit(void)
+{
+ del_timer_sync(&ktimer);
+ linuxpps_unregister_source(&linuxpps_ktimer_info);
+
+ info("ktimer PPS source unregistered");
+}
+
+static int __init linuxpps_ktimer_init(void)
+{
+ int ret;
+
+ ret = linuxpps_register_source(&linuxpps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (ret < 0) {
+ err("cannot register ktimer source");
+ return ret;
+ }
+ source = ret;
+
+ init_timer(&ktimer);
+ ktimer.function = linuxpps_ktimer_event;
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+
+ info("ktimer PPS source registered at %d", source);
+
+ return 0;
+}
+
+module_init(linuxpps_ktimer_init);
+module_exit(linuxpps_ktimer_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("testing PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
new file mode 100644
index 0000000..f4b0b6e
--- /dev/null
+++ b/drivers/pps/kapi.c
@@ -0,0 +1,213 @@
+/*
+ * kapi.c -- kernel API
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Local functions ----------------------------------------------------- */
+
+#ifndef NSEC_PER_SEC
+#define NSEC_PER_SEC 1000000000
+#endif
+static void linuxpps_add_offset(struct timespec *ts, struct timespec *offset)
+{
+ ts->tv_nsec += offset->tv_nsec;
+ if (ts->tv_nsec >= NSEC_PER_SEC) {
+ ts->tv_nsec -= NSEC_PER_SEC;
+ ts->tv_sec++;
+ } else if (ts->tv_nsec < 0) {
+ ts->tv_nsec += NSEC_PER_SEC;
+ ts->tv_sec--;
+ }
+ ts->tv_sec += offset->tv_sec;
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+static inline int __linuxpps_register_source(struct linuxpps_source_info_s *info, int default_params, int try_id)
+{
+ int i;
+
+ if (try_id >= 0) {
+ if (__linuxpps_is_allocated(try_id)) {
+ err("source id %d busy", try_id);
+ return -EBUSY;
+ }
+ i = try_id;
+ }
+ else {
+ for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
+ if (!__linuxpps_is_allocated(i))
+ break;
+ if (i >= LINUXPPS_MAX_SOURCES) {
+ err("no free source ids");
+ return -ENOMEM;
+ }
+ }
+
+ /* Sanity checks */
+ if ((info->mode&default_params) != default_params) {
+ err("unsupported default parameters");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0 && info->echo == NULL) {
+ err("echo function is not defined");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ err("unspecified time format");
+ return -EINVAL;
+ }
+
+ /* Allocate the PPS source */
+ memset(&linuxpps_source[i], 0, sizeof(struct linuxpps_s));
+ linuxpps_source[i].info = info;
+ linuxpps_source[i].params.api_version = PPS_API_VERS;
+ linuxpps_source[i].params.mode = default_params;
+ init_waitqueue_head(&linuxpps_source[i].queue);
+
+ return i;
+}
+
+int linuxpps_register_source(struct linuxpps_source_info_s *info, int default_params, int try_id)
+{
+ unsigned long flags;
+ int i, ret;
+
+ spin_lock_irqsave(&linuxpps_lock, flags);
+ ret = __linuxpps_register_source(info, default_params, try_id);
+ spin_unlock_irqrestore(&linuxpps_lock, flags);
+
+ if (ret < 0)
+ return ret;
+ i = ret;
+
+ ret = linuxpps_sysfs_create_source_entry(info, i);
+ if (ret < 0)
+ err("unable to create sysfs entry for source %d", i);
+
+ ret = linuxpps_procfs_create_source_entry(info, i);
+ if (ret < 0)
+ err("unable to create procfs entry for source %d", i);
+
+ return i;
+}
+
+static inline int __linuxpps_unregister_source(struct linuxpps_source_info_s *info)
+{
+ int i;
+
+ for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
+ if (__linuxpps_is_allocated(i) && linuxpps_source[i].info == info)
+ break;
+
+ if (i >= LINUXPPS_MAX_SOURCES) {
+ err("warning! Try to unregister an unknow PPS source");
+ return -EINVAL;
+ }
+
+ /* Deallocate the PPS source */
+ linuxpps_source[i].info = NULL;
+
+ return i;
+}
+
+void linuxpps_unregister_source(struct linuxpps_source_info_s *info)
+{
+ unsigned long flags;
+ int i, ret;
+
+ spin_lock_irqsave(&linuxpps_lock, flags);
+ ret = __linuxpps_unregister_source(info);
+ spin_unlock_irqrestore(&linuxpps_lock, flags);
+
+ if (ret < 0)
+ return;
+ i = ret;
+
+ linuxpps_sysfs_remove_source_entry(info, i);
+ linuxpps_procfs_remove_source_entry(info, i);
+}
+
+void linuxpps_event(int source, int event, void *data)
+{
+ struct timespec ts;
+
+ /* In this function we shouldn't need locking at all since each PPS
+ * source arrives once per second and due the per-PPS source data
+ * array... */
+
+ /* First of all we get the time stamp... */
+ getnstimeofday(&ts);
+
+ /* ... then we can do some sanity checks */
+ if (!linuxpps_is_allocated(source)) {
+ err("unknow source for event!");
+ return;
+ }
+ if ((event&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0 ) {
+ err("unknow event (%x) for source %d", event, source);
+ return;
+ }
+
+ /* Must call the echo function? */
+ if ((linuxpps_source[source].params.mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0)
+ linuxpps_source[source].info->echo(source, event, data);
+
+ /* Check the event */
+ linuxpps_source[source].current_mode = linuxpps_source[source].params.mode;
+ if (event&PPS_CAPTUREASSERT) {
+ /* We have to add an offset? */
+ if (linuxpps_source[source].params.mode&PPS_OFFSETASSERT)
+ linuxpps_add_offset(&ts, &linuxpps_source[source].params.assert_off_tu.tspec);
+
+ /* Save the time stamp */
+ linuxpps_source[source].assert_tu.tspec = ts;
+ linuxpps_source[source].assert_sequence++;
+ dbg("capture assert seq #%lu for source %d",
+ linuxpps_source[source].assert_sequence, source);
+ }
+ if (event&PPS_CAPTURECLEAR) {
+ /* We have to add an offset? */
+ if (linuxpps_source[source].params.mode&PPS_OFFSETCLEAR)
+ linuxpps_add_offset(&ts, &linuxpps_source[source].params.clear_off_tu.tspec);
+
+ /* Save the time stamp */
+ linuxpps_source[source].clear_tu.tspec = ts;
+ linuxpps_source[source].clear_sequence++;
+ dbg("capture clear seq #%lu for source %d",
+ linuxpps_source[source].clear_sequence, source);
+ }
+
+ wake_up_interruptible(&linuxpps_source[source].queue);
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+EXPORT_SYMBOL(linuxpps_register_source);
+EXPORT_SYMBOL(linuxpps_unregister_source);
+EXPORT_SYMBOL(linuxpps_event);
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
new file mode 100644
index 0000000..b3c677f
--- /dev/null
+++ b/drivers/pps/pps.c
@@ -0,0 +1,377 @@
+/*
+ * main.c -- Main driver file
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ---------------------------------------------------- */
+
+struct linuxpps_s linuxpps_source[LINUXPPS_MAX_SOURCES];
+spinlock_t linuxpps_lock = SPIN_LOCK_UNLOCKED;
+
+/* --- Local variables ----------------------------------------------------- */
+
+static struct sock *nl_sk = NULL;
+
+/* --- Misc functions ------------------------------------------------------ */
+
+static inline int linuxpps_find_source(int source)
+{
+ int i;
+
+ if (source >= 0) {
+ if (source >= LINUXPPS_MAX_SOURCES || !linuxpps_is_allocated(source))
+ return -EINVAL;
+ else
+ return source;
+ }
+
+ for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
+ if (linuxpps_is_allocated(i))
+ break;
+
+ if (i >= LINUXPPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+static inline int linuxpps_find_path(char *path)
+{
+ int i;
+
+ for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
+ if (linuxpps_is_allocated(i) &&
+ (strncmp(linuxpps_source[i].info->path, path,
+ LINUXPPS_MAX_NAME_LEN) == 0 ||
+ strncmp(linuxpps_source[i].info->name, path,
+ LINUXPPS_MAX_NAME_LEN) == 0))
+ break;
+
+ if (i >= LINUXPPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+/* --- Input function ------------------------------------------------------ */
+
+static void linuxpps_nl_data_ready(struct sock *sk, int len)
+{
+ struct sk_buff *skb;
+ struct nlmsghdr *nlh;
+ struct pps_netlink_msg *nlpps;
+
+ int cmd, source, id;
+ wait_queue_head_t *queue;
+ unsigned long timeout;
+
+ int ret;
+
+ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+ nlh = (struct nlmsghdr *) skb->data;
+ dbg("New message from PID %d (flags %x)",
+ nlh->nlmsg_pid, nlh->nlmsg_flags);
+
+ /* Decode the userland command */
+ nlpps = (struct pps_netlink_msg*) NLMSG_DATA(nlh);
+ cmd = nlpps->cmd;
+ source = nlpps->source;
+
+ switch (cmd) {
+ case PPS_CREATE : {
+ dbg("PPS_CREATE: source %d", source);
+
+ /* Check if the requested source is allocated */
+ ret = linuxpps_find_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->source = ret;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_DESTROY : {
+ dbg("PPS_DESTROY: source %d", source);
+
+ /* Nothing to do here! Just answer ok... */
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_SETPARMS : {
+ dbg("PPS_SETPARMS: source %d", source);
+
+ /* Check the capabilities */
+ if (!capable(CAP_SYS_TIME)) {
+ nlpps->ret = -EPERM;
+ break;
+ }
+
+ /* Sanity checks */
+ if (nlpps->source < 0 || !linuxpps_is_allocated(source)) {
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&~linuxpps_source[source].info->mode) != 0) {
+ dbg("unsupported capabilities");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0) {
+ dbg("capture mode unspecified");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ /* section 3.3 of RFC 2783 interpreted */
+ dbg("time format unspecified");
+ nlpps->params.mode |= PPS_TSFMT_TSPEC;
+ }
+
+ /* Save the new parameters */
+ linuxpps_source[source].params = nlpps->params;
+
+ /* Restore the read only parameters */
+ if (linuxpps_source[source].info->mode&PPS_CANWAIT)
+ linuxpps_source[source].params.mode |= PPS_CANWAIT;
+ linuxpps_source[source].params.api_version = PPS_API_VERS;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETPARMS : {
+ dbg("PPS_GETPARMS: source %d", source);
+
+ /* Sanity checks */
+ if (nlpps->source < 0 || !linuxpps_is_allocated(source)) {
+ nlpps->ret = -EINVAL;
+ break;
+ }
+
+ nlpps->params = linuxpps_source[source].params;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETCAP : {
+ dbg("PPS_GETCAP: source %d", source);
+
+ /* Sanity checks */
+ if (nlpps->source < 0 || !linuxpps_is_allocated(source)) {
+ nlpps->ret = -EINVAL;
+ break;
+ }
+
+ nlpps->mode = linuxpps_source[source].info->mode;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FETCH : {
+ dbg("PPS_FETCH: source %d", source);
+ queue = &linuxpps_source[source].queue;
+
+ /* Sanity checks */
+ if (nlpps->source < 0 || !linuxpps_is_allocated(source)) {
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->tsformat != PPS_TSFMT_TSPEC) != 0 ) {
+ dbg("unsupported time format");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+
+ /* Manage the timeout */
+ if (nlpps->timeout.tv_sec != -1) {
+ timeout = nlpps->timeout.tv_sec*HZ;
+ timeout += nlpps->timeout.tv_nsec/(1000000000/HZ);
+
+ if (timeout != 0) {
+ timeout = interruptible_sleep_on_timeout(queue, timeout);
+ if (timeout <= 0) {
+ dbg("timeout expired");
+ nlpps->ret = -ETIMEDOUT;
+ break;
+ }
+ }
+ }
+ else
+ interruptible_sleep_on(queue);
+
+ /* Return the fetched timestamp */
+ nlpps->info.assert_sequence = linuxpps_source[source].assert_sequence;
+ nlpps->info.clear_sequence = linuxpps_source[source].clear_sequence;
+ nlpps->info.assert_tu = linuxpps_source[source].assert_tu;
+ nlpps->info.clear_tu = linuxpps_source[source].clear_tu;
+ nlpps->info.current_mode = linuxpps_source[source].current_mode;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_KC_BIND : {
+ dbg("PPS_KC_BIND: source %d", source);
+ /* Feature currently not supported */
+ nlpps->ret = -EOPNOTSUPP;
+
+ break;
+ }
+
+ case PPS_FIND_SRC : {
+ dbg("PPS_FIND_SRC: source %d", source);
+ source = linuxpps_find_source(source);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, linuxpps_source[source].info->name,
+ LINUXPPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, linuxpps_source[source].info->path,
+ LINUXPPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FIND_PATH : {
+ dbg("PPS_FIND_PATH: source %s", nlpps->path);
+ source = linuxpps_find_path(nlpps->path);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, linuxpps_source[source].info->name,
+ LINUXPPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, linuxpps_source[source].info->path,
+ LINUXPPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ default : {
+ /* Unknow command */
+ dbg("unknow command %d", nlpps->cmd);
+
+ nlpps->ret = -EINVAL;
+ }
+ }
+
+ /* Send an answer to the userland */
+ id = NETLINK_CB(skb).pid;
+ dbg("start sending reply to ID %d...", id);
+ NETLINK_CB(skb).pid = 0; /* from the kernel */
+ NETLINK_CB(skb).dst_group = 0; /* not in mcast groups */
+
+ ret = netlink_unicast(nl_sk, skb, id, MSG_DONTWAIT);
+ dbg("... reply sent (%d)", ret);
+ }
+}
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit linuxpps_exit(void)
+{
+ linuxpps_sysfs_unregister();
+ linuxpps_procfs_unregister();
+ sock_release(nl_sk->sk_socket);
+
+ info("LinuxPPS API ver. %d removed", PPS_API_VERS);
+}
+
+static int __init linuxpps_init(void)
+{
+ int ret;
+
+ nl_sk = netlink_kernel_create(NETLINK_PPSAPI, 0,
+ linuxpps_nl_data_ready, THIS_MODULE);
+ if (nl_sk == NULL) {
+ err("unable to create netlink kernel socket");
+ return -EBUSY;
+ }
+ dbg("netlink protocol %d created", NETLINK_PPSAPI);
+
+ /* Init the main struct */
+ memset(linuxpps_source, 0, sizeof(struct linuxpps_s)*LINUXPPS_MAX_SOURCES);
+
+ /* Register to sysfs */
+ ret = linuxpps_sysfs_register();
+ if (ret < 0) {
+ err("unable to register sysfs");
+ goto linuxpps_sysfs_register_error;
+ }
+
+ /* Register to procfs */
+ ret = linuxpps_procfs_register();
+ if (ret < 0) {
+ err("unable to register procfs");
+ goto linuxpps_procfs_register_error;
+ }
+
+ info("LinuxPPS API ver. %d registered", PPS_API_VERS);
+ info("Software ver. %s - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>", PPS_VERSION);
+
+ return 0;
+
+linuxpps_procfs_register_error :
+
+ linuxpps_sysfs_unregister();
+
+linuxpps_sysfs_register_error :
+
+ sock_release(nl_sk->sk_socket);
+
+ return ret;
+}
+
+subsys_initcall(linuxpps_init);
+module_exit(linuxpps_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("LinuxPPS support (RFC 2783) - ver. " PPS_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/procfs.c b/drivers/pps/procfs.c
new file mode 100644
index 0000000..929d9d7
--- /dev/null
+++ b/drivers/pps/procfs.c
@@ -0,0 +1,179 @@
+/*
+ * procfs.c -- procfs support
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/proc_fs.h>
+#include <linux/module.h>
+#include <linux/string.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+#ifdef CONFIG_PPS_PROCFS
+
+static struct proc_dir_entry *procfs_root_dir;
+
+/* ----- Private functions -------------------------------------------- */
+
+static int linuxpps_procfs_assert_read(char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+ int len = 0;
+ int id = (int) data;
+ len += sprintf(page+len, "%ld.%09ld #%ld\n",
+ linuxpps_source[id].assert_tu.tspec.tv_sec,
+ linuxpps_source[id].assert_tu.tspec.tv_nsec,
+ linuxpps_source[id].assert_sequence);
+
+ *eof = 1;
+ return len;
+}
+
+static int linuxpps_procfs_clear_read(char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+ int len = 0;
+ int id = (int) data;
+ len += sprintf(page+len, "%ld.%09ld #%ld\n",
+ linuxpps_source[id].clear_tu.tspec.tv_sec,
+ linuxpps_source[id].clear_tu.tspec.tv_nsec,
+ linuxpps_source[id].clear_sequence);
+
+ *eof = 1;
+ return len;
+}
+
+static int linuxpps_sources_read(char *page, char **start, off_t off, int count, int *eof, void *data)
+{
+ int i;
+ int len = 0;
+
+ len += sprintf(page+len, "id\tmode\techo\tname\t\t\tpath\n");
+ len += sprintf(page+len, "----\t------\t----\t----------------\t----------------\n");
+ for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
+ if (linuxpps_is_allocated(i))
+ len += sprintf(page+len, "%.02d\t%4x\t%s\t%s\t\t%s\n",
+ i,
+ linuxpps_source[i].info->mode,
+ linuxpps_source[i].info->echo ? "yes" : "no",
+ linuxpps_source[i].info->name,
+ linuxpps_source[i].info->path);
+
+ *eof = 1;
+ return len;
+}
+
+/* ----- Public functions --------------------------------------------- */
+
+void linuxpps_procfs_remove_source_entry(struct linuxpps_source_info_s *info, int id) {
+ char buf[32];
+
+ /* Sanity checks */
+ if (info == NULL || info->dir == NULL || id >= LINUXPPS_MAX_SOURCES)
+ return;
+
+ remove_proc_entry("clear", info->dir);
+ remove_proc_entry("assert", info->dir);
+ sprintf(buf, "%.02d", id);
+ remove_proc_entry(buf, procfs_root_dir);
+}
+
+int linuxpps_procfs_create_source_entry(struct linuxpps_source_info_s *info, int id) {
+ struct proc_dir_entry *procfs_file;
+ char buf[32];
+
+ /* Sanity checks */
+ if (info == NULL || id >= LINUXPPS_MAX_SOURCES)
+ return -EINVAL;
+
+ /* Create dir "/proc/pps/<id>" */
+ sprintf(buf, "%.02d", id);
+ info->dir = proc_mkdir(buf, procfs_root_dir);
+ if (info->dir == NULL)
+ return -ENOMEM;
+
+ /* Create file "assert" and "clear" according to source capability */
+ if (info->mode&PPS_CAPTUREASSERT) {
+ procfs_file = create_proc_entry("assert", S_IRUGO|S_IWUSR, info->dir);
+ if (procfs_file == NULL)
+ goto exit;
+ procfs_file->read_proc = linuxpps_procfs_assert_read;
+ procfs_file->data = (void *) id;
+ }
+ if (info->mode&PPS_CAPTURECLEAR) {
+ procfs_file = create_proc_entry("clear", S_IRUGO|S_IWUSR, info->dir);
+ if (procfs_file == NULL)
+ goto exit;
+ procfs_file->read_proc = linuxpps_procfs_clear_read;
+ procfs_file->data = (void *) id;
+ }
+
+ return 0;
+
+exit :
+ linuxpps_procfs_remove_source_entry(info, id);
+
+ return -ENOMEM;
+}
+
+void linuxpps_procfs_unregister(void)
+{
+ remove_proc_entry("pps/sources", NULL);
+
+ /* The root dir in /proc/pps */
+ remove_proc_entry("pps", NULL);
+}
+
+int linuxpps_procfs_register(void)
+{
+ struct proc_dir_entry *procfs_file;
+
+ /* The root dir in /proc */
+ procfs_root_dir = proc_mkdir("pps", NULL);
+ if (procfs_root_dir == NULL)
+ return -ENOMEM;
+
+ /* The file "sources" */
+ procfs_file = create_proc_entry("sources", S_IRUGO|S_IWUSR, procfs_root_dir);
+ if (procfs_file == NULL) {
+ linuxpps_procfs_unregister();
+ return -ENOMEM;
+ }
+ procfs_file->owner = THIS_MODULE;
+ procfs_file->read_proc = linuxpps_sources_read;
+ procfs_file->write_proc = NULL; /* no write method */
+
+ info("procfs enabled");
+ return 0;
+}
+
+#else /* CONFIG_PPS_PROCFS */
+
+void linuxpps_procfs_unregister(void)
+{
+ /* Nothing to do here... */
+ return;
+}
+
+int linuxpps_procfs_register(void)
+{
+ info("procfs not enabled");
+ return 0;
+}
+#endif /* CONFIG_PPS_PROCFS */
diff --git a/drivers/pps/sysfs.c b/drivers/pps/sysfs.c
new file mode 100644
index 0000000..6cd01f5
--- /dev/null
+++ b/drivers/pps/sysfs.c
@@ -0,0 +1,200 @@
+/*
+ * sysfs.c -- sysfs support
+ *
+ *
+ * Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/string.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* ----- Private functions -------------------------------------------- */
+
+static ssize_t linuxpps_show_assert(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->assert_tu.tspec.tv_sec,
+ dev->assert_tu.tspec.tv_nsec,
+ dev->assert_sequence);
+}
+
+static ssize_t linuxpps_show_clear(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->clear_tu.tspec.tv_sec,
+ dev->clear_tu.tspec.tv_nsec,
+ dev->clear_sequence);
+}
+
+static ssize_t linuxpps_show_mode(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%4x\n", info->mode);
+}
+
+static ssize_t linuxpps_show_echo(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%d\n", !!info->echo);
+}
+
+static ssize_t linuxpps_show_name(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->name);
+}
+
+static ssize_t linuxpps_show_path(struct class_device *cdev, char *buf)
+{
+ struct linuxpps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->path);
+}
+
+/* ----- Files definitions -------------------------------------------- */
+
+#define DECLARE_INFO_ATTR(_name, _mode, _show, _store) \
+{ \
+ .attr = { \
+ .name = __stringify(_name), \
+ .mode = _mode, \
+ .owner = THIS_MODULE, \
+ }, \
+ .show = _show, \
+ .store = _store, \
+}
+
+static struct class_device_attribute linuxpps_class_device_attributes[] = {
+ DECLARE_INFO_ATTR(assert, 0644, linuxpps_show_assert, NULL),
+ DECLARE_INFO_ATTR(clear, 0644, linuxpps_show_clear, NULL),
+ DECLARE_INFO_ATTR(mode, 0644, linuxpps_show_mode, NULL),
+ DECLARE_INFO_ATTR(echo, 0644, linuxpps_show_echo, NULL),
+ DECLARE_INFO_ATTR(name, 0644, linuxpps_show_name, NULL),
+ DECLARE_INFO_ATTR(path, 0644, linuxpps_show_path, NULL),
+};
+
+/* ----- Class definitions -------------------------------------------- */
+
+static void linuxpps_class_release(struct class_device *cdev)
+{
+ /* Nop??? */
+}
+
+static struct class linuxpps_class = {
+ .name = "pps",
+ .release = linuxpps_class_release,
+};
+
+/* ----- Public functions --------------------------------------------- */
+
+void linuxpps_sysfs_remove_source_entry(struct linuxpps_source_info_s *info, int id) {
+ int i;
+
+ /* Sanity checks */
+ if (info == NULL || info->dir == NULL || id >= LINUXPPS_MAX_SOURCES)
+ return;
+
+ for (i = 0; i < ARRAY_SIZE(linuxpps_class_device_attributes); i++)
+ class_device_remove_file(&info->class_dev,
+ &linuxpps_class_device_attributes[i]);
+
+ class_device_unregister(&info->class_dev);
+}
+
+int linuxpps_sysfs_create_source_entry(struct linuxpps_source_info_s *info, int id) {
+ char buf[32];
+ int i, ret;
+
+ /* Sanity checks */
+ if (info == NULL || id >= LINUXPPS_MAX_SOURCES)
+ return -EINVAL;
+
+ /* Create dir class device name */
+ sprintf(buf, "%.02d", id);
+
+ /* Setup the class struct */
+ memset(&info->class_dev, 0, sizeof(struct class_device));
+ info->class_dev.class = &linuxpps_class;
+ strlcpy(info->class_dev.class_id, buf, KOBJ_NAME_LEN);
+ class_set_devdata(&info->class_dev, &linuxpps_source[id]);
+
+ /* Register the new class */
+ ret = class_device_register(&info->class_dev);
+ if (unlikely(ret))
+ goto error_class_device_register;
+
+ /* Create info files */
+
+ /* Create file "assert" and "clear" according to source capability */
+ if (info->mode&PPS_CAPTUREASSERT) {
+ ret = class_device_create_file(&info->class_dev,
+ &linuxpps_class_device_attributes[0]);
+ i = 0;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+ if (info->mode&PPS_CAPTURECLEAR) {
+ ret = class_device_create_file(&info->class_dev,
+ &linuxpps_class_device_attributes[1]);
+ i = 1;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ for (i = 2; i < ARRAY_SIZE(linuxpps_class_device_attributes); i++) {
+ ret = class_device_create_file(&info->class_dev,
+ &linuxpps_class_device_attributes[i]);
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ return 0;
+
+error_class_device_create_file :
+ while (--i >= 0)
+ class_device_remove_file(&info->class_dev,
+ &linuxpps_class_device_attributes[i]);
+
+ class_device_unregister(&info->class_dev);
+ /* Here the release() method was already called */
+
+error_class_device_register :
+
+ return ret;
+}
+
+void linuxpps_sysfs_unregister(void)
+{
+ class_unregister(&linuxpps_class);
+}
+
+int linuxpps_sysfs_register(void)
+{
+ return class_register(&linuxpps_class);
+}
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 98ec861..cd9a003 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1315,8 +1315,25 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
up->port.icount.rng++;
if (status & UART_MSR_DDSR)
up->port.icount.dsr++;
- if (status & UART_MSR_DDCD)
+ if (status & UART_MSR_DDCD) {
+#ifdef CONFIG_PPS_CLIENT_UART_8250
+ if (status & UART_MSR_DCD) {
+ linuxpps_event(up->port.pps_source,
+ PPS_CAPTUREASSERT, up);
+ dbg("serial8250: PPS assert event at %lu "
+ "on source #%d",
+ jiffies, up->port.pps_source);
+ }
+ else {
+ linuxpps_event(up->port.pps_source,
+ PPS_CAPTURECLEAR, up);
+ dbg("serial8250: PPS clear event at %lu "
+ "on source #%d",
+ jiffies, up->port.pps_source);
+ }
+#endif
uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
+ }
if (status & UART_MSR_DCTS)
uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
@@ -2004,6 +2021,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
up->ier |= UART_IER_MSI;
if (up->capabilities & UART_CAP_UUE)
up->ier |= UART_IER_UUE | UART_IER_RTOIE;
+#ifdef CONFIG_PPS_CLIENT_UART_8250
+ up->ier |= UART_IER_MSI; /* enable interrupts */
+#endif
serial_out(up, UART_IER, up->ier);
@@ -2718,6 +2738,7 @@ void serial8250_unregister_port(int line)
struct uart_8250_port *uart = &serial8250_ports[line];
mutex_lock(&serial_mutex);
+
uart_remove_one_port(&serial8250_reg, &uart->port);
if (serial8250_isa_devs) {
uart->port.flags &= ~UPF_BOOT_AUTOCONF;
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0422c0f..a11faa0 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,6 +37,11 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
#undef DEBUG
#ifdef DEBUG
#define DPRINTK(x...) printk(x)
@@ -2083,6 +2088,7 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
struct uart_port *port)
{
unsigned int flags;
+ int retval;
/*
* If there isn't a port here, don't do anything further.
@@ -2124,6 +2130,33 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
*/
if (!uart_console(port))
uart_change_pm(state, 3);
+
+#ifdef CONFIG_PPS_CLIENT_UART
+ /*
+ * Add the PPS support for the probed port.
+ */
+ snprintf(state->pps_info.name, LINUXPPS_MAX_NAME_LEN,
+ "%s%d", drv->driver_name, port->line);
+ snprintf(state->pps_info.path, LINUXPPS_MAX_NAME_LEN,
+ "/dev/%s%d", drv->dev_name, port->line);
+
+ state->pps_info.mode = PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ retval = linuxpps_register_source(&state->pps_info,
+ PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR,
+ -1 /* PPS ID is up to the system */);
+ if (retval < 0) {
+ err("cannot register PPS source \"%s\"",
+ state->pps_info.path);
+ return;
+ }
+ port->pps_source = retval;
+ info("PPS source #%d \"%s\" added to the system ",
+ port->pps_source, state->pps_info.path);
+#endif
}
}
@@ -2350,6 +2383,16 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
port->flags |= UPF_DEAD;
mutex_unlock(&state->mutex);
+#ifdef CONFIG_PPS_CLIENT_UART
+ /*
+ * Remove the PPS support.
+ */
+ if (port->type != PORT_UNKNOWN) {
+ linuxpps_unregister_source(&state->pps_info);
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, state->pps_info.path);
+ }
+#endif
/*
* Remove the devices from the tty layer
*/
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2a20f48..32eee60 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -21,7 +21,7 @@
#define NETLINK_DNRTMSG 14 /* DECnet routing messages */
#define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
#define NETLINK_GENERIC 16
-/* leave room for NETLINK_DM (DM Events) */
+#define NETLINK_PPSAPI 17 /* linuxPPS support */
#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
#define NETLINK_ECRYPTFS 19
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 80682aa..d225362 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -104,6 +104,11 @@ typedef enum {
#include <asm/ptrace.h>
#include <asm/semaphore.h>
+#ifdef CONFIG_PPS_CLIENT_LP_PARPORT_PC
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
/* Define this later. */
struct parport;
struct pardevice;
@@ -323,6 +328,11 @@ struct parport {
struct list_head full_list;
struct parport *slaves[3];
+
+#ifdef CONFIG_PPS_CLIENT_LP_PARPORT_PC
+ struct linuxpps_source_info_s pps_info;
+ int pps_source; /* PPS source ID */
+#endif
};
#define DEFAULT_SPIN_TIME 500 /* us */
diff --git a/include/linux/pps.h b/include/linux/pps.h
new file mode 100644
index 0000000..52f67ce
--- /dev/null
+++ b/include/linux/pps.h
@@ -0,0 +1,119 @@
+/*
+ * pps.h -- PPS API kernel header.
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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 _PPS_H_
+#define _PPS_H_
+
+/* ----- Misc macros -------------------------------------------------- */
+
+#define PPS_VERSION "2.4.3"
+
+#ifdef CONFIG_PPS_DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif
+
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+
+/* --- Global defines ------------------------------------------------------ */
+
+#define LINUXPPS_MAX_SOURCES 16
+
+/* --- Global variables ---------------------------------------------------- */
+
+/* The specific PPS source info */
+struct linuxpps_source_info_s {
+ char name[LINUXPPS_MAX_NAME_LEN]; /* simbolic name */
+ char path[LINUXPPS_MAX_NAME_LEN]; /* path of connected device */
+ int mode; /* PPS's allowed mode */
+
+ void (*echo)(int source, int event, void *data);/* the PPS echo function */
+
+ /* sysfs section */
+ struct class_device class_dev;
+
+ /* procfs section */
+ struct proc_dir_entry *dir;
+};
+
+/* The main struct */
+struct linuxpps_s {
+ struct linuxpps_source_info_s *info; /* PSS source info */
+
+ pps_params_t params; /* PPS's current params */
+
+ volatile pps_seq_t assert_sequence; /* PPS' assert event seq # */
+ volatile pps_seq_t clear_sequence; /* PPS' clear event seq # */
+ volatile pps_timeu_t assert_tu;
+ volatile pps_timeu_t clear_tu;
+ int current_mode; /* PPS mode at event time */
+
+ wait_queue_head_t queue; /* PPS event queue */
+};
+
+/* --- Global variables ---------------------------------------------------- */
+
+extern struct linuxpps_s linuxpps_source[LINUXPPS_MAX_SOURCES];
+extern spinlock_t linuxpps_lock;
+
+/* --- Global functions ---------------------------------------------------- */
+
+static inline int __linuxpps_is_allocated(int source) {
+ return linuxpps_source[source].info != NULL;
+}
+
+static inline int linuxpps_is_allocated(int source) {
+ unsigned long flags;
+ int ret;
+
+ spin_lock_irqsave(&linuxpps_lock, flags);
+ ret = __linuxpps_is_allocated(source);
+ spin_unlock_irqrestore(&linuxpps_lock, flags);
+
+ return ret;
+}
+
+#define to_class_dev(obj) container_of((obj), struct class_device, kobj)
+#define to_pps_info(obj) container_of((obj), struct linuxpps_source_info_s, class_dev)
+
+/* --- Exported functions -------------------------------------------------- */
+
+extern int linuxpps_register_source(struct linuxpps_source_info_s *info, int default_params, int try_id);
+extern void linuxpps_unregister_source(struct linuxpps_source_info_s *info);
+extern void linuxpps_event(int source, int event, void *data);
+
+extern int linuxpps_procfs_create_source_entry(struct linuxpps_source_info_s *info, int id);
+extern void linuxpps_procfs_remove_source_entry(struct linuxpps_source_info_s *info, int id);
+extern int linuxpps_procfs_register(void);
+extern void linuxpps_procfs_unregister(void);
+
+extern int linuxpps_sysfs_create_source_entry(struct linuxpps_source_info_s *info, int id);
+extern void linuxpps_sysfs_remove_source_entry(struct linuxpps_source_info_s *info, int id);
+extern int linuxpps_sysfs_register(void);
+extern void linuxpps_sysfs_unregister(void);
+
+#endif /* _PPS_H_ */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 586aaba..645f8e1 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -145,6 +145,11 @@
#include <linux/tty.h>
#include <linux/mutex.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
struct uart_port;
struct uart_info;
struct serial_struct;
@@ -223,6 +228,9 @@ struct uart_port {
unsigned char regshift; /* reg offset shift */
unsigned char iotype; /* io access style */
unsigned char unused1;
+#ifdef CONFIG_PPS_CLIENT_UART
+ int pps_source; /* PPS source ID */
+#endif
#define UPIO_PORT (0)
#define UPIO_HUB6 (1)
@@ -295,6 +303,10 @@ struct uart_state {
struct uart_info *info;
struct uart_port *port;
+#ifdef CONFIG_PPS_CLIENT_UART
+ struct linuxpps_source_info_s pps_info;
+#endif
+
struct mutex mutex;
};
diff --git a/include/linux/timepps.h b/include/linux/timepps.h
new file mode 100644
index 0000000..5bf400a
--- /dev/null
+++ b/include/linux/timepps.h
@@ -0,0 +1,514 @@
+/*
+ * timepps.h -- PPS API main header
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ *
+ * NOTE: this file is *strongly* based on a previous job by Ulrich Windl.
+ * The original copyright note follows:
+ *
+ * Interface to the PPS API described in RFC 2783 (March 2000)
+ *
+ * Copyright (c) 1999, 2001, 2004 by Ulrich Windl,
+ * based on code by Reg Clemens <reg@dwf.com>
+ * based on code by Poul-Henning Kamp <phk@FreeBSD.org>
+ *
+ * ----------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@FreeBSD.org> wrote this file. As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return.
+ * Poul-Henning Kamp
+ * ----------------------------------------------------------------------
+ */
+
+#ifndef _SYS_TIMEPPS_H_
+#define _SYS_TIMEPPS_H_
+
+/* Implementation note: the logical states ``assert'' and ``clear''
+ * are implemented in terms of the chip register, i.e. ``assert''
+ * means the bit is set. */
+
+/* --- 3.2 New data structures --------------------------------------------- */
+
+#define PPS_API_VERS_2 2 /* LinuxPPS proposal, dated 2006-05 */
+#define PPS_API_VERS PPS_API_VERS_2
+#define LINUXPSS_API 1 /* mark LinuxPPS API */
+#define NETLINK_PPSAPI 17 /* we use just one free number... */
+
+typedef struct pps_handle_s {
+ int source;
+ int socket;
+} pps_handle_t; /* represents a PPS source */
+
+typedef unsigned long pps_seq_t; /* sequence number */
+
+typedef struct ntp_fp {
+ unsigned int integral;
+ unsigned int fractional;
+} ntp_fp_t; /* NTP-compatible time stamp */
+
+typedef union pps_timeu {
+ struct timespec tspec;
+ ntp_fp_t ntpfp;
+ unsigned long longpad[3];
+} pps_timeu_t; /* generic data type to represent time stamps */
+
+typedef struct pps_info {
+ pps_seq_t assert_sequence; /* seq. num. of assert event */
+ pps_seq_t clear_sequence; /* seq. num. of clear event */
+ pps_timeu_t assert_tu; /* time of assert event */
+ pps_timeu_t clear_tu; /* time of clear event */
+ int current_mode; /* current mode bits */
+} pps_info_t;
+
+#define assert_timestamp assert_tu.tspec
+#define clear_timestamp clear_tu.tspec
+
+#define assert_timestamp_ntpfp assert_tu.ntpfp
+#define clear_timestamp_ntpfp clear_tu.ntpfp
+
+typedef struct pps_params {
+ int api_version; /* API version # */
+ int mode; /* mode bits */
+ pps_timeu_t assert_off_tu; /* offset compensation for assert */
+ pps_timeu_t clear_off_tu; /* offset compensation for clear */
+} pps_params_t;
+
+#define assert_offset assert_off_tu.tspec
+#define clear_offset clear_off_tu.tspec
+
+#define assert_offset_ntpfp assert_off_tu.ntpfp
+#define clear_offset_ntpfp clear_off_tu.ntpfp
+
+/* --- 3.3 Mode bit definitions -------------------------------------------- */
+
+/* Device/implementation parameters */
+#define PPS_CAPTUREASSERT 0x01 /* capture assert events */
+#define PPS_CAPTURECLEAR 0x02 /* capture clear events */
+#define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */
+
+#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert ev. */
+#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear ev. */
+
+#define PPS_CANWAIT 0x100 /* Can we wait for an event? */
+#define PPS_CANPOLL 0x200 /* "This bit is reserved for
+ future use." */
+
+/* Kernel actions */
+#define PPS_ECHOASSERT 0x40 /* feed back assert event to output */
+#define PPS_ECHOCLEAR 0x80 /* feed back clear event to output */
+
+/* Timestamp formats */
+#define PPS_TSFMT_TSPEC 0x1000 /* select timespec format */
+#define PPS_TSFMT_NTPFP 0x2000 /* select NTP format */
+
+/* --- 3.4.4 New functions: disciplining the kernel timebase --------------- */
+
+/* Kernel consumers */
+#define PPS_KC_HARDPPS 0 /* hardpps() (or equivalent) */
+#define PPS_KC_HARDPPS_PLL 1 /* hardpps() constrained to
+ use a phase-locked loop */
+#define PPS_KC_HARDPPS_FLL 2 /* hardpps() constrained to
+ use a frequency-locked loop */
+
+/* --- Here begins the implementation-specific part! ----------------------- */
+
+#define LINUXPPS_MAX_NAME_LEN 32
+struct pps_netlink_msg {
+ int cmd; /* the command to execute */
+ int source;
+ char name[LINUXPPS_MAX_NAME_LEN]; /* symbolic name */
+ char path[LINUXPPS_MAX_NAME_LEN]; /* path of the connected device */
+ int consumer; /* selected kernel consumer */
+ pps_params_t params;
+ int mode; /* edge */
+ int tsformat; /* format of time stamps */
+ pps_info_t info;
+ struct timespec timeout;
+ int ret;
+};
+#define PPSAPI_MAX_PAYLOAD sizeof(struct pps_netlink_msg)
+
+/* check Documentation/ioctl-number.txt! */
+#define PPS_CREATE 1
+#define PPS_DESTROY 2
+#define PPS_SETPARMS 3
+#define PPS_GETPARMS 4
+#define PPS_GETCAP 5
+#define PPS_FETCH 6
+#define PPS_KC_BIND 7
+#define PPS_FIND_SRC 8
+#define PPS_FIND_PATH 9
+
+#ifdef __KERNEL__
+
+#include <linux/socket.h>
+#include <net/sock.h>
+#include <linux/netlink.h>
+
+struct pps_state {
+ pps_params_t parm; /* PPS parameters */
+ pps_info_t info; /* PPS information */
+ int cap; /* PPS capabilities */
+ long ecount; /* interpolation offset of event */
+ struct timespec etime; /* kernel time of event */
+ wait_queue_head_t ewait; /* wait queue for event */
+};
+
+/* State variables to bind kernel consumer */
+/* PPS API (RFC 2783): current source and mode for ``kernel consumer'' */
+extern const struct pps *pps_kc_hardpps_dev; /* some unique pointer to device */
+extern int pps_kc_hardpps_mode; /* mode bits for kernel consumer */
+
+/* Return allowed mode bits for given pps struct, file's mode, and user.
+ * Bits set in `*obligatory' must be set. Returned bits may be set. */
+extern int pps_allowed_mode(const struct pps *pps, mode_t fmode, int *obligatory);
+
+#else /* !__KERNEL__ */
+
+/* --- 3.4 Functions ------------------------------------------------------- */
+
+#include <unistd.h>
+#include <errno.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+/* Private functions */
+
+static int netlink_msg(int socket, struct pps_netlink_msg *nlpps)
+{
+ struct sockaddr_nl dest_addr;
+ struct nlmsghdr *nlh;
+ struct iovec iov;
+ struct msghdr msg;
+
+ int ret;
+
+ memset(&msg, 0, sizeof(msg));
+
+ /* Create the destination address */
+ memset(&dest_addr, 0, sizeof(dest_addr));
+ dest_addr.nl_family = AF_NETLINK;
+ dest_addr.nl_pid = 0; /* for the kernel */
+ dest_addr.nl_groups = 0; /* not in mcast groups */
+
+ nlh = (struct nlmsghdr *) alloca(NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ if (nlh == NULL)
+ return -1;
+
+ /* Fill the netlink message header */
+ nlh->nlmsg_len = NLMSG_SPACE(PPSAPI_MAX_PAYLOAD);
+ nlh->nlmsg_pid = getpid();
+ nlh->nlmsg_flags = 0;
+ memcpy(NLMSG_DATA(nlh), nlpps, sizeof(struct pps_netlink_msg));
+
+ iov.iov_base = (void *) nlh;
+ iov.iov_len = nlh->nlmsg_len;
+ msg.msg_name = (void *) &dest_addr;
+ msg.msg_namelen = sizeof(dest_addr);
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+ /* Send the message */
+ ret = sendmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Wait for the answer */
+ memset(nlh, 0, NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ ret = recvmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Check the return value */
+ memcpy(nlpps, NLMSG_DATA(nlh), sizeof(struct pps_netlink_msg));
+ if (nlpps->ret < 0) {
+ errno = -nlpps->ret;
+ return -1;
+ }
+
+ return 0;
+}
+
+/* The PPSAPI functions */
+
+/* Create PPS handle from source number */
+static __inline int time_pps_create(int source, pps_handle_t *handle)
+{
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ handle->socket = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(handle->socket, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(handle->socket);
+ return ret;
+ }
+
+ /* Now ask the kernel to create the PPS source */
+ nlpps.cmd = PPS_CREATE;
+ nlpps.source = source;
+ ret = netlink_msg(handle->socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Save the PPS source returned by the kernel */
+ handle->source = nlpps.source;
+
+ return 0;
+}
+
+/* Release PPS handle */
+static __inline int time_pps_destroy(pps_handle_t handle)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_DESTROY;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Now we can destroy the netlink socket */
+ close(handle.socket);
+
+ return 0;
+}
+
+/* Set parameters for handle */
+static __inline int time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to set the new PPS source's parameters */
+ nlpps.cmd = PPS_SETPARMS;
+ nlpps.source = handle.source;
+ nlpps.params = *ppsparams;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static __inline int time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's parameters */
+ nlpps.cmd = PPS_GETPARMS;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the parameters */
+ *ppsparams = nlpps.params;
+
+ return 0;
+}
+
+/* Get capabilities for handle */
+static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_GETCAP;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the capabilities */
+ *mode = nlpps.mode;
+
+ return 0;
+}
+
+/* current event for handle */
+static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat, pps_info_t *ppsinfobuf, const struct timespec *timeout)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_FETCH;
+ nlpps.source = handle.source;
+ nlpps.tsformat = tsformat;
+ if (timeout)
+ nlpps.timeout = *timeout;
+ else /* wait forever */
+ nlpps.timeout.tv_sec = nlpps.timeout.tv_nsec = -1;
+
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the timestamps */
+ *ppsinfobuf = nlpps.info;
+
+ return 0;
+}
+
+/* Specify kernel consumer */
+static __inline int time_pps_kcbind(pps_handle_t handle, const int kernel_consumer, const int edge, const int tsformat)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_KC_BIND;
+ nlpps.source = handle.source;
+ nlpps.consumer = kernel_consumer;
+ nlpps.mode = edge;
+ nlpps.tsformat = tsformat;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+/* Find a PPS source */
+#define PPS_HAVE_FINDSOURCE 1
+static __inline int time_pps_findsource(int index, char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_SRC;
+ nlpps.source = index;
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#define PPS_HAVE_FINDPATH 1
+static __inline void time_pps_readlink(char *link, int linklen, char *path, int pathlen)
+{
+ int i;
+
+ i = readlink(link, path, pathlen-1);
+ if (i <= 0) {
+ /* "link" is not a valid symbolic so we directly use it */
+ strncpy(path, link, linklen <= pathlen ? linklen : pathlen);
+ return;
+ }
+
+ /* Return the file name where "link" points to */
+ path[i] = '\0';
+ return;
+}
+
+static __inline int time_pps_findpath(char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_PATH;
+ strncpy(nlpps.path, path, pathlen);
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#endif /* !__KERNEL__ */
+#endif /* _SYS_TIMEPPS_H_ */
^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
@ 2007-02-16 19:12 ` Russell King
2007-02-16 20:43 ` Rodolfo Giometti
2007-02-16 19:56 ` Jan Dittmer
` (4 subsequent siblings)
5 siblings, 1 reply; 32+ messages in thread
From: Russell King @ 2007-02-16 19:12 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel, linuxpps
On Fri, Feb 16, 2007 at 07:52:30PM +0100, Rodolfo Giometti wrote:
> diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
> index 98ec861..cd9a003 100644
> --- a/drivers/serial/8250.c
> +++ b/drivers/serial/8250.c
> @@ -1315,8 +1315,25 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
> up->port.icount.rng++;
> if (status & UART_MSR_DDSR)
> up->port.icount.dsr++;
> - if (status & UART_MSR_DDCD)
> + if (status & UART_MSR_DDCD) {
> +#ifdef CONFIG_PPS_CLIENT_UART_8250
> + if (status & UART_MSR_DCD) {
> + linuxpps_event(up->port.pps_source,
> + PPS_CAPTUREASSERT, up);
> + dbg("serial8250: PPS assert event at %lu "
> + "on source #%d",
> + jiffies, up->port.pps_source);
> + }
> + else {
> + linuxpps_event(up->port.pps_source,
> + PPS_CAPTURECLEAR, up);
> + dbg("serial8250: PPS clear event at %lu "
> + "on source #%d",
> + jiffies, up->port.pps_source);
> + }
> +#endif
Yuck. Please. No. Doing it this way means you have to modify every
single serial driver out there which is a mamouth task.
> uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
Did you not look to see what's in this helper? You'll find within here
the following code:
#ifdef CONFIG_HARD_PPS
if ((port->flags & UPF_HARDPPS_CD) && status)
hardpps();
#endif
which should've been a big sign lit up in bright lights in Times Square
pointing you towards the right place to put your code.
> + }
> if (status & UART_MSR_DCTS)
> uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
>
> @@ -2004,6 +2021,9 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
> up->ier |= UART_IER_MSI;
> if (up->capabilities & UART_CAP_UUE)
> up->ier |= UART_IER_UUE | UART_IER_RTOIE;
> +#ifdef CONFIG_PPS_CLIENT_UART_8250
> + up->ier |= UART_IER_MSI; /* enable interrupts */
> +#endif
Why not continue to leave it as a decision of the administrator - if
you want ports to default to having PPS support enabled, change all
the registration to set UPF_HARDPPS_CD. But leave the admin with
the ability to disable it.
> @@ -2124,6 +2130,33 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
> */
> if (!uart_console(port))
> uart_change_pm(state, 3);
> +
> +#ifdef CONFIG_PPS_CLIENT_UART
> + /*
> + * Add the PPS support for the probed port.
> + */
> + snprintf(state->pps_info.name, LINUXPPS_MAX_NAME_LEN,
> + "%s%d", drv->driver_name, port->line);
> + snprintf(state->pps_info.path, LINUXPPS_MAX_NAME_LEN,
> + "/dev/%s%d", drv->dev_name, port->line);
> +
> + state->pps_info.mode = PPS_CAPTUREBOTH | \
> + PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
> + PPS_CANWAIT | PPS_TSFMT_TSPEC;
> +
> + retval = linuxpps_register_source(&state->pps_info,
> + PPS_CAPTUREBOTH | \
> + PPS_OFFSETASSERT | PPS_OFFSETCLEAR,
> + -1 /* PPS ID is up to the system */);
> + if (retval < 0) {
> + err("cannot register PPS source \"%s\"",
> + state->pps_info.path);
> + return;
> + }
> + port->pps_source = retval;
> + info("PPS source #%d \"%s\" added to the system ",
> + port->pps_source, state->pps_info.path);
> +#endif
This means that PPS support is not available for any port which wasn't
autoprobed at device discovery time. That seems quite restrictive.
Maybe it needs to be coupled with the setting/clearing of UPF_HARDPPS_CD ?
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 19:12 ` Russell King
@ 2007-02-16 20:43 ` Rodolfo Giometti
2007-02-16 20:51 ` Russell King
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-16 20:43 UTC (permalink / raw)
To: linux-kernel, linuxpps
On Fri, Feb 16, 2007 at 07:12:08PM +0000, Russell King wrote:
>
> Yuck. Please. No. Doing it this way means you have to modify every
> single serial driver out there which is a mamouth task.
>
> > uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
>
> Did you not look to see what's in this helper? You'll find within here
> the following code:
>
> #ifdef CONFIG_HARD_PPS
> if ((port->flags & UPF_HARDPPS_CD) && status)
> hardpps();
> #endif
>
> which should've been a big sign lit up in bright lights in Times Square
> pointing you towards the right place to put your code.
Ok.
> Why not continue to leave it as a decision of the administrator - if
> you want ports to default to having PPS support enabled, change all
> the registration to set UPF_HARDPPS_CD. But leave the admin with
> the ability to disable it.
Ok.
> This means that PPS support is not available for any port which wasn't
> autoprobed at device discovery time. That seems quite restrictive.
How I can force probing for a specified uart port?
> Maybe it needs to be coupled with the setting/clearing of UPF_HARDPPS_CD ?
What do you think about? I should enable the PPS support only if the
userland sets the UPF_HARDPPS_CD flag?
Thanks for your comments,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 20:43 ` Rodolfo Giometti
@ 2007-02-16 20:51 ` Russell King
2007-02-16 21:03 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Russell King @ 2007-02-16 20:51 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel
On Fri, Feb 16, 2007 at 09:43:36PM +0100, Rodolfo Giometti wrote:
> On Fri, Feb 16, 2007 at 07:12:08PM +0000, Russell King wrote:
> >
> > Yuck. Please. No. Doing it this way means you have to modify every
> > single serial driver out there which is a mamouth task.
> >
> > > uart_handle_dcd_change(&up->port, status & UART_MSR_DCD);
> >
> > Did you not look to see what's in this helper? You'll find within here
> > the following code:
> >
> > #ifdef CONFIG_HARD_PPS
> > if ((port->flags & UPF_HARDPPS_CD) && status)
> > hardpps();
> > #endif
> >
> > which should've been a big sign lit up in bright lights in Times Square
> > pointing you towards the right place to put your code.
>
> Ok.
>
> > Why not continue to leave it as a decision of the administrator - if
> > you want ports to default to having PPS support enabled, change all
> > the registration to set UPF_HARDPPS_CD. But leave the admin with
> > the ability to disable it.
>
> Ok.
>
> > This means that PPS support is not available for any port which wasn't
> > autoprobed at device discovery time. That seems quite restrictive.
>
> How I can force probing for a specified uart port?
You can't because it doesn't go through the interfaces you're hooking
into. Existing interfaces are "changed" to point at the UARTs using
setserial, which does its work via an ioctl.
> > Maybe it needs to be coupled with the setting/clearing of UPF_HARDPPS_CD ?
>
> What do you think about? I should enable the PPS support only if the
> userland sets the UPF_HARDPPS_CD flag?
Not specifically only userland - if it happens to be set when the port
is registered then enable PPS support then as well.
So:
1. uart_configure_port - if UPF_HARDPPS_CD is set, register the port
for PPS support.
2. uart_remove_one_port - if UPF_HARDPPS_CD is set, unregister the port
for PPS support.
3. uart_set_info - if changing UPF_HARDPPS_CD, appropriately register or
unregister the port for PPS support.
PS, linuxpps@ml.enneenne.com dropped from the cc: since it rejects my
postings.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 20:51 ` Russell King
@ 2007-02-16 21:03 ` Rodolfo Giometti
0 siblings, 0 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-16 21:03 UTC (permalink / raw)
To: Russell King; +Cc: linux-kernel, linuxpps
On Fri, Feb 16, 2007 at 08:51:35PM +0000, Russell King wrote:
>
> You can't because it doesn't go through the interfaces you're hooking
> into. Existing interfaces are "changed" to point at the UARTs using
> setserial, which does its work via an ioctl.
I see.
> Not specifically only userland - if it happens to be set when the port
> is registered then enable PPS support then as well.
>
> So:
>
> 1. uart_configure_port - if UPF_HARDPPS_CD is set, register the port
> for PPS support.
> 2. uart_remove_one_port - if UPF_HARDPPS_CD is set, unregister the port
> for PPS support.
> 3. uart_set_info - if changing UPF_HARDPPS_CD, appropriately register or
> unregister the port for PPS support.
Ok. I'm going to study how to modify the code.
> PS, linuxpps@ml.enneenne.com dropped from the cc: since it rejects my
> postings.
I just fixed my spam filter (at least I hope so :).
Thanks,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
2007-02-16 19:12 ` Russell King
@ 2007-02-16 19:56 ` Jan Dittmer
2007-02-16 20:57 ` Rodolfo Giometti
2007-02-18 22:43 ` LinuxPPS: fixes Rodolfo Giometti
` (3 subsequent siblings)
5 siblings, 1 reply; 32+ messages in thread
From: Jan Dittmer @ 2007-02-16 19:56 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel
Some non political comments
Rodolfo Giometti wrote:
> +Coding example
> +--------------
> +
> +To register a PPS source into the kernel you should define a struct
> +linuxpps_source_info_s as follow:
> +
> + static struct linuxpps_source_info_s linuxpps_ktimer_info = {
Drop the linux prefix. It's in the linux kernel after all.
> +PROCFS support
> +--------------
New features shouldn't introduce new /proc stuff.
> +Resources
> +---------
> +
> +Wiki: http://wiki.enneenne.com/index.php/LinuxPPS_support and the LinuxPPS
> +ML: http://ml.enneenne.com/cgi-bin/mailman/listinfo/linuxpps.
Add to MAINTAINERS
Your way to hook into lp and 8250 is pretty gross. It should at least be
possible to deactivate it via the kernel command line, but it would be
a lot nicer to have pps_lp and pps_8250 modules which you can load. Also
what happens if you've multiple lp ports? How do you control which to
grab?
- don't implement your own dbg() stuff, use dprintk and friends
- drop the inlines, gcc will do the right thing.
> --- a/drivers/char/lp.c
> +++ b/drivers/char/lp.c
> static struct parport_driver lp_driver = {
> diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
> index b61c17b..426b0ac 100644
> --- a/drivers/parport/parport_pc.c
> +++ b/drivers/parport/parport_pc.c
> @@ -272,6 +272,14 @@ static int clear_epp_timeout(struct parport *pb)
>
> static irqreturn_t parport_pc_interrupt(int irq, void *dev_id)
> {
> +#ifdef CONFIG_PPS_CLIENT_LP_PARPORT_PC
> + struct parport *p = (struct parport *) dev_id;
> +
> + linuxpps_event(p->pps_source, PPS_CAPTUREASSERT, p);
Perhaps just implement empty defines for the none pps cases and get
rid of the ifdefs? But this should really be controllabe via
sysfs or such.
> --- /dev/null
> +++ b/drivers/pps/clients/Kconfig
> @@ -0,0 +1,56 @@
> +#
> +# LinuxPPS clients configuration
> +#
> +
> +if PPS
> +
> +comment "PPS clients support"
> +
> +config PPS_CLIENT_KTIMER
> + tristate "Kernel timer client (Testing client, use for debug)"
> + help
> + If you say yes here you get support for a PPS debugging client
> + which uses a kernel timer to generate the PPS signal.
> +
> + This driver can also be built as a module. If so, the module
> + will be called ktimer.o.
> +
> +comment "UART serial support (forced off)"
> + depends on SERIAL_CORE && ( PPS = m && SERIAL_CORE = y )
> +
> +config PPS_CLIENT_UART
> + bool "UART serial support"
> + depends on SERIAL_CORE && ! ( PPS = m && SERIAL_CORE = y )
help text
> +
> +comment "8250 serial support (forced off)"
> + depends on PPS_CLIENT_UART && SERIAL_8250 && \
> + ( PPS = m && SERIAL_8250 = y )
> +
> +config PPS_CLIENT_UART_8250
> + bool "8250 serial support"
> + depends on PPS_CLIENT_UART && SERIAL_8250 && \
> + ! ( PPS = m && SERIAL_8250 = y )
> + help
> + If you say yes here you get support for a PPS source connected
> + with the CD (Carrier Detect) pin of your 8250 serial line chip.
> +
> +comment "Parallel printer support (forced off)"
> + depends on PRINTER && ( PPS = m && PRINTER = y )
> +
> +config PPS_CLIENT_LP
> + bool "Parallel printer support"
> + depends on PRINTER && ! ( PPS = m && PRINTER = y )
help text
> +comment "Parport PC support (forced off)"
> + depends on PPS_CLIENT_LP && PARPORT_PC && \
> + ( PPS = m && PARPORT_PC = y )
> +
> +config PPS_CLIENT_LP_PARPORT_PC
> + bool "Parport PC support"
> + depends on PPS_CLIENT_LP && PARPORT_PC && \
> + ! ( PPS = m && PARPORT_PC = y )
> + help
> + If you say yes here you get support for a PPS source connected
> + with the interrupt pin of your PC parallel port.
help text and difference to CLIENT_LP?
> +++ b/drivers/pps/kapi.c
> +/* --- Local functions ----------------------------------------------------- */
> +
> +#ifndef NSEC_PER_SEC
> +#define NSEC_PER_SEC 1000000000
> +#endif
What's that for? Why is(n't) it defined?
> + for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
> + if (!__linuxpps_is_allocated(i))
> + break;
> + if (i >= LINUXPPS_MAX_SOURCES) {
> + err("no free source ids");
> + return -ENOMEM;
> + }
Why no dynamically allocated array?
> +void linuxpps_event(int source, int event, void *data)
> +{
> + struct timespec ts;
> +
> + /* In this function we shouldn't need locking at all since each PPS
> + * source arrives once per second and due the per-PPS source data
> + * array... */
I wouldn't bet on that.
> +++ b/drivers/pps/pps.c
> @@ -0,0 +1,377 @@
> +/*
> + * main.c -- Main driver file
Doesn't match filename
> +++ b/drivers/pps/procfs.c
I'd drop that completely.
> +++ b/include/linux/netlink.h
> @@ -21,7 +21,7 @@
> #define NETLINK_DNRTMSG 14 /* DECnet routing messages */
> #define NETLINK_KOBJECT_UEVENT 15 /* Kernel messages to userspace */
> #define NETLINK_GENERIC 16
> -/* leave room for NETLINK_DM (DM Events) */
> +#define NETLINK_PPSAPI 17 /* linuxPPS support */
You read the comment above your line?
> #define DEFAULT_SPIN_TIME 500 /* us */
> diff --git a/include/linux/pps.h b/include/linux/pps.h
> new file mode 100644
> index 0000000..52f67ce
> --- /dev/null
> +++ b/include/linux/pps.h
> +#ifdef CONFIG_PPS_DEBUG
> +#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
> + KBUILD_MODNAME , ## arg)
> +#else
> +#define dbg(format, arg...) do {} while (0)
> +#endif
> +
> +#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
> + KBUILD_MODNAME , ## arg)
> +#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \
> + KBUILD_MODNAME , ## arg)
These should use dprintk and friends
> +
> +/* --- Global defines ------------------------------------------------------ */
> +
> +#define LINUXPPS_MAX_SOURCES 16
Isn't something like 4 more reasonable (lp + 8250 + ktimer?)
> +/* The main struct */
> +struct linuxpps_s {
> + struct linuxpps_source_info_s *info; /* PSS source info */
> +
> + pps_params_t params; /* PPS's current params */
> +
> + volatile pps_seq_t assert_sequence; /* PPS' assert event seq # */
> + volatile pps_seq_t clear_sequence; /* PPS' clear event seq # */
> + volatile pps_timeu_t assert_tu;
> + volatile pps_timeu_t clear_tu;
I think you can drop the volatiles, there was a discussion some time ago
that they mostly waste of words.
> +static inline int __linuxpps_is_allocated(int source) {
> + return linuxpps_source[source].info != NULL;
> +}
> +
> +static inline int linuxpps_is_allocated(int source) {
> + unsigned long flags;
> + int ret;
> +
> + spin_lock_irqsave(&linuxpps_lock, flags);
> + ret = __linuxpps_is_allocated(source);
> + spin_unlock_irqrestore(&linuxpps_lock, flags);
> +
> + return ret;
> +}
This one looks pretty fishy. After the check you normally want
to use it, don't you? And then you already lost the guarantee.
> +#define to_class_dev(obj) container_of((obj), struct class_device, kobj)
pretty generic name.
> +++ b/include/linux/timepps.h
use a frequency-locked loop */
> +
> +/* --- Here begins the implementation-specific part! ----------------------- */
> +
> +#define LINUXPPS_MAX_NAME_LEN 32
> +struct pps_netlink_msg {
> + int cmd; /* the command to execute */
> + int source;
> + char name[LINUXPPS_MAX_NAME_LEN]; /* symbolic name */
> + char path[LINUXPPS_MAX_NAME_LEN]; /* path of the connected device */
> + int consumer; /* selected kernel consumer */
> + pps_params_t params;
> + int mode; /* edge */
> + int tsformat; /* format of time stamps */
> + pps_info_t info;
> + struct timespec timeout;
> + int ret;
> +};
Have you thought about 32/64bit issues?
> +/* Private functions */
> +
> +static int netlink_msg(int socket, struct pps_netlink_msg *nlpps)
Function in .h?
Jan
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 19:56 ` Jan Dittmer
@ 2007-02-16 20:57 ` Rodolfo Giometti
2007-02-16 21:19 ` Jan Dittmer
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-16 20:57 UTC (permalink / raw)
To: Jan Dittmer; +Cc: linux-kernel, linuxpps
On Fri, Feb 16, 2007 at 08:56:18PM +0100, Jan Dittmer wrote:
> Drop the linux prefix. It's in the linux kernel after all.
Ok.
> > +PROCFS support
> > +--------------
>
> New features shouldn't introduce new /proc stuff.
It's a must? I can leave procfs for backward compatibility with old
utilities?
> Add to MAINTAINERS
Ok.
> Your way to hook into lp and 8250 is pretty gross. It should at least be
> possible to deactivate it via the kernel command line, but it would be
> a lot nicer to have pps_lp and pps_8250 modules which you can load. Also
I think it's not possible... however the Russell's suggestions should
go in that direction.
> what happens if you've multiple lp ports? How do you control which to
> grab?
No way... I can add a specific flag as for uart lines or a kernel
module parameter.
> - don't implement your own dbg() stuff, use dprintk and friends
> - drop the inlines, gcc will do the right thing.
Ok. Ok.
> Perhaps just implement empty defines for the none pps cases and get
> rid of the ifdefs? But this should really be controllabe via
> sysfs or such.
Mmm... let me think about howto implement that...
> help text
Ok.
> help text and difference to CLIENT_LP?
Ok.
> Why no dynamically allocated array?
It's easier! :P
Also it's very difficult having more that 3 or 4 PPS sources in a
system.
> I wouldn't bet on that.
Why not? =:-o
Also locking instructions may add extra code and delay the timestamp
recording...
> Doesn't match filename
I'm going to fix it.
> > +++ b/drivers/pps/procfs.c
>
> I'd drop that completely.
:'(
> You read the comment above your line?
No, sorry. I'm going to choose another id number... or can I keep 17?
> These should use dprintk and friends
Ok.
> Isn't something like 4 more reasonable (lp + 8250 + ktimer?)
It should be enought...
> I think you can drop the volatiles, there was a discussion some time ago
> that they mostly waste of words.
I see...
> This one looks pretty fishy. After the check you normally want
> to use it, don't you? And then you already lost the guarantee.
You are right...
> > +#define to_class_dev(obj) container_of((obj), struct class_device, kobj)
>
> pretty generic name.
I should change it?
> Have you thought about 32/64bit issues?
No. I have no 64 bits machine to test the code...
> Function in .h?
I'm going to check it.
Thanks for your suggestions,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 20:57 ` Rodolfo Giometti
@ 2007-02-16 21:19 ` Jan Dittmer
0 siblings, 0 replies; 32+ messages in thread
From: Jan Dittmer @ 2007-02-16 21:19 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel
Rodolfo Giometti wrote:
>>> +PROCFS support
>>> +--------------
>> New features shouldn't introduce new /proc stuff.
>
> It's a must? I can leave procfs for backward compatibility with old
> utilities?
Hmm, as this is a new feature with regard to the mainline kernel, old
utilities don't count (if you can install a new kernel you can also
be expected to install new user-space tools for the new feature).
>> You read the comment above your line?
>
> No, sorry. I'm going to choose another id number... or can I keep 17?
I don't know, ask whoever is responsible for the file.
>>> +#define to_class_dev(obj) container_of((obj), struct class_device, kobj)
>> pretty generic name.
>
> I should change it?
If it's of general use put it in the appropriate header file. If it's
just for the pps subsystem name it as such.
>> Have you thought about 32/64bit issues?
>
> No. I have no 64 bits machine to test the code...
Hmm, think about x86_64 with 64-bit kernel and 32-bit userspace, probably
having got different padding in the struct. Read LDD3, chapter 11,
especially 11.4 .
Jan
^ permalink raw reply [flat|nested] 32+ messages in thread
* LinuxPPS: fixes
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
2007-02-16 19:12 ` Russell King
2007-02-16 19:56 ` Jan Dittmer
@ 2007-02-18 22:43 ` Rodolfo Giometti
2007-02-20 2:56 ` [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux H. Peter Anvin
` (2 subsequent siblings)
5 siblings, 0 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-18 22:43 UTC (permalink / raw)
To: Russell King, Jan Dittmer; +Cc: linuxpps, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 5390 bytes --]
Hello,
after yours suggestions I modified my code. Please see the patch
below.
However some issues are still not modified. Here my reasons (lines
with ">" are yours suggestions):
> Your way to hook into lp and 8250 is pretty gross. It should at least be
> possible to deactivate it via the kernel command line, but it would be
> a lot nicer to have pps_lp and pps_8250 modules which you can load. Also
> what happens if you've multiple lp ports? How do you control which to
> grab?
Serial support has "setserial" and I used it to enable/disable PPS
support at runtime. Here the patch for setserial:
--- setserial.c.old 2007-02-17 08:47:45.000000000 +0100
+++ setserial.c 2007-02-17 08:57:26.000000000 +0100
@@ -127,6 +127,7 @@
CMD_FLAG, "hup_notify", ASYNC_HUP_NOTIFY, ASYNC_HUP_NOTIFY, 0, FLAG_CAN_INVERT,
CMD_FLAG, "skip_test", ASYNC_SKIP_TEST,ASYNC_SKIP_TEST,2, FLAG_CAN_INVERT,
CMD_FLAG, "auto_irq", ASYNC_AUTO_IRQ, ASYNC_AUTO_IRQ, 2, FLAG_CAN_INVERT,
+ CMD_FLAG, "hardpps", ASYNC_HARDPPS_CD, ASYNC_HARDPPS_CD, 2, FLAG_CAN_INVERT,
CMD_FLAG, "split_termios", ASYNC_SPLIT_TERMIOS, ASYNC_SPLIT_TERMIOS, 2, FLAG_CAN_INVERT,
CMD_FLAG, "session_lockout", ASYNC_SESSION_LOCKOUT, ASYNC_SESSION_LOCKOUT, 2, FLAG_CAN_INVERT,
CMD_FLAG, "pgrp_lockout", ASYNC_PGRP_LOCKOUT, ASYNC_PGRP_LOCKOUT, 2, FLAG_CAN_INVERT,
@@ -725,6 +726,7 @@
fprintf(stderr, "\t^ fourport\tconfigure the port as an AST Fourport\n");
fprintf(stderr, "\t autoconfig\tautomatically configure the serial port\n");
fprintf(stderr, "\t^ auto_irq\ttry to determine irq during autoconfiguration\n");
+ fprintf(stderr, "\t^ hardpps\tmanage PPS signal when CD changes status\n");
fprintf(stderr, "\t^ skip_test\tskip UART test during autoconfiguration\n");
fprintf(stderr, "\n");
fprintf(stderr, "\t^ sak\t\tset the break key as the Secure Attention Key\n");
For parallel support I just cleaned up the code but I didn't find
something similar to setserial so I decided to leave the code as is
since at interrupt time we just register a timestamp without touching
the parallel port functionality.
> don't implement your own dbg() stuff, use dprintk and friends
My own dbg() stuff are for specific debugging string for PPS code. If
I use pr_dbg & friends I also enable several (and unwanted) kernel
debugging lines.
> drop the inlines, gcc will do the right thing.
I like specify them. :) Hope this is not a problem...
> > + for (i = 0; i < LINUXPPS_MAX_SOURCES; i++)
> > + if (!__linuxpps_is_allocated(i))
> > + break;
> > + if (i >= LINUXPPS_MAX_SOURCES) {
> > + err("no free source ids");
> > + return -ENOMEM;
> > + }
>
> Why no dynamically allocated array?
It's just easier...
> > +void linuxpps_event(int source, int event, void *data)
> > +{
> > + struct timespec ts;
> > +
> > + /* In this function we shouldn't need locking at all since each PPS
> > + * source arrives once per second and due the per-PPS source data
> > + * array... */
>
> I wouldn't bet on that.
I see. However it is not a problem at all since if the device is a PPS
source we have just one interrupt at second, if not we just register a
timestamp never used.
> > +/* The main struct */
> > +struct linuxpps_s {
> > + struct linuxpps_source_info_s *info; /* PSS source info */
> > +
> > + pps_params_t params; /* PPS's current params */
> > +
> > + volatile pps_seq_t assert_sequence; /* PPS' assert event seq # */
> > + volatile pps_seq_t clear_sequence; /* PPS' clear event seq # */
> > + volatile pps_timeu_t assert_tu;
> > + volatile pps_timeu_t clear_tu;
>
> I think you can drop the volatiles, there was a discussion some time ago
> that they mostly waste of words.
As for inlines I like specify volatiles... :P
> > +/* Private functions */
> > +
> > +static int netlink_msg(int socket, struct pps_netlink_msg *nlpps)
>
> Function in .h?
That's why these functions must be used into userland from NTPD and it
doesn't consider specific libraries to link with... it's the same
trick used by PPSkit (another PPS support).
> > +#define LINUXPPS_MAX_NAME_LEN 32
> > +struct pps_netlink_msg {
> > + int cmd; /* the command to execute */
> > + int source;
> > + char name[LINUXPPS_MAX_NAME_LEN]; /* symbolic name */
> > + char path[LINUXPPS_MAX_NAME_LEN]; /* path of the connected device */
> > + int consumer; /* selected kernel consumer */
> > + pps_params_t params;
> > + int mode; /* edge */
> > + int tsformat; /* format of time stamps */
> > + pps_info_t info;
> > + struct timespec timeout;
> > + int ret;
> > +};
>
> Have you thought about 32/64bit issues?
I have no 64 bits hardware to test it... I just used PPC, MIPS and ARM
at 32 bits.
Thanks a lot for your suggestions!
Ciao,
Rodolfo
P.S. After your replies (and some tests) I'll repost my patch for
inclusion.
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
[-- Attachment #2: ntp-pps-2.6.20.diff --]
[-- Type: text/x-diff, Size: 62918 bytes --]
diff --git a/Documentation/pps.txt b/Documentation/pps.txt
new file mode 100644
index 0000000..c99d2b4
--- /dev/null
+++ b/Documentation/pps.txt
@@ -0,0 +1,172 @@
+
+ PPS - Pulse Per Second
+ ----------------------
+
+(C) Copyright 2007 Rodolfo Giometti <giometti@enneenne.com>
+
+
+Overview
+--------
+
+LinuxPPS provides a programming interface (API) to define into the
+system several PPS sources.
+
+PPS means "pulse per second" and a PPS source is just a device which
+provides a high precision signal each second so that an application
+can use it to adjust system clock time.
+
+A PPS source can be connected to a serial port (usually to the Data
+Carrier Detect pin) or to a parallel port (ACK-pin) or to a special
+CPU's GPIOs (this is the common case in embedded systems) but in each
+case when a new pulse comes the system must apply to it a timestamp
+and record it for the userland.
+
+Common use is the combination of the NTPD as userland program with a
+GPS receiver as PPS source to obtain a wallclock-time with
+sub-millisecond synchronisation to UTC.
+
+
+RFC considerations
+------------------
+
+While implementing a PPS API as RFC 2783 defines and using an embedded
+CPU GPIO-Pin as physical link to the signal, I encountered a deeper
+problem:
+
+ At startup it needs a file descriptor as argument for the function
+ time_pps_create().
+
+This implies that the source has a /dev/... entry. This assumption is
+ok for the serial and parallel port, where you can do something
+usefull besides(!) the gathering of timestamps as it is the central
+task for a PPS-API. But this assumption does not work for a single
+purpose GPIO line. In this case even basic file-related functionality
+(like read() and write()) makes no sense at all and should not be a
+precondition for the use of a PPS-API.
+
+The problem can be simply solved if you change the original RFC 2783:
+
+ pps_handle_t type is an opaque __scalar type__ used to represent a
+ PPS source within the API
+
+into a modified:
+
+ pps_handle_t type is an opaque __variable__ used to represent a PPS
+ source within the API and programs should not access it directly to
+ it due to its opacity.
+
+This change seems to be neglibile because even the original RFC 2783
+does not encourage programs to check (read: use) the pps_handle_t
+variable before calling the time_pps_*() functions, since each
+function should do this job internally.
+
+If I intentionally separate the concept of "file descriptor" from the
+concept of the "PPS source" I'm obliged to provide a solution to find
+and register a PPS-source without using a file descriptor: it's done
+by the functions time_pps_findsource() and time_pps_findpath() now.
+
+According to this current NTPD drivers' code should be modified as
+follows:
+
++#ifdef PPS_HAVE_FINDPATH
++ /* Get the PPS source's real name */
++ fd = readlink(link, path, STRING_LEN-1);
++ if (fd <= 0)
++ strncpy(path, link, STRING_LEN);
++ else
++ path[fd] = '\0';
++
++ /* Try to find the source */
++ fd = time_pps_findpath(path, STRING_LEN, id, STRING_LEN);
++ if (fd < 0) {
++ msyslog(LOG_ERR, "refclock: cannot find PPS source \"%s\" in the system", path);
++ return 1;
++ }
++ msyslog(LOG_INFO, "refclock: found PPS source #%d \"%s\" on \"%s\"", fd, path, id);
++#endif /* PPS_HAVE_FINDPATH */
++
++
+ if (time_pps_create(fd, &pps_handle) < 0) {
+- pps_handle = 0;
+ msyslog(LOG_ERR, "refclock: time_pps_create failed: %m");
+ }
+
+
+Coding example
+--------------
+
+To register a PPS source into the kernel you should define a struct
+pps_source_info_s as follow:
+
+ static struct pps_source_info_s pps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : pps_ktimer_echo,
+ };
+
+and then calling the function pps_register_source() in your
+intialization routine as follow:
+
+ source = pps_register_source(&pps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+
+The pps_register_source() prototype is:
+
+ int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+
+where "info" is a pointer to a structure that describes a particular
+PPS source, "default_params" tells the system what the initial default
+parameters for the device should be (is obvious that these parameters
+must be a subset of ones defined into the struct
+pps_source_info_s which describe the capabilities of the driver)
+and "try_id" can be used to force a particular ID for your device into
+the system (just use -1 if you wish the system chooses one for you).
+
+Once you have registered a new PPS source into the system you can
+signal an assert event (for example in the interrupt handler routine)
+just using:
+
+ pps_event(source, PPS_CAPTUREASSERT, ptr);
+
+The same function may also run the defined echo function
+(pps_ktimer_echo(), passing to it the "ptr" pointer) if the user
+asked for that... etc..
+
+Please see the file drivers/pps/clients/ktimer.c for an example code.
+
+
+SYSFS support
+-------------
+
+The SYSFS support is enabled by default if the SYSFS filesystem is
+enabled in the kernel and it provides a new class:
+
+ $ ls /sys/class/pps/
+ 00/ 01/ 02/
+
+Every directory is the ID of a PPS sources defined into the system and
+inside you find several files:
+
+ $ ls /sys/class/pps/00/
+ assert clear echo mode name path subsystem@ uevent
+
+Inside each "assert" and "clear" file you can find the timestamp and a
+sequence number:
+
+ $ cat cat /sys/class/pps/00/assert
+ 1170026870.983207967#8
+
+Where before the "#" is the timestamp in seconds and after it is the
+sequence number. Other files are:
+
+* echo: reports if the PPS source has an echo function or not;
+
+* mode: reports available PPS functioning modes;
+
+* name: reports the PPS source's name;
+
+* path: reports the PPS source's device path, that is the device the
+ PPS source is connected to (if it exists).
diff --git a/MAINTAINERS b/MAINTAINERS
index b0fd71b..baa3901 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2693,6 +2693,13 @@ P: Michal Ostrowski
M: mostrows@speakeasy.net
S: Maintained
+PPS SUPPORT
+P: Rodolfo Giometti
+M: giometti@enneenne.com
+W: http://wiki.enneenne.com/index.php/LinuxPPS_support
+L: linuxpps@ml.enneenne.com
+S: Maintained
+
PREEMPTIBLE KERNEL
P: Robert Love
M: rml@tech9.net
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 050323f..bb54cab 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
+source "drivers/pps/Kconfig"
+
source "drivers/w1/Kconfig"
source "drivers/hwmon/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 3a718f5..d0007f7 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/
obj-$(CONFIG_I2C) += i2c/
+obj-$(CONFIG_PPS) += pps/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_HWMON) += hwmon/
obj-$(CONFIG_PHONE) += telephony/
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index b51d08b..c8dbfc7 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -750,6 +750,27 @@ static struct console lpcons = {
#endif /* console on line printer */
+/* --- support for PPS signal on the line printer -------------- */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+
+static inline void lp_pps_echo(int source, int event, void *data)
+{
+ struct parport *port = (struct parport *) data;
+ unsigned char status = parport_read_status(port);
+
+ /* echo event via SEL bit */
+ parport_write_control(port,
+ parport_read_control(port) | PARPORT_CONTROL_SELECT);
+
+ /* signal no event */
+ if ((status & PARPORT_STATUS_ACK) != 0)
+ parport_write_control(port,
+ parport_read_control(port) & ~PARPORT_CONTROL_SELECT);
+}
+
+#endif
+
/* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
@@ -821,6 +842,36 @@ static int lp_register(int nr, struct parport *port)
}
#endif
+#ifdef CONFIG_PPS_CLIENT_LP
+ snprintf(port->pps_info.path, PPS_MAX_NAME_LEN, "/dev/lp%d", nr);
+
+ /* No PPS support if lp port has no IRQ line */
+ if (port->irq != PARPORT_IRQ_NONE) {
+ strncpy(port->pps_info.name, port->name, PPS_MAX_NAME_LEN);
+
+ port->pps_info.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT | \
+ PPS_ECHOASSERT | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ port->pps_info.echo = lp_pps_echo;
+
+ port->pps_source = pps_register_source(&(port->pps_info),
+ PPS_CAPTUREASSERT | PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (port->pps_source < 0)
+ err("cannot register PPS source \"%s\"",
+ port->pps_info.path);
+ else
+ info("PPS source #%d \"%s\" added to the system",
+ port->pps_source, port->pps_info.path);
+ }
+ else {
+ port->pps_source = -1;
+ err("PPS support disabled due port \"%s\" is in polling mode",
+ port->pps_info.path);
+ }
+#endif
+
return 0;
}
@@ -864,6 +915,14 @@ static void lp_detach (struct parport *port)
console_registered = NULL;
}
#endif /* CONFIG_LP_CONSOLE */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+ if (port->pps_source >= 0) {
+ pps_unregister_source(&(port->pps_info));
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, port->pps_info.path);
+ }
+#endif
}
static struct parport_driver lp_driver = {
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
new file mode 100644
index 0000000..54297e8
--- /dev/null
+++ b/drivers/pps/Kconfig
@@ -0,0 +1,34 @@
+#
+# Character device configuration
+#
+
+menu "PPS support"
+
+config PPS
+ tristate "PPS support"
+ depends on EXPERIMENTAL
+ ---help---
+ PPS (Pulse Per Second) is a special pulse provided by some GPS
+ antennas. Userland can use it to get an high time reference.
+
+ Some antennas' PPS signals are connected with the CD (Carrier
+ Detect) pin of the serial line they use to communicate with the
+ host. In this case use the SERIAL_LINE client support.
+
+ Some antennas' PPS signals are connected with some special host
+ inputs so you have to enable the corresponding client support.
+
+ This PPS support can also be built as a module. If so, the module
+ will be called pps-core.
+
+config PPS_DEBUG
+ bool "PPS debugging messages"
+ depends on PPS
+ help
+ Say Y here if you want the PPS support to produce a bunch of debug
+ messages to the system log. Select this if you are having a
+ problem with PPS support and want to see more of what is going on.
+
+source drivers/pps/clients/Kconfig
+
+endmenu
diff --git a/drivers/pps/Makefile b/drivers/pps/Makefile
new file mode 100644
index 0000000..76101cd
--- /dev/null
+++ b/drivers/pps/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the PPS core.
+#
+
+pps_core-objs += pps.o kapi.o sysfs.o
+obj-$(CONFIG_PPS) += pps_core.o
+obj-y += clients/
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
new file mode 100644
index 0000000..1da1503
--- /dev/null
+++ b/drivers/pps/clients/Kconfig
@@ -0,0 +1,38 @@
+#
+# LinuxPPS clients configuration
+#
+
+if PPS
+
+comment "PPS clients support"
+
+config PPS_CLIENT_KTIMER
+ tristate "Kernel timer client (Testing client, use for debug)"
+ help
+ If you say yes here you get support for a PPS debugging client
+ which uses a kernel timer to generate the PPS signal.
+
+ This driver can also be built as a module. If so, the module
+ will be called ktimer.o.
+
+comment "UART serial support (forced off)"
+ depends on ! ( SERIAL_CORE != n && ! ( PPS = m && SERIAL_CORE = y ) )
+
+config PPS_CLIENT_UART
+ bool "UART serial support"
+ depends on SERIAL_CORE != n && ! ( PPS = m && SERIAL_CORE = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the CD (Carrier Detect) pin of your serial port.
+
+comment "Parallel printer support (forced off)"
+ depends on ! ( PRINTER != n && ! ( PPS = m && PRINTER = y ) )
+
+config PPS_CLIENT_LP
+ bool "Parallel printer support"
+ depends on PRINTER != n && ! ( PPS = m && PRINTER = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the interrupt pin of your parallel port.
+
+endif
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
new file mode 100644
index 0000000..3ecca41
--- /dev/null
+++ b/drivers/pps/clients/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for miscellaneous I2C chip drivers.
+#
+
+obj-$(CONFIG_PPS_CLIENT_KTIMER) += ktimer.o
+
diff --git a/drivers/pps/clients/ktimer.c b/drivers/pps/clients/ktimer.c
new file mode 100644
index 0000000..eb06393
--- /dev/null
+++ b/drivers/pps/clients/ktimer.c
@@ -0,0 +1,107 @@
+/*
+ * ktimer.c -- kernel timer test client
+ *
+ *
+ * Copyright (C) 2005-2006 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/timer.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ----------------------------------------------------- */
+
+static int source;
+static struct timer_list ktimer;
+
+/* --- The kernel timer ----------------------------------------------------- */
+
+static void pps_ktimer_event(unsigned long ptr) {
+ info("PPS event at %lu", jiffies);
+
+ pps_event(source, PPS_CAPTUREASSERT, NULL);
+
+ /* Rescheduling */
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+}
+
+/* --- The echo function ---------------------------------------------------- */
+
+static void pps_ktimer_echo(int source, int event, void *data)
+{
+ info("echo %s %s for source %d",
+ event&PPS_CAPTUREASSERT ? "assert" : "",
+ event&PPS_CAPTURECLEAR ? "clear" : "",
+ source);
+}
+
+/* --- The PPS info struct -------------------------------------------------- */
+
+static struct pps_source_info_s pps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : pps_ktimer_echo,
+};
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit pps_ktimer_exit(void)
+{
+ del_timer_sync(&ktimer);
+ pps_unregister_source(&pps_ktimer_info);
+
+ info("ktimer PPS source unregistered");
+}
+
+static int __init pps_ktimer_init(void)
+{
+ int ret;
+
+ ret = pps_register_source(&pps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (ret < 0) {
+ err("cannot register ktimer source");
+ return ret;
+ }
+ source = ret;
+
+ init_timer(&ktimer);
+ ktimer.function = pps_ktimer_event;
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+
+ info("ktimer PPS source registered at %d", source);
+
+ return 0;
+}
+
+module_init(pps_ktimer_init);
+module_exit(pps_ktimer_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("testing PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
new file mode 100644
index 0000000..83fbc0f
--- /dev/null
+++ b/drivers/pps/kapi.c
@@ -0,0 +1,205 @@
+/*
+ * kapi.c -- kernel API
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Local functions ----------------------------------------------------- */
+
+static void pps_add_offset(struct timespec *ts, struct timespec *offset)
+{
+ ts->tv_nsec += offset->tv_nsec;
+ if (ts->tv_nsec >= NSEC_PER_SEC) {
+ ts->tv_nsec -= NSEC_PER_SEC;
+ ts->tv_sec++;
+ } else if (ts->tv_nsec < 0) {
+ ts->tv_nsec += NSEC_PER_SEC;
+ ts->tv_sec--;
+ }
+ ts->tv_sec += offset->tv_sec;
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+static inline int __pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+{
+ int i;
+
+ if (try_id >= 0) {
+ if (pps_is_allocated(try_id)) {
+ err("source id %d busy", try_id);
+ return -EBUSY;
+ }
+ i = try_id;
+ }
+ else {
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (!pps_is_allocated(i))
+ break;
+ if (i >= PPS_MAX_SOURCES) {
+ err("no free source ids");
+ return -ENOMEM;
+ }
+ }
+
+ /* Sanity checks */
+ if ((info->mode&default_params) != default_params) {
+ err("unsupported default parameters");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0 && info->echo == NULL) {
+ err("echo function is not defined");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ err("unspecified time format");
+ return -EINVAL;
+ }
+
+ /* Allocate the PPS source */
+ memset(&pps_source[i], 0, sizeof(struct pps_s));
+ pps_source[i].info = info;
+ pps_source[i].params.api_version = PPS_API_VERS;
+ pps_source[i].params.mode = default_params;
+ init_waitqueue_head(&pps_source[i].queue);
+
+ return i;
+}
+
+int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+{
+ unsigned long flags;
+ int i, ret;
+
+ spin_lock_irqsave(&pps_lock, flags);
+ ret = __pps_register_source(info, default_params, try_id);
+ spin_unlock_irqrestore(&pps_lock, flags);
+
+ if (ret < 0)
+ return ret;
+ i = ret;
+
+ ret = pps_sysfs_create_source_entry(info, i);
+ if (ret < 0)
+ err("unable to create sysfs entry for source %d", i);
+
+ return i;
+}
+
+static inline int __pps_unregister_source(struct pps_source_info_s *info)
+{
+ int i;
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i) && pps_source[i].info == info)
+ break;
+
+ if (i >= PPS_MAX_SOURCES) {
+ err("warning! Try to unregister an unknow PPS source");
+ return -EINVAL;
+ }
+
+ /* Deallocate the PPS source */
+ pps_source[i].info = NULL;
+
+ return i;
+}
+
+void pps_unregister_source(struct pps_source_info_s *info)
+{
+ unsigned long flags;
+ int i, ret;
+
+ spin_lock_irqsave(&pps_lock, flags);
+ ret = __pps_unregister_source(info);
+ spin_unlock_irqrestore(&pps_lock, flags);
+
+ if (ret < 0)
+ return;
+ i = ret;
+
+ pps_sysfs_remove_source_entry(info, i);
+}
+
+void pps_event(int source, int event, void *data)
+{
+ struct timespec ts;
+
+ /* In this function we shouldn't need locking at all since each PPS
+ * source arrives once per second and due the per-PPS source data
+ * array... */
+
+ /* First of all we get the time stamp... */
+ getnstimeofday(&ts);
+
+ /* ... then we can do some sanity checks */
+ if (!pps_is_allocated(source)) {
+ err("unknow source for event!");
+ return;
+ }
+ if ((event&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0 ) {
+ err("unknow event (%x) for source %d", event, source);
+ return;
+ }
+
+ /* Must call the echo function? */
+ if ((pps_source[source].params.mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0)
+ pps_source[source].info->echo(source, event, data);
+
+ /* Check the event */
+ pps_source[source].current_mode = pps_source[source].params.mode;
+ if (event&PPS_CAPTUREASSERT) {
+ /* We have to add an offset? */
+ if (pps_source[source].params.mode&PPS_OFFSETASSERT)
+ pps_add_offset(&ts, &pps_source[source].params.assert_off_tu.tspec);
+
+ /* Save the time stamp */
+ pps_source[source].assert_tu.tspec = ts;
+ pps_source[source].assert_sequence++;
+ dbg("capture assert seq #%lu for source %d",
+ pps_source[source].assert_sequence, source);
+ }
+ if (event&PPS_CAPTURECLEAR) {
+ /* We have to add an offset? */
+ if (pps_source[source].params.mode&PPS_OFFSETCLEAR)
+ pps_add_offset(&ts, &pps_source[source].params.clear_off_tu.tspec);
+
+ /* Save the time stamp */
+ pps_source[source].clear_tu.tspec = ts;
+ pps_source[source].clear_sequence++;
+ dbg("capture clear seq #%lu for source %d",
+ pps_source[source].clear_sequence, source);
+ }
+
+ wake_up_interruptible(&pps_source[source].queue);
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+EXPORT_SYMBOL(pps_register_source);
+EXPORT_SYMBOL(pps_unregister_source);
+EXPORT_SYMBOL(pps_event);
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
new file mode 100644
index 0000000..cba3036
--- /dev/null
+++ b/drivers/pps/pps.c
@@ -0,0 +1,374 @@
+/*
+ * pps.c -- Main PPS support file
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ---------------------------------------------------- */
+
+struct pps_s pps_source[PPS_MAX_SOURCES];
+spinlock_t pps_lock = SPIN_LOCK_UNLOCKED;
+
+/* --- Local variables ----------------------------------------------------- */
+
+static struct sock *nl_sk = NULL;
+
+/* --- Misc functions ------------------------------------------------------ */
+
+static inline int pps_check_source(int source)
+{
+ return (source < 0 || !pps_is_allocated(source)) ? -EINVAL : 0;
+}
+
+static inline int pps_find_source(int source)
+{
+ int i;
+
+ if (source >= 0) {
+ if (source >= PPS_MAX_SOURCES || !pps_is_allocated(source))
+ return -EINVAL;
+ else
+ return source;
+ }
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i))
+ break;
+
+ if (i >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+static inline int pps_find_path(char *path)
+{
+ int i;
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i) &&
+ (strncmp(pps_source[i].info->path, path,
+ PPS_MAX_NAME_LEN) == 0 ||
+ strncmp(pps_source[i].info->name, path,
+ PPS_MAX_NAME_LEN) == 0))
+ break;
+
+ if (i >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+/* --- Input function ------------------------------------------------------ */
+
+static void pps_nl_data_ready(struct sock *sk, int len)
+{
+ struct sk_buff *skb;
+ struct nlmsghdr *nlh;
+ struct pps_netlink_msg *nlpps;
+
+ int cmd, source, id;
+ wait_queue_head_t *queue;
+ unsigned long timeout;
+
+ int ret;
+
+ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+ nlh = (struct nlmsghdr *) skb->data;
+ dbg("New message from PID %d (flags %x)",
+ nlh->nlmsg_pid, nlh->nlmsg_flags);
+
+ /* Decode the userland command */
+ nlpps = (struct pps_netlink_msg*) NLMSG_DATA(nlh);
+ cmd = nlpps->cmd;
+ source = nlpps->source;
+
+ switch (cmd) {
+ case PPS_CREATE : {
+ dbg("PPS_CREATE: source %d", source);
+
+ /* Check if the requested source is allocated */
+ ret = pps_find_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->source = ret;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_DESTROY : {
+ dbg("PPS_DESTROY: source %d", source);
+
+ /* Nothing to do here! Just answer ok... */
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_SETPARMS : {
+ dbg("PPS_SETPARMS: source %d", source);
+
+ /* Check the capabilities */
+ if (!capable(CAP_SYS_TIME)) {
+ nlpps->ret = -EPERM;
+ break;
+ }
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+ if ((nlpps->params.mode&~pps_source[source].info->mode) != 0) {
+ dbg("unsupported capabilities");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0) {
+ dbg("capture mode unspecified");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ /* section 3.3 of RFC 2783 interpreted */
+ dbg("time format unspecified");
+ nlpps->params.mode |= PPS_TSFMT_TSPEC;
+ }
+
+ /* Save the new parameters */
+ pps_source[source].params = nlpps->params;
+
+ /* Restore the read only parameters */
+ if (pps_source[source].info->mode&PPS_CANWAIT)
+ pps_source[source].params.mode |= PPS_CANWAIT;
+ pps_source[source].params.api_version = PPS_API_VERS;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETPARMS : {
+ dbg("PPS_GETPARMS: source %d", source);
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->params = pps_source[source].params;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETCAP : {
+ dbg("PPS_GETCAP: source %d", source);
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->mode = pps_source[source].info->mode;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FETCH : {
+ dbg("PPS_FETCH: source %d", source);
+ queue = &pps_source[source].queue;
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+ if ((nlpps->tsformat != PPS_TSFMT_TSPEC) != 0 ) {
+ dbg("unsupported time format");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+
+ /* Manage the timeout */
+ if (nlpps->timeout.tv_sec != -1) {
+ timeout = nlpps->timeout.tv_sec*HZ;
+ timeout += nlpps->timeout.tv_nsec/(1000000000/HZ);
+
+ if (timeout != 0) {
+ timeout = interruptible_sleep_on_timeout(queue, timeout);
+ if (timeout <= 0) {
+ dbg("timeout expired");
+ nlpps->ret = -ETIMEDOUT;
+ break;
+ }
+ }
+ }
+ else
+ interruptible_sleep_on(queue);
+
+ /* Return the fetched timestamp */
+ nlpps->info.assert_sequence = pps_source[source].assert_sequence;
+ nlpps->info.clear_sequence = pps_source[source].clear_sequence;
+ nlpps->info.assert_tu = pps_source[source].assert_tu;
+ nlpps->info.clear_tu = pps_source[source].clear_tu;
+ nlpps->info.current_mode = pps_source[source].current_mode;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_KC_BIND : {
+ dbg("PPS_KC_BIND: source %d", source);
+ /* Feature currently not supported */
+ nlpps->ret = -EOPNOTSUPP;
+
+ break;
+ }
+
+ case PPS_FIND_SRC : {
+ dbg("PPS_FIND_SRC: source %d", source);
+ source = pps_find_source(source);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, pps_source[source].info->name,
+ PPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, pps_source[source].info->path,
+ PPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FIND_PATH : {
+ dbg("PPS_FIND_PATH: source %s", nlpps->path);
+ source = pps_find_path(nlpps->path);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, pps_source[source].info->name,
+ PPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, pps_source[source].info->path,
+ PPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ default : {
+ /* Unknow command */
+ dbg("unknow command %d", nlpps->cmd);
+
+ nlpps->ret = -EINVAL;
+ }
+ }
+
+ /* Send an answer to the userland */
+ id = NETLINK_CB(skb).pid;
+ dbg("start sending reply to ID %d...", id);
+ NETLINK_CB(skb).pid = 0; /* from the kernel */
+ NETLINK_CB(skb).dst_group = 0; /* not in mcast groups */
+
+ ret = netlink_unicast(nl_sk, skb, id, MSG_DONTWAIT);
+ dbg("... reply sent (%d)", ret);
+ }
+}
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit pps_exit(void)
+{
+ pps_sysfs_unregister();
+ sock_release(nl_sk->sk_socket);
+
+ info("LinuxPPS API ver. %d removed", PPS_API_VERS);
+}
+
+static int __init pps_init(void)
+{
+ int ret;
+
+ nl_sk = netlink_kernel_create(NETLINK_PPSAPI, 0,
+ pps_nl_data_ready, THIS_MODULE);
+ if (nl_sk == NULL) {
+ err("unable to create netlink kernel socket");
+ return -EBUSY;
+ }
+ dbg("netlink protocol %d created", NETLINK_PPSAPI);
+
+ /* Init the main struct */
+ memset(pps_source, 0, sizeof(struct pps_s)*PPS_MAX_SOURCES);
+
+ /* Register to sysfs */
+ ret = pps_sysfs_register();
+ if (ret < 0) {
+ err("unable to register sysfs");
+ goto pps_sysfs_register_error;
+ }
+
+ info("LinuxPPS API ver. %d registered", PPS_API_VERS);
+ info("Software ver. %s - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>", PPS_VERSION);
+
+ return 0;
+
+pps_sysfs_register_error :
+
+ sock_release(nl_sk->sk_socket);
+
+ return ret;
+}
+
+subsys_initcall(pps_init);
+module_exit(pps_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("LinuxPPS support (RFC 2783) - ver. " PPS_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/sysfs.c b/drivers/pps/sysfs.c
new file mode 100644
index 0000000..0a34b42
--- /dev/null
+++ b/drivers/pps/sysfs.c
@@ -0,0 +1,200 @@
+/*
+ * sysfs.c -- sysfs support
+ *
+ *
+ * Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/string.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* ----- Private functions -------------------------------------------- */
+
+static ssize_t pps_show_assert(struct class_device *cdev, char *buf)
+{
+ struct pps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->assert_tu.tspec.tv_sec,
+ dev->assert_tu.tspec.tv_nsec,
+ dev->assert_sequence);
+}
+
+static ssize_t pps_show_clear(struct class_device *cdev, char *buf)
+{
+ struct pps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->clear_tu.tspec.tv_sec,
+ dev->clear_tu.tspec.tv_nsec,
+ dev->clear_sequence);
+}
+
+static ssize_t pps_show_mode(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%4x\n", info->mode);
+}
+
+static ssize_t pps_show_echo(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%d\n", !!info->echo);
+}
+
+static ssize_t pps_show_name(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->name);
+}
+
+static ssize_t pps_show_path(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->path);
+}
+
+/* ----- Files definitions -------------------------------------------- */
+
+#define DECLARE_INFO_ATTR(_name, _mode, _show, _store) \
+{ \
+ .attr = { \
+ .name = __stringify(_name), \
+ .mode = _mode, \
+ .owner = THIS_MODULE, \
+ }, \
+ .show = _show, \
+ .store = _store, \
+}
+
+static struct class_device_attribute pps_class_device_attributes[] = {
+ DECLARE_INFO_ATTR(assert, 0644, pps_show_assert, NULL),
+ DECLARE_INFO_ATTR(clear, 0644, pps_show_clear, NULL),
+ DECLARE_INFO_ATTR(mode, 0644, pps_show_mode, NULL),
+ DECLARE_INFO_ATTR(echo, 0644, pps_show_echo, NULL),
+ DECLARE_INFO_ATTR(name, 0644, pps_show_name, NULL),
+ DECLARE_INFO_ATTR(path, 0644, pps_show_path, NULL),
+};
+
+/* ----- Class definitions -------------------------------------------- */
+
+static void pps_class_release(struct class_device *cdev)
+{
+ /* Nop??? */
+}
+
+static struct class pps_class = {
+ .name = "pps",
+ .release = pps_class_release,
+};
+
+/* ----- Public functions --------------------------------------------- */
+
+void pps_sysfs_remove_source_entry(struct pps_source_info_s *info, int id) {
+ int i;
+
+ /* Sanity checks */
+ if (info == NULL || info->dir == NULL || id >= PPS_MAX_SOURCES)
+ return;
+
+ for (i = 0; i < ARRAY_SIZE(pps_class_device_attributes); i++)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+
+ class_device_unregister(&info->class_dev);
+}
+
+int pps_sysfs_create_source_entry(struct pps_source_info_s *info, int id) {
+ char buf[32];
+ int i, ret;
+
+ /* Sanity checks */
+ if (info == NULL || id >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ /* Create dir class device name */
+ sprintf(buf, "%.02d", id);
+
+ /* Setup the class struct */
+ memset(&info->class_dev, 0, sizeof(struct class_device));
+ info->class_dev.class = &pps_class;
+ strlcpy(info->class_dev.class_id, buf, KOBJ_NAME_LEN);
+ class_set_devdata(&info->class_dev, &pps_source[id]);
+
+ /* Register the new class */
+ ret = class_device_register(&info->class_dev);
+ if (unlikely(ret))
+ goto error_class_device_register;
+
+ /* Create info files */
+
+ /* Create file "assert" and "clear" according to source capability */
+ if (info->mode&PPS_CAPTUREASSERT) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[0]);
+ i = 0;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+ if (info->mode&PPS_CAPTURECLEAR) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[1]);
+ i = 1;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ for (i = 2; i < ARRAY_SIZE(pps_class_device_attributes); i++) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ return 0;
+
+error_class_device_create_file :
+ while (--i >= 0)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+
+ class_device_unregister(&info->class_dev);
+ /* Here the release() method was already called */
+
+error_class_device_register :
+
+ return ret;
+}
+
+void pps_sysfs_unregister(void)
+{
+ class_unregister(&pps_class);
+}
+
+int pps_sysfs_register(void)
+{
+ return class_register(&pps_class);
+}
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 98ec861..543c7cb 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2004,6 +2004,8 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
up->ier |= UART_IER_MSI;
if (up->capabilities & UART_CAP_UUE)
up->ier |= UART_IER_UUE | UART_IER_RTOIE;
+ if (up->port.flags & UPF_HARDPPS_CD)
+ up->ier |= UART_IER_MSI; /* enable interrupts */
serial_out(up, UART_IER, up->ier);
@@ -2718,6 +2720,7 @@ void serial8250_unregister_port(int line)
struct uart_8250_port *uart = &serial8250_ports[line];
mutex_lock(&serial_mutex);
+
uart_remove_one_port(&serial8250_reg, &uart->port);
if (serial8250_isa_devs) {
uart->port.flags &= ~UPF_BOOT_AUTOCONF;
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0422c0f..d1756c6 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,6 +37,11 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
#undef DEBUG
#ifdef DEBUG
#define DPRINTK(x...) printk(x)
@@ -640,6 +645,52 @@ static int uart_get_info(struct uart_state *state,
return 0;
}
+#ifdef CONFIG_PPS_CLIENT_UART
+
+static int
+uart_register_pps_port(struct uart_state *state, struct uart_port *port)
+{
+ struct tty_driver *drv = port->info->tty->driver;
+ int ret;
+
+ snprintf(state->pps_info.name, PPS_MAX_NAME_LEN, "%s%d",
+ drv->driver_name, port->line);
+ snprintf(state->pps_info.path, PPS_MAX_NAME_LEN, "/dev/%s%d",
+ drv->name, port->line);
+
+ state->pps_info.mode = PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ ret = pps_register_source(&state->pps_info, PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR,
+ -1 /* PPS ID is up to the system */);
+ if (ret < 0) {
+ err("cannot register PPS source \"%s\"", state->pps_info.path);
+ return ret;
+ }
+ port->pps_source = ret;
+ info("PPS source #%d \"%s\" added to the system ",
+ port->pps_source, state->pps_info.path);
+
+ return 0;
+}
+
+static void
+uart_unregister_pps_port(struct uart_state *state, struct uart_port *port)
+{
+ pps_unregister_source(&state->pps_info);
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, state->pps_info.path);
+}
+
+#else
+
+#define uart_register_pps_port(state, port) do { } while (0)
+#define uart_unregister_pps_port(state, port) do { } while (0)
+
+#endif /* CONFIG_PPS_CLIENT_UART */
+
static int uart_set_info(struct uart_state *state,
struct serial_struct __user *newinfo)
{
@@ -809,6 +860,16 @@ static int uart_set_info(struct uart_state *state,
state->info->tty->low_latency =
(port->flags & UPF_LOW_LATENCY) ? 1 : 0;
+ /*
+ * PPS support enabled/disabled?
+ */
+ if ((old_flags & UPF_HARDPPS_CD) != (new_flags & UPF_HARDPPS_CD)) {
+ if (new_flags & UPF_HARDPPS_CD)
+ uart_register_pps_port(state, port);
+ else
+ uart_unregister_pps_port(state, port);
+ }
+
check_and_exit:
retval = 0;
if (port->type == PORT_UNKNOWN)
@@ -2102,6 +2163,12 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
port->ops->config_port(port, flags);
}
+ /*
+ * Add the PPS support for the current port.
+ */
+ if (port->flags & UPF_HARDPPS_CD)
+ uart_register_pps_port(state, port);
+
if (port->type != PORT_UNKNOWN) {
unsigned long flags;
@@ -2351,6 +2418,12 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
mutex_unlock(&state->mutex);
/*
+ * Remove PPS support from the current port.
+ */
+ if (port->flags & UPF_HARDPPS_CD)
+ uart_unregister_pps_port(state, port);
+
+ /*
* Remove the devices from the tty layer
*/
tty_unregister_device(drv->tty_driver, port->line);
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2a20f48..f8d77e6 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,7 @@
/* leave room for NETLINK_DM (DM Events) */
#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
#define NETLINK_ECRYPTFS 19
+#define NETLINK_PPSAPI 20 /* linuxPPS support */
#define MAX_LINKS 32
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 80682aa..8861aa0 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -104,6 +104,11 @@ typedef enum {
#include <asm/ptrace.h>
#include <asm/semaphore.h>
+#ifdef CONFIG_PPS_CLIENT_LP
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
/* Define this later. */
struct parport;
struct pardevice;
@@ -323,6 +328,11 @@ struct parport {
struct list_head full_list;
struct parport *slaves[3];
+
+#ifdef CONFIG_PPS_CLIENT_LP
+ struct pps_source_info_s pps_info;
+ int pps_source; /* PPS source ID */
+#endif
};
#define DEFAULT_SPIN_TIME 500 /* us */
@@ -513,6 +523,12 @@ extern int parport_daisy_select (struct parport *port, int daisy, int mode);
/* Lowlevel drivers _can_ call this support function to handle irqs. */
static __inline__ void parport_generic_irq(int irq, struct parport *port)
{
+#ifdef CONFIG_PPS_CLIENT_LP
+ pps_event(port->pps_source, PPS_CAPTUREASSERT, port);
+ dbg("parport_pc: PPS assert event at %lu on source #%d",
+ jiffies, port->pps_source);
+#endif
+
parport_ieee1284_interrupt (irq, port);
read_lock(&port->cad_lock);
if (port->cad && port->cad->irq_func)
diff --git a/include/linux/pps.h b/include/linux/pps.h
new file mode 100644
index 0000000..650843e
--- /dev/null
+++ b/include/linux/pps.h
@@ -0,0 +1,107 @@
+/*
+ * pps.h -- PPS API kernel header.
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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 _PPS_H_
+#define _PPS_H_
+
+/* ----- Misc macros -------------------------------------------------- */
+
+#define PPS_VERSION "3.0.0-rc1"
+
+#ifdef CONFIG_PPS_DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif
+
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+
+/* --- Global defines ------------------------------------------------------ */
+
+#define PPS_MAX_SOURCES 16
+
+/* --- Global variables ---------------------------------------------------- */
+
+/* The specific PPS source info */
+struct pps_source_info_s {
+ char name[PPS_MAX_NAME_LEN]; /* simbolic name */
+ char path[PPS_MAX_NAME_LEN]; /* path of connected device */
+ int mode; /* PPS's allowed mode */
+
+ void (*echo)(int source, int event, void *data);/* the PPS echo function */
+
+ /* sysfs section */
+ struct class_device class_dev;
+
+ /* procfs section */
+ struct proc_dir_entry *dir;
+};
+
+/* The main struct */
+struct pps_s {
+ struct pps_source_info_s *info; /* PSS source info */
+
+ pps_params_t params; /* PPS's current params */
+
+ volatile pps_seq_t assert_sequence; /* PPS' assert event seq # */
+ volatile pps_seq_t clear_sequence; /* PPS' clear event seq # */
+ volatile pps_timeu_t assert_tu;
+ volatile pps_timeu_t clear_tu;
+ int current_mode; /* PPS mode at event time */
+
+ wait_queue_head_t queue; /* PPS event queue */
+};
+
+/* --- Global variables ---------------------------------------------------- */
+
+extern struct pps_s pps_source[PPS_MAX_SOURCES];
+extern spinlock_t pps_lock;
+
+/* --- Global functions ---------------------------------------------------- */
+
+static inline int pps_is_allocated(int source) {
+ return pps_source[source].info != NULL;
+}
+
+#define to_pps_info(obj) container_of((obj), struct pps_source_info_s, class_dev)
+
+/* --- Exported functions -------------------------------------------------- */
+
+extern int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id);
+extern void pps_unregister_source(struct pps_source_info_s *info);
+extern void pps_event(int source, int event, void *data);
+
+extern int pps_procfs_create_source_entry(struct pps_source_info_s *info, int id);
+extern void pps_procfs_remove_source_entry(struct pps_source_info_s *info, int id);
+extern int pps_procfs_register(void);
+extern void pps_procfs_unregister(void);
+
+extern int pps_sysfs_create_source_entry(struct pps_source_info_s *info, int id);
+extern void pps_sysfs_remove_source_entry(struct pps_source_info_s *info, int id);
+extern int pps_sysfs_register(void);
+extern void pps_sysfs_unregister(void);
+
+#endif /* _PPS_H_ */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 586aaba..c45a140 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -145,6 +145,11 @@
#include <linux/tty.h>
#include <linux/mutex.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
struct uart_port;
struct uart_info;
struct serial_struct;
@@ -223,6 +228,9 @@ struct uart_port {
unsigned char regshift; /* reg offset shift */
unsigned char iotype; /* io access style */
unsigned char unused1;
+#ifdef CONFIG_PPS_CLIENT_UART
+ int pps_source; /* PPS source ID */
+#endif
#define UPIO_PORT (0)
#define UPIO_HUB6 (1)
@@ -295,6 +303,10 @@ struct uart_state {
struct uart_info *info;
struct uart_port *port;
+#ifdef CONFIG_PPS_CLIENT_UART
+ struct pps_source_info_s pps_info;
+#endif
+
struct mutex mutex;
};
@@ -459,13 +471,23 @@ uart_handle_dcd_change(struct uart_port *port, unsigned int status)
{
struct uart_info *info = port->info;
- port->icount.dcd++;
-
-#ifdef CONFIG_HARD_PPS
- if ((port->flags & UPF_HARDPPS_CD) && status)
- hardpps();
+#ifdef CONFIG_PPS
+ if ((port->flags & UPF_HARDPPS_CD) && status) {
+ if (status & UART_MSR_DCD) {
+ pps_event(up->port.pps_source, PPS_CAPTUREASSERT, port);
+ dbg("serial8250: PPS assert event at %lu on source #%d",
+ jiffies, up->port.pps_source);
+ }
+ else {
+ pps_event(up->port.pps_source, PPS_CAPTURECLEAR, port);
+ dbg("serial8250: PPS clear event at %lu on source #%d",
+ jiffies, up->port.pps_source);
+ }
+ }
#endif
+ port->icount.dcd++;
+
if (info->flags & UIF_CHECK_CD) {
if (status)
wake_up_interruptible(&info->open_wait);
diff --git a/include/linux/timepps.h b/include/linux/timepps.h
new file mode 100644
index 0000000..4916d87
--- /dev/null
+++ b/include/linux/timepps.h
@@ -0,0 +1,519 @@
+/*
+ * timepps.h -- PPS API main header
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ *
+ * NOTE: this file is *strongly* based on a previous job by Ulrich Windl.
+ * The original copyright note follows:
+ *
+ * Interface to the PPS API described in RFC 2783 (March 2000)
+ *
+ * Copyright (c) 1999, 2001, 2004 by Ulrich Windl,
+ * based on code by Reg Clemens <reg@dwf.com>
+ * based on code by Poul-Henning Kamp <phk@FreeBSD.org>
+ *
+ * ----------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@FreeBSD.org> wrote this file. As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return.
+ * Poul-Henning Kamp
+ * ----------------------------------------------------------------------
+ */
+
+#ifndef _SYS_TIMEPPS_H_
+#define _SYS_TIMEPPS_H_
+
+/* Implementation note: the logical states ``assert'' and ``clear''
+ * are implemented in terms of the chip register, i.e. ``assert''
+ * means the bit is set. */
+
+/* --- 3.2 New data structures --------------------------------------------- */
+
+#define PPS_API_VERS_2 2 /* LinuxPPS proposal, dated 2006-05 */
+#define PPS_API_VERS PPS_API_VERS_2
+#define LINUXPSS_API 1 /* mark LinuxPPS API */
+
+#ifndef __KERNEL__
+#include <asm/types.h>
+#include <sys/socket.h>
+#endif
+#include <linux/netlink.h> /* NETLINK_PPSAPI */
+
+typedef struct pps_handle_s {
+ int source;
+ int socket;
+} pps_handle_t; /* represents a PPS source */
+
+typedef unsigned long pps_seq_t; /* sequence number */
+
+typedef struct ntp_fp {
+ unsigned int integral;
+ unsigned int fractional;
+} ntp_fp_t; /* NTP-compatible time stamp */
+
+typedef union pps_timeu {
+ struct timespec tspec;
+ ntp_fp_t ntpfp;
+ unsigned long longpad[3];
+} pps_timeu_t; /* generic data type to represent time stamps */
+
+typedef struct pps_info {
+ pps_seq_t assert_sequence; /* seq. num. of assert event */
+ pps_seq_t clear_sequence; /* seq. num. of clear event */
+ pps_timeu_t assert_tu; /* time of assert event */
+ pps_timeu_t clear_tu; /* time of clear event */
+ int current_mode; /* current mode bits */
+} pps_info_t;
+
+#define assert_timestamp assert_tu.tspec
+#define clear_timestamp clear_tu.tspec
+
+#define assert_timestamp_ntpfp assert_tu.ntpfp
+#define clear_timestamp_ntpfp clear_tu.ntpfp
+
+typedef struct pps_params {
+ int api_version; /* API version # */
+ int mode; /* mode bits */
+ pps_timeu_t assert_off_tu; /* offset compensation for assert */
+ pps_timeu_t clear_off_tu; /* offset compensation for clear */
+} pps_params_t;
+
+#define assert_offset assert_off_tu.tspec
+#define clear_offset clear_off_tu.tspec
+
+#define assert_offset_ntpfp assert_off_tu.ntpfp
+#define clear_offset_ntpfp clear_off_tu.ntpfp
+
+/* --- 3.3 Mode bit definitions -------------------------------------------- */
+
+/* Device/implementation parameters */
+#define PPS_CAPTUREASSERT 0x01 /* capture assert events */
+#define PPS_CAPTURECLEAR 0x02 /* capture clear events */
+#define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */
+
+#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert ev. */
+#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear ev. */
+
+#define PPS_CANWAIT 0x100 /* Can we wait for an event? */
+#define PPS_CANPOLL 0x200 /* "This bit is reserved for
+ future use." */
+
+/* Kernel actions */
+#define PPS_ECHOASSERT 0x40 /* feed back assert event to output */
+#define PPS_ECHOCLEAR 0x80 /* feed back clear event to output */
+
+/* Timestamp formats */
+#define PPS_TSFMT_TSPEC 0x1000 /* select timespec format */
+#define PPS_TSFMT_NTPFP 0x2000 /* select NTP format */
+
+/* --- 3.4.4 New functions: disciplining the kernel timebase --------------- */
+
+/* Kernel consumers */
+#define PPS_KC_HARDPPS 0 /* hardpps() (or equivalent) */
+#define PPS_KC_HARDPPS_PLL 1 /* hardpps() constrained to
+ use a phase-locked loop */
+#define PPS_KC_HARDPPS_FLL 2 /* hardpps() constrained to
+ use a frequency-locked loop */
+
+/* --- Here begins the implementation-specific part! ----------------------- */
+
+#define PPS_MAX_NAME_LEN 32
+struct pps_netlink_msg {
+ int cmd; /* the command to execute */
+ int source;
+ char name[PPS_MAX_NAME_LEN]; /* symbolic name */
+ char path[PPS_MAX_NAME_LEN]; /* path of the connected device */
+ int consumer; /* selected kernel consumer */
+ pps_params_t params;
+ int mode; /* edge */
+ int tsformat; /* format of time stamps */
+ pps_info_t info;
+ struct timespec timeout;
+ int ret;
+};
+#define PPSAPI_MAX_PAYLOAD sizeof(struct pps_netlink_msg)
+
+/* check Documentation/ioctl-number.txt! */
+#define PPS_CREATE 1
+#define PPS_DESTROY 2
+#define PPS_SETPARMS 3
+#define PPS_GETPARMS 4
+#define PPS_GETCAP 5
+#define PPS_FETCH 6
+#define PPS_KC_BIND 7
+#define PPS_FIND_SRC 8
+#define PPS_FIND_PATH 9
+
+#ifdef __KERNEL__
+
+#include <linux/socket.h>
+#include <net/sock.h>
+#include <linux/netlink.h>
+
+struct pps_state {
+ pps_params_t parm; /* PPS parameters */
+ pps_info_t info; /* PPS information */
+ int cap; /* PPS capabilities */
+ long ecount; /* interpolation offset of event */
+ struct timespec etime; /* kernel time of event */
+ wait_queue_head_t ewait; /* wait queue for event */
+};
+
+/* State variables to bind kernel consumer */
+/* PPS API (RFC 2783): current source and mode for ``kernel consumer'' */
+extern const struct pps *pps_kc_hardpps_dev; /* some unique pointer to device */
+extern int pps_kc_hardpps_mode; /* mode bits for kernel consumer */
+
+/* Return allowed mode bits for given pps struct, file's mode, and user.
+ * Bits set in `*obligatory' must be set. Returned bits may be set. */
+extern int pps_allowed_mode(const struct pps *pps, mode_t fmode, int *obligatory);
+
+#else /* !__KERNEL__ */
+
+/* --- 3.4 Functions ------------------------------------------------------- */
+
+#include <unistd.h>
+#include <errno.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+/* Private functions */
+
+static int netlink_msg(int socket, struct pps_netlink_msg *nlpps)
+{
+ struct sockaddr_nl dest_addr;
+ struct nlmsghdr *nlh;
+ struct iovec iov;
+ struct msghdr msg;
+
+ int ret;
+
+ memset(&msg, 0, sizeof(msg));
+
+ /* Create the destination address */
+ memset(&dest_addr, 0, sizeof(dest_addr));
+ dest_addr.nl_family = AF_NETLINK;
+ dest_addr.nl_pid = 0; /* for the kernel */
+ dest_addr.nl_groups = 0; /* not in mcast groups */
+
+ nlh = (struct nlmsghdr *) alloca(NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ if (nlh == NULL)
+ return -1;
+
+ /* Fill the netlink message header */
+ nlh->nlmsg_len = NLMSG_SPACE(PPSAPI_MAX_PAYLOAD);
+ nlh->nlmsg_pid = getpid();
+ nlh->nlmsg_flags = 0;
+ memcpy(NLMSG_DATA(nlh), nlpps, sizeof(struct pps_netlink_msg));
+
+ iov.iov_base = (void *) nlh;
+ iov.iov_len = nlh->nlmsg_len;
+ msg.msg_name = (void *) &dest_addr;
+ msg.msg_namelen = sizeof(dest_addr);
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+ /* Send the message */
+ ret = sendmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Wait for the answer */
+ memset(nlh, 0, NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ ret = recvmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Check the return value */
+ memcpy(nlpps, NLMSG_DATA(nlh), sizeof(struct pps_netlink_msg));
+ if (nlpps->ret < 0) {
+ errno = -nlpps->ret;
+ return -1;
+ }
+
+ return 0;
+}
+
+/* The PPSAPI functions */
+
+/* Create PPS handle from source number */
+static __inline int time_pps_create(int source, pps_handle_t *handle)
+{
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ handle->socket = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(handle->socket, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(handle->socket);
+ return ret;
+ }
+
+ /* Now ask the kernel to create the PPS source */
+ nlpps.cmd = PPS_CREATE;
+ nlpps.source = source;
+ ret = netlink_msg(handle->socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Save the PPS source returned by the kernel */
+ handle->source = nlpps.source;
+
+ return 0;
+}
+
+/* Release PPS handle */
+static __inline int time_pps_destroy(pps_handle_t handle)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_DESTROY;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Now we can destroy the netlink socket */
+ close(handle.socket);
+
+ return 0;
+}
+
+/* Set parameters for handle */
+static __inline int time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to set the new PPS source's parameters */
+ nlpps.cmd = PPS_SETPARMS;
+ nlpps.source = handle.source;
+ nlpps.params = *ppsparams;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static __inline int time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's parameters */
+ nlpps.cmd = PPS_GETPARMS;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the parameters */
+ *ppsparams = nlpps.params;
+
+ return 0;
+}
+
+/* Get capabilities for handle */
+static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_GETCAP;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the capabilities */
+ *mode = nlpps.mode;
+
+ return 0;
+}
+
+/* current event for handle */
+static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat, pps_info_t *ppsinfobuf, const struct timespec *timeout)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_FETCH;
+ nlpps.source = handle.source;
+ nlpps.tsformat = tsformat;
+ if (timeout)
+ nlpps.timeout = *timeout;
+ else /* wait forever */
+ nlpps.timeout.tv_sec = nlpps.timeout.tv_nsec = -1;
+
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the timestamps */
+ *ppsinfobuf = nlpps.info;
+
+ return 0;
+}
+
+/* Specify kernel consumer */
+static __inline int time_pps_kcbind(pps_handle_t handle, const int kernel_consumer, const int edge, const int tsformat)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_KC_BIND;
+ nlpps.source = handle.source;
+ nlpps.consumer = kernel_consumer;
+ nlpps.mode = edge;
+ nlpps.tsformat = tsformat;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+/* Find a PPS source */
+#define PPS_HAVE_FINDSOURCE 1
+static __inline int time_pps_findsource(int index, char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_SRC;
+ nlpps.source = index;
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#define PPS_HAVE_FINDPATH 1
+static __inline void time_pps_readlink(char *link, int linklen, char *path, int pathlen)
+{
+ int i;
+
+ i = readlink(link, path, pathlen-1);
+ if (i <= 0) {
+ /* "link" is not a valid symbolic so we directly use it */
+ strncpy(path, link, linklen <= pathlen ? linklen : pathlen);
+ return;
+ }
+
+ /* Return the file name where "link" points to */
+ path[i] = '\0';
+ return;
+}
+
+static __inline int time_pps_findpath(char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_PATH;
+ strncpy(nlpps.path, path, pathlen);
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#endif /* !__KERNEL__ */
+#endif /* _SYS_TIMEPPS_H_ */
^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
` (2 preceding siblings ...)
2007-02-18 22:43 ` LinuxPPS: fixes Rodolfo Giometti
@ 2007-02-20 2:56 ` H. Peter Anvin
2007-02-21 12:04 ` Rodolfo Giometti
2007-02-21 10:16 ` Pavel Machek
2007-03-13 21:38 ` Rodolfo Giometti
5 siblings, 1 reply; 32+ messages in thread
From: H. Peter Anvin @ 2007-02-20 2:56 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel
Rodolfo Giometti wrote:
>
> Please read the following consideratios before sending to /dev/null!
> :)
>
> RFC considerations
> ------------------
>
> While implementing a PPS API as RFC 2783 defines and using an embedded
> CPU GPIO-Pin as physical link to the signal, I encountered a deeper
> problem:
>
> At startup it needs a file descriptor as argument for the function
> time_pps_create().
>
> This implies that the source has a /dev/... entry. This assumption is
> ok for the serial and parallel port, where you can do something
> usefull beside(!) the gathering of timestamps as it is the central
> task for a PPS-API. But this assumption does not work for a single
> purpose GPIO line. In this case even basic file-related functionality
> (like read() and write()) makes no sense at all and should not be a
> precondition for the use of a PPS-API.
>
It's not a precondition for a file descriptor, either. There are plenty
of ioctl-only device drivers in existence.
Furthermore, a file descriptor doesn't imply a device entry. Consider
pipe(2), for example.
As far as the kernel is concerned, a file handle is a nice, uniform
system for providing communication between the kernel and user space.
It doesn't matter if one can read() or write() on it; it's perfectly
normal to support only a subset of the normal operations.
-hpa
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-20 2:56 ` [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux H. Peter Anvin
@ 2007-02-21 12:04 ` Rodolfo Giometti
2007-02-21 16:14 ` H. Peter Anvin
2007-02-21 23:51 ` Roman Zippel
0 siblings, 2 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-21 12:04 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: linux-kernel, linuxpps
On Mon, Feb 19, 2007 at 06:56:20PM -0800, H. Peter Anvin wrote:
> It's not a precondition for a file descriptor, either. There are plenty
> of ioctl-only device drivers in existence.
>
> Furthermore, a file descriptor doesn't imply a device entry. Consider
> pipe(2), for example.
>
> As far as the kernel is concerned, a file handle is a nice, uniform
> system for providing communication between the kernel and user space.
> It doesn't matter if one can read() or write() on it; it's perfectly
> normal to support only a subset of the normal operations.
The problem is that sometimes you cannot have a filedescriptor at
all. Think about a PPS source connected with a CPU's GPIO pin. You
have no filedes to use and defining one just for a PPS source or for a
class of PPS sources, I think, is a non sense.
RFC simply doesn't consider the fact that you can have a PPS source
__without__ a filedes connected with, and a single filedes is
considered __always__ connected with a single PPS source.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-21 12:04 ` Rodolfo Giometti
@ 2007-02-21 16:14 ` H. Peter Anvin
2007-02-22 8:51 ` Rodolfo Giometti
2007-02-21 23:51 ` Roman Zippel
1 sibling, 1 reply; 32+ messages in thread
From: H. Peter Anvin @ 2007-02-21 16:14 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel, linuxpps
Rodolfo Giometti wrote:
>
> The problem is that sometimes you cannot have a filedescriptor at
> all. Think about a PPS source connected with a CPU's GPIO pin. You
> have no filedes to use and defining one just for a PPS source or for a
> class of PPS sources, I think, is a non sense.
>
If you have a kernel driver at all, then it makes perfect sense. If you
don't have a kernel driver at all, then it's irrelevant to the
linux-kernel discussion.
> RFC simply doesn't consider the fact that you can have a PPS source
> __without__ a filedes connected with, and a single filedes is
> considered __always__ connected with a single PPS source.
That's the Unix way.
-hpa
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-21 16:14 ` H. Peter Anvin
@ 2007-02-22 8:51 ` Rodolfo Giometti
0 siblings, 0 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-22 8:51 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: linux-kernel, linuxpps
On Wed, Feb 21, 2007 at 08:14:14AM -0800, H. Peter Anvin wrote:
>
> If you have a kernel driver at all, then it makes perfect sense. If you
> don't have a kernel driver at all, then it's irrelevant to the
> linux-kernel discussion.
???
So you are told me that if my PPS source is connected with a single
CPU GPIO I have to add a new driver to the kernel? I have to choose a
proper major/minor numbers for just one PIN? =:-o
> >RFC simply doesn't consider the fact that you can have a PPS source
> >__without__ a filedes connected with, and a single filedes is
> >considered __always__ connected with a single PPS source.
>
> That's the Unix way.
But not PPS one. In several embedded systems the GPS antenna is
connected with the serial port and the PPS source, which cames from
the __same__ GPS antenna, is connected with a GPIO.
How I should manage such case? Which fildes I should use? Also
consider that NTPD currently manage only one filedes which should
support both GPS antenna's data and PPS source. My patch can solve
this problem.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-21 12:04 ` Rodolfo Giometti
2007-02-21 16:14 ` H. Peter Anvin
@ 2007-02-21 23:51 ` Roman Zippel
2007-02-22 9:00 ` Rodolfo Giometti
1 sibling, 1 reply; 32+ messages in thread
From: Roman Zippel @ 2007-02-21 23:51 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: H. Peter Anvin, linux-kernel, linuxpps
Hi,
On Wednesday 21 February 2007 13:04, Rodolfo Giometti wrote:
> RFC simply doesn't consider the fact that you can have a PPS source
> __without__ a filedes connected with, and a single filedes is
> considered __always__ connected with a single PPS source.
That's not entirely true. It doesn't say that pps_handle_t must be a file
descriptor and it leaves the option for the argument to time_pps_create() not
to be a file descriptor as well.
bye, Roman
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-21 23:51 ` Roman Zippel
@ 2007-02-22 9:00 ` Rodolfo Giometti
0 siblings, 0 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-22 9:00 UTC (permalink / raw)
To: Roman Zippel; +Cc: H. Peter Anvin, linux-kernel, linuxpps
On Thu, Feb 22, 2007 at 12:51:48AM +0100, Roman Zippel wrote:
> Hi,
>
> On Wednesday 21 February 2007 13:04, Rodolfo Giometti wrote:
>
> > RFC simply doesn't consider the fact that you can have a PPS source
> > __without__ a filedes connected with, and a single filedes is
> > considered __always__ connected with a single PPS source.
>
> That's not entirely true. It doesn't say that pps_handle_t must be a file
> descriptor and it leaves the option for the argument to time_pps_create() not
> to be a file descriptor as well.
Yes. In fact that's my solution!
The problem is that "pps_handle_t" is forced by the RFC to be a scalar
and _not_ a generic (and opaque) type. I suppose that since right now
such handler was simply the filedes of the serial/parallel port
connected with the GPS antenna. But this is not always the case. As
already told the GPS antenna can be connected with the serial line
while the PPS signal is not, so NTPD should always open the serial
port to read GPS data but it must not use such filedes for the
time_pps_create().
My support try to resolve this problem with minor changes in both RFC
and NTPD code.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
` (3 preceding siblings ...)
2007-02-20 2:56 ` [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux H. Peter Anvin
@ 2007-02-21 10:16 ` Pavel Machek
2007-02-22 9:59 ` Rodolfo Giometti
2007-03-13 21:38 ` Rodolfo Giometti
5 siblings, 1 reply; 32+ messages in thread
From: Pavel Machek @ 2007-02-21 10:16 UTC (permalink / raw)
To: Rodolfo Giometti; +Cc: linux-kernel, linuxpps
Hi!
> @@ -0,0 +1,206 @@
> +
> + PPS - Pulse Per Second
> + ----------------------
> +
> +(C) Copyright 2007 Rodolfo Giometti <giometti@enneenne.com>
If you add copyright, add license, too.
> +PROCFS support
> +--------------
> +
> +If PROCFS support is enabled a new directory "/proc/pps" is created:
> +
> + $ ls /proc/pps/
> + 00 01 sources
> +
> +The file "sources" holds a brief description of all PPS sources
> +defined in the system:
> +
> + $ cat /proc/pps/sources
> + id mode echo name path
> + ---- ------ ---- ---------------- ----------------
> + 00 1133 no serial0 /dev/ttyS0
> + 01 1133 no serial1 /dev/ttyS1
> +
> +The other entries are directories that hold one or two files according
> +to the ability of the associated source to provide "assert" and
> +"clear" timestamps:
> +
> + $ ls /proc/pps/00
> + assert clear
> +
> +Inside each "assert" and "clear" file you can find the timestamp and a
> +sequence number:
> +
> + $ cat /proc/pps/00/assert
> + 1170026870.983207967 #8
No new /proc files, please.
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-21 10:16 ` Pavel Machek
@ 2007-02-22 9:59 ` Rodolfo Giometti
0 siblings, 0 replies; 32+ messages in thread
From: Rodolfo Giometti @ 2007-02-22 9:59 UTC (permalink / raw)
To: Pavel Machek; +Cc: linux-kernel, linuxpps
On Wed, Feb 21, 2007 at 10:16:45AM +0000, Pavel Machek wrote:
> Hi!
>
> > @@ -0,0 +1,206 @@
> > +
> > + PPS - Pulse Per Second
> > + ----------------------
> > +
> > +(C) Copyright 2007 Rodolfo Giometti <giometti@enneenne.com>
>
> If you add copyright, add license, too.
Ok.
> No new /proc files, please.
Already removed. As soon as possible I'll repost a new patch.
Thanks!
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
` (4 preceding siblings ...)
2007-02-21 10:16 ` Pavel Machek
@ 2007-03-13 21:38 ` Rodolfo Giometti
2007-03-13 22:48 ` Lennart Sorensen
5 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-13 21:38 UTC (permalink / raw)
To: linux-kernel; +Cc: linuxpps, Russell King, Jan Dittmer, Pavel Machek
[-- Attachment #1: Type: text/plain, Size: 464 bytes --]
Hello,
here my new patch for PPS support in Linux.
I tried to follow your suggestions as much possible! Please let me
know if this new version could be more acceptable.
Thanks in advance,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
[-- Attachment #2: ntp-pps-2.6.20.diff --]
[-- Type: text/x-diff, Size: 63916 bytes --]
diff --git a/Documentation/pps.txt b/Documentation/pps.txt
new file mode 100644
index 0000000..bf13a59
--- /dev/null
+++ b/Documentation/pps.txt
@@ -0,0 +1,183 @@
+
+ PPS - Pulse Per Second
+ ----------------------
+
+(C) Copyright 2007 Rodolfo Giometti <giometti@enneenne.com>
+
+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.
+
+
+
+Overview
+--------
+
+LinuxPPS provides a programming interface (API) to define into the
+system several PPS sources.
+
+PPS means "pulse per second" and a PPS source is just a device which
+provides a high precision signal each second so that an application
+can use it to adjust system clock time.
+
+A PPS source can be connected to a serial port (usually to the Data
+Carrier Detect pin) or to a parallel port (ACK-pin) or to a special
+CPU's GPIOs (this is the common case in embedded systems) but in each
+case when a new pulse comes the system must apply to it a timestamp
+and record it for the userland.
+
+Common use is the combination of the NTPD as userland program with a
+GPS receiver as PPS source to obtain a wallclock-time with
+sub-millisecond synchronisation to UTC.
+
+
+RFC considerations
+------------------
+
+While implementing a PPS API as RFC 2783 defines and using an embedded
+CPU GPIO-Pin as physical link to the signal, I encountered a deeper
+problem:
+
+ At startup it needs a file descriptor as argument for the function
+ time_pps_create().
+
+This implies that the source has a /dev/... entry. This assumption is
+ok for the serial and parallel port, where you can do something
+usefull besides(!) the gathering of timestamps as it is the central
+task for a PPS-API. But this assumption does not work for a single
+purpose GPIO line. In this case even basic file-related functionality
+(like read() and write()) makes no sense at all and should not be a
+precondition for the use of a PPS-API.
+
+The problem can be simply solved if you change the original RFC 2783:
+
+ pps_handle_t type is an opaque __scalar type__ used to represent a
+ PPS source within the API
+
+into a modified:
+
+ pps_handle_t type is an opaque __variable__ used to represent a PPS
+ source within the API and programs should not access it directly to
+ it due to its opacity.
+
+This change seems to be neglibile because even the original RFC 2783
+does not encourage programs to check (read: use) the pps_handle_t
+variable before calling the time_pps_*() functions, since each
+function should do this job internally.
+
+If I intentionally separate the concept of "file descriptor" from the
+concept of the "PPS source" I'm obliged to provide a solution to find
+and register a PPS-source without using a file descriptor: it's done
+by the functions time_pps_findsource() and time_pps_findpath() now.
+
+According to this current NTPD drivers' code should be modified as
+follows:
+
++#ifdef PPS_HAVE_FINDPATH
++ /* Get the PPS source's real name */
++ fd = readlink(link, path, STRING_LEN-1);
++ if (fd <= 0)
++ strncpy(path, link, STRING_LEN);
++ else
++ path[fd] = '\0';
++
++ /* Try to find the source */
++ fd = time_pps_findpath(path, STRING_LEN, id, STRING_LEN);
++ if (fd < 0) {
++ msyslog(LOG_ERR, "refclock: cannot find PPS source \"%s\" in the system", path);
++ return 1;
++ }
++ msyslog(LOG_INFO, "refclock: found PPS source #%d \"%s\" on \"%s\"", fd, path, id);
++#endif /* PPS_HAVE_FINDPATH */
++
++
+ if (time_pps_create(fd, &pps_handle) < 0) {
+- pps_handle = 0;
+ msyslog(LOG_ERR, "refclock: time_pps_create failed: %m");
+ }
+
+
+Coding example
+--------------
+
+To register a PPS source into the kernel you should define a struct
+pps_source_info_s as follow:
+
+ static struct pps_source_info_s pps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : pps_ktimer_echo,
+ };
+
+and then calling the function pps_register_source() in your
+intialization routine as follow:
+
+ source = pps_register_source(&pps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+
+The pps_register_source() prototype is:
+
+ int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+
+where "info" is a pointer to a structure that describes a particular
+PPS source, "default_params" tells the system what the initial default
+parameters for the device should be (is obvious that these parameters
+must be a subset of ones defined into the struct
+pps_source_info_s which describe the capabilities of the driver)
+and "try_id" can be used to force a particular ID for your device into
+the system (just use -1 if you wish the system chooses one for you).
+
+Once you have registered a new PPS source into the system you can
+signal an assert event (for example in the interrupt handler routine)
+just using:
+
+ pps_event(source, PPS_CAPTUREASSERT, ptr);
+
+The same function may also run the defined echo function
+(pps_ktimer_echo(), passing to it the "ptr" pointer) if the user
+asked for that... etc..
+
+Please see the file drivers/pps/clients/ktimer.c for an example code.
+
+
+SYSFS support
+-------------
+
+The SYSFS support is enabled by default if the SYSFS filesystem is
+enabled in the kernel and it provides a new class:
+
+ $ ls /sys/class/pps/
+ 00/ 01/ 02/
+
+Every directory is the ID of a PPS sources defined into the system and
+inside you find several files:
+
+ $ ls /sys/class/pps/00/
+ assert clear echo mode name path subsystem@ uevent
+
+Inside each "assert" and "clear" file you can find the timestamp and a
+sequence number:
+
+ $ cat cat /sys/class/pps/00/assert
+ 1170026870.983207967#8
+
+Where before the "#" is the timestamp in seconds and after it is the
+sequence number. Other files are:
+
+* echo: reports if the PPS source has an echo function or not;
+
+* mode: reports available PPS functioning modes;
+
+* name: reports the PPS source's name;
+
+* path: reports the PPS source's device path, that is the device the
+ PPS source is connected to (if it exists).
diff --git a/MAINTAINERS b/MAINTAINERS
index b0fd71b..baa3901 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2693,6 +2693,13 @@ P: Michal Ostrowski
M: mostrows@speakeasy.net
S: Maintained
+PPS SUPPORT
+P: Rodolfo Giometti
+M: giometti@enneenne.com
+W: http://wiki.enneenne.com/index.php/LinuxPPS_support
+L: linuxpps@ml.enneenne.com
+S: Maintained
+
PREEMPTIBLE KERNEL
P: Robert Love
M: rml@tech9.net
diff --git a/drivers/Kconfig b/drivers/Kconfig
index 050323f..bb54cab 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
source "drivers/spi/Kconfig"
+source "drivers/pps/Kconfig"
+
source "drivers/w1/Kconfig"
source "drivers/hwmon/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 3a718f5..d0007f7 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -59,6 +59,7 @@ obj-$(CONFIG_INPUT) += input/
obj-$(CONFIG_I2O) += message/
obj-$(CONFIG_RTC_LIB) += rtc/
obj-$(CONFIG_I2C) += i2c/
+obj-$(CONFIG_PPS) += pps/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_HWMON) += hwmon/
obj-$(CONFIG_PHONE) += telephony/
diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index b51d08b..c8dbfc7 100644
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -750,6 +750,27 @@ static struct console lpcons = {
#endif /* console on line printer */
+/* --- support for PPS signal on the line printer -------------- */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+
+static inline void lp_pps_echo(int source, int event, void *data)
+{
+ struct parport *port = (struct parport *) data;
+ unsigned char status = parport_read_status(port);
+
+ /* echo event via SEL bit */
+ parport_write_control(port,
+ parport_read_control(port) | PARPORT_CONTROL_SELECT);
+
+ /* signal no event */
+ if ((status & PARPORT_STATUS_ACK) != 0)
+ parport_write_control(port,
+ parport_read_control(port) & ~PARPORT_CONTROL_SELECT);
+}
+
+#endif
+
/* --- initialisation code ------------------------------------- */
static int parport_nr[LP_NO] = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
@@ -821,6 +842,36 @@ static int lp_register(int nr, struct parport *port)
}
#endif
+#ifdef CONFIG_PPS_CLIENT_LP
+ snprintf(port->pps_info.path, PPS_MAX_NAME_LEN, "/dev/lp%d", nr);
+
+ /* No PPS support if lp port has no IRQ line */
+ if (port->irq != PARPORT_IRQ_NONE) {
+ strncpy(port->pps_info.name, port->name, PPS_MAX_NAME_LEN);
+
+ port->pps_info.mode = PPS_CAPTUREASSERT | PPS_OFFSETASSERT | \
+ PPS_ECHOASSERT | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ port->pps_info.echo = lp_pps_echo;
+
+ port->pps_source = pps_register_source(&(port->pps_info),
+ PPS_CAPTUREASSERT | PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (port->pps_source < 0)
+ err("cannot register PPS source \"%s\"",
+ port->pps_info.path);
+ else
+ info("PPS source #%d \"%s\" added to the system",
+ port->pps_source, port->pps_info.path);
+ }
+ else {
+ port->pps_source = -1;
+ err("PPS support disabled due port \"%s\" is in polling mode",
+ port->pps_info.path);
+ }
+#endif
+
return 0;
}
@@ -864,6 +915,14 @@ static void lp_detach (struct parport *port)
console_registered = NULL;
}
#endif /* CONFIG_LP_CONSOLE */
+
+#ifdef CONFIG_PPS_CLIENT_LP
+ if (port->pps_source >= 0) {
+ pps_unregister_source(&(port->pps_info));
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, port->pps_info.path);
+ }
+#endif
}
static struct parport_driver lp_driver = {
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
new file mode 100644
index 0000000..54297e8
--- /dev/null
+++ b/drivers/pps/Kconfig
@@ -0,0 +1,34 @@
+#
+# Character device configuration
+#
+
+menu "PPS support"
+
+config PPS
+ tristate "PPS support"
+ depends on EXPERIMENTAL
+ ---help---
+ PPS (Pulse Per Second) is a special pulse provided by some GPS
+ antennas. Userland can use it to get an high time reference.
+
+ Some antennas' PPS signals are connected with the CD (Carrier
+ Detect) pin of the serial line they use to communicate with the
+ host. In this case use the SERIAL_LINE client support.
+
+ Some antennas' PPS signals are connected with some special host
+ inputs so you have to enable the corresponding client support.
+
+ This PPS support can also be built as a module. If so, the module
+ will be called pps-core.
+
+config PPS_DEBUG
+ bool "PPS debugging messages"
+ depends on PPS
+ help
+ Say Y here if you want the PPS support to produce a bunch of debug
+ messages to the system log. Select this if you are having a
+ problem with PPS support and want to see more of what is going on.
+
+source drivers/pps/clients/Kconfig
+
+endmenu
diff --git a/drivers/pps/Makefile b/drivers/pps/Makefile
new file mode 100644
index 0000000..76101cd
--- /dev/null
+++ b/drivers/pps/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the PPS core.
+#
+
+pps_core-objs += pps.o kapi.o sysfs.o
+obj-$(CONFIG_PPS) += pps_core.o
+obj-y += clients/
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
new file mode 100644
index 0000000..1da1503
--- /dev/null
+++ b/drivers/pps/clients/Kconfig
@@ -0,0 +1,38 @@
+#
+# LinuxPPS clients configuration
+#
+
+if PPS
+
+comment "PPS clients support"
+
+config PPS_CLIENT_KTIMER
+ tristate "Kernel timer client (Testing client, use for debug)"
+ help
+ If you say yes here you get support for a PPS debugging client
+ which uses a kernel timer to generate the PPS signal.
+
+ This driver can also be built as a module. If so, the module
+ will be called ktimer.o.
+
+comment "UART serial support (forced off)"
+ depends on ! ( SERIAL_CORE != n && ! ( PPS = m && SERIAL_CORE = y ) )
+
+config PPS_CLIENT_UART
+ bool "UART serial support"
+ depends on SERIAL_CORE != n && ! ( PPS = m && SERIAL_CORE = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the CD (Carrier Detect) pin of your serial port.
+
+comment "Parallel printer support (forced off)"
+ depends on ! ( PRINTER != n && ! ( PPS = m && PRINTER = y ) )
+
+config PPS_CLIENT_LP
+ bool "Parallel printer support"
+ depends on PRINTER != n && ! ( PPS = m && PRINTER = y )
+ help
+ If you say yes here you get support for a PPS source connected
+ with the interrupt pin of your parallel port.
+
+endif
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
new file mode 100644
index 0000000..3ecca41
--- /dev/null
+++ b/drivers/pps/clients/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for miscellaneous I2C chip drivers.
+#
+
+obj-$(CONFIG_PPS_CLIENT_KTIMER) += ktimer.o
+
diff --git a/drivers/pps/clients/ktimer.c b/drivers/pps/clients/ktimer.c
new file mode 100644
index 0000000..eb06393
--- /dev/null
+++ b/drivers/pps/clients/ktimer.c
@@ -0,0 +1,107 @@
+/*
+ * ktimer.c -- kernel timer test client
+ *
+ *
+ * Copyright (C) 2005-2006 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/timer.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ----------------------------------------------------- */
+
+static int source;
+static struct timer_list ktimer;
+
+/* --- The kernel timer ----------------------------------------------------- */
+
+static void pps_ktimer_event(unsigned long ptr) {
+ info("PPS event at %lu", jiffies);
+
+ pps_event(source, PPS_CAPTUREASSERT, NULL);
+
+ /* Rescheduling */
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+}
+
+/* --- The echo function ---------------------------------------------------- */
+
+static void pps_ktimer_echo(int source, int event, void *data)
+{
+ info("echo %s %s for source %d",
+ event&PPS_CAPTUREASSERT ? "assert" : "",
+ event&PPS_CAPTURECLEAR ? "clear" : "",
+ source);
+}
+
+/* --- The PPS info struct -------------------------------------------------- */
+
+static struct pps_source_info_s pps_ktimer_info = {
+ name : "ktimer",
+ path : "",
+ mode : PPS_CAPTUREASSERT|PPS_OFFSETASSERT|PPS_ECHOASSERT| \
+ PPS_CANWAIT|PPS_TSFMT_TSPEC,
+ echo : pps_ktimer_echo,
+};
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit pps_ktimer_exit(void)
+{
+ del_timer_sync(&ktimer);
+ pps_unregister_source(&pps_ktimer_info);
+
+ info("ktimer PPS source unregistered");
+}
+
+static int __init pps_ktimer_init(void)
+{
+ int ret;
+
+ ret = pps_register_source(&pps_ktimer_info,
+ PPS_CAPTUREASSERT|PPS_OFFSETASSERT,
+ -1 /* is up to the system */);
+ if (ret < 0) {
+ err("cannot register ktimer source");
+ return ret;
+ }
+ source = ret;
+
+ init_timer(&ktimer);
+ ktimer.function = pps_ktimer_event;
+ ktimer.expires = jiffies+HZ; /* 1 second */
+ add_timer(&ktimer);
+
+ info("ktimer PPS source registered at %d", source);
+
+ return 0;
+}
+
+module_init(pps_ktimer_init);
+module_exit(pps_ktimer_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("testing PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
new file mode 100644
index 0000000..aa3e3c5
--- /dev/null
+++ b/drivers/pps/kapi.c
@@ -0,0 +1,198 @@
+/*
+ * kapi.c -- kernel API
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/time.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Local functions ----------------------------------------------------- */
+
+static void pps_add_offset(struct timespec *ts, struct timespec *offset)
+{
+ ts->tv_nsec += offset->tv_nsec;
+ if (ts->tv_nsec >= NSEC_PER_SEC) {
+ ts->tv_nsec -= NSEC_PER_SEC;
+ ts->tv_sec++;
+ } else if (ts->tv_nsec < 0) {
+ ts->tv_nsec += NSEC_PER_SEC;
+ ts->tv_sec--;
+ }
+ ts->tv_sec += offset->tv_sec;
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+static inline int __pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+{
+ int i;
+
+ if (try_id >= 0) {
+ if (pps_is_allocated(try_id)) {
+ err("source id %d busy", try_id);
+ return -EBUSY;
+ }
+ i = try_id;
+ }
+ else {
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (!pps_is_allocated(i))
+ break;
+ if (i >= PPS_MAX_SOURCES) {
+ err("no free source ids");
+ return -ENOMEM;
+ }
+ }
+
+ /* Sanity checks */
+ if ((info->mode&default_params) != default_params) {
+ err("unsupported default parameters");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0 && info->echo == NULL) {
+ err("echo function is not defined");
+ return -EINVAL;
+ }
+ if ((info->mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ err("unspecified time format");
+ return -EINVAL;
+ }
+
+ /* Allocate the PPS source */
+ memset(&pps_source[i], 0, sizeof(struct pps_s));
+ pps_source[i].info = info;
+ pps_source[i].params.api_version = PPS_API_VERS;
+ pps_source[i].params.mode = default_params;
+ init_waitqueue_head(&pps_source[i].queue);
+
+ return i;
+}
+
+int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id)
+{
+ unsigned long flags;
+ int i, ret;
+
+ spin_lock_irqsave(&pps_lock, flags);
+ ret = __pps_register_source(info, default_params, try_id);
+ spin_unlock_irqrestore(&pps_lock, flags);
+
+ if (ret < 0)
+ return ret;
+ i = ret;
+
+ ret = pps_sysfs_create_source_entry(info, i);
+ if (ret < 0)
+ err("unable to create sysfs entry for source %d", i);
+
+ return i;
+}
+
+static inline void __pps_unregister_source(struct pps_source_info_s *info)
+{
+ int i;
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i) && pps_source[i].info == info)
+ break;
+
+ if (i >= PPS_MAX_SOURCES) {
+ err("warning! Try to unregister an unknow PPS source");
+ return;
+ }
+
+ /* Deallocate the PPS source */
+ pps_source[i].info = NULL;
+}
+
+void pps_unregister_source(struct pps_source_info_s *info)
+{
+ unsigned long flags;
+
+ pps_sysfs_remove_source_entry(info);
+
+ spin_lock_irqsave(&pps_lock, flags);
+ __pps_unregister_source(info);
+ spin_unlock_irqrestore(&pps_lock, flags);
+}
+
+void pps_event(int source, int event, void *data)
+{
+ struct timespec ts;
+
+ /* In this function we shouldn't need locking at all since each PPS
+ * source arrives once per second and due the per-PPS source data
+ * array... */
+
+ /* First of all we get the time stamp... */
+ getnstimeofday(&ts);
+
+ /* ... then we can do some sanity checks */
+ if (!pps_is_allocated(source)) {
+ err("unknow source for event!");
+ return;
+ }
+ if ((event&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0 ) {
+ err("unknow event (%x) for source %d", event, source);
+ return;
+ }
+
+ /* Must call the echo function? */
+ if ((pps_source[source].params.mode&(PPS_ECHOASSERT|PPS_ECHOCLEAR)) != 0)
+ pps_source[source].info->echo(source, event, data);
+
+ /* Check the event */
+ pps_source[source].current_mode = pps_source[source].params.mode;
+ if (event&PPS_CAPTUREASSERT) {
+ /* We have to add an offset? */
+ if (pps_source[source].params.mode&PPS_OFFSETASSERT)
+ pps_add_offset(&ts, &pps_source[source].params.assert_off_tu.tspec);
+
+ /* Save the time stamp */
+ pps_source[source].assert_tu.tspec = ts;
+ pps_source[source].assert_sequence++;
+ dbg("capture assert seq #%lu for source %d",
+ pps_source[source].assert_sequence, source);
+ }
+ if (event&PPS_CAPTURECLEAR) {
+ /* We have to add an offset? */
+ if (pps_source[source].params.mode&PPS_OFFSETCLEAR)
+ pps_add_offset(&ts, &pps_source[source].params.clear_off_tu.tspec);
+
+ /* Save the time stamp */
+ pps_source[source].clear_tu.tspec = ts;
+ pps_source[source].clear_sequence++;
+ dbg("capture clear seq #%lu for source %d",
+ pps_source[source].clear_sequence, source);
+ }
+
+ wake_up_interruptible(&pps_source[source].queue);
+}
+
+/* --- Exported functions -------------------------------------------------- */
+
+EXPORT_SYMBOL(pps_register_source);
+EXPORT_SYMBOL(pps_unregister_source);
+EXPORT_SYMBOL(pps_event);
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
new file mode 100644
index 0000000..cba3036
--- /dev/null
+++ b/drivers/pps/pps.c
@@ -0,0 +1,374 @@
+/*
+ * pps.c -- Main PPS support file
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/skbuff.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* --- Global variables ---------------------------------------------------- */
+
+struct pps_s pps_source[PPS_MAX_SOURCES];
+spinlock_t pps_lock = SPIN_LOCK_UNLOCKED;
+
+/* --- Local variables ----------------------------------------------------- */
+
+static struct sock *nl_sk = NULL;
+
+/* --- Misc functions ------------------------------------------------------ */
+
+static inline int pps_check_source(int source)
+{
+ return (source < 0 || !pps_is_allocated(source)) ? -EINVAL : 0;
+}
+
+static inline int pps_find_source(int source)
+{
+ int i;
+
+ if (source >= 0) {
+ if (source >= PPS_MAX_SOURCES || !pps_is_allocated(source))
+ return -EINVAL;
+ else
+ return source;
+ }
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i))
+ break;
+
+ if (i >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+static inline int pps_find_path(char *path)
+{
+ int i;
+
+ for (i = 0; i < PPS_MAX_SOURCES; i++)
+ if (pps_is_allocated(i) &&
+ (strncmp(pps_source[i].info->path, path,
+ PPS_MAX_NAME_LEN) == 0 ||
+ strncmp(pps_source[i].info->name, path,
+ PPS_MAX_NAME_LEN) == 0))
+ break;
+
+ if (i >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ return i;
+}
+
+/* --- Input function ------------------------------------------------------ */
+
+static void pps_nl_data_ready(struct sock *sk, int len)
+{
+ struct sk_buff *skb;
+ struct nlmsghdr *nlh;
+ struct pps_netlink_msg *nlpps;
+
+ int cmd, source, id;
+ wait_queue_head_t *queue;
+ unsigned long timeout;
+
+ int ret;
+
+ while ((skb = skb_dequeue(&sk->sk_receive_queue)) != NULL) {
+ nlh = (struct nlmsghdr *) skb->data;
+ dbg("New message from PID %d (flags %x)",
+ nlh->nlmsg_pid, nlh->nlmsg_flags);
+
+ /* Decode the userland command */
+ nlpps = (struct pps_netlink_msg*) NLMSG_DATA(nlh);
+ cmd = nlpps->cmd;
+ source = nlpps->source;
+
+ switch (cmd) {
+ case PPS_CREATE : {
+ dbg("PPS_CREATE: source %d", source);
+
+ /* Check if the requested source is allocated */
+ ret = pps_find_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->source = ret;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_DESTROY : {
+ dbg("PPS_DESTROY: source %d", source);
+
+ /* Nothing to do here! Just answer ok... */
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_SETPARMS : {
+ dbg("PPS_SETPARMS: source %d", source);
+
+ /* Check the capabilities */
+ if (!capable(CAP_SYS_TIME)) {
+ nlpps->ret = -EPERM;
+ break;
+ }
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+ if ((nlpps->params.mode&~pps_source[source].info->mode) != 0) {
+ dbg("unsupported capabilities");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_CAPTUREASSERT|PPS_CAPTURECLEAR)) == 0) {
+ dbg("capture mode unspecified");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+ if ((nlpps->params.mode&(PPS_TSFMT_TSPEC|PPS_TSFMT_NTPFP)) == 0) {
+ /* section 3.3 of RFC 2783 interpreted */
+ dbg("time format unspecified");
+ nlpps->params.mode |= PPS_TSFMT_TSPEC;
+ }
+
+ /* Save the new parameters */
+ pps_source[source].params = nlpps->params;
+
+ /* Restore the read only parameters */
+ if (pps_source[source].info->mode&PPS_CANWAIT)
+ pps_source[source].params.mode |= PPS_CANWAIT;
+ pps_source[source].params.api_version = PPS_API_VERS;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETPARMS : {
+ dbg("PPS_GETPARMS: source %d", source);
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->params = pps_source[source].params;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_GETCAP : {
+ dbg("PPS_GETCAP: source %d", source);
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+
+ nlpps->mode = pps_source[source].info->mode;
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FETCH : {
+ dbg("PPS_FETCH: source %d", source);
+ queue = &pps_source[source].queue;
+
+ /* Sanity checks */
+ ret = pps_check_source(source);
+ if (ret < 0) {
+ nlpps->ret = ret;
+ break;
+ }
+ if ((nlpps->tsformat != PPS_TSFMT_TSPEC) != 0 ) {
+ dbg("unsupported time format");
+ nlpps->ret = -EINVAL;
+ break;
+ }
+
+ /* Manage the timeout */
+ if (nlpps->timeout.tv_sec != -1) {
+ timeout = nlpps->timeout.tv_sec*HZ;
+ timeout += nlpps->timeout.tv_nsec/(1000000000/HZ);
+
+ if (timeout != 0) {
+ timeout = interruptible_sleep_on_timeout(queue, timeout);
+ if (timeout <= 0) {
+ dbg("timeout expired");
+ nlpps->ret = -ETIMEDOUT;
+ break;
+ }
+ }
+ }
+ else
+ interruptible_sleep_on(queue);
+
+ /* Return the fetched timestamp */
+ nlpps->info.assert_sequence = pps_source[source].assert_sequence;
+ nlpps->info.clear_sequence = pps_source[source].clear_sequence;
+ nlpps->info.assert_tu = pps_source[source].assert_tu;
+ nlpps->info.clear_tu = pps_source[source].clear_tu;
+ nlpps->info.current_mode = pps_source[source].current_mode;
+
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_KC_BIND : {
+ dbg("PPS_KC_BIND: source %d", source);
+ /* Feature currently not supported */
+ nlpps->ret = -EOPNOTSUPP;
+
+ break;
+ }
+
+ case PPS_FIND_SRC : {
+ dbg("PPS_FIND_SRC: source %d", source);
+ source = pps_find_source(source);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, pps_source[source].info->name,
+ PPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, pps_source[source].info->path,
+ PPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ case PPS_FIND_PATH : {
+ dbg("PPS_FIND_PATH: source %s", nlpps->path);
+ source = pps_find_path(nlpps->path);
+ if (source < 0) {
+ dbg("no PPS devices found");
+ nlpps->ret = -ENODEV;
+ break;
+ }
+
+ /* Found! So copy the info */
+ nlpps->source = source;
+ strncpy(nlpps->name, pps_source[source].info->name,
+ PPS_MAX_NAME_LEN);
+ strncpy(nlpps->path, pps_source[source].info->path,
+ PPS_MAX_NAME_LEN);
+ nlpps->ret = 0;
+
+ break;
+ }
+
+ default : {
+ /* Unknow command */
+ dbg("unknow command %d", nlpps->cmd);
+
+ nlpps->ret = -EINVAL;
+ }
+ }
+
+ /* Send an answer to the userland */
+ id = NETLINK_CB(skb).pid;
+ dbg("start sending reply to ID %d...", id);
+ NETLINK_CB(skb).pid = 0; /* from the kernel */
+ NETLINK_CB(skb).dst_group = 0; /* not in mcast groups */
+
+ ret = netlink_unicast(nl_sk, skb, id, MSG_DONTWAIT);
+ dbg("... reply sent (%d)", ret);
+ }
+}
+
+/* --- Module staff -------------------------------------------------------- */
+
+static void __exit pps_exit(void)
+{
+ pps_sysfs_unregister();
+ sock_release(nl_sk->sk_socket);
+
+ info("LinuxPPS API ver. %d removed", PPS_API_VERS);
+}
+
+static int __init pps_init(void)
+{
+ int ret;
+
+ nl_sk = netlink_kernel_create(NETLINK_PPSAPI, 0,
+ pps_nl_data_ready, THIS_MODULE);
+ if (nl_sk == NULL) {
+ err("unable to create netlink kernel socket");
+ return -EBUSY;
+ }
+ dbg("netlink protocol %d created", NETLINK_PPSAPI);
+
+ /* Init the main struct */
+ memset(pps_source, 0, sizeof(struct pps_s)*PPS_MAX_SOURCES);
+
+ /* Register to sysfs */
+ ret = pps_sysfs_register();
+ if (ret < 0) {
+ err("unable to register sysfs");
+ goto pps_sysfs_register_error;
+ }
+
+ info("LinuxPPS API ver. %d registered", PPS_API_VERS);
+ info("Software ver. %s - Copyright 2005-2007 Rodolfo Giometti <giometti@linux.it>", PPS_VERSION);
+
+ return 0;
+
+pps_sysfs_register_error :
+
+ sock_release(nl_sk->sk_socket);
+
+ return ret;
+}
+
+subsys_initcall(pps_init);
+module_exit(pps_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("LinuxPPS support (RFC 2783) - ver. " PPS_VERSION);
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/sysfs.c b/drivers/pps/sysfs.c
new file mode 100644
index 0000000..7b1bd41
--- /dev/null
+++ b/drivers/pps/sysfs.c
@@ -0,0 +1,210 @@
+/*
+ * sysfs.c -- sysfs support
+ *
+ *
+ * Copyright (C) 2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ */
+
+
+#include <linux/device.h>
+#include <linux/module.h>
+#include <linux/string.h>
+
+#include <linux/timepps.h>
+#include <linux/pps.h>
+
+/* ----- Private functions -------------------------------------------- */
+
+static ssize_t pps_show_assert(struct class_device *cdev, char *buf)
+{
+ struct pps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->assert_tu.tspec.tv_sec,
+ dev->assert_tu.tspec.tv_nsec,
+ dev->assert_sequence);
+}
+
+static ssize_t pps_show_clear(struct class_device *cdev, char *buf)
+{
+ struct pps_s *dev = class_get_devdata(cdev);
+
+ return sprintf(buf, "%ld.%09ld#%ld\n",
+ dev->clear_tu.tspec.tv_sec,
+ dev->clear_tu.tspec.tv_nsec,
+ dev->clear_sequence);
+}
+
+static ssize_t pps_show_mode(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%4x\n", info->mode);
+}
+
+static ssize_t pps_show_echo(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%d\n", !!info->echo);
+}
+
+static ssize_t pps_show_name(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->name);
+}
+
+static ssize_t pps_show_path(struct class_device *cdev, char *buf)
+{
+ struct pps_source_info_s *info = to_pps_info(cdev);
+
+ return sprintf(buf, "%s\n", info->path);
+}
+
+/* ----- Files definitions -------------------------------------------- */
+
+#define DECLARE_INFO_ATTR(_name, _mode, _show, _store) \
+{ \
+ .attr = { \
+ .name = __stringify(_name), \
+ .mode = _mode, \
+ .owner = THIS_MODULE, \
+ }, \
+ .show = _show, \
+ .store = _store, \
+}
+
+static struct class_device_attribute pps_class_device_attributes[] = {
+ DECLARE_INFO_ATTR(assert, 0444, pps_show_assert, NULL),
+ DECLARE_INFO_ATTR(clear, 0444, pps_show_clear, NULL),
+ DECLARE_INFO_ATTR(mode, 0444, pps_show_mode, NULL),
+ DECLARE_INFO_ATTR(echo, 0444, pps_show_echo, NULL),
+ DECLARE_INFO_ATTR(name, 0444, pps_show_name, NULL),
+ DECLARE_INFO_ATTR(path, 0444, pps_show_path, NULL),
+};
+
+/* ----- Class definitions -------------------------------------------- */
+
+static void pps_class_release(struct class_device *cdev)
+{
+ /* Nop??? */
+}
+
+static struct class pps_class = {
+ .name = "pps",
+ .release = pps_class_release,
+};
+
+/* ----- Public functions --------------------------------------------- */
+
+void pps_sysfs_remove_source_entry(struct pps_source_info_s *info) {
+ int i;
+
+ /* Sanity checks */
+ if (info == NULL)
+ return;
+
+ /* Delete info files */
+ if (info->mode&PPS_CAPTUREASSERT)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[0]);
+
+ if (info->mode&PPS_CAPTURECLEAR)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[1]);
+
+ for (i = 2; i < ARRAY_SIZE(pps_class_device_attributes); i++)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+
+ /* Deregister the pps class */
+ class_device_unregister(&info->class_dev);
+}
+
+int pps_sysfs_create_source_entry(struct pps_source_info_s *info, int id) {
+ char buf[32];
+ int i, ret;
+
+ /* Sanity checks */
+ if (info == NULL || id >= PPS_MAX_SOURCES)
+ return -EINVAL;
+
+ /* Create dir class device name */
+ sprintf(buf, "%.02d", id);
+
+ /* Setup the class struct */
+ memset(&info->class_dev, 0, sizeof(struct class_device));
+ info->class_dev.class = &pps_class;
+ strlcpy(info->class_dev.class_id, buf, KOBJ_NAME_LEN);
+ class_set_devdata(&info->class_dev, &pps_source[id]);
+
+ /* Register the new class */
+ ret = class_device_register(&info->class_dev);
+ if (unlikely(ret))
+ goto error_class_device_register;
+
+ /* Create info files */
+
+ /* Create file "assert" and "clear" according to source capability */
+ if (info->mode&PPS_CAPTUREASSERT) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[0]);
+ i = 0;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+ if (info->mode&PPS_CAPTURECLEAR) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[1]);
+ i = 1;
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ for (i = 2; i < ARRAY_SIZE(pps_class_device_attributes); i++) {
+ ret = class_device_create_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+ if (unlikely(ret))
+ goto error_class_device_create_file;
+ }
+
+ return 0;
+
+error_class_device_create_file :
+ while (--i >= 0)
+ class_device_remove_file(&info->class_dev,
+ &pps_class_device_attributes[i]);
+
+ class_device_unregister(&info->class_dev);
+ /* Here the release() method was already called */
+
+error_class_device_register :
+
+ return ret;
+}
+
+void pps_sysfs_unregister(void)
+{
+ class_unregister(&pps_class);
+}
+
+int pps_sysfs_register(void)
+{
+ return class_register(&pps_class);
+}
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 98ec861..543c7cb 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2004,6 +2004,8 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios,
up->ier |= UART_IER_MSI;
if (up->capabilities & UART_CAP_UUE)
up->ier |= UART_IER_UUE | UART_IER_RTOIE;
+ if (up->port.flags & UPF_HARDPPS_CD)
+ up->ier |= UART_IER_MSI; /* enable interrupts */
serial_out(up, UART_IER, up->ier);
@@ -2718,6 +2720,7 @@ void serial8250_unregister_port(int line)
struct uart_8250_port *uart = &serial8250_ports[line];
mutex_lock(&serial_mutex);
+
uart_remove_one_port(&serial8250_reg, &uart->port);
if (serial8250_isa_devs) {
uart->port.flags &= ~UPF_BOOT_AUTOCONF;
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0422c0f..ca5be9a 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -37,6 +37,11 @@
#include <asm/irq.h>
#include <asm/uaccess.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
#undef DEBUG
#ifdef DEBUG
#define DPRINTK(x...) printk(x)
@@ -640,6 +645,52 @@ static int uart_get_info(struct uart_state *state,
return 0;
}
+#ifdef CONFIG_PPS_CLIENT_UART
+
+static int
+uart_register_pps_port(struct uart_state *state, struct uart_port *port)
+{
+ struct tty_driver *drv = port->info->tty->driver;
+ int ret;
+
+ snprintf(state->pps_info.name, PPS_MAX_NAME_LEN, "%s%d",
+ drv->driver_name, port->line);
+ snprintf(state->pps_info.path, PPS_MAX_NAME_LEN, "/dev/%s%d",
+ drv->name, port->line);
+
+ state->pps_info.mode = PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
+ PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+ ret = pps_register_source(&state->pps_info, PPS_CAPTUREBOTH | \
+ PPS_OFFSETASSERT | PPS_OFFSETCLEAR,
+ -1 /* PPS ID is up to the system */);
+ if (ret < 0) {
+ err("cannot register PPS source \"%s\"", state->pps_info.path);
+ return ret;
+ }
+ port->pps_source = ret;
+ info("PPS source #%d \"%s\" added to the system ",
+ port->pps_source, state->pps_info.path);
+
+ return 0;
+}
+
+static void
+uart_unregister_pps_port(struct uart_state *state, struct uart_port *port)
+{
+ pps_unregister_source(&state->pps_info);
+ dbg("PPS source #%d \"%s\" removed from the system",
+ port->pps_source, state->pps_info.path);
+}
+
+#else
+
+#define uart_register_pps_port(state, port) do { } while (0)
+#define uart_unregister_pps_port(state, port) do { } while (0)
+
+#endif /* CONFIG_PPS_CLIENT_UART */
+
static int uart_set_info(struct uart_state *state,
struct serial_struct __user *newinfo)
{
@@ -810,11 +861,19 @@ static int uart_set_info(struct uart_state *state,
(port->flags & UPF_LOW_LATENCY) ? 1 : 0;
check_and_exit:
+ /* PPS support enabled/disabled? */
+ if ((old_flags & UPF_HARDPPS_CD) != (new_flags & UPF_HARDPPS_CD)) {
+ if (new_flags & UPF_HARDPPS_CD)
+ uart_register_pps_port(state, port);
+ else
+ uart_unregister_pps_port(state, port);
+ }
+
retval = 0;
if (port->type == PORT_UNKNOWN)
goto exit;
if (state->info->flags & UIF_INITIALIZED) {
- if (((old_flags ^ port->flags) & UPF_SPD_MASK) ||
+ if (((old_flags ^ port->flags) & (UPF_SPD_MASK|UPF_HARDPPS_CD)) ||
old_custom_divisor != port->custom_divisor) {
/*
* If they're setting up a custom divisor or speed,
@@ -2102,6 +2161,12 @@ uart_configure_port(struct uart_driver *drv, struct uart_state *state,
port->ops->config_port(port, flags);
}
+ /*
+ * Add the PPS support for the current port.
+ */
+ if (port->flags & UPF_HARDPPS_CD)
+ uart_register_pps_port(state, port);
+
if (port->type != PORT_UNKNOWN) {
unsigned long flags;
@@ -2351,6 +2416,12 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *port)
mutex_unlock(&state->mutex);
/*
+ * Remove PPS support from the current port.
+ */
+ if (port->flags & UPF_HARDPPS_CD)
+ uart_unregister_pps_port(state, port);
+
+ /*
* Remove the devices from the tty layer
*/
tty_unregister_device(drv->tty_driver, port->line);
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2a20f48..f8d77e6 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,7 @@
/* leave room for NETLINK_DM (DM Events) */
#define NETLINK_SCSITRANSPORT 18 /* SCSI Transports */
#define NETLINK_ECRYPTFS 19
+#define NETLINK_PPSAPI 20 /* linuxPPS support */
#define MAX_LINKS 32
diff --git a/include/linux/parport.h b/include/linux/parport.h
index 80682aa..8861aa0 100644
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -104,6 +104,11 @@ typedef enum {
#include <asm/ptrace.h>
#include <asm/semaphore.h>
+#ifdef CONFIG_PPS_CLIENT_LP
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
/* Define this later. */
struct parport;
struct pardevice;
@@ -323,6 +328,11 @@ struct parport {
struct list_head full_list;
struct parport *slaves[3];
+
+#ifdef CONFIG_PPS_CLIENT_LP
+ struct pps_source_info_s pps_info;
+ int pps_source; /* PPS source ID */
+#endif
};
#define DEFAULT_SPIN_TIME 500 /* us */
@@ -513,6 +523,12 @@ extern int parport_daisy_select (struct parport *port, int daisy, int mode);
/* Lowlevel drivers _can_ call this support function to handle irqs. */
static __inline__ void parport_generic_irq(int irq, struct parport *port)
{
+#ifdef CONFIG_PPS_CLIENT_LP
+ pps_event(port->pps_source, PPS_CAPTUREASSERT, port);
+ dbg("parport_pc: PPS assert event at %lu on source #%d",
+ jiffies, port->pps_source);
+#endif
+
parport_ieee1284_interrupt (irq, port);
read_lock(&port->cad_lock);
if (port->cad && port->cad->irq_func)
diff --git a/include/linux/pps.h b/include/linux/pps.h
new file mode 100644
index 0000000..00b34ab
--- /dev/null
+++ b/include/linux/pps.h
@@ -0,0 +1,99 @@
+/*
+ * pps.h -- PPS API kernel header.
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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 _PPS_H_
+#define _PPS_H_
+
+/* ----- Misc macros -------------------------------------------------- */
+
+#define PPS_VERSION "3.0.0"
+
+#ifdef CONFIG_PPS_DEBUG
+#define dbg(format, arg...) printk(KERN_DEBUG "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#else
+#define dbg(format, arg...) do {} while (0)
+#endif
+
+#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , \
+ KBUILD_MODNAME , ## arg)
+
+/* --- Global defines ------------------------------------------------------ */
+
+#define PPS_MAX_SOURCES 16
+
+/* --- Global variables ---------------------------------------------------- */
+
+/* The specific PPS source info */
+struct pps_source_info_s {
+ char name[PPS_MAX_NAME_LEN]; /* simbolic name */
+ char path[PPS_MAX_NAME_LEN]; /* path of connected device */
+ int mode; /* PPS's allowed mode */
+
+ void (*echo)(int source, int event, void *data);/* the PPS echo function */
+
+ /* sysfs section */
+ struct class_device class_dev;
+};
+
+/* The main struct */
+struct pps_s {
+ struct pps_source_info_s *info; /* PSS source info */
+
+ pps_params_t params; /* PPS's current params */
+
+ volatile pps_seq_t assert_sequence; /* PPS' assert event seq # */
+ volatile pps_seq_t clear_sequence; /* PPS' clear event seq # */
+ volatile pps_timeu_t assert_tu;
+ volatile pps_timeu_t clear_tu;
+ int current_mode; /* PPS mode at event time */
+
+ wait_queue_head_t queue; /* PPS event queue */
+};
+
+/* --- Global variables ---------------------------------------------------- */
+
+extern struct pps_s pps_source[PPS_MAX_SOURCES];
+extern spinlock_t pps_lock;
+
+/* --- Global functions ---------------------------------------------------- */
+
+static inline int pps_is_allocated(int source) {
+ return pps_source[source].info != NULL;
+}
+
+#define to_pps_info(obj) container_of((obj), struct pps_source_info_s, class_dev)
+
+/* --- Exported functions -------------------------------------------------- */
+
+extern int pps_register_source(struct pps_source_info_s *info, int default_params, int try_id);
+extern void pps_unregister_source(struct pps_source_info_s *info);
+extern void pps_event(int source, int event, void *data);
+
+extern int pps_sysfs_create_source_entry(struct pps_source_info_s *info, int id);
+extern void pps_sysfs_remove_source_entry(struct pps_source_info_s *info);
+extern int pps_sysfs_register(void);
+extern void pps_sysfs_unregister(void);
+
+#endif /* _PPS_H_ */
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 586aaba..690daa5 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -145,6 +145,11 @@
#include <linux/tty.h>
#include <linux/mutex.h>
+#ifdef CONFIG_PPS_CLIENT_UART
+#include <linux/timepps.h>
+#include <linux/pps.h>
+#endif
+
struct uart_port;
struct uart_info;
struct serial_struct;
@@ -223,6 +228,9 @@ struct uart_port {
unsigned char regshift; /* reg offset shift */
unsigned char iotype; /* io access style */
unsigned char unused1;
+#ifdef CONFIG_PPS_CLIENT_UART
+ int pps_source; /* PPS source ID */
+#endif
#define UPIO_PORT (0)
#define UPIO_HUB6 (1)
@@ -264,7 +272,8 @@ struct uart_port {
#define UPF_IOREMAP ((__force upf_t) (1 << 31))
#define UPF_CHANGE_MASK ((__force upf_t) (0x17fff))
-#define UPF_USR_MASK ((__force upf_t) (UPF_SPD_MASK|UPF_LOW_LATENCY))
+#define UPF_USR_MASK ((__force upf_t) (UPF_SPD_MASK|UPF_LOW_LATENCY\
+ |UPF_HARDPPS_CD))
unsigned int mctrl; /* current modem ctrl settings */
unsigned int timeout; /* character-based timeout */
@@ -295,6 +304,10 @@ struct uart_state {
struct uart_info *info;
struct uart_port *port;
+#ifdef CONFIG_PPS_CLIENT_UART
+ struct pps_source_info_s pps_info;
+#endif
+
struct mutex mutex;
};
@@ -459,13 +472,23 @@ uart_handle_dcd_change(struct uart_port *port, unsigned int status)
{
struct uart_info *info = port->info;
- port->icount.dcd++;
-
-#ifdef CONFIG_HARD_PPS
- if ((port->flags & UPF_HARDPPS_CD) && status)
- hardpps();
+#ifdef CONFIG_PPS_CLIENT_UART
+ if (port->flags & UPF_HARDPPS_CD) {
+ if (status) {
+ pps_event(port->pps_source, PPS_CAPTUREASSERT, port);
+ dbg("serial8250: PPS assert event at %lu on source #%d",
+ jiffies, port->pps_source);
+ }
+ else {
+ pps_event(port->pps_source, PPS_CAPTURECLEAR, port);
+ dbg("serial8250: PPS clear event at %lu on source #%d",
+ jiffies, port->pps_source);
+ }
+ }
#endif
+ port->icount.dcd++;
+
if (info->flags & UIF_CHECK_CD) {
if (status)
wake_up_interruptible(&info->open_wait);
diff --git a/include/linux/timepps.h b/include/linux/timepps.h
new file mode 100644
index 0000000..4916d87
--- /dev/null
+++ b/include/linux/timepps.h
@@ -0,0 +1,519 @@
+/*
+ * timepps.h -- PPS API main header
+ *
+ *
+ * Copyright (C) 2005-2007 Rodolfo Giometti <giometti@linux.it>
+ *
+ * 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.
+ *
+ * NOTE: this file is *strongly* based on a previous job by Ulrich Windl.
+ * The original copyright note follows:
+ *
+ * Interface to the PPS API described in RFC 2783 (March 2000)
+ *
+ * Copyright (c) 1999, 2001, 2004 by Ulrich Windl,
+ * based on code by Reg Clemens <reg@dwf.com>
+ * based on code by Poul-Henning Kamp <phk@FreeBSD.org>
+ *
+ * ----------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42):
+ * <phk@FreeBSD.org> wrote this file. As long as you retain this notice
+ * you can do whatever you want with this stuff. If we meet some day, and
+ * you think this stuff is worth it, you can buy me a beer in return.
+ * Poul-Henning Kamp
+ * ----------------------------------------------------------------------
+ */
+
+#ifndef _SYS_TIMEPPS_H_
+#define _SYS_TIMEPPS_H_
+
+/* Implementation note: the logical states ``assert'' and ``clear''
+ * are implemented in terms of the chip register, i.e. ``assert''
+ * means the bit is set. */
+
+/* --- 3.2 New data structures --------------------------------------------- */
+
+#define PPS_API_VERS_2 2 /* LinuxPPS proposal, dated 2006-05 */
+#define PPS_API_VERS PPS_API_VERS_2
+#define LINUXPSS_API 1 /* mark LinuxPPS API */
+
+#ifndef __KERNEL__
+#include <asm/types.h>
+#include <sys/socket.h>
+#endif
+#include <linux/netlink.h> /* NETLINK_PPSAPI */
+
+typedef struct pps_handle_s {
+ int source;
+ int socket;
+} pps_handle_t; /* represents a PPS source */
+
+typedef unsigned long pps_seq_t; /* sequence number */
+
+typedef struct ntp_fp {
+ unsigned int integral;
+ unsigned int fractional;
+} ntp_fp_t; /* NTP-compatible time stamp */
+
+typedef union pps_timeu {
+ struct timespec tspec;
+ ntp_fp_t ntpfp;
+ unsigned long longpad[3];
+} pps_timeu_t; /* generic data type to represent time stamps */
+
+typedef struct pps_info {
+ pps_seq_t assert_sequence; /* seq. num. of assert event */
+ pps_seq_t clear_sequence; /* seq. num. of clear event */
+ pps_timeu_t assert_tu; /* time of assert event */
+ pps_timeu_t clear_tu; /* time of clear event */
+ int current_mode; /* current mode bits */
+} pps_info_t;
+
+#define assert_timestamp assert_tu.tspec
+#define clear_timestamp clear_tu.tspec
+
+#define assert_timestamp_ntpfp assert_tu.ntpfp
+#define clear_timestamp_ntpfp clear_tu.ntpfp
+
+typedef struct pps_params {
+ int api_version; /* API version # */
+ int mode; /* mode bits */
+ pps_timeu_t assert_off_tu; /* offset compensation for assert */
+ pps_timeu_t clear_off_tu; /* offset compensation for clear */
+} pps_params_t;
+
+#define assert_offset assert_off_tu.tspec
+#define clear_offset clear_off_tu.tspec
+
+#define assert_offset_ntpfp assert_off_tu.ntpfp
+#define clear_offset_ntpfp clear_off_tu.ntpfp
+
+/* --- 3.3 Mode bit definitions -------------------------------------------- */
+
+/* Device/implementation parameters */
+#define PPS_CAPTUREASSERT 0x01 /* capture assert events */
+#define PPS_CAPTURECLEAR 0x02 /* capture clear events */
+#define PPS_CAPTUREBOTH 0x03 /* capture assert and clear events */
+
+#define PPS_OFFSETASSERT 0x10 /* apply compensation for assert ev. */
+#define PPS_OFFSETCLEAR 0x20 /* apply compensation for clear ev. */
+
+#define PPS_CANWAIT 0x100 /* Can we wait for an event? */
+#define PPS_CANPOLL 0x200 /* "This bit is reserved for
+ future use." */
+
+/* Kernel actions */
+#define PPS_ECHOASSERT 0x40 /* feed back assert event to output */
+#define PPS_ECHOCLEAR 0x80 /* feed back clear event to output */
+
+/* Timestamp formats */
+#define PPS_TSFMT_TSPEC 0x1000 /* select timespec format */
+#define PPS_TSFMT_NTPFP 0x2000 /* select NTP format */
+
+/* --- 3.4.4 New functions: disciplining the kernel timebase --------------- */
+
+/* Kernel consumers */
+#define PPS_KC_HARDPPS 0 /* hardpps() (or equivalent) */
+#define PPS_KC_HARDPPS_PLL 1 /* hardpps() constrained to
+ use a phase-locked loop */
+#define PPS_KC_HARDPPS_FLL 2 /* hardpps() constrained to
+ use a frequency-locked loop */
+
+/* --- Here begins the implementation-specific part! ----------------------- */
+
+#define PPS_MAX_NAME_LEN 32
+struct pps_netlink_msg {
+ int cmd; /* the command to execute */
+ int source;
+ char name[PPS_MAX_NAME_LEN]; /* symbolic name */
+ char path[PPS_MAX_NAME_LEN]; /* path of the connected device */
+ int consumer; /* selected kernel consumer */
+ pps_params_t params;
+ int mode; /* edge */
+ int tsformat; /* format of time stamps */
+ pps_info_t info;
+ struct timespec timeout;
+ int ret;
+};
+#define PPSAPI_MAX_PAYLOAD sizeof(struct pps_netlink_msg)
+
+/* check Documentation/ioctl-number.txt! */
+#define PPS_CREATE 1
+#define PPS_DESTROY 2
+#define PPS_SETPARMS 3
+#define PPS_GETPARMS 4
+#define PPS_GETCAP 5
+#define PPS_FETCH 6
+#define PPS_KC_BIND 7
+#define PPS_FIND_SRC 8
+#define PPS_FIND_PATH 9
+
+#ifdef __KERNEL__
+
+#include <linux/socket.h>
+#include <net/sock.h>
+#include <linux/netlink.h>
+
+struct pps_state {
+ pps_params_t parm; /* PPS parameters */
+ pps_info_t info; /* PPS information */
+ int cap; /* PPS capabilities */
+ long ecount; /* interpolation offset of event */
+ struct timespec etime; /* kernel time of event */
+ wait_queue_head_t ewait; /* wait queue for event */
+};
+
+/* State variables to bind kernel consumer */
+/* PPS API (RFC 2783): current source and mode for ``kernel consumer'' */
+extern const struct pps *pps_kc_hardpps_dev; /* some unique pointer to device */
+extern int pps_kc_hardpps_mode; /* mode bits for kernel consumer */
+
+/* Return allowed mode bits for given pps struct, file's mode, and user.
+ * Bits set in `*obligatory' must be set. Returned bits may be set. */
+extern int pps_allowed_mode(const struct pps *pps, mode_t fmode, int *obligatory);
+
+#else /* !__KERNEL__ */
+
+/* --- 3.4 Functions ------------------------------------------------------- */
+
+#include <unistd.h>
+#include <errno.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+
+/* Private functions */
+
+static int netlink_msg(int socket, struct pps_netlink_msg *nlpps)
+{
+ struct sockaddr_nl dest_addr;
+ struct nlmsghdr *nlh;
+ struct iovec iov;
+ struct msghdr msg;
+
+ int ret;
+
+ memset(&msg, 0, sizeof(msg));
+
+ /* Create the destination address */
+ memset(&dest_addr, 0, sizeof(dest_addr));
+ dest_addr.nl_family = AF_NETLINK;
+ dest_addr.nl_pid = 0; /* for the kernel */
+ dest_addr.nl_groups = 0; /* not in mcast groups */
+
+ nlh = (struct nlmsghdr *) alloca(NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ if (nlh == NULL)
+ return -1;
+
+ /* Fill the netlink message header */
+ nlh->nlmsg_len = NLMSG_SPACE(PPSAPI_MAX_PAYLOAD);
+ nlh->nlmsg_pid = getpid();
+ nlh->nlmsg_flags = 0;
+ memcpy(NLMSG_DATA(nlh), nlpps, sizeof(struct pps_netlink_msg));
+
+ iov.iov_base = (void *) nlh;
+ iov.iov_len = nlh->nlmsg_len;
+ msg.msg_name = (void *) &dest_addr;
+ msg.msg_namelen = sizeof(dest_addr);
+ msg.msg_iov = &iov;
+ msg.msg_iovlen = 1;
+
+ /* Send the message */
+ ret = sendmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Wait for the answer */
+ memset(nlh, 0, NLMSG_SPACE(PPSAPI_MAX_PAYLOAD));
+ ret = recvmsg(socket, &msg, 0);
+ if (ret < 0)
+ return ret;
+
+ /* Check the return value */
+ memcpy(nlpps, NLMSG_DATA(nlh), sizeof(struct pps_netlink_msg));
+ if (nlpps->ret < 0) {
+ errno = -nlpps->ret;
+ return -1;
+ }
+
+ return 0;
+}
+
+/* The PPSAPI functions */
+
+/* Create PPS handle from source number */
+static __inline int time_pps_create(int source, pps_handle_t *handle)
+{
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ handle->socket = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(handle->socket, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(handle->socket);
+ return ret;
+ }
+
+ /* Now ask the kernel to create the PPS source */
+ nlpps.cmd = PPS_CREATE;
+ nlpps.source = source;
+ ret = netlink_msg(handle->socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Save the PPS source returned by the kernel */
+ handle->source = nlpps.source;
+
+ return 0;
+}
+
+/* Release PPS handle */
+static __inline int time_pps_destroy(pps_handle_t handle)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_DESTROY;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Now we can destroy the netlink socket */
+ close(handle.socket);
+
+ return 0;
+}
+
+/* Set parameters for handle */
+static __inline int time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to set the new PPS source's parameters */
+ nlpps.cmd = PPS_SETPARMS;
+ nlpps.source = handle.source;
+ nlpps.params = *ppsparams;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static __inline int time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's parameters */
+ nlpps.cmd = PPS_GETPARMS;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the parameters */
+ *ppsparams = nlpps.params;
+
+ return 0;
+}
+
+/* Get capabilities for handle */
+static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_GETCAP;
+ nlpps.source = handle.source;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the capabilities */
+ *mode = nlpps.mode;
+
+ return 0;
+}
+
+/* current event for handle */
+static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat, pps_info_t *ppsinfobuf, const struct timespec *timeout)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to return the PPS source's capabilities */
+ nlpps.cmd = PPS_FETCH;
+ nlpps.source = handle.source;
+ nlpps.tsformat = tsformat;
+ if (timeout)
+ nlpps.timeout = *timeout;
+ else /* wait forever */
+ nlpps.timeout.tv_sec = nlpps.timeout.tv_nsec = -1;
+
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ /* Return the timestamps */
+ *ppsinfobuf = nlpps.info;
+
+ return 0;
+}
+
+/* Specify kernel consumer */
+static __inline int time_pps_kcbind(pps_handle_t handle, const int kernel_consumer, const int edge, const int tsformat)
+{
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_KC_BIND;
+ nlpps.source = handle.source;
+ nlpps.consumer = kernel_consumer;
+ nlpps.mode = edge;
+ nlpps.tsformat = tsformat;
+ ret = netlink_msg(handle.socket, &nlpps);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+/* Find a PPS source */
+#define PPS_HAVE_FINDSOURCE 1
+static __inline int time_pps_findsource(int index, char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_SRC;
+ nlpps.source = index;
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#define PPS_HAVE_FINDPATH 1
+static __inline void time_pps_readlink(char *link, int linklen, char *path, int pathlen)
+{
+ int i;
+
+ i = readlink(link, path, pathlen-1);
+ if (i <= 0) {
+ /* "link" is not a valid symbolic so we directly use it */
+ strncpy(path, link, linklen <= pathlen ? linklen : pathlen);
+ return;
+ }
+
+ /* Return the file name where "link" points to */
+ path[i] = '\0';
+ return;
+}
+
+static __inline int time_pps_findpath(char *path, int pathlen, char *idstring, int idlen)
+{
+ int sock;
+ struct sockaddr_nl src_addr, dest_addr;
+ struct pps_netlink_msg nlpps;
+
+ int ret;
+
+ /* Create the netlink socket */
+ ret = socket(PF_NETLINK, SOCK_RAW, NETLINK_PPSAPI);
+ if (ret < 0)
+ return ret;
+ sock = ret;
+
+ /* Bind the socket with the source address */
+ memset(&src_addr, 0, sizeof(src_addr));
+ src_addr.nl_family = AF_NETLINK;
+ src_addr.nl_pid = 0; /* ask kernel to choose an unique ID */
+ src_addr.nl_groups = 0; /* not in mcast groups */
+ ret = bind(sock, (struct sockaddr *) &src_addr, sizeof(src_addr));
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ /* Ask the kernel to destroy the PPS source */
+ nlpps.cmd = PPS_FIND_PATH;
+ strncpy(nlpps.path, path, pathlen);
+ ret = netlink_msg(sock, &nlpps);
+ if (ret < 0) {
+ close(sock);
+ return ret;
+ }
+
+ strncpy(path, nlpps.path, pathlen);
+ strncpy(idstring, nlpps.name, idlen);
+
+ close(sock);
+ return nlpps.source;
+}
+
+#endif /* !__KERNEL__ */
+#endif /* _SYS_TIMEPPS_H_ */
^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-13 21:38 ` Rodolfo Giometti
@ 2007-03-13 22:48 ` Lennart Sorensen
2007-03-14 9:31 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-13 22:48 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Tue, Mar 13, 2007 at 10:38:43PM +0100, Rodolfo Giometti wrote:
> here my new patch for PPS support in Linux.
>
> I tried to follow your suggestions as much possible! Please let me
> know if this new version could be more acceptable.
I have tried out 3.0.0-rc2 which seems to work pretty well so far (when
combined with the patches to the jsm driver I just posted). It took soe
work to get ntp's refclock_nmea to work though, since the patch that is
linked to from the linuxpps page seems out of date. Here is the patch
that seems to be working for me, although I am still testing it. Given
you know the linuxpps code better perhaps you can see if it looks sane
to you.
--- ntpd/refclock_nmea.c.ori 2007-03-13 18:38:01.000000000 -0400
+++ ntpd/refclock_nmea.c 2007-03-13 18:44:47.000000000 -0400
@@ -79,6 +79,7 @@
#define RANGEGATE 500000 /* range gate (ns) */
#define LENNMEA 75 /* min timecode length */
+#define LENPPS PPS_MAX_NAME_LEN
/*
* Tables to compute the ddd of year form icky dd/mm timecode. Viva la
@@ -99,6 +100,7 @@
pps_params_t pps_params; /* pps parameters */
pps_info_t pps_info; /* last pps data */
pps_handle_t handle; /* pps handlebars */
+ int handle_created; /* pps handle created flag */
#endif /* HAVE_PPSAPI */
};
@@ -147,6 +149,11 @@
register struct nmeaunit *up;
struct refclockproc *pp;
int fd;
+#ifdef PPS_HAVE_FINDPATH
+ char id[LENPPS] = "",
+ path[LENPPS],
+ mylink[LENPPS] = ""; /* just a default device */
+#endif /* PPS_HAVE_FINDPATH */
char device[20];
/*
@@ -201,7 +208,20 @@
#else
return (0);
#endif
- }
+ } else {
+ struct serial_struct ss;
+ if (ioctl(fd, TIOCGSERIAL, &ss) < 0 ||
+ (
+ ss.flags |= ASYNC_HARDPPS_CD,
+ ioctl(fd, TIOCSSERIAL, &ss)) < 0) {
+ msyslog(LOG_NOTICE, "refclock_nmea: TIOCSSERIAL fd %d, %m", fd);
+ msyslog(LOG_NOTICE,
+ "refclock_nmea: optional PPS processing not available");
+ } else {
+ msyslog(LOG_INFO,
+ "refclock_nmea: PPS detection on");
+ }
+ }
/*
* Allocate and initialize unit structure
@@ -238,12 +258,26 @@
* Start the PPSAPI interface if it is there. Default to use
* the assert edge and do not enable the kernel hardpps.
*/
+#ifdef PPS_HAVE_FINDPATH
+ /* Get the PPS source's real name */
+ //time_pps_readlink(mylink, LENPPS, path, LENPPS);
+ time_pps_readlink(device, LENPPS, path, LENPPS);
+
+ /* Try to find the source */
+ fd = time_pps_findpath(path, LENPPS, id, LENPPS);
+ if (fd < 0) {
+ msyslog(LOG_ERR, "refclock_nmea: cannot find PPS path \"%s\" in the system", path);
+ return (0);
+ }
+ msyslog(LOG_INFO, "refclock_nmea: found PPS source \"%s\" at id #%d on \"%s\"", path, fd, id);
+#endif /* PPS_HAVE_FINDPATH */
if (time_pps_create(fd, &up->handle) < 0) {
- up->handle = 0;
+ up->handle_created = 0;
msyslog(LOG_ERR,
"refclock_nmea: time_pps_create failed: %m");
return (1);
}
+ up->handle_created = ~0;
return(nmea_ppsapi(peer, 0, 0));
#else
return (1);
@@ -265,8 +299,10 @@
pp = peer->procptr;
up = (struct nmeaunit *)pp->unitptr;
#ifdef HAVE_PPSAPI
- if (up->handle != 0)
+ if (up->handle_created) {
time_pps_destroy(up->handle);
+ up->handle_created = 0;
+ }
#endif /* HAVE_PPSAPI */
io_closeclock(&pp->io);
free(up);
@@ -374,7 +410,7 @@
/*
* Convert the timespec nanoseconds field to ntp l_fp units.
*/
- if (up->handle == 0)
+ if (!up->handle_created)
return (0);
timeout.tv_sec = 0;
timeout.tv_nsec = 0;
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-13 22:48 ` Lennart Sorensen
@ 2007-03-14 9:31 ` Rodolfo Giometti
2007-03-14 13:19 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-14 9:31 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Tue, Mar 13, 2007 at 06:48:17PM -0400, Lennart Sorensen wrote:
>
> I have tried out 3.0.0-rc2 which seems to work pretty well so far (when
Thanks. I just posted to the linux kernel ML the last release
3.0.0. Maybe you can do a "git pull" and try it out. :)
> combined with the patches to the jsm driver I just posted). It took soe
> work to get ntp's refclock_nmea to work though, since the patch that is
> linked to from the linuxpps page seems out of date. Here is the patch
> that seems to be working for me, although I am still testing it. Given
> you know the linuxpps code better perhaps you can see if it looks sane
> to you.
>
> --- ntpd/refclock_nmea.c.ori 2007-03-13 18:38:01.000000000 -0400
> +++ ntpd/refclock_nmea.c 2007-03-13 18:44:47.000000000 -0400
> @@ -79,6 +79,7 @@
> #define RANGEGATE 500000 /* range gate (ns) */
>
> #define LENNMEA 75 /* min timecode length */
> +#define LENPPS PPS_MAX_NAME_LEN
>
> /*
> * Tables to compute the ddd of year form icky dd/mm timecode. Viva la
> @@ -99,6 +100,7 @@
> pps_params_t pps_params; /* pps parameters */
> pps_info_t pps_info; /* last pps data */
> pps_handle_t handle; /* pps handlebars */
> + int handle_created; /* pps handle created flag */
> #endif /* HAVE_PPSAPI */
> };
>
> @@ -147,6 +149,11 @@
> register struct nmeaunit *up;
> struct refclockproc *pp;
> int fd;
> +#ifdef PPS_HAVE_FINDPATH
> + char id[LENPPS] = "",
> + path[LENPPS],
> + mylink[LENPPS] = ""; /* just a default device */
> +#endif /* PPS_HAVE_FINDPATH */
> char device[20];
>
> /*
> @@ -201,7 +208,20 @@
> #else
> return (0);
> #endif
> - }
> + } else {
> + struct serial_struct ss;
> + if (ioctl(fd, TIOCGSERIAL, &ss) < 0 ||
> + (
> + ss.flags |= ASYNC_HARDPPS_CD,
> + ioctl(fd, TIOCSSERIAL, &ss)) < 0) {
> + msyslog(LOG_NOTICE, "refclock_nmea: TIOCSSERIAL fd %d, %m", fd);
> + msyslog(LOG_NOTICE,
> + "refclock_nmea: optional PPS processing not available");
> + } else {
> + msyslog(LOG_INFO,
> + "refclock_nmea: PPS detection on");
> + }
> + }
You should use "setserial" here. Keep in mind that the PPS source
could be _not_ connected with the serial line at all.
> /*
> * Allocate and initialize unit structure
> @@ -238,12 +258,26 @@
> * Start the PPSAPI interface if it is there. Default to use
> * the assert edge and do not enable the kernel hardpps.
> */
> +#ifdef PPS_HAVE_FINDPATH
> + /* Get the PPS source's real name */
> + //time_pps_readlink(mylink, LENPPS, path, LENPPS);
Remove unneeded code.
> + time_pps_readlink(device, LENPPS, path, LENPPS);
Test the return value (see the wiki at
http://wiki.enneenne.com/index.php/LinuxPPS_support#How_to_modify_a_refclock_to_work_with_LinuxPPS).
> + /* Try to find the source */
> + fd = time_pps_findpath(path, LENPPS, id, LENPPS);
> + if (fd < 0) {
> + msyslog(LOG_ERR, "refclock_nmea: cannot find PPS path \"%s\" in the system", path);
> + return (0);
> + }
> + msyslog(LOG_INFO, "refclock_nmea: found PPS source \"%s\" at id #%d on \"%s\"", path, fd, id);
> +#endif /* PPS_HAVE_FINDPATH */
> if (time_pps_create(fd, &up->handle) < 0) {
> - up->handle = 0;
> + up->handle_created = 0;
> msyslog(LOG_ERR,
> "refclock_nmea: time_pps_create failed: %m");
> return (1);
> }
> + up->handle_created = ~0;
> return(nmea_ppsapi(peer, 0, 0));
> #else
> return (1);
> @@ -265,8 +299,10 @@
> pp = peer->procptr;
> up = (struct nmeaunit *)pp->unitptr;
> #ifdef HAVE_PPSAPI
> - if (up->handle != 0)
> + if (up->handle_created) {
> time_pps_destroy(up->handle);
> + up->handle_created = 0;
> + }
> #endif /* HAVE_PPSAPI */
> io_closeclock(&pp->io);
> free(up);
> @@ -374,7 +410,7 @@
> /*
> * Convert the timespec nanoseconds field to ntp l_fp units.
> */
> - if (up->handle == 0)
> + if (!up->handle_created)
> return (0);
> timeout.tv_sec = 0;
> timeout.tv_nsec = 0;
Please, rewiev and test the code and I'll publish it.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 9:31 ` Rodolfo Giometti
@ 2007-03-14 13:19 ` Lennart Sorensen
2007-03-14 14:06 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-14 13:19 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 10:31:46AM +0100, Rodolfo Giometti wrote:
> On Tue, Mar 13, 2007 at 06:48:17PM -0400, Lennart Sorensen wrote:
> >
> > I have tried out 3.0.0-rc2 which seems to work pretty well so far (when
>
> Thanks. I just posted to the linux kernel ML the last release
> 3.0.0. Maybe you can do a "git pull" and try it out. :)
I will grab the last couple of commits and try although they didn't
sound like they really make much difference.
> > combined with the patches to the jsm driver I just posted). It took soe
> > work to get ntp's refclock_nmea to work though, since the patch that is
> > linked to from the linuxpps page seems out of date. Here is the patch
> > that seems to be working for me, although I am still testing it. Given
> > you know the linuxpps code better perhaps you can see if it looks sane
> > to you.
> >
> > --- ntpd/refclock_nmea.c.ori 2007-03-13 18:38:01.000000000 -0400
> > +++ ntpd/refclock_nmea.c 2007-03-13 18:44:47.000000000 -0400
> > @@ -79,6 +79,7 @@
> > #define RANGEGATE 500000 /* range gate (ns) */
> >
> > #define LENNMEA 75 /* min timecode length */
> > +#define LENPPS PPS_MAX_NAME_LEN
> >
> > /*
> > * Tables to compute the ddd of year form icky dd/mm timecode. Viva la
> > @@ -99,6 +100,7 @@
> > pps_params_t pps_params; /* pps parameters */
> > pps_info_t pps_info; /* last pps data */
> > pps_handle_t handle; /* pps handlebars */
> > + int handle_created; /* pps handle created flag */
> > #endif /* HAVE_PPSAPI */
> > };
> >
> > @@ -147,6 +149,11 @@
> > register struct nmeaunit *up;
> > struct refclockproc *pp;
> > int fd;
> > +#ifdef PPS_HAVE_FINDPATH
> > + char id[LENPPS] = "",
> > + path[LENPPS],
> > + mylink[LENPPS] = ""; /* just a default device */
> > +#endif /* PPS_HAVE_FINDPATH */
> > char device[20];
> >
> > /*
> > @@ -201,7 +208,20 @@
> > #else
> > return (0);
> > #endif
> > - }
> > + } else {
> > + struct serial_struct ss;
> > + if (ioctl(fd, TIOCGSERIAL, &ss) < 0 ||
> > + (
> > + ss.flags |= ASYNC_HARDPPS_CD,
> > + ioctl(fd, TIOCSSERIAL, &ss)) < 0) {
> > + msyslog(LOG_NOTICE, "refclock_nmea: TIOCSSERIAL fd %d, %m", fd);
> > + msyslog(LOG_NOTICE,
> > + "refclock_nmea: optional PPS processing not available");
> > + } else {
> > + msyslog(LOG_INFO,
> > + "refclock_nmea: PPS detection on");
> > + }
> > + }
>
> You should use "setserial" here. Keep in mind that the PPS source
> could be _not_ connected with the serial line at all.
I couldn't find any way to do that with setserial (at least not the
version I have), and I would rather not have to install setserial just
to do that. Which version of setserial is needed and what arguments
does it need to do it?
If it is NOT connected to the same device, then how would you specify
it? The ntp configuration is rather sparse when it comes to specifying
anything and seems to rely in symlinks to hardcoded device names for
finding everything. I suppose one could have gps# for the nmea messages
and pps# for the associated pps device name symlink (which may point
to something that doesn't even exist if there is an internal source of
that name with no associated device). Does that seem reasonable? I can
certainly change it to do that. Certainly refclock_atom already uses
/dev/pps# as it's device, so using that again may be reasonable.
> > /*
> > * Allocate and initialize unit structure
> > @@ -238,12 +258,26 @@
> > * Start the PPSAPI interface if it is there. Default to use
> > * the assert edge and do not enable the kernel hardpps.
> > */
> > +#ifdef PPS_HAVE_FINDPATH
> > + /* Get the PPS source's real name */
> > + //time_pps_readlink(mylink, LENPPS, path, LENPPS);
>
> Remove unneeded code.
Oops. Missed that one. I was changing it to the below line to reuse
the same serial device already specified for the NMEA messages.
I actually find the way it determines the pps device a bit annoying.
Right now I have to do this:
cd /dev
ln -s ttyn0 jsm0
ln -s jsm0 gps0
This way gps0 is the symlink the ntp refclock looks for when asked for
device 0, and readlink turns that into jsm0 (since the internal driver
name for ttyn0 is jsm, that is what the pps code insists it must be
named), which then is another symlink to the real device name. Same for
ttyS3 <- serial3 <- gps0. Now it would be nice if the internal driver
name matched the device name, but apparently that really never seems to
happen. Is all this symlink spagheti really necesary?
> > + time_pps_readlink(device, LENPPS, path, LENPPS);
>
> Test the return value (see the wiki at
> http://wiki.enneenne.com/index.php/LinuxPPS_support#How_to_modify_a_refclock_to_work_with_LinuxPPS).
OK, I will do that too. Apparently the current refclock_nmea patch
fails that too then.
> > + /* Try to find the source */
> > + fd = time_pps_findpath(path, LENPPS, id, LENPPS);
> > + if (fd < 0) {
> > + msyslog(LOG_ERR, "refclock_nmea: cannot find PPS path \"%s\" in the system", path);
> > + return (0);
> > + }
> > + msyslog(LOG_INFO, "refclock_nmea: found PPS source \"%s\" at id #%d on \"%s\"", path, fd, id);
> > +#endif /* PPS_HAVE_FINDPATH */
> > if (time_pps_create(fd, &up->handle) < 0) {
> > - up->handle = 0;
> > + up->handle_created = 0;
> > msyslog(LOG_ERR,
> > "refclock_nmea: time_pps_create failed: %m");
> > return (1);
> > }
> > + up->handle_created = ~0;
> > return(nmea_ppsapi(peer, 0, 0));
> > #else
> > return (1);
> > @@ -265,8 +299,10 @@
> > pp = peer->procptr;
> > up = (struct nmeaunit *)pp->unitptr;
> > #ifdef HAVE_PPSAPI
> > - if (up->handle != 0)
> > + if (up->handle_created) {
> > time_pps_destroy(up->handle);
> > + up->handle_created = 0;
> > + }
> > #endif /* HAVE_PPSAPI */
> > io_closeclock(&pp->io);
> > free(up);
> > @@ -374,7 +410,7 @@
> > /*
> > * Convert the timespec nanoseconds field to ntp l_fp units.
> > */
> > - if (up->handle == 0)
> > + if (!up->handle_created)
> > return (0);
> > timeout.tv_sec = 0;
> > timeout.tv_nsec = 0;
>
> Please, rewiev and test the code and I'll publish it.
Will do.
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 13:19 ` Lennart Sorensen
@ 2007-03-14 14:06 ` Rodolfo Giometti
2007-03-14 14:12 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-14 14:06 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 09:19:34AM -0400, Lennart Sorensen wrote:
>
> I will grab the last couple of commits and try although they didn't
> sound like they really make much difference.
Some fixes up... see the git log for further info.
> I couldn't find any way to do that with setserial (at least not the
> version I have), and I would rather not have to install setserial just
> to do that. Which version of setserial is needed and what arguments
> does it need to do it?
Unluckely you need a patched version of setserial (see the patch on my
site). On the same site you can find a precompiled version which I use
for my tests, maybe it works for you...
> If it is NOT connected to the same device, then how would you specify
> it? The ntp configuration is rather sparse when it comes to specifying
> anything and seems to rely in symlinks to hardcoded device names for
> finding everything. I suppose one could have gps# for the nmea messages
> and pps# for the associated pps device name symlink (which may point
> to something that doesn't even exist if there is an internal source of
> that name with no associated device). Does that seem reasonable? I can
> certainly change it to do that. Certainly refclock_atom already uses
> /dev/pps# as it's device, so using that again may be reasonable.
This is a specific problem of NTPD not of LinuxPPS itself. I wrote
some letters about this problem into NTP list but with no results.
The sysadm shoulkd use setserial to enable a serial port to become a
PPS source and then NTPD should verify if such PPS source exists
(using time_pps_findpath() & Co.).
> I actually find the way it determines the pps device a bit annoying.
> Right now I have to do this:
>
> cd /dev
> ln -s ttyn0 jsm0
> ln -s jsm0 gps0
>
> This way gps0 is the symlink the ntp refclock looks for when asked for
> device 0, and readlink turns that into jsm0 (since the internal driver
> name for ttyn0 is jsm, that is what the pps code insists it must be
> named), which then is another symlink to the real device name. Same for
> ttyS3 <- serial3 <- gps0. Now it would be nice if the internal driver
> name matched the device name, but apparently that really never seems to
> happen. Is all this symlink spagheti really necesary?
Did you read this example on the wiki?
giometti@jeeg:~/linuxpps$ cat /sys/class/pps/01/name
serial1
giometti@jeeg:~/linuxpps$ cat /sys/class/pps/01/path
/dev/ttyS1
giometti at jeeg:~/linuxpps/test$ sudo ln -sf /dev/ttyS1 /dev/gps0
giometti at jeeg:~/linuxpps/test$ sudo ./ppstest /dev/gps0
found PPS source #2 "serial1" on "/dev/ttyS1"
giometti at jeeg:~/linuxpps/test$ sudo ln -sf ktimer /dev/gps0
giometti at jeeg:~/linuxpps/test$ sudo ./ppstest /dev/gps0
found PPS source #0 "ktimer" on ""
it doesn't work for you?
> Will do.
Thanks a lot,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 14:06 ` Rodolfo Giometti
@ 2007-03-14 14:12 ` Lennart Sorensen
2007-03-14 14:27 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-14 14:12 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 03:06:23PM +0100, Rodolfo Giometti wrote:
> Some fixes up... see the git log for further info.
I looked at those, and they didn't sound important. I will grab it
anyhow just for completeness.
> Unluckely you need a patched version of setserial (see the patch on my
> site). On the same site you can find a precompiled version which I use
> for my tests, maybe it works for you...
OK, that explains why it wasn't in setserial's code.
> This is a specific problem of NTPD not of LinuxPPS itself. I wrote
> some letters about this problem into NTP list but with no results.
>
> The sysadm shoulkd use setserial to enable a serial port to become a
> PPS source and then NTPD should verify if such PPS source exists
> (using time_pps_findpath() & Co.).
Well I think I may just write a small tool to do the ioctl to enable it
so I don't need the full setserial around.
> Did you read this example on the wiki?
>
> giometti@jeeg:~/linuxpps$ cat /sys/class/pps/01/name
> serial1
> giometti@jeeg:~/linuxpps$ cat /sys/class/pps/01/path
> /dev/ttyS1
> giometti at jeeg:~/linuxpps/test$ sudo ln -sf /dev/ttyS1 /dev/gps0
> giometti at jeeg:~/linuxpps/test$ sudo ./ppstest /dev/gps0
> found PPS source #2 "serial1" on "/dev/ttyS1"
> giometti at jeeg:~/linuxpps/test$ sudo ln -sf ktimer /dev/gps0
> giometti at jeeg:~/linuxpps/test$ sudo ./ppstest /dev/gps0
> found PPS source #0 "ktimer" on ""
>
> it doesn't work for you?
I will have to try that again to be sure. I may have got myself
confused when I first tried it. One symlink I can deal with (that's
ntpd sillyness after all).
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 14:12 ` Lennart Sorensen
@ 2007-03-14 14:27 ` Rodolfo Giometti
2007-03-14 14:42 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-14 14:27 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 10:12:53AM -0400, Lennart Sorensen wrote:
>
> I looked at those, and they didn't sound important. I will grab it
> anyhow just for completeness.
Ok! Thanks.
> Well I think I may just write a small tool to do the ioctl to enable it
> so I don't need the full setserial around.
Yes, this could be a good solution while waiting for a new setserial.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 14:27 ` Rodolfo Giometti
@ 2007-03-14 14:42 ` Lennart Sorensen
2007-03-14 14:52 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-14 14:42 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 03:27:12PM +0100, Rodolfo Giometti wrote:
> Ok! Thanks.
>
> Yes, this could be a good solution while waiting for a new setserial.
Now you said to check the return value of time_pps_readlink. Well it
returns void so that isn't much good, and the stuff the wiki says to do,
appears to be done internally by the function. So I guess that means I
should undo that change so that I can actually get ntpd to compile
again.
If the call was to readlink directly it needs to be done, while your
time_pps_readlink is just a handy wrapper that does all that for you,
right?
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 14:42 ` Lennart Sorensen
@ 2007-03-14 14:52 ` Rodolfo Giometti
2007-03-14 15:37 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-14 14:52 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 10:42:51AM -0400, Lennart Sorensen wrote:
>
> Now you said to check the return value of time_pps_readlink. Well it
I refere to readlink(), not to time_pps_readlink(). I'm sorry for
mistake.
> If the call was to readlink directly it needs to be done, while your
> time_pps_readlink is just a handy wrapper that does all that for you,
> right?
Right.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 14:52 ` Rodolfo Giometti
@ 2007-03-14 15:37 ` Lennart Sorensen
2007-03-14 15:47 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-14 15:37 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
Well here is my current version of the refclock_nmea.c.patch for
LinuxPPS. It now uses /dev/gps# for the nmea messages and /dev/pps# for
the PPS device (which in my case is of course the same device). I am
running some more tests on it, but I think it is OK.
--- refclock_nmea.c.ori 2007-03-14 11:24:14.000000000 -0400
+++ refclock_nmea.c 2007-03-14 11:31:04.000000000 -0400
@@ -69,6 +69,7 @@
# define DEVICE "COM%d:" /* COM 1 - 3 supported */
#else
# define DEVICE "/dev/gps%d" /* name of radio device */
+# define PPSDEVICE "/dev/pps%d" /* name of pps device */
#endif
#define SPEED232 B4800 /* uart speed (4800 bps) */
#define PRECISION (-9) /* precision assumed (about 2 ms) */
@@ -79,6 +80,7 @@
#define RANGEGATE 500000 /* range gate (ns) */
#define LENNMEA 75 /* min timecode length */
+#define LENPPS PPS_MAX_NAME_LEN
/*
* Tables to compute the ddd of year form icky dd/mm timecode. Viva la
@@ -99,6 +101,7 @@
pps_params_t pps_params; /* pps parameters */
pps_info_t pps_info; /* last pps data */
pps_handle_t handle; /* pps handlebars */
+ int handle_created; /* pps handle created flag */
#endif /* HAVE_PPSAPI */
};
@@ -147,6 +150,11 @@
register struct nmeaunit *up;
struct refclockproc *pp;
int fd;
+#ifdef PPS_HAVE_FINDPATH
+ char id[LENPPS] = "",
+ path[LENPPS],
+ ppsdevice[LENPPS] = ""; /* just a default device */
+#endif /* PPS_HAVE_FINDPATH */
char device[20];
/*
@@ -238,12 +246,26 @@
* Start the PPSAPI interface if it is there. Default to use
* the assert edge and do not enable the kernel hardpps.
*/
+#ifdef PPS_HAVE_FINDPATH
+ /* Get the PPS source's real name */
+ (void)sprintf(ppsdevice, PPSDEVICE, unit);
+ time_pps_readlink(ppsdevice, LENPPS, path, LENPPS);
+
+ /* Try to find the source */
+ fd = time_pps_findpath(path, LENPPS, id, LENPPS);
+ if (fd < 0) {
+ msyslog(LOG_ERR, "refclock_nmea: cannot find PPS path \"%s\" in the system", path);
+ return (0);
+ }
+ msyslog(LOG_INFO, "refclock_nmea: found PPS source \"%s\" at id #%d on \"%s\"", path, fd, id);
+#endif /* PPS_HAVE_FINDPATH */
if (time_pps_create(fd, &up->handle) < 0) {
- up->handle = 0;
+ up->handle_created = 0;
msyslog(LOG_ERR,
"refclock_nmea: time_pps_create failed: %m");
return (1);
}
+ up->handle_created = ~0;
return(nmea_ppsapi(peer, 0, 0));
#else
return (1);
@@ -265,8 +287,10 @@
pp = peer->procptr;
up = (struct nmeaunit *)pp->unitptr;
#ifdef HAVE_PPSAPI
- if (up->handle != 0)
+ if (up->handle_created) {
time_pps_destroy(up->handle);
+ up->handle_created = 0;
+ }
#endif /* HAVE_PPSAPI */
io_closeclock(&pp->io);
free(up);
@@ -374,7 +398,7 @@
/*
* Convert the timespec nanoseconds field to ntp l_fp units.
*/
- if (up->handle == 0)
+ if (!up->handle_created)
return (0);
timeout.tv_sec = 0;
timeout.tv_nsec = 0;
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 15:37 ` Lennart Sorensen
@ 2007-03-14 15:47 ` Rodolfo Giometti
2007-03-14 20:57 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-14 15:47 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 11:37:05AM -0400, Lennart Sorensen wrote:
> Well here is my current version of the refclock_nmea.c.patch for
> LinuxPPS. It now uses /dev/gps# for the nmea messages and /dev/pps# for
> the PPS device (which in my case is of course the same device). I am
> running some more tests on it, but I think it is OK.
Thanks, published. :)
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 15:47 ` Rodolfo Giometti
@ 2007-03-14 20:57 ` Lennart Sorensen
2007-03-15 10:29 ` Rodolfo Giometti
0 siblings, 1 reply; 32+ messages in thread
From: Lennart Sorensen @ 2007-03-14 20:57 UTC (permalink / raw)
To: Rodolfo Giometti
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
On Wed, Mar 14, 2007 at 04:47:32PM +0100, Rodolfo Giometti wrote:
> On Wed, Mar 14, 2007 at 11:37:05AM -0400, Lennart Sorensen wrote:
> > Well here is my current version of the refclock_nmea.c.patch for
> > LinuxPPS. It now uses /dev/gps# for the nmea messages and /dev/pps# for
> > the PPS device (which in my case is of course the same device). I am
> > running some more tests on it, but I think it is OK.
>
> Thanks, published. :)
Well it does work for our GPS receiver at least. Of course I have to
change the baud rate in the driver since our unit doens't use the NNEA
standard 4800. And the configure script for ntp doesn't recognize the
v2 PPSAPI, so I have to manually explain to it that I have the PPS API
and it should actually include it.
Here is my utility for enabling PPS on my serial port now. Seems less
of a pain that patching setserial and including that (with 256MB flash
space, setserial seems wasteful).
ppsctl.c
--------
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
#include <string.h>
#include <linux/serial.h>
void usage(char *name) {
fprintf(stderr,"Usage: %s /dev/port [0|1]\n",name);
fprintf(stderr,"Where 0 means disable PPS and 1 means enable PPS\n");
}
int main(int argc, char *argv[]) {
int fd;
char *state;
if(argc<3) {
usage(argv[0]);
return 1;
}
fd = open(argv[1],O_RDWR);
if (fd>=0) {
struct serial_struct ss;
if (ioctl(fd, TIOCGSERIAL, &ss) < 0 ) {
perror("TIOCGSERIAL");
return 1;
} else {
if(strcmp(argv[2],"1")==0) {
ss.flags |= ASYNC_HARDPPS_CD;
state="enabled";
} else if(strcmp(argv[2],"0")==0) {
ss.flags &= ~ASYNC_HARDPPS_CD;
state="disabled";
} else {
fprintf(stderr,"Invalid state argument \"%s\"\n",argv[2]);
return 1;
}
if (ioctl(fd, TIOCSSERIAL, &ss) < 0) {
perror("TIOCSSERIAL");
} else {
fprintf(stderr,"PPS on %s is now %s\n",argv[1],state);
}
}
} else {
fprintf(stderr,"Can't open \"%s\":",argv[1]);
perror("");
}
return 0;
}
/* vim:ts=4:shiftwidth=4:
* */
--
Len Sorensen
^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux
2007-03-14 20:57 ` Lennart Sorensen
@ 2007-03-15 10:29 ` Rodolfo Giometti
2007-03-15 15:18 ` Lennart Sorensen
0 siblings, 1 reply; 32+ messages in thread
From: Rodolfo Giometti @ 2007-03-15 10:29 UTC (permalink / raw)
To: Lennart Sorensen
Cc: linux-kernel, linuxpps, Russell King, Jan Dittmer, Pavel Machek
[-- Attachment #1: Type: text/plain, Size: 1168 bytes --]
On Wed, Mar 14, 2007 at 04:57:32PM -0400, Lennart Sorensen wrote:
>
> Well it does work for our GPS receiver at least. Of course I have to
> change the baud rate in the driver since our unit doens't use the NNEA
> standard 4800. And the configure script for ntp doesn't recognize the
> v2 PPSAPI, so I have to manually explain to it that I have the PPS API
> and it should actually include it.
Can you please provide a little help about it? A patch against current
wiki wuold be great! ;)
> Here is my utility for enabling PPS on my serial port now. Seems less
> of a pain that patching setserial and including that (with 256MB flash
> space, setserial seems wasteful).
I modify your code add inquiry functionality. Can you please test it?
See http://ftp.enneenne.com/pub/misc/linuxpps/test/ and the wiki at
http://wiki.enneenne.com/index.php/LinuxPPS_support#Compiling_the_code.
Ciao,
Rodolfo
--
GNU/Linux Solutions e-mail: giometti@enneenne.com
Linux Device Driver giometti@gnudd.com
Embedded Systems giometti@linux.it
UNIX programming phone: +39 349 2432127
[-- Attachment #2: ppsctl.c --]
[-- Type: text/x-csrc, Size: 1213 bytes --]
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
#include <linux/serial.h>
void usage(char *name)
{
fprintf(stderr, "usage: %s <ttyS> [enable|disable]\n", name);
exit(EXIT_FAILURE);
}
int main(int argc, char *argv[])
{
int fd, ret;
struct serial_struct ss;
if (argc < 2)
usage(argv[0]);
fd = open(argv[1], O_RDWR);
if (fd < 0) {
perror("open");
exit(EXIT_FAILURE);
}
ret = ioctl(fd, TIOCGSERIAL, &ss);
if (ret < 0 ) {
perror("ioctl(TIOCGSERIAL)");
exit(EXIT_FAILURE);
}
if (argc < 3) { /* just read PPS status */
printf("PPS is %sabled\n",
ss.flags & ASYNC_HARDPPS_CD ? "en" : "dis");
exit(EXIT_SUCCESS);
}
if (argv[2][0] == 'e' || argv[2][0] == '1')
ss.flags |= ASYNC_HARDPPS_CD;
else if (argv[2][0] == 'd' || argv[2][0] == '0')
ss.flags &= ~ASYNC_HARDPPS_CD;
else {
fprintf(stderr, "invalid state argument \"%s\"\n", argv[2]);
exit(EXIT_FAILURE);
}
ret = ioctl(fd, TIOCSSERIAL, &ss);
if (ret < 0) {
perror("ioctl(TIOCSSERIAL)");
exit(EXIT_FAILURE);
}
return 0;
}
^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2007-03-15 15:36 UTC | newest]
Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-16 18:52 [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux Rodolfo Giometti
2007-02-16 19:12 ` Russell King
2007-02-16 20:43 ` Rodolfo Giometti
2007-02-16 20:51 ` Russell King
2007-02-16 21:03 ` Rodolfo Giometti
2007-02-16 19:56 ` Jan Dittmer
2007-02-16 20:57 ` Rodolfo Giometti
2007-02-16 21:19 ` Jan Dittmer
2007-02-18 22:43 ` LinuxPPS: fixes Rodolfo Giometti
2007-02-20 2:56 ` [PATCH 1/1] LinuxPPS: Pulse per Second support for Linux H. Peter Anvin
2007-02-21 12:04 ` Rodolfo Giometti
2007-02-21 16:14 ` H. Peter Anvin
2007-02-22 8:51 ` Rodolfo Giometti
2007-02-21 23:51 ` Roman Zippel
2007-02-22 9:00 ` Rodolfo Giometti
2007-02-21 10:16 ` Pavel Machek
2007-02-22 9:59 ` Rodolfo Giometti
2007-03-13 21:38 ` Rodolfo Giometti
2007-03-13 22:48 ` Lennart Sorensen
2007-03-14 9:31 ` Rodolfo Giometti
2007-03-14 13:19 ` Lennart Sorensen
2007-03-14 14:06 ` Rodolfo Giometti
2007-03-14 14:12 ` Lennart Sorensen
2007-03-14 14:27 ` Rodolfo Giometti
2007-03-14 14:42 ` Lennart Sorensen
2007-03-14 14:52 ` Rodolfo Giometti
2007-03-14 15:37 ` Lennart Sorensen
2007-03-14 15:47 ` Rodolfo Giometti
2007-03-14 20:57 ` Lennart Sorensen
2007-03-15 10:29 ` Rodolfo Giometti
2007-03-15 15:18 ` Lennart Sorensen
2007-03-15 15:37 ` Rodolfo Giometti
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.