(version 3) LinuxPPS new functionalities
This patchset adds several PPS functionalities.
All patches have a specific comment but I prefer say something more:
* Patches 01-02 are just documentation about PPS support.
* Patch 03 adds PPS client support skeleton.
* Patches 04-06 add generic PPS serial support (with specific modifications requested by Alan Cox).
* Patches 07-08 add PPS serial support for specific hardware.
Changelog:
V3 -> V2
* On patch 01:
- client name moved to pps-ktimer.
- not needed continuation characters removed.
- typos fix up.
V2 -> V1
* Old patches 01-02 removed due related to userland code and then managed elsewhere.
* char: n_tty.c: documentation in kerneldoc form added.
* pps: pps-ldisc: avoid using global functions over in n_tty.c
Ciao,
Rodolfo
--
b/Documentation/serial/tty.txt | 4 b/drivers/char/n_tty.c | 17 ++++ b/drivers/pps/Kconfig | 2 b/drivers/pps/Makefile | 1 b/drivers/pps/clients/Kconfig | 18 ++++ b/drivers/pps/clients/Makefile | 9 ++ b/drivers/pps/clients/pps-ktimer.c | 123 +++++++++++++++++++++++++++++ b/drivers/pps/clients/pps-ldisc.c | 154 +++++++++++++++++++++++++++++++++++++ b/drivers/serial/8250.c | 16 +++ b/drivers/serial/amba-pl010.c | 15 +++ b/include/linux/serial_core.h | 11 ++ b/include/linux/tty.h | 1 b/include/linux/tty_ldisc.h | 8 + drivers/pps/clients/Kconfig | 7 + drivers/pps/clients/Makefile | 1 15 files changed, 386 insertions(+), 1 deletion(-)
PATCH 1/6 pps: LinuxPPS clients support.
Each PPS source can be registered/deregistered into the system by using special modules called "clients". They simply define the PPS sources' attributes and implement the time signal registartion mechanism.
This patch adds a special directory for such clients and adds a dummy client that can be useful to test system integrity on real systems.
--- drivers/pps/Kconfig | 2 + drivers/pps/Makefile | 1 + drivers/pps/clients/Kconfig | 18 ++++++ drivers/pps/clients/Makefile | 9 +++ drivers/pps/clients/pps-ktimer.c | 123 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 153 insertions(+), 0 deletions(-) create mode 100644 drivers/pps/clients/Kconfig create mode 100644 drivers/pps/clients/Makefile create mode 100644 drivers/pps/clients/pps-ktimer.c
drivers/pps/Kconfig +2 -0
@@ -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
drivers/pps/Makefile +1 -0
@@ -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
drivers/pps/clients/Kconfig new file +18 -0
@@ -0,0 +1,18 @@ +# +# 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. + +endif
drivers/pps/clients/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# +# Makefile for PPS clients. +# + +obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o + +ifeq ($(CONFIG_PPS_DEBUG),y) +EXTRA_CFLAGS += -DDEBUG +endif
drivers/pps/clients/pps-ktimer.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 2/6 ldisc: new dcd_change() method for line disciplines.
--- Documentation/serial/tty.txt | 4 ++++ include/linux/tty_ldisc.h | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)
Documentation/serial/tty.txt +4 -0
@@ -105,6 +105,10 @@ write_wakeup() - May be called at any point between open and close. is permitted to call the driver write method from this function. In such a situation defer it. +dcd_change() - Report to the tty line the current DCD pin status + changes and the relative timestamp. The timestamp + can be NULL. + Driver Access
include/linux/tty_ldisc.h +8 -0
@@ -99,6 +99,12 @@* cease I/O to the tty driver. Can sleep. The driver should * seek to perform this action quickly but should wait until * any pending driver I/O is completed. +* +* void (*dcd_change)(struct tty_struct *tty, unsigned int status, +* struct timespec *ts) +* +* Tells the discipline that the DCD pin has changed its status and +* the relative timestamp. Pointer ts can be NULL. */ #include <linux/fs.h>
@@ -136,6 +142,8 @@ struct tty_ldisc_ops {void (*receive_buf)(struct tty_struct *,const unsigned char *cp,char *fp,int count);void (*write_wakeup)(struct tty_struct *); +void (*dcd_change)(struct tty_struct *,unsigned int , +struct timespec *);struct module *owner;
Signature · 1 line
1.6.3.3
PATCH 3/6 ldisc n_tty: add new method n_tty_inherit_ops()
This new method can be used to init a new struct tty_ldisc_ops as the default tty_ldisc_N_TTY struct.
--- drivers/char/n_tty.c | 17 +++++++++++++++++ include/linux/tty.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-)
drivers/char/n_tty.c +17 -0
@@ -48,6 +48,7 @@#include <linux/audit.h> #include <linux/file.h> #include <linux/uaccess.h> +#include <linux/module.h> #include <asm/system.h>
@@ -2091,3 +2092,19 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = { .receive_buf = n_tty_receive_buf, .write_wakeup = n_tty_write_wakeup }; + +/** +* n_tty_inherit_ops - inherit N_TTY methods +* @ops: struct tty_ldisc_ops where to save N_TTY methods +* +* Used by a generic struct tty_ldisc_ops to easily inherit N_TTY +* methods. +*/ + +void n_tty_inherit_ops (struct tty_ldisc_ops *ops) +{ + *ops = tty_ldisc_N_TTY; + ops->owner =NULL ; + ops->refcount = ops->flags =0 ; +} +EXPORT_SYMBOL_GPL (n_tty_inherit_ops);
include/linux/tty.h +1 -0
@@ -504,6 +504,7 @@ extern void tty_ldisc_enable(struct tty_struct *tty);/* n_tty.c */ extern struct tty_ldisc_ops tty_ldisc_N_TTY; +extern void n_tty_inherit_ops (struct tty_ldisc_ops *ops);/* tty_audit.c */ #ifdef CONFIG_AUDIT
Signature · 1 line
1.6.3.3
PATCH 4/6 pps: serial clients support.
Adds support, by using the PPS line discipline, for the PPS sources connected with the CD (Carrier Detect) pin of a serial port.
--- drivers/pps/clients/Kconfig | 7 ++ drivers/pps/clients/Makefile | 1 + drivers/pps/clients/pps-ldisc.c | 154 +++++++++++++++++++++++++++++++++++++++ include/linux/serial_core.h | 11 +++- 4 files changed, 172 insertions(+), 1 deletions(-) create mode 100644 drivers/pps/clients/pps-ldisc.c
drivers/pps/clients/Kconfig +7 -0
@@ -15,4 +15,11 @@ config PPS_CLIENT_KTIMER 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
drivers/pps/clients/Makefile +1 -0
@@ -3,6 +3,7 @@ # obj-$(CONFIG_PPS_CLIENT_KTIMER) += pps-ktimer.o +obj-$(CONFIG_PPS_CLIENT_LDISC) += pps-ldisc.o ifeq ($(CONFIG_PPS_DEBUG),y) EXTRA_CFLAGS += -DDEBUG
drivers/pps/clients/pps-ldisc.c new file +154 -0
154 lines not on this page · raw message
include/linux/serial_core.h +10 -1
@@ -491,9 +491,13 @@ uart_handle_dcd_change(struct uart_port *uport, unsigned int status) {struct uart_state *state = uport->state;struct tty_port *port = &state->port; +struct tty_ldisc *ld =tty_ldisc_ref (port->tty); +struct timespec ts; - uport->icount.dcd++; +if (ld && ld->ops->dcd_change) +getnstimeofday (&ts); + uport->icount.dcd++;#ifdef CONFIG_HARD_PPS if ((uport->flags &UPF_HARDPPS_CD ) && status)hardpps ();
@@ -505,6 +509,11 @@ uart_handle_dcd_change(struct uart_port *uport, unsigned int status)else if (port->tty)tty_hangup (port->tty); } + +if (ld && ld->ops->dcd_change) + ld->ops->dcd_change (port->tty, status, &ts); +if (ld) +tty_ldisc_deref (ld); }/**
Signature · 1 line
1.6.3.3
PATCH 5/6 serial 8250: enable PPS support.
Automagically function serial8250_enable_ms() is called when PPS ldisc is selected.
--- drivers/serial/8250.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-)
drivers/serial/8250.c +16 -0
@@ -2413,6 +2413,21 @@ serial8250_set_termios(struct uart_port *port, struct ktermios *termios, }static void +serial8250_set_ldisc (struct uart_port *port) +{ +int line = port->line; + +if (line >= port->state->port.tty->driver->num) +return ; + +if (port->state->port.tty->ldisc->ops->num ==N_PPS ) { + port->flags |=UPF_HARDPPS_CD ; +serial8250_enable_ms (port); + }else + port->flags &= ~UPF_HARDPPS_CD ; +} + +static void serial8250_pm (struct uart_port *port,unsigned int state,unsigned int oldstate) {
@@ -2626,6 +2641,7 @@ static struct uart_ops serial8250_pops = { .startup = serial8250_startup, .shutdown = serial8250_shutdown, .set_termios = serial8250_set_termios, + .set_ldisc = serial8250_set_ldisc, .pm = serial8250_pm, .type = serial8250_type, .release_port = serial8250_release_port,
Signature · 1 line
1.6.3.3
PATCH 6/6 serial amba-pl010: enable PPS support.
Function pl010_enable_ms() is automagically called when PPS ldisc is selected.
--- drivers/serial/amba-pl010.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-)
drivers/serial/amba-pl010.c +15 -0
@@ -471,6 +471,20 @@ pl010_set_termios(struct uart_port *port, struct ktermios *termios,spin_unlock_irqrestore (&uap->port.lock, flags); } +static void pl010_set_ldisc (struct uart_port *port) +{ +int line = port->line; + +if (line >= port->state->port.tty->driver->num) +return ; + +if (port->state->port.tty->ldisc->ops->num ==N_PPS ) { + port->flags |=UPF_HARDPPS_CD ; +pl010_enable_ms (port); + }else + port->flags &= ~UPF_HARDPPS_CD ; +} +static const char *pl010_type (struct uart_port *port) {return port->type ==PORT_AMBA ?"AMBA" :NULL ;
@@ -531,6 +545,7 @@ static struct uart_ops amba_pl010_pops = { .startup = pl010_startup, .shutdown = pl010_shutdown, .set_termios = pl010_set_termios, + .set_ldisc = pl010_set_ldisc, .type = pl010_type, .release_port = pl010_release_port, .request_port = pl010_request_port,
Signature · 1 line
1.6.3.3