Skip to contentSkip to conversation

staging: speakup: migrate synths to use TTY-based comms

PATCH Superseded Okash Khawaja 2 participants 11 messages Apr 29, 2017 – May 15, 2017

Subsystems (2)
Staging TTY layer and serial drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Okash Khawaja

author
#0 lore raw

cover staging: speakup: migrate synths to use TTY-based comms

author
#1 lore raw

PATCH 1/6 staging: speakup: make input functionality swappable

This moves functions which take input from external synth, into struct spk_io_ops. The calling code then uses serial implementation of those methods through spk_io_ops. That way we can add a parallel TTY-based implementation and simply replace serial with TTY. That is what the next patch in this series does.

speakup_decext.c has get_last_char function which reads the most recent available character from the synth. This patch changes that by defining read_buff_add callback method of spk_syth and letting that update the last_char global character read from the synth. read_buff_add is called from ISR, so there is a possibility for last_char to be stale. Therefore it is marked as volatile. It also pulls a repeated get_index implementation into synth.c, to be used as a utility function.

Signed-off-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>
drivers/staging/speakup/serialio.c +6 -4
Index: linux-staging/drivers/staging/speakup/serialio.c
===================================================================
@@ -28,11 +28,15 @@ static int timeouts;
 static int spk_serial_out(struct spk_synth *in_synth, const char ch);
 static void spk_serial_send_xchar(char ch);
 static void spk_serial_tiocmset(unsigned int set, unsigned int clear);
+static unsigned char spk_serial_in(void);
+static unsigned char spk_serial_in_nowait(void);
 
 struct spk_io_ops spk_serial_io_ops = {
 	.synth_out = spk_serial_out,
 	.send_xchar = spk_serial_send_xchar,
 	.tiocmset = spk_serial_tiocmset,
+	.synth_in = spk_serial_in,
+	.synth_in_nowait = spk_serial_in_nowait,
 };
 EXPORT_SYMBOL_GPL(spk_serial_io_ops);
 

@@ -240,7 +244,7 @@ int spk_wait_for_xmitr(struct spk_synth
 	return 1;
 }
 
-unsigned char spk_serial_in(void)
+static unsigned char spk_serial_in(void)
 {
 	int tmout = SPK_SERIAL_TIMEOUT;
 

@@ -253,9 +257,8 @@ unsigned char spk_serial_in(void)
 	}
 	return inb_p(speakup_info.port_tts + UART_RX);
 }
-EXPORT_SYMBOL_GPL(spk_serial_in);
 
-unsigned char spk_serial_in_nowait(void)
+static unsigned char spk_serial_in_nowait(void)
 {
 	unsigned char lsr;
 

@@ -264,7 +267,6 @@ unsigned char spk_serial_in_nowait(void)
 		return 0;
 	return inb_p(speakup_info.port_tts + UART_RX);
 }
-EXPORT_SYMBOL_GPL(spk_serial_in_nowait);
 
 static int spk_serial_out(struct spk_synth *in_synth, const char ch)
 {
drivers/staging/speakup/speakup_audptr.c +2 -2
Index: linux-staging/drivers/staging/speakup/speakup_audptr.c
===================================================================
@@ -138,11 +138,11 @@ static void synth_version(struct spk_syn
 	char synth_id[40] = "";
 
 	synth->synth_immediate(synth, "\x05[Q]");
-	synth_id[test] = spk_serial_in();
+	synth_id[test] = synth->io_ops->synth_in();
 	if (synth_id[test] == 'A') {
 		do {
 			/* read version string from synth */
-			synth_id[++test] = spk_serial_in();
+			synth_id[++test] = synth->io_ops->synth_in();
 		} while (synth_id[test] != '\n' && test < 32);
 		synth_id[++test] = 0x00;
 	}
drivers/staging/speakup/speakup_dectlk.c +2 -2
Index: linux-staging/drivers/staging/speakup/speakup_dectlk.c
===================================================================
@@ -42,7 +42,7 @@ static inline int synth_full(void)
 static void do_catch_up(struct spk_synth *synth);
 static void synth_flush(struct spk_synth *synth);
 static void read_buff_add(u_char c);
-static unsigned char get_index(void);
+static unsigned char get_index(struct spk_synth *synth);
 
 static int in_escape;
 static int is_flushing;

@@ -163,7 +163,7 @@ static int is_indnum(u_char *ch)
 
 static u_char lastind;
 
-static unsigned char get_index(void)
+static unsigned char get_index(struct spk_synth *synth)
 {
 	u_char rv;
drivers/staging/speakup/spk_priv.h +1 -2
Index: linux-staging/drivers/staging/speakup/spk_priv.h
===================================================================
@@ -43,8 +43,6 @@
 const struct old_serial_port *spk_serial_init(int index);
 void spk_stop_serial_interrupt(void);
 int spk_wait_for_xmitr(struct spk_synth *in_synth);
-unsigned char spk_serial_in(void);
-unsigned char spk_serial_in_nowait(void);
 void spk_serial_release(void);
 
 void synth_buffer_skip_nonlatin1(void);

@@ -61,6 +59,7 @@ int spk_serial_synth_probe(struct spk_sy
 const char *spk_serial_synth_immediate(struct spk_synth *synth, const char *buff);
 void spk_do_catch_up(struct spk_synth *synth);
 void spk_synth_flush(struct spk_synth *synth);
+unsigned char spk_synth_get_index(struct spk_synth *synth);
 int spk_synth_is_alive_nop(struct spk_synth *synth);
 int spk_synth_is_alive_restart(struct spk_synth *synth);
 __printf(1, 2)
drivers/staging/speakup/spk_types.h +3 -1
Index: linux-staging/drivers/staging/speakup/spk_types.h
===================================================================
@@ -152,6 +152,8 @@ struct spk_io_ops {
 	int (*synth_out)(struct spk_synth *synth, const char ch);
 	void (*send_xchar)(char ch);
 	void (*tiocmset)(unsigned int set, unsigned int clear);
+	unsigned char (*synth_in)(void);
+	unsigned char (*synth_in_nowait)(void);
 };
 
 struct spk_synth {

@@ -182,7 +184,7 @@ struct spk_synth {
 	int (*is_alive)(struct spk_synth *synth);
 	int (*synth_adjust)(struct st_var_header *var);
 	void (*read_buff_add)(u_char);
-	unsigned char (*get_index)(void);
+	unsigned char (*get_index)(struct spk_synth *synth);
 	struct synth_indexing indexing;
 	int alive;
 	struct attribute_group attributes;
drivers/staging/speakup/speakup_decext.c +5 -9
Index: linux-staging/drivers/staging/speakup/speakup_decext.c
===================================================================
@@ -30,20 +30,16 @@
 #define DRV_VERSION "2.14"
 #define SYNTH_CLEAR 0x03
 #define PROCSPEECH 0x0b
-static unsigned char last_char;
+static volatile unsigned char last_char;
 
-static inline u_char get_last_char(void)
+static void read_buff_add(u_char ch)
 {
-	u_char avail = inb_p(speakup_info.port_tts + UART_LSR) & UART_LSR_DR;
-
-	if (avail)
-		last_char = inb_p(speakup_info.port_tts + UART_RX);
-	return last_char;
+	last_char = ch;
 }
 
 static inline bool synth_full(void)
 {
-	return get_last_char() == 0x13;
+	return last_char == 0x13;
 }
 
 static void do_catch_up(struct spk_synth *synth);

@@ -135,7 +131,7 @@ static struct spk_synth synth_decext = {
 	.flush = synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
 	.synth_adjust = NULL,
-	.read_buff_add = NULL,
+	.read_buff_add = read_buff_add,
 	.get_index = NULL,
 	.indexing = {
 		.command = NULL,
drivers/staging/speakup/speakup_dtlk.c +1 -1
Index: linux-staging/drivers/staging/speakup/speakup_dtlk.c
===================================================================
@@ -138,7 +138,7 @@ static struct spk_synth synth_dtlk = {
 	.is_alive = spk_synth_is_alive_nop,
 	.synth_adjust = NULL,
 	.read_buff_add = NULL,
-	.get_index = spk_serial_in_nowait,
+	.get_index = spk_synth_get_index,
 	.indexing = {
 		.command = "\x01%di",
 		.lowindex = 1,
drivers/staging/speakup/speakup_ltlk.c +2 -2
Index: linux-staging/drivers/staging/speakup/speakup_ltlk.c
===================================================================
@@ -120,7 +120,7 @@ static struct spk_synth synth_ltlk = {
 	.is_alive = spk_synth_is_alive_restart,
 	.synth_adjust = NULL,
 	.read_buff_add = NULL,
-	.get_index = spk_serial_in_nowait,
+	.get_index = spk_synth_get_index,
 	.indexing = {
 		.command = "\x01%di",
 		.lowindex = 1,

@@ -141,7 +141,7 @@ static void synth_interrogate(struct spk
 
 	synth->synth_immediate(synth, "\x18\x01?");
 	for (i = 0; i < 50; i++) {
-		buf[i] = spk_serial_in();
+		buf[i] = synth->io_ops->synth_in();
 		if (i > 2 && buf[i] == 0x7f)
 			break;
 	}
drivers/staging/speakup/speakup_soft.c +2 -2
Index: linux-staging/drivers/staging/speakup/speakup_soft.c
===================================================================
@@ -36,7 +36,7 @@
 static int softsynth_probe(struct spk_synth *synth);
 static void softsynth_release(void);
 static int softsynth_is_alive(struct spk_synth *synth);
-static unsigned char get_index(void);
+static unsigned char get_index(struct spk_synth *synth);
 
 static struct miscdevice synth_device, synthu_device;
 static int init_pos;

@@ -340,7 +340,7 @@ static unsigned int softsynth_poll(struc
 	return ret;
 }
 
-static unsigned char get_index(void)
+static unsigned char get_index(struct spk_synth *synth)
 {
 	int rv;
drivers/staging/speakup/speakup_spkout.c +1 -1
Index: linux-staging/drivers/staging/speakup/speakup_spkout.c
===================================================================
@@ -111,7 +111,7 @@ static struct spk_synth synth_spkout = {
 	.is_alive = spk_synth_is_alive_restart,
 	.synth_adjust = NULL,
 	.read_buff_add = NULL,
-	.get_index = spk_serial_in_nowait,
+	.get_index = spk_synth_get_index,
 	.indexing = {
 		.command = "\x05[%c",
 		.lowindex = 1,
drivers/staging/speakup/synth.c +8 -2
Index: linux-staging/drivers/staging/speakup/synth.c
===================================================================
@@ -124,6 +124,12 @@ void spk_synth_flush(struct spk_synth *s
 }
 EXPORT_SYMBOL_GPL(spk_synth_flush);
 
+unsigned char spk_synth_get_index(struct spk_synth *synth)
+{
+	return synth->io_ops->synth_in_nowait();
+}
+EXPORT_SYMBOL_GPL(spk_synth_get_index);
+
 int spk_synth_is_alive_nop(struct spk_synth *synth)
 {
 	synth->alive = 1;

@@ -249,7 +255,7 @@ void spk_reset_index_count(int sc)
 	if (first)
 		first = 0;
 	else
-		synth->get_index();
+		synth->get_index(synth);
 	index_count = 0;
 	sentence_count = sc;
 }

@@ -282,7 +288,7 @@ void synth_insert_next_index(int sent_nu
 
 void spk_get_index_count(int *linecount, int *sentcount)
 {
-	int ind = synth->get_index();
+	int ind = synth->get_index(synth);
 
 	if (ind) {
 		sentence_count = ind % 10;
author
#2 lore raw

PATCH 2/6 tty: export tty_open_by_driver

In reply to Okash Khawaja

This applies on top of the changes already in staging-next branch which allow kernel access to TTY dev.

Signe-doff-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>
drivers/tty/tty_io.c +7 -3
Index: linux-staging/drivers/tty/tty_io.c
===================================================================
@@ -1369,7 +1369,10 @@ static struct tty_struct *tty_driver_loo
 	struct tty_struct *tty;
 
 	if (driver->ops->lookup)
-		tty = driver->ops->lookup(driver, file, idx);
+		if (!file)
+			tty = ERR_PTR(-EIO);
+		else
+			tty = driver->ops->lookup(driver, file, idx);
 	else
 		tty = driver->ttys[idx];
 

@@ -2001,7 +2004,7 @@ static struct tty_driver *tty_lookup_dri
 		struct tty_driver *console_driver = console_device(index);
 		if (console_driver) {
 			driver = tty_driver_kref_get(console_driver);
-			if (driver) {
+			if (driver && filp) {
 				/* Don't let /dev/console block */
 				filp->f_flags |= O_NONBLOCK;
 				break;

@@ -2034,7 +2037,7 @@ static struct tty_driver *tty_lookup_dri
  *	  - concurrent tty driver removal w/ lookup
  *	  - concurrent tty removal from driver table
  */
-static struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
+struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
 					     struct file *filp)
 {
 	struct tty_struct *tty;

@@ -2079,6 +2082,7 @@ out:
 	tty_driver_kref_put(driver);
 	return tty;
 }
+EXPORT_SYMBOL(tty_open_by_driver);
 
 /**
  *	tty_open		-	open a tty device
include/linux/tty.h +2 -0
Index: linux-staging/include/linux/tty.h
===================================================================
@@ -401,6 +401,8 @@ extern struct tty_struct *get_current_tt
 /* tty_io.c */
 extern int __init tty_init(void);
 extern const char *tty_name(const struct tty_struct *tty);
+extern struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
+		struct file *filp);
 #else
 static inline void console_init(void)
 { }
author
#6 lore raw

PATCH 3/6 staging: speakup: add tty-based comms functions

In reply to Okash Khawaja

This adds spk_ttyio.c file. It contains a set of functions which implement those methods in spk_synth struct which relate to sending bytes out using serial comms. Implementations in this file perform the same function but using TTY subsystem instead. Currently synths access serial ports, directly poking standard ISA ports by trying to steal them from serial driver. Some ISA cards actually need this way of doing it, but most other synthesizers don't, and can actually work by using the proper TTY subsystem through a new N_SPEAKUP line discipline. So this adds the methods for drivers to switch to accessing serial ports through the TTY subsystem, whenever appropriate.

Signed-off-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>
drivers/staging/speakup/Makefile +1 -0
Index: linux-staging/drivers/staging/speakup/Makefile
===================================================================
@@ -25,6 +25,7 @@ speakup-y := \
 	kobjects.o \
 	selection.o \
 	serialio.o \
+	spk_ttyio.o \
 	synth.o \
 	thread.o \
 	varhandlers.o
drivers/staging/speakup/spk_priv.h +4 -0
Index: linux-staging/drivers/staging/speakup/spk_priv.h
===================================================================
@@ -44,6 +44,7 @@ const struct old_serial_port *spk_serial
 void spk_stop_serial_interrupt(void);
 int spk_wait_for_xmitr(struct spk_synth *in_synth);
 void spk_serial_release(void);
+void spk_ttyio_release(void);
 
 void synth_buffer_skip_nonlatin1(void);
 u16 synth_buffer_getc(void);

@@ -56,7 +57,9 @@ ssize_t spk_var_store(struct kobject *ko
 		      const char *buf, size_t count);
 
 int spk_serial_synth_probe(struct spk_synth *synth);
+int spk_ttyio_synth_probe(struct spk_synth *synth);
 const char *spk_serial_synth_immediate(struct spk_synth *synth, const char *buff);
+const char *spk_ttyio_synth_immediate(struct spk_synth *synth, const char *buff);
 void spk_do_catch_up(struct spk_synth *synth);
 void spk_synth_flush(struct spk_synth *synth);
 unsigned char spk_synth_get_index(struct spk_synth *synth);

@@ -78,5 +81,6 @@ extern struct speakup_info_t speakup_inf
 extern struct var_t synth_time_vars[];
 
 extern struct spk_io_ops spk_serial_io_ops;
+extern struct spk_io_ops spk_ttyio_ops;
 
 #endif
drivers/staging/speakup/spk_ttyio.c new file +143 -0

143 lines not on this page · raw message

drivers/tty/tty_ldisc.c +2 -0
Index: linux-staging/drivers/tty/tty_ldisc.c
===================================================================
@@ -556,6 +556,7 @@ err:
 	tty_unlock(tty);
 	return retval;
 }
+EXPORT_SYMBOL(tty_set_ldisc);
 
 /**
  *	tty_ldisc_kill	-	teardown ldisc

@@ -744,6 +745,7 @@ void tty_ldisc_release(struct tty_struct
 
 	tty_ldisc_debug(tty, "released\n");
 }
+EXPORT_SYMBOL(tty_ldisc_release);
 
 /**
  *	tty_ldisc_init		-	ldisc setup for new tty
include/uapi/linux/tty.h +1 -0
Index: linux-staging/include/uapi/linux/tty.h
===================================================================
@@ -35,5 +35,6 @@
 #define N_TRACESINK	23	/* Trace data routing for MIPI P1149.7 */
 #define N_TRACEROUTER	24	/* Trace data routing for MIPI P1149.7 */
 #define N_NCI		25	/* NFC NCI UART */
+#define N_SPEAKUP	26	/* Speakup communication with synths*/
 
 #endif /* _UAPI_LINUX_TTY_H */
author
#7 lore raw

PATCH 4/6 staging: speakup: migrate acntsa, bns, dummy and txprt to ttyio

In reply to Okash Khawaja

This changes the above five synths to TTY-based comms. They were chosen as a first pass because their serial comms are straightforward, i.e. they don't use serial input and don't do internal port knocking.

Signed-off-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>
drivers/staging/speakup/speakup_dummy.c +4 -4
Index: linux-staging/drivers/staging/speakup/speakup_dummy.c
===================================================================
@@ -98,10 +98,10 @@ static struct spk_synth synth_dummy = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
drivers/staging/speakup/speakup_acntsa.c +4 -4
Index: linux-staging/drivers/staging/speakup/speakup_acntsa.c
===================================================================
@@ -99,10 +99,10 @@ static struct spk_synth synth_acntsa = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
+	.io_ops = &spk_ttyio_ops,
 	.probe = synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
 	.is_alive = spk_synth_is_alive_restart,

@@ -125,7 +125,7 @@ static int synth_probe(struct spk_synth
 {
 	int failed;
 
-	failed = spk_serial_synth_probe(synth);
+	failed = spk_ttyio_synth_probe(synth);
 	if (failed == 0) {
 		synth->synth_immediate(synth, "\033=R\r");
 		mdelay(100);
drivers/staging/speakup/speakup_txprt.c +4 -4
Index: linux-staging/drivers/staging/speakup/speakup_txprt.c
===================================================================
@@ -95,10 +95,10 @@ static struct spk_synth synth_txprt = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
author
#8 lore raw

PATCH 5/6 staging: speakup: add send_xchar, tiocmset and input functionality for tty

In reply to Okash Khawaja

This patch adds further TTY-based functionality, specifically implementation of send_xchar and tiocmset methods, and input. send_xchar and tiocmset methods simply delegate to corresponding TTY operations.

For input, it implements the receive_buf2 callback in tty_ldisc_ops of speakup's ldisc. If a synth defines read_buff_add method then receive_buf2 simply delegates to that and returns.

For spk_ttyio_in, the data is passed from receive_buf2 thread to spk_ttyio_in thread through spk_ldisc_data structure. It has following members:

- char buf: represents data received
- struct semaphore sem: used to signal to spk_ttyio_in thread that data is available to be read without having to busy wait
- bool buf_free: this is used in comination with mb() calls to syncronise the two threads over buf

receive_buf2 only writes to buf if buf_free is true. The check for buf_free and writing to buf are separated by mb() to ensure that spk_ttyio_in has read buf before receive_buf2 writes to it. After writing, it ups the semaphore to signal to spk_ttyio_in that there is now data to read.

spk_ttyio_in waits for data to read by downing the semaphore. Thus when signalled by receive_buf2 thread above, it reads from buf and sets buf_free to true. These two operations are separated by mb() to ensure that receive_buf2 thread finds buf_free to be true only after buf has been read. After that spk_ttyio_in calls tty_schedule_flip for subsequent data to come in through receive_buf2.

Signed-off-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>
drivers/staging/speakup/spk_ttyio.c +107 -0
Index: linux-staging/drivers/staging/speakup/spk_ttyio.c
===================================================================
@@ -1,36 +1,97 @@
 #include <linux/types.h>
 #include <linux/tty.h>
+#include <linux/tty_flip.h>
+#include <linux/slab.h>
 
 #include "speakup.h"
 #include "spk_types.h"
+#include "spk_priv.h"
 
+struct spk_ldisc_data {
+	char buf;
+	struct semaphore sem;
+	bool buf_free;
+};
+
+static struct spk_synth *spk_ttyio_synth;
 static struct tty_struct *speakup_tty;
 
 static int spk_ttyio_ldisc_open(struct tty_struct *tty)
 {
+	struct spk_ldisc_data *ldisc_data;
+
 	if (tty->ops->write == NULL)
 		return -EOPNOTSUPP;
 	speakup_tty = tty;
 
+	ldisc_data = kmalloc(sizeof(struct spk_ldisc_data), GFP_KERNEL);
+	if (!ldisc_data) {
+		pr_err("speakup: Failed to allocate ldisc_data.\n");
+		return -ENOMEM;
+	}
+
+	sema_init(&ldisc_data->sem, 0);
+	ldisc_data->buf_free = true;
+	speakup_tty->disc_data = ldisc_data;
+
 	return 0;
 }
 
 static void spk_ttyio_ldisc_close(struct tty_struct *tty)
 {
+	kfree(speakup_tty->disc_data);
 	speakup_tty = NULL;
 }
 
+static int spk_ttyio_receive_buf2(struct tty_struct *tty,
+		const unsigned char *cp, char *fp, int count)
+{
+	struct spk_ldisc_data *ldisc_data = tty->disc_data;
+
+	if (spk_ttyio_synth->read_buff_add) {
+		int i;
+		for (i = 0; i < count; i++)
+			spk_ttyio_synth->read_buff_add(cp[i]);
+
+		return count;
+	}
+
+	if (!ldisc_data->buf_free)
+		/* ttyio_in will tty_schedule_flip */
+		return 0;
+
+	/* Make sure the consumer has read buf before we have seen
+         * buf_free == true and overwrite buf */
+	mb();
+
+	ldisc_data->buf = cp[0];
+	ldisc_data->buf_free = false;
+	up(&ldisc_data->sem);
+
+	return 1;
+}
+
 static struct tty_ldisc_ops spk_ttyio_ldisc_ops = {
 	.owner          = THIS_MODULE,
 	.magic          = TTY_LDISC_MAGIC,
 	.name           = "speakup_ldisc",
 	.open           = spk_ttyio_ldisc_open,
 	.close          = spk_ttyio_ldisc_close,
+	.receive_buf2	= spk_ttyio_receive_buf2,
 };
 
 static int spk_ttyio_out(struct spk_synth *in_synth, const char ch);
+static void spk_ttyio_send_xchar(char ch);
+static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear);
+static unsigned char spk_ttyio_in(void);
+static unsigned char spk_ttyio_in_nowait(void);
+
 struct spk_io_ops spk_ttyio_ops = {
 	.synth_out = spk_ttyio_out,
+	.send_xchar = spk_ttyio_send_xchar,
+	.tiocmset = spk_ttyio_tiocmset,
+	.synth_in = spk_ttyio_in,
+	.synth_in_nowait = spk_ttyio_in_nowait,
 };
 EXPORT_SYMBOL_GPL(spk_ttyio_ops);
 

@@ -95,6 +156,51 @@
 	return 0;
 }
 
+static void spk_ttyio_send_xchar(char ch)
+{
+	speakup_tty->ops->send_xchar(speakup_tty, ch);
+}
+
+static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear)
+{
+	speakup_tty->ops->tiocmset(speakup_tty, set, clear);
+}
+
+static unsigned char ttyio_in(int timeout)
+{
+	struct spk_ldisc_data *ldisc_data = speakup_tty->disc_data;
+	char rv;
+
+	if (down_timeout(&ldisc_data->sem, usecs_to_jiffies(timeout)) == -ETIME) {
+		if (timeout)
+			pr_warn("spk_ttyio: timeout (%d)  while waiting for input\n",
+				timeout);
+		return 0xff;
+	}
+
+	rv = ldisc_data->buf;
+	/* Make sure we have read buf before we set buf_free to let
+	 * the producer overwrite it */
+	mb();
+	ldisc_data->buf_free = true;
+	/* Let TTY push more characters */
+	tty_schedule_flip(speakup_tty->port);
+
+	return rv;
+}
+
+static unsigned char spk_ttyio_in(void)
+{
+	return ttyio_in(SPK_SYNTH_TIMEOUT);
+}
+
+static unsigned char spk_ttyio_in_nowait(void)
+{
+	char rv = ttyio_in(0);
+
+	return (rv == 0xff) ? 0 : rv;
+}
+
 int spk_ttyio_synth_probe(struct spk_synth *synth)
 {
 	int rv = spk_ttyio_initialise_ldisc(synth->ser);

@@ -103,6 +209,7 @@
 		return rv;
 
 	synth->alive = 1;
+	spk_ttyio_synth = synth;
 
 	return 0;
 }
drivers/staging/speakup/serialio.h +3 -1
Index: linux-staging/drivers/staging/speakup/serialio.h
===================================================================
@@ -8,6 +8,8 @@
 #endif
 #include <linux/serial_core.h>
 
+#include "spk_priv.h"
+
 /*
  * this is cut&paste from 8250.h. Get rid of the structure, the definitions
  * and this whole broken driver.

@@ -21,7 +23,7 @@
 };
 
 /* countdown values for serial timeouts in us */
-#define SPK_SERIAL_TIMEOUT 100000
+#define SPK_SERIAL_TIMEOUT SPK_SYNTH_TIMEOUT
 /* countdown values transmitter/dsr timeouts in us */
 #define SPK_XMITR_TIMEOUT 100000
 /* countdown values cts timeouts in us */
drivers/staging/speakup/spk_priv.h +1 -0
Index: linux-staging/drivers/staging/speakup/spk_priv.h
===================================================================
@@ -39,6 +39,7 @@
 #endif
 
 #define KT_SPKUP 15
+#define SPK_SYNTH_TIMEOUT 100000 /* in micro-seconds */
 
 const struct old_serial_port *spk_serial_init(int index);
 void spk_stop_serial_interrupt(void);
author
#9 lore raw

PATCH 6/6 staging: speakup: migrate apollo, ltlk, audptr, decext, dectlk and spkout

In reply to Okash Khawaja

This patch simply uses the changes introduced in previous patches and migrates apollo, ltlk, audptr, decext, spkout and dectlk. Migrations are straightforward function pointer updates.

Signed-off by: Okash Khawaja <[email protected]>

Reviewed-by Samuel Thibault <[email protected]>
drivers/staging/speakup/speakup_apollo.c +5 -5
Index: linux-staging/drivers/staging/speakup/speakup_apollo.c
===================================================================
@@ -22,9 +22,9 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/kthread.h>
+#include <linux/serial_reg.h>	/* for UART_MCR* constants */
 
 #include "spk_priv.h"
-#include "serialio.h"
 #include "speakup.h"
 
 #define DRV_VERSION "2.21"

@@ -108,10 +108,10 @@ static struct spk_synth synth_apollo = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = spk_synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
drivers/staging/speakup/speakup_ltlk.c +4 -5
Index: linux-staging/drivers/staging/speakup/speakup_ltlk.c
===================================================================
@@ -20,7 +20,6 @@
  */
 #include "speakup.h"
 #include "spk_priv.h"
-#include "serialio.h"
 #include "speakup_dtlk.h" /* local header file for LiteTalk values */
 
 #define DRV_VERSION "2.11"

@@ -111,10 +110,10 @@ static struct spk_synth synth_ltlk = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
+	.io_ops = &spk_ttyio_ops,
 	.probe = synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = spk_synth_flush,
 	.is_alive = spk_synth_is_alive_restart,

@@ -159,7 +158,7 @@ static int synth_probe(struct spk_synth
 {
 	int failed = 0;
 
-	failed = spk_serial_synth_probe(synth);
+	failed = spk_ttyio_synth_probe(synth);
 	if (failed == 0)
 		synth_interrogate(synth);
 	synth->alive = !failed;
drivers/staging/speakup/speakup_audptr.c +4 -5
Index: linux-staging/drivers/staging/speakup/speakup_audptr.c
===================================================================
@@ -20,7 +20,6 @@
  */
 #include "spk_priv.h"
 #include "speakup.h"
-#include "serialio.h"
 
 #define DRV_VERSION "2.11"
 #define SYNTH_CLEAR 0x18 /* flush synth buffer */

@@ -104,10 +103,10 @@ static struct spk_synth synth_audptr = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
+	.io_ops = &spk_ttyio_ops,
 	.probe = synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = synth_flush,
 	.is_alive = spk_synth_is_alive_restart,

@@ -154,7 +153,7 @@ static int synth_probe(struct spk_synth
 {
 	int failed;
 
-	failed = spk_serial_synth_probe(synth);
+	failed = spk_ttyio_synth_probe(synth);
 	if (failed == 0)
 		synth_version(synth);
 	synth->alive = !failed;
drivers/staging/speakup/speakup_decext.c +5 -5
Index: linux-staging/drivers/staging/speakup/speakup_decext.c
===================================================================
@@ -24,12 +24,12 @@
 #include <linux/kthread.h>
 
 #include "spk_priv.h"
-#include "serialio.h"
 #include "speakup.h"
 
 #define DRV_VERSION "2.14"
 #define SYNTH_CLEAR 0x03
 #define PROCSPEECH 0x0b
+
 static volatile unsigned char last_char;
 
 static void read_buff_add(u_char ch)

@@ -123,10 +123,10 @@ static struct spk_synth synth_decext = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
drivers/staging/speakup/speakup_spkout.c +4 -5
Index: linux-staging/drivers/staging/speakup/speakup_spkout.c
===================================================================
@@ -20,7 +20,6 @@
  */
 #include "spk_priv.h"
 #include "speakup.h"
-#include "serialio.h"
 
 #define DRV_VERSION "2.11"
 #define SYNTH_CLEAR 0x18

@@ -102,10 +101,10 @@ static struct spk_synth synth_spkout = {
 	.startup = SYNTH_START,
 	.checkval = SYNTH_CHECK,
 	.vars = vars,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = spk_do_catch_up,
 	.flush = synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
drivers/staging/speakup/speakup_dectlk.c +4 -5
Index: linux-staging/drivers/staging/speakup/speakup_dectlk.c
===================================================================
@@ -27,7 +27,6 @@
 #include <linux/kthread.h>
 #include "speakup.h"
 #include "spk_priv.h"
-#include "serialio.h"
 
 #define DRV_VERSION "2.20"
 #define SYNTH_CLEAR 0x03

@@ -130,10 +129,10 @@ static struct spk_synth synth_dectlk = {
 	.vars = vars,
 	.default_pitch = ap_defaults,
 	.default_vol = g5_defaults,
-	.io_ops = &spk_serial_io_ops,
-	.probe = spk_serial_synth_probe,
-	.release = spk_serial_release,
-	.synth_immediate = spk_serial_synth_immediate,
+	.io_ops = &spk_ttyio_ops,
+	.probe = spk_ttyio_synth_probe,
+	.release = spk_ttyio_release,
+	.synth_immediate = spk_ttyio_synth_immediate,
 	.catch_up = do_catch_up,
 	.flush = synth_flush,
 	.is_alive = spk_synth_is_alive_restart,
author
#10 lore raw
In reply to Okash Khawaja

Hi,

Forgot to add intro. Following is what I wanted to say:

This patchset migrates all external synths from using raw serial i/o to using tty-based comms. The synths not migrated are internal ones - plugged directly into motherboard, communicating over ISA etc. It's important to note that these patches access TTY from inside kernel.

Here is the summary of the patches in this set.

Patch 1: Refactors to make input functionality swappable between serial i/o and tty. This is part of series of previous patches already submitted, which refactor the code in order to pave the way for actual migration to come.
Patch 2: Exports tty_open_by_driver in order to allow the speakup to access it.
Patch 3: Adds spk_ttyio.c, a container of TTY-based comms. Patch 4: Migrates some synths which use relatively simple comms - output only.
Patch 5: Adds more TTY-based functionality that wasn't already added in patch 3.
Patch 6: Migrates remaining external synths based.

Thanks,
Okash

maintainer
#3 lore raw

Re: [patch 2/6] tty: export tty_open_by_driver

In reply to Okash Khawaja
Quoted 11 lines · Okash Khawaja

This applies on top of the changes already in staging-next branch which allow kernel access to TTY dev.

Signe-doff-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>

Index: linux-staging/drivers/tty/tty_io.c
===================================================================

drivers/tty/tty_io.c static struct tty_struct *tty_driver_loo · line 1375

Quoted 8 lines
drivers/tty/tty_io.c +4 -1
@@ -1369,7 +1369,10 @@ static struct tty_struct *tty_driver_loo
 	struct tty_struct *tty;
 
 	if (driver->ops->lookup)
-		tty = driver->ops->lookup(driver, file, idx);
+		if (!file)
+			tty = ERR_PTR(-EIO);
+		else
+			tty = driver->ops->lookup(driver, file, idx);

Why make this change? Shouldn't the lookup function allow a NULL file pointer? Or is the problem that they do not?

drivers/tty/tty_io.c static struct tty_driver *tty_lookup_dri · line 2007

Quoted 9 lines
drivers/tty/tty_io.c +1 -1
 	else
 		tty = driver->ttys[idx];
 

@@ -2001,7 +2004,7 @@ static struct tty_driver *tty_lookup_dri
 		struct tty_driver *console_driver = console_device(index);
 		if (console_driver) {
 			driver = tty_driver_kref_get(console_driver);
-			if (driver) {
+			if (driver && filp) {

Why change this too?

Your changelog does not explain any of this, please do so.

thanks,

greg k-h

author
#4 lore raw

Re: [patch 2/6] tty: export tty_open_by_driver

Hi,

Quoted 36 lines · Greg Kroah-Hartman
Quoted 11 lines · Okash Khawaja

This applies on top of the changes already in staging-next branch which allow kernel access to TTY dev.

Signe-doff-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>

Index: linux-staging/drivers/tty/tty_io.c
===================================================================

drivers/tty/tty_io.c static struct tty_struct *tty_driver_loo · line 1375

Quoted 8 lines
drivers/tty/tty_io.c +4 -1
@@ -1369,7 +1369,10 @@ static struct tty_struct *tty_driver_loo
      struct tty_struct *tty;
 
      if (driver->ops->lookup)
-             tty = driver->ops->lookup(driver, file, idx);
+             if (!file)
+                     tty = ERR_PTR(-EIO);
+             else
+                     tty = driver->ops->lookup(driver, file, idx);

Why make this change? Shouldn't the lookup function allow a NULL file pointer? Or is the problem that they do not?

drivers/tty/tty_io.c static struct tty_driver *tty_lookup_dri · line 2007

Quoted 9 lines
drivers/tty/tty_io.c +1 -1
      else
              tty = driver->ttys[idx];
 

@@ -2001,7 +2004,7 @@ static struct tty_driver *tty_lookup_dri
              struct tty_driver *console_driver = console_device(index);
              if (console_driver) {
                      driver = tty_driver_kref_get(console_driver);
-                     if (driver) {
+                     if (driver && filp) {

Why change this too?

Quoted 5 lines

Your changelog does not explain any of this, please do so.

thanks,

greg k-h

Sorry, I should have been more descriptive here. The changes which check file pointer for null are basically from Alan Cox's patch here:
http://www.mail-archive.com/[email protected]/msg1215095.html.
The description from that patch is quoted below:

"[RFC] tty_port: allow a port to be opened with a tty that has no file handle

Let us create tty objects entirely in kernel space. Untested proposal to show why all the ideas around rewriting half the uart stack are not needed.

With this a kernel created non file backed tty object could be used to
handle
data, and set terminal modes. Not all ldiscs can cope with this as N_TTY in particular has to work back to the fs/tty layer.

The tty_port code is however otherwise clean of file handles as far as I can tell as is the low level tty port write path used by the ldisc, the configuration low level interfaces and most of the ldiscs.

Currently you don't have any exposure to see tty hangups because those are built around the file layer. However a) it's a fixed port so you probably don't care about that b) if you do we can add a callback and c) you almost certainly don't want the userspace tear down/rebuild behaviour anyway.

This should however be sufficient if we wanted for example to enumerate all the bluetooth bound fixed ports via ACPI and make them directly available.

It doesn't deal with the case of a user opening a port that's also kernel opened and that would need some locking out (so it returned EBUSY if bound to a kernel device of some kind). That needs resolving along with how you "up" or "down" your new bluetooth device, or enumerate it while providing the existing tty API to avoid regressions (and to debug)."

With this patchset tty_open_by_driver is now called from inside kernel with file pointer set to null. I can resend this patch with above description.

Thanks,
Okash

maintainer
#5 lore raw

Re: [patch 2/6] tty: export tty_open_by_driver

Quoted 80 lines · Okash Khawaja

Hi,

Quoted 36 lines · Greg Kroah-Hartman
Quoted 11 lines · Okash Khawaja

This applies on top of the changes already in staging-next branch which allow kernel access to TTY dev.

Signe-doff-by Okash Khawaja <[email protected]>
Reviewed-by Samuel Thibault <[email protected]>

Index: linux-staging/drivers/tty/tty_io.c
===================================================================

drivers/tty/tty_io.c static struct tty_struct *tty_driver_loo · line 1375

Quoted 8 lines
drivers/tty/tty_io.c +4 -1
@@ -1369,7 +1369,10 @@ static struct tty_struct *tty_driver_loo
      struct tty_struct *tty;
 
      if (driver->ops->lookup)
-             tty = driver->ops->lookup(driver, file, idx);
+             if (!file)
+                     tty = ERR_PTR(-EIO);
+             else
+                     tty = driver->ops->lookup(driver, file, idx);

Why make this change? Shouldn't the lookup function allow a NULL file pointer? Or is the problem that they do not?

drivers/tty/tty_io.c static struct tty_driver *tty_lookup_dri · line 2007

Quoted 9 lines
drivers/tty/tty_io.c +1 -1
      else
              tty = driver->ttys[idx];
 

@@ -2001,7 +2004,7 @@ static struct tty_driver *tty_lookup_dri
              struct tty_driver *console_driver = console_device(index);
              if (console_driver) {
                      driver = tty_driver_kref_get(console_driver);
-                     if (driver) {
+                     if (driver && filp) {

Why change this too?

Quoted 5 lines

Your changelog does not explain any of this, please do so.

thanks,

greg k-h

Sorry, I should have been more descriptive here. The changes which check file pointer for null are basically from Alan Cox's patch here:
http://www.mail-archive.com/[email protected]/msg1215095.html.
The description from that patch is quoted below:

"[RFC] tty_port: allow a port to be opened with a tty that has no file handle

Let us create tty objects entirely in kernel space. Untested proposal to show why all the ideas around rewriting half the uart stack are not needed.

With this a kernel created non file backed tty object could be used to
handle
data, and set terminal modes. Not all ldiscs can cope with this as N_TTY in particular has to work back to the fs/tty layer.

The tty_port code is however otherwise clean of file handles as far as I can tell as is the low level tty port write path used by the ldisc, the configuration low level interfaces and most of the ldiscs.

Currently you don't have any exposure to see tty hangups because those are built around the file layer. However a) it's a fixed port so you probably don't care about that b) if you do we can add a callback and c) you almost certainly don't want the userspace tear down/rebuild behaviour anyway.

This should however be sufficient if we wanted for example to enumerate all the bluetooth bound fixed ports via ACPI and make them directly available.

It doesn't deal with the case of a user opening a port that's also kernel opened and that would need some locking out (so it returned EBUSY if bound to a kernel device of some kind). That needs resolving along with how you "up" or "down" your new bluetooth device, or enumerate it while providing the existing tty API to avoid regressions (and to debug)."

Quoted 3 lines

With this patchset tty_open_by_driver is now called from inside kernel with file pointer set to null. I can resend this patch with above description.

Please fix that up and resend the whole series.

thanks,

greg k-h