Merge commit 'v2.6.34-rc6' into core/locking

7 files changed, 316 insertions, 0 deletions

diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index cc2eb8edb514..1afe4e03440f 100644
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -30,4 +30,6 @@ config PPS_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
index 19ea582f431d..98960ddd3188 100644
--- a/drivers/pps/Makefile
+++ b/drivers/pps/Makefile
@@ -4,5 +4,6 @@
 
 pps_core-y                      := pps.o kapi.o sysfs.o
 obj-$(CONFIG_PPS)               := pps_core.o
+obj-y                           += clients/
 
 ccflags-$(CONFIG_PPS_DEBUG) := -DDEBUG
diff --git a/drivers/pps/clients/Kconfig b/drivers/pps/clients/Kconfig
new file mode 100644
index 000000000000..4e801bd7254f
--- /dev/null
+++ b/drivers/pps/clients/Kconfig
@@ -0,0 +1,25 @@
+#
+# PPS 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 pps-ktimer.
+
+config PPS_CLIENT_LDISC
+        tristate "PPS line discipline"
+        depends on PPS
+        help
+          If you say yes here you get support for a PPS source connected
+          with the CD (Carrier Detect) pin of your serial port.
+
+endif
diff --git a/drivers/pps/clients/Makefile b/drivers/pps/clients/Makefile
new file mode 100644
index 000000000000..812c9b19b430
--- /dev/null
+++ b/drivers/pps/clients/Makefile
@@ -0,0 +1,10 @@
+#
+# Makefile for PPS clients.
+#
+
+obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o
+obj-$(CONFIG_PPS_CLIENT_LDISC)  += pps-ldisc.o
+
+ifeq ($(CONFIG_PPS_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/drivers/pps/clients/pps-ktimer.c b/drivers/pps/clients/pps-ktimer.c
new file mode 100644
index 000000000000..e7ef5b8186d0
--- /dev/null
+++ b/drivers/pps/clients/pps-ktimer.c
@@ -0,0 +1,123 @@
+/*
+ * pps-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/pps_kernel.h>
+
+/*
+ * Global variables
+ */
+
+static int source;
+static struct timer_list ktimer;
+
+/*
+ * The kernel timer
+ */
+
+static void pps_ktimer_event(unsigned long ptr)
+{
+        struct timespec __ts;
+        struct pps_ktime ts;
+
+        /* First of all we get the time stamp... */
+        getnstimeofday(&__ts);
+
+        pr_info("PPS event at %lu\n", jiffies);
+
+        /* ... and translate it to PPS time data struct */
+        ts.sec = __ts.tv_sec;
+        ts.nsec = __ts.tv_nsec;
+
+        pps_event(source, &ts, PPS_CAPTUREASSERT, NULL);
+
+        mod_timer(&ktimer, jiffies + HZ);
+}
+
+/*
+ * The echo function
+ */
+
+static void pps_ktimer_echo(int source, int event, void *data)
+{
+        pr_info("echo %s %s for source %d\n",
+                event & PPS_CAPTUREASSERT ? "assert" : "",
+                event & PPS_CAPTURECLEAR ? "clear" : "",
+                source);
+}
+
+/*
+ * The PPS info struct
+ */
+
+static struct pps_source_info pps_ktimer_info = {
+        .name           = "ktimer",
+        .path           = "",
+        .mode           = PPS_CAPTUREASSERT | PPS_OFFSETASSERT |
+                          PPS_ECHOASSERT |
+                          PPS_CANWAIT | PPS_TSFMT_TSPEC,
+        .echo           = pps_ktimer_echo,
+        .owner          = THIS_MODULE,
+};
+
+/*
+ * Module staff
+ */
+
+static void __exit pps_ktimer_exit(void)
+{
+        del_timer_sync(&ktimer);
+        pps_unregister_source(source);
+
+        pr_info("ktimer PPS source unregistered\n");
+}
+
+static int __init pps_ktimer_init(void)
+{
+        int ret;
+
+        ret = pps_register_source(&pps_ktimer_info,
+                                PPS_CAPTUREASSERT | PPS_OFFSETASSERT);
+        if (ret < 0) {
+                printk(KERN_ERR "cannot register ktimer source\n");
+                return ret;
+        }
+        source = ret;
+
+        setup_timer(&ktimer, pps_ktimer_event, 0);
+        mod_timer(&ktimer, jiffies + HZ);
+
+        pr_info("ktimer PPS source registered at %d\n", source);
+
+        return  0;
+}
+
+module_init(pps_ktimer_init);
+module_exit(pps_ktimer_exit);
+
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("dummy PPS source by using a kernel timer (just for debug)");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/clients/pps-ldisc.c b/drivers/pps/clients/pps-ldisc.c
new file mode 100644
index 000000000000..8e1932d29fd4
--- /dev/null
+++ b/drivers/pps/clients/pps-ldisc.c
@@ -0,0 +1,154 @@
+/*
+ * pps-ldisc.c -- PPS line discipline
+ *
+ *
+ * Copyright (C) 2008   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/module.h>
+#include <linux/serial_core.h>
+#include <linux/tty.h>
+#include <linux/pps_kernel.h>
+
+#define PPS_TTY_MAGIC           0x0001
+
+static void pps_tty_dcd_change(struct tty_struct *tty, unsigned int status,
+                                struct timespec *ts)
+{
+        int id = (long)tty->disc_data;
+        struct timespec __ts;
+        struct pps_ktime pps_ts;
+
+        /* First of all we get the time stamp... */
+        getnstimeofday(&__ts);
+
+        /* Does caller give us a timestamp? */
+        if (ts) {       /* Yes. Let's use it! */
+                pps_ts.sec = ts->tv_sec;
+                pps_ts.nsec = ts->tv_nsec;
+        } else {        /* No. Do it ourself! */
+                pps_ts.sec = __ts.tv_sec;
+                pps_ts.nsec = __ts.tv_nsec;
+        }
+
+        /* Now do the PPS event report */
+        pps_event(id, &pps_ts, status ? PPS_CAPTUREASSERT : PPS_CAPTURECLEAR,
+                        NULL);
+
+        pr_debug("PPS %s at %lu on source #%d\n",
+                        status ? "assert" : "clear", jiffies, id);
+}
+
+static int (*alias_n_tty_open)(struct tty_struct *tty);
+
+static int pps_tty_open(struct tty_struct *tty)
+{
+        struct pps_source_info info;
+        struct tty_driver *drv = tty->driver;
+        int index = tty->index + drv->name_base;
+        int ret;
+
+        info.owner = THIS_MODULE;
+        info.dev = NULL;
+        snprintf(info.name, PPS_MAX_NAME_LEN, "%s%d", drv->driver_name, index);
+        snprintf(info.path, PPS_MAX_NAME_LEN, "/dev/%s%d", drv->name, index);
+        info.mode = PPS_CAPTUREBOTH | \
+                        PPS_OFFSETASSERT | PPS_OFFSETCLEAR | \
+                        PPS_CANWAIT | PPS_TSFMT_TSPEC;
+
+        ret = pps_register_source(&info, PPS_CAPTUREBOTH | \
+                                PPS_OFFSETASSERT | PPS_OFFSETCLEAR);
+        if (ret < 0) {
+                pr_err("cannot register PPS source \"%s\"\n", info.path);
+                return ret;
+        }
+        tty->disc_data = (void *)(long)ret;
+
+        /* Should open N_TTY ldisc too */
+        ret = alias_n_tty_open(tty);
+        if (ret < 0)
+                pps_unregister_source((long)tty->disc_data);
+
+        pr_info("PPS source #%d \"%s\" added\n", ret, info.path);
+
+        return 0;
+}
+
+static void (*alias_n_tty_close)(struct tty_struct *tty);
+
+static void pps_tty_close(struct tty_struct *tty)
+{
+        int id = (long)tty->disc_data;
+
+        pps_unregister_source(id);
+        alias_n_tty_close(tty);
+
+        pr_info("PPS source #%d removed\n", id);
+}
+
+static struct tty_ldisc_ops pps_ldisc_ops;
+
+/*
+ * Module stuff
+ */
+
+static int __init pps_tty_init(void)
+{
+        int err;
+
+        /* Inherit the N_TTY's ops */
+        n_tty_inherit_ops(&pps_ldisc_ops);
+
+        /* Save N_TTY's open()/close() methods */
+        alias_n_tty_open = pps_ldisc_ops.open;
+        alias_n_tty_close = pps_ldisc_ops.close;
+
+        /* Init PPS_TTY data */
+        pps_ldisc_ops.owner = THIS_MODULE;
+        pps_ldisc_ops.magic = PPS_TTY_MAGIC;
+        pps_ldisc_ops.name = "pps_tty";
+        pps_ldisc_ops.dcd_change = pps_tty_dcd_change;
+        pps_ldisc_ops.open = pps_tty_open;
+        pps_ldisc_ops.close = pps_tty_close;
+
+        err = tty_register_ldisc(N_PPS, &pps_ldisc_ops);
+        if (err)
+                pr_err("can't register PPS line discipline\n");
+        else
+                pr_info("PPS line discipline registered\n");
+
+        return err;
+}
+
+static void __exit pps_tty_cleanup(void)
+{
+        int err;
+
+        err = tty_unregister_ldisc(N_PPS);
+        if (err)
+                pr_err("can't unregister PPS line discipline\n");
+        else
+                pr_info("PPS line discipline removed\n");
+}
+
+module_init(pps_tty_init);
+module_exit(pps_tty_cleanup);
+
+MODULE_ALIAS_LDISC(N_PPS);
+MODULE_AUTHOR("Rodolfo Giometti <giometti@linux.it>");
+MODULE_DESCRIPTION("PPS TTY device driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c
index 2d414e23d390..1aa02db3ff4e 100644
--- a/drivers/pps/kapi.c
+++ b/drivers/pps/kapi.c
@@ -29,6 +29,7 @@
 #include <linux/idr.h>
 #include <linux/fs.h>
 #include <linux/pps_kernel.h>
+#include <linux/slab.h>
 
 /*
  * Global variables