* [PATCH] omap-serial: add RS485 mode support
@ 2011-10-02 20:27 Ilya Yanok
2011-11-09 0:20 ` Ilya Yanok
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Yanok @ 2011-10-02 20:27 UTC (permalink / raw)
To: linux-omap; +Cc: Ilya Yanok
Add support for asserting RTS line while TX is in progress. OMAP
hardware doesn't support auto-RS485 mode so we control the line from
software. We use TX_EMPTY_CTL_IT bit in SCR register to generate TX
empty interrupt.
We use SER_RS485_RTS_ON_SEND flag to control the polarity of RTS signal
(RTS is asserted high during transmition if this flag is set and low
otherwise) though I'm not sure if this is what this flag is for...
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
arch/arm/plat-omap/include/plat/omap-serial.h | 3 +
drivers/tty/serial/omap-serial.c | 127 ++++++++++++++++++++++---
include/linux/serial_reg.h | 2 +
3 files changed, 120 insertions(+), 12 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
index 2682043..5003400 100644
--- a/arch/arm/plat-omap/include/plat/omap-serial.h
+++ b/arch/arm/plat-omap/include/plat/omap-serial.h
@@ -111,6 +111,9 @@ struct uart_omap_port {
unsigned char msr_saved_flags;
char name[20];
unsigned long port_activity;
+ struct serial_rs485 rs485;
+ unsigned int tx_in_progress:1,
+ tx_wait_end:1;
};
#endif /* __OMAP_SERIAL_H__ */
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 47cadf4..6526171 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -37,11 +37,14 @@
#include <linux/clk.h>
#include <linux/serial_core.h>
#include <linux/irq.h>
+#include <linux/uaccess.h>
#include <plat/dma.h>
#include <plat/dmtimer.h>
#include <plat/omap-serial.h>
+#define OMAP_RS485_SUPPORTED (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND)
+
static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
/* Forward declaration of functions */
@@ -114,6 +117,45 @@ static void serial_omap_enable_ms(struct uart_port *port)
serial_out(up, UART_IER, up->ier);
}
+static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
+{
+ if (!(up->ier & UART_IER_THRI)) {
+ up->ier |= UART_IER_THRI;
+ serial_out(up, UART_IER, up->ier);
+ }
+}
+
+static inline void serial_omap_disable_ier_thri(struct uart_omap_port *up)
+{
+ if (up->ier & UART_IER_THRI) {
+ up->ier &= ~UART_IER_THRI;
+ serial_out(up, UART_IER, up->ier);
+ }
+}
+
+static inline void serial_omap_thri_mode(struct uart_omap_port *up)
+{
+ unsigned char scr = serial_in(up, UART_OMAP_SCR);
+
+ if (up->tx_wait_end)
+ scr |= UART_OMAP_SCR_TX_EMPTY_CTL_IT;
+ else
+ scr &= ~UART_OMAP_SCR_TX_EMPTY_CTL_IT;
+ serial_out(up, UART_OMAP_SCR, scr);
+}
+
+static inline void serial_omap_update_rts(struct uart_omap_port *up)
+{
+ unsigned char mcr = up->mcr;
+ int rts_on_send = up->rs485.flags & SER_RS485_RTS_ON_SEND;
+
+ if ((up->rs485.flags & SER_RS485_ENABLED) &&
+ ((up->tx_in_progress && rts_on_send) ||
+ !(up->tx_in_progress || rts_on_send)))
+ mcr |= UART_MCR_RTS;
+ serial_out(up, UART_MCR, mcr);
+}
+
static void serial_omap_stop_tx(struct uart_port *port)
{
struct uart_omap_port *up = (struct uart_omap_port *)port;
@@ -131,10 +173,14 @@ static void serial_omap_stop_tx(struct uart_port *port)
up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
}
- if (up->ier & UART_IER_THRI) {
- up->ier &= ~UART_IER_THRI;
- serial_out(up, UART_IER, up->ier);
+ if (!(up->rs485.flags & SER_RS485_ENABLED)) {
+ serial_omap_disable_ier_thri(up);
+ return;
}
+
+ up->tx_wait_end = 1;
+ serial_omap_thri_mode(up);
+ serial_omap_enable_ier_thri(up);
}
static void serial_omap_stop_rx(struct uart_port *port)
@@ -246,14 +292,6 @@ static void transmit_chars(struct uart_omap_port *up)
serial_omap_stop_tx(&up->port);
}
-static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
-{
- if (!(up->ier & UART_IER_THRI)) {
- up->ier |= UART_IER_THRI;
- serial_out(up, UART_IER, up->ier);
- }
-}
-
static void serial_omap_start_tx(struct uart_port *port)
{
struct uart_omap_port *up = (struct uart_omap_port *)port;
@@ -261,6 +299,18 @@ static void serial_omap_start_tx(struct uart_port *port)
unsigned int start;
int ret = 0;
+ if (up->rs485.flags & SER_RS485_ENABLED) {
+ if (!up->tx_in_progress) {
+ up->tx_in_progress = 1;
+ serial_omap_update_rts(up);
+ }
+ if (up->tx_wait_end) {
+ up->tx_wait_end = 0;
+ serial_omap_thri_mode(up);
+ serial_omap_disable_ier_thri(up);
+ }
+ }
+
if (!up->use_dma) {
serial_omap_enable_ier_thri(up);
return;
@@ -343,6 +393,11 @@ static unsigned int check_modem_status(struct uart_omap_port *up)
return status;
}
+static inline unsigned int __serial_omap_tx_empty(struct uart_omap_port *up)
+{
+ return serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+}
+
/**
* serial_omap_irq() - This handles the interrupt from one port
* @irq: uart port irq number
@@ -359,6 +414,17 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
return IRQ_NONE;
spin_lock_irqsave(&up->port.lock, flags);
+ if (up->tx_wait_end && (iir & UART_IIR_THRI) &&
+ __serial_omap_tx_empty(up)) {
+ up->tx_wait_end = 0;
+ up->tx_in_progress = 0;
+ serial_omap_thri_mode(up);
+ serial_omap_update_rts(up);
+ serial_omap_disable_ier_thri(up);
+ spin_unlock_irqrestore(&up->port.lock, flags);
+ return IRQ_HANDLED;
+ }
+
lsr = serial_in(up, UART_LSR);
if (iir & UART_IIR_RLSI) {
if (!up->use_dma) {
@@ -390,7 +456,7 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->pdev->id);
spin_lock_irqsave(&up->port.lock, flags);
- ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0;
+ ret = __serial_omap_tx_empty(up);
spin_unlock_irqrestore(&up->port.lock, flags);
return ret;
@@ -1029,6 +1095,42 @@ static inline void serial_omap_add_console_port(struct uart_omap_port *up)
#endif
+static int
+serial_omap_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg)
+{
+ struct serial_rs485 rs485conf;
+ struct uart_omap_port *up = (struct uart_omap_port *)port;
+ unsigned long flags;
+
+ switch (cmd) {
+ case TIOCSRS485:
+ if (copy_from_user(&rs485conf, (struct serial_rs485 *) arg,
+ sizeof(rs485conf)))
+ return -EFAULT;
+
+ rs485conf.flags &= OMAP_RS485_SUPPORTED;
+ spin_lock_irqsave(&up->port.lock, flags);
+ if (!(rs485conf.flags & SER_RS485_ENABLED)) {
+ up->tx_in_progress = 0;
+ up->tx_wait_end = 0;
+ }
+ up->rs485 = rs485conf;
+ serial_omap_update_rts(up);
+ serial_omap_thri_mode(up);
+ spin_unlock_irqrestore(&up->port.lock, flags);
+
+ case TIOCGRS485:
+ if (copy_to_user((struct serial_rs485 *) arg,
+ &(up->rs485), sizeof(rs485conf)))
+ return -EFAULT;
+ break;
+
+ default:
+ return -ENOIOCTLCMD;
+ }
+ return 0;
+}
+
static struct uart_ops serial_omap_pops = {
.tx_empty = serial_omap_tx_empty,
.set_mctrl = serial_omap_set_mctrl,
@@ -1042,6 +1144,7 @@ static struct uart_ops serial_omap_pops = {
.shutdown = serial_omap_shutdown,
.set_termios = serial_omap_set_termios,
.pm = serial_omap_pm,
+ .ioctl = serial_omap_ioctl,
.type = serial_omap_type,
.release_port = serial_omap_release_port,
.request_port = serial_omap_request_port,
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index c75bda3..aae46f2 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -362,5 +362,7 @@
#define UART_OMAP_MDR1_CIR_MODE 0x06 /* CIR mode */
#define UART_OMAP_MDR1_DISABLE 0x07 /* Disable (default state) */
+#define UART_OMAP_SCR_TX_EMPTY_CTL_IT 0x04 /* TX Empty IRQ mode */
+
#endif /* _LINUX_SERIAL_REG_H */
--
1.7.6.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] omap-serial: add RS485 mode support
2011-10-02 20:27 [PATCH] omap-serial: add RS485 mode support Ilya Yanok
@ 2011-11-09 0:20 ` Ilya Yanok
2011-11-10 18:39 ` Kevin Hilman
0 siblings, 1 reply; 3+ messages in thread
From: Ilya Yanok @ 2011-11-09 0:20 UTC (permalink / raw)
To: linux-omap
Hi guys,
any comments on this? Is anybody interested?
Regards, Ilya.
03.10.2011 0:27, Ilya Yanok wrote:
> Add support for asserting RTS line while TX is in progress. OMAP
> hardware doesn't support auto-RS485 mode so we control the line from
> software. We use TX_EMPTY_CTL_IT bit in SCR register to generate TX
> empty interrupt.
>
> We use SER_RS485_RTS_ON_SEND flag to control the polarity of RTS signal
> (RTS is asserted high during transmition if this flag is set and low
> otherwise) though I'm not sure if this is what this flag is for...
>
> Signed-off-by: Ilya Yanok<yanok@emcraft.com>
> ---
> arch/arm/plat-omap/include/plat/omap-serial.h | 3 +
> drivers/tty/serial/omap-serial.c | 127 ++++++++++++++++++++++---
> include/linux/serial_reg.h | 2 +
> 3 files changed, 120 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h
> index 2682043..5003400 100644
> --- a/arch/arm/plat-omap/include/plat/omap-serial.h
> +++ b/arch/arm/plat-omap/include/plat/omap-serial.h
> @@ -111,6 +111,9 @@ struct uart_omap_port {
> unsigned char msr_saved_flags;
> char name[20];
> unsigned long port_activity;
> + struct serial_rs485 rs485;
> + unsigned int tx_in_progress:1,
> + tx_wait_end:1;
> };
>
> #endif /* __OMAP_SERIAL_H__ */
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index 47cadf4..6526171 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -37,11 +37,14 @@
> #include<linux/clk.h>
> #include<linux/serial_core.h>
> #include<linux/irq.h>
> +#include<linux/uaccess.h>
>
> #include<plat/dma.h>
> #include<plat/dmtimer.h>
> #include<plat/omap-serial.h>
>
> +#define OMAP_RS485_SUPPORTED (SER_RS485_ENABLED | SER_RS485_RTS_ON_SEND)
> +
> static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];
>
> /* Forward declaration of functions */
> @@ -114,6 +117,45 @@ static void serial_omap_enable_ms(struct uart_port *port)
> serial_out(up, UART_IER, up->ier);
> }
>
> +static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
> +{
> + if (!(up->ier& UART_IER_THRI)) {
> + up->ier |= UART_IER_THRI;
> + serial_out(up, UART_IER, up->ier);
> + }
> +}
> +
> +static inline void serial_omap_disable_ier_thri(struct uart_omap_port *up)
> +{
> + if (up->ier& UART_IER_THRI) {
> + up->ier&= ~UART_IER_THRI;
> + serial_out(up, UART_IER, up->ier);
> + }
> +}
> +
> +static inline void serial_omap_thri_mode(struct uart_omap_port *up)
> +{
> + unsigned char scr = serial_in(up, UART_OMAP_SCR);
> +
> + if (up->tx_wait_end)
> + scr |= UART_OMAP_SCR_TX_EMPTY_CTL_IT;
> + else
> + scr&= ~UART_OMAP_SCR_TX_EMPTY_CTL_IT;
> + serial_out(up, UART_OMAP_SCR, scr);
> +}
> +
> +static inline void serial_omap_update_rts(struct uart_omap_port *up)
> +{
> + unsigned char mcr = up->mcr;
> + int rts_on_send = up->rs485.flags& SER_RS485_RTS_ON_SEND;
> +
> + if ((up->rs485.flags& SER_RS485_ENABLED)&&
> + ((up->tx_in_progress&& rts_on_send) ||
> + !(up->tx_in_progress || rts_on_send)))
> + mcr |= UART_MCR_RTS;
> + serial_out(up, UART_MCR, mcr);
> +}
> +
> static void serial_omap_stop_tx(struct uart_port *port)
> {
> struct uart_omap_port *up = (struct uart_omap_port *)port;
> @@ -131,10 +173,14 @@ static void serial_omap_stop_tx(struct uart_port *port)
> up->uart_dma.tx_dma_channel = OMAP_UART_DMA_CH_FREE;
> }
>
> - if (up->ier& UART_IER_THRI) {
> - up->ier&= ~UART_IER_THRI;
> - serial_out(up, UART_IER, up->ier);
> + if (!(up->rs485.flags& SER_RS485_ENABLED)) {
> + serial_omap_disable_ier_thri(up);
> + return;
> }
> +
> + up->tx_wait_end = 1;
> + serial_omap_thri_mode(up);
> + serial_omap_enable_ier_thri(up);
> }
>
> static void serial_omap_stop_rx(struct uart_port *port)
> @@ -246,14 +292,6 @@ static void transmit_chars(struct uart_omap_port *up)
> serial_omap_stop_tx(&up->port);
> }
>
> -static inline void serial_omap_enable_ier_thri(struct uart_omap_port *up)
> -{
> - if (!(up->ier& UART_IER_THRI)) {
> - up->ier |= UART_IER_THRI;
> - serial_out(up, UART_IER, up->ier);
> - }
> -}
> -
> static void serial_omap_start_tx(struct uart_port *port)
> {
> struct uart_omap_port *up = (struct uart_omap_port *)port;
> @@ -261,6 +299,18 @@ static void serial_omap_start_tx(struct uart_port *port)
> unsigned int start;
> int ret = 0;
>
> + if (up->rs485.flags& SER_RS485_ENABLED) {
> + if (!up->tx_in_progress) {
> + up->tx_in_progress = 1;
> + serial_omap_update_rts(up);
> + }
> + if (up->tx_wait_end) {
> + up->tx_wait_end = 0;
> + serial_omap_thri_mode(up);
> + serial_omap_disable_ier_thri(up);
> + }
> + }
> +
> if (!up->use_dma) {
> serial_omap_enable_ier_thri(up);
> return;
> @@ -343,6 +393,11 @@ static unsigned int check_modem_status(struct uart_omap_port *up)
> return status;
> }
>
> +static inline unsigned int __serial_omap_tx_empty(struct uart_omap_port *up)
> +{
> + return serial_in(up, UART_LSR)& UART_LSR_TEMT ? TIOCSER_TEMT : 0;
> +}
> +
> /**
> * serial_omap_irq() - This handles the interrupt from one port
> * @irq: uart port irq number
> @@ -359,6 +414,17 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
> return IRQ_NONE;
>
> spin_lock_irqsave(&up->port.lock, flags);
> + if (up->tx_wait_end&& (iir& UART_IIR_THRI)&&
> + __serial_omap_tx_empty(up)) {
> + up->tx_wait_end = 0;
> + up->tx_in_progress = 0;
> + serial_omap_thri_mode(up);
> + serial_omap_update_rts(up);
> + serial_omap_disable_ier_thri(up);
> + spin_unlock_irqrestore(&up->port.lock, flags);
> + return IRQ_HANDLED;
> + }
> +
> lsr = serial_in(up, UART_LSR);
> if (iir& UART_IIR_RLSI) {
> if (!up->use_dma) {
> @@ -390,7 +456,7 @@ static unsigned int serial_omap_tx_empty(struct uart_port *port)
>
> dev_dbg(up->port.dev, "serial_omap_tx_empty+%d\n", up->pdev->id);
> spin_lock_irqsave(&up->port.lock, flags);
> - ret = serial_in(up, UART_LSR)& UART_LSR_TEMT ? TIOCSER_TEMT : 0;
> + ret = __serial_omap_tx_empty(up);
> spin_unlock_irqrestore(&up->port.lock, flags);
>
> return ret;
> @@ -1029,6 +1095,42 @@ static inline void serial_omap_add_console_port(struct uart_omap_port *up)
>
> #endif
>
> +static int
> +serial_omap_ioctl(struct uart_port *port, unsigned int cmd, unsigned long arg)
> +{
> + struct serial_rs485 rs485conf;
> + struct uart_omap_port *up = (struct uart_omap_port *)port;
> + unsigned long flags;
> +
> + switch (cmd) {
> + case TIOCSRS485:
> + if (copy_from_user(&rs485conf, (struct serial_rs485 *) arg,
> + sizeof(rs485conf)))
> + return -EFAULT;
> +
> + rs485conf.flags&= OMAP_RS485_SUPPORTED;
> + spin_lock_irqsave(&up->port.lock, flags);
> + if (!(rs485conf.flags& SER_RS485_ENABLED)) {
> + up->tx_in_progress = 0;
> + up->tx_wait_end = 0;
> + }
> + up->rs485 = rs485conf;
> + serial_omap_update_rts(up);
> + serial_omap_thri_mode(up);
> + spin_unlock_irqrestore(&up->port.lock, flags);
> +
> + case TIOCGRS485:
> + if (copy_to_user((struct serial_rs485 *) arg,
> + &(up->rs485), sizeof(rs485conf)))
> + return -EFAULT;
> + break;
> +
> + default:
> + return -ENOIOCTLCMD;
> + }
> + return 0;
> +}
> +
> static struct uart_ops serial_omap_pops = {
> .tx_empty = serial_omap_tx_empty,
> .set_mctrl = serial_omap_set_mctrl,
> @@ -1042,6 +1144,7 @@ static struct uart_ops serial_omap_pops = {
> .shutdown = serial_omap_shutdown,
> .set_termios = serial_omap_set_termios,
> .pm = serial_omap_pm,
> + .ioctl = serial_omap_ioctl,
> .type = serial_omap_type,
> .release_port = serial_omap_release_port,
> .request_port = serial_omap_request_port,
> diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
> index c75bda3..aae46f2 100644
> --- a/include/linux/serial_reg.h
> +++ b/include/linux/serial_reg.h
> @@ -362,5 +362,7 @@
> #define UART_OMAP_MDR1_CIR_MODE 0x06 /* CIR mode */
> #define UART_OMAP_MDR1_DISABLE 0x07 /* Disable (default state) */
>
> +#define UART_OMAP_SCR_TX_EMPTY_CTL_IT 0x04 /* TX Empty IRQ mode */
> +
> #endif /* _LINUX_SERIAL_REG_H */
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] omap-serial: add RS485 mode support
2011-11-09 0:20 ` Ilya Yanok
@ 2011-11-10 18:39 ` Kevin Hilman
0 siblings, 0 replies; 3+ messages in thread
From: Kevin Hilman @ 2011-11-10 18:39 UTC (permalink / raw)
To: Ilya Yanok; +Cc: linux-omap
Ilya Yanok <yanok@emcraft.com> writes:
> Hi guys,
>
> any comments on this? Is anybody interested?
There's a major cleanup of the OMAP UART driver in progress[1]. I
suggest you rebase on top of that, or hold onto this until the cleanup
is merged.
Kevin
[1] http://marc.info/?l=linux-omap&m=131914563820506&w=2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-10 18:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-02 20:27 [PATCH] omap-serial: add RS485 mode support Ilya Yanok
2011-11-09 0:20 ` Ilya Yanok
2011-11-10 18:39 ` Kevin Hilman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).