pch_uart: change type to u8
PATCH 1/6 pch_uart: change type to u8
Target uart register access size is 8bit.
However, 32bit is used at 2 points.
This patch modifies type "unsigned int" to "unsigned char".
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
drivers/tty/serial/pch_uart.c +4 -8
@@ -460,14 +460,10 @@ static int pch_uart_hal_read(struct eg20t_port *priv, unsigned char *buf,return i; } -static unsigned int pch_uart_hal_get_iid (struct eg20t_port *priv) +static unsigned char pch_uart_hal_get_iid (struct eg20t_port *priv) { -unsigned int iir; -int ret; - - iir =ioread8 (priv->membase +UART_IIR ); - ret = (iir & (PCH_UART_IIR_IID |PCH_UART_IIR_TOI |PCH_UART_IIR_IP )); -return ret; +return ioread8 (priv->membase +UART_IIR ) &\ + (PCH_UART_IIR_IID |PCH_UART_IIR_TOI |PCH_UART_IIR_IP ); }static u8 pch_uart_hal_get_line_status (struct eg20t_port *priv)
@@ -955,7 +951,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)unsigned int handled;u8 lsr;int ret =0 ; -unsigned int iid; +unsigned char iid;unsigned long flags;spin_lock_irqsave (&priv->port.lock, flags);
Signature · 1 line
1.7.4.4
PATCH 2/6 pch_uart: change type to %d to %02x
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/tty/serial/pch_uart.c +1 -1
@@ -993,7 +993,7 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) ret =PCH_UART_HANDLED_MS_INT ;break ;default :/* Never junp to this label */ -dev_err (priv->port.dev,"%s:iid=%d (%lu)\n" , __func__, +dev_err (priv->port.dev,"%s:iid=%02x (%lu)\n" , __func__, iid, jiffies); ret =-1 ;break ;
Signature · 1 line
1.7.4.4
PATCH 3/6 pch_uart: Support modem status interrupt
In reply to Tomoya MORINAGASigned-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-)
drivers/tty/serial/pch_uart.c +13 -2
@@ -953,10 +953,15 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id)int ret =0 ;unsigned char iid;unsigned long flags; +int next =1 ; +u8 msr;spin_lock_irqsave (&priv->port.lock, flags); handled =0 ; -while ((iid =pch_uart_hal_get_iid (priv)) >1 ) { +while (next) { + iid =pch_uart_hal_get_iid (priv); +if (iid &PCH_UART_IIR_IP )/* No Interrupt */ +break ;switch (iid) {case PCH_UART_IID_RLS :/* Receiver Line Status */ lsr =pch_uart_hal_get_line_status (priv);
@@ -990,12 +995,18 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) ret =handle_tx (priv);break ;case PCH_UART_IID_MS :/* Modem Status */ - ret =PCH_UART_HANDLED_MS_INT ; + msr =pch_uart_hal_get_modem (priv); + next =0 ;/* MS ir prioirty is the lowest. So, MS ir +means final interrupt */ +if ((msr &UART_MSR_ANY_DELTA ) ==0 ) +break ; + ret |=PCH_UART_HANDLED_MS_INT ;break ;default :/* Never junp to this label */ dev_err (priv->port.dev,"%s:iid=%02x (%lu)\n" , __func__, iid, jiffies); ret =-1 ; + next =0 ;break ; } handled |= (unsigned int )ret;
Signature · 1 line
1.7.4.4
PATCH 4/6 pch_uart: delete unused data structure
In reply to Tomoya MORINAGASigned-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
drivers/tty/serial/pch_uart.c +0 -6
@@ -215,7 +215,6 @@ struct eg20t_port {int start_tx;int start_rx;int tx_empty; -int int_dis_flag;int trigger;int trigger_level;struct pch_uart_buffer rxbuf;
@@ -1011,10 +1010,6 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) } handled |= (unsigned int )ret; } -if (handled ==0 && iid <=1 ) { -if (priv->int_dis_flag) - priv->int_dis_flag =0 ; - }spin_unlock_irqrestore (&priv->port.lock, flags);return IRQ_RETVAL (handled);
@@ -1111,7 +1106,6 @@ static void pch_uart_stop_rx(struct uart_port *port) priv = container_of(port, struct eg20t_port, port); priv->start_rx =0 ;pch_uart_hal_disable_interrupt (priv,PCH_UART_HAL_RX_INT ); - priv->int_dis_flag =1 ; }/* Enable the modem status interrupts. */
Signature · 1 line
1.7.4.4
PATCH 5/6 pch_uart: Fix return value issue
In reply to Tomoya MORINAGACurrently, occurring line status interrupt, returned value is not set in interrupt handler function. As a result, 0 can be returned.
This patch adds setting returned value.
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
drivers/tty/serial/pch_uart.c +5 -0
@@ -35,6 +35,7 @@ enum {PCH_UART_HANDLED_RX_ERR_INT_SHIFT ,PCH_UART_HANDLED_RX_TRG_INT_SHIFT ,PCH_UART_HANDLED_MS_INT_SHIFT , + PCH_UART_HANDLED_LS_INT_SHIFT, }; enum {
@@ -59,6 +60,8 @@ enum { PCH_UART_HANDLED_RX_TRG_INT_SHIFT)<<1))#define PCH_UART_HANDLED_MS_INT (1<<((PCH_UART_HANDLED_MS_INT_SHIFT)<<1)) +#define PCH_UART_HANDLED_LS_INT (1<<((PCH_UART_HANDLED_LS_INT_SHIFT)<<1)) +#define PCH_UART_RBR 0x00#define PCH_UART_THR 0x00
@@ -968,6 +971,8 @@ static irqreturn_t pch_uart_interrupt(int irq, void *dev_id) UART_LSR_PE | UART_LSR_OE)) { pch_uart_err_ir(priv, lsr); ret = PCH_UART_HANDLED_RX_ERR_INT; + } else { + ret =PCH_UART_HANDLED_LS_INT ; }break ;case PCH_UART_IID_RDR :/* Received Data Ready */
Signature · 1 line
1.7.4.4
PATCH 6/6 pch_uart: Add initialize processing
In reply to Tomoya MORINAGAAdd initialize variable to prevent duplicate free memory.
Signed-off-by Tomoya MORINAGA <[email protected]>
--- drivers/tty/serial/pch_uart.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/tty/serial/pch_uart.c +7 -4
@@ -566,10 +566,13 @@ static void pch_free_dma(struct uart_port *port)dma_release_channel (priv->chan_rx); priv->chan_rx =NULL ; } -if (sg_dma_address (&priv->sg_rx)) -dma_free_coherent (port->dev, port->fifosize, -sg_virt (&priv->sg_rx), -sg_dma_address (&priv->sg_rx)); + +if (priv->rx_buf_dma) { +dma_free_coherent (port->dev, port->fifosize, priv->rx_buf_virt, + priv->rx_buf_dma); + priv->rx_buf_virt =NULL ; + priv->rx_buf_dma =0 ; + }return ; }
Signature · 1 line
1.7.4.4