From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbdFZMz2 convert rfc822-to-8bit (ORCPT ); Mon, 26 Jun 2017 08:55:28 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:45970 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752124AbdFZMt4 (ORCPT ); Mon, 26 Jun 2017 08:49:56 -0400 From: Bich HEMON To: Greg Kroah-Hartman , Rob Herring , Mark Rutland , Maxime Coquelin , Alexandre TORGUE , "Jiri Slaby" , "linux-serial@vger.kernel.org" , "devicetree@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" CC: Bich HEMON Subject: [PATCH 08/20] serial: stm32: timeout interrupt using with dma Thread-Topic: [PATCH 08/20] serial: stm32: timeout interrupt using with dma Thread-Index: AQHS7nqclx0goLRgs0yyCwG67KlTog== Date: Mon, 26 Jun 2017 12:49:12 +0000 Message-ID: <1498481318-1894-9-git-send-email-bich.hemon@st.com> References: <1498481318-1894-1-git-send-email-bich.hemon@st.com> In-Reply-To: <1498481318-1894-1-git-send-email-bich.hemon@st.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.75.127.50] Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-06-26_09:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bich Hemon Signed-off-by: Gerald Baeza --- drivers/tty/serial/stm32-usart.c | 25 +++++++++++++++++++------ drivers/tty/serial/stm32-usart.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c index dcc6d1e..ed2025b 100644 --- a/drivers/tty/serial/stm32-usart.c +++ b/drivers/tty/serial/stm32-usart.c @@ -371,6 +371,10 @@ static irqreturn_t stm32_interrupt(int irq, void *ptr) sr = readl_relaxed(port->membase + ofs->isr); + if ((sr & USART_SR_RTOF) && (ofs->icr != UNDEF_REG)) + writel_relaxed(USART_ICR_RTOCF, + port->membase + ofs->icr); + if ((sr & USART_SR_RXNE) && !(stm32_port->rx_ch)) stm32_receive_chars(port, false); @@ -453,7 +457,7 @@ static void stm32_throttle(struct uart_port *port) unsigned long flags; spin_lock_irqsave(&port->lock, flags); - stm32_clr_bits(port, ofs->cr1, USART_CR1_RXNEIE); + stm32_clr_bits(port, ofs->cr1, stm32_port->rx_irq); spin_unlock_irqrestore(&port->lock, flags); } @@ -465,7 +469,7 @@ static void stm32_unthrottle(struct uart_port *port) unsigned long flags; spin_lock_irqsave(&port->lock, flags); - stm32_set_bits(port, ofs->cr1, USART_CR1_RXNEIE); + stm32_set_bits(port, ofs->cr1, stm32_port->rx_irq); spin_unlock_irqrestore(&port->lock, flags); } @@ -475,7 +479,7 @@ static void stm32_stop_rx(struct uart_port *port) struct stm32_port *stm32_port = to_stm32_port(port); struct stm32_usart_offsets *ofs = &stm32_port->info->ofs; - stm32_clr_bits(port, ofs->cr1, USART_CR1_RXNEIE); + stm32_clr_bits(port, ofs->cr1, stm32_port->rx_irq); } /* Handle breaks - ignored by us */ @@ -497,7 +501,7 @@ static int stm32_startup(struct uart_port *port) if (ret) return ret; - val = USART_CR1_RXNEIE | USART_CR1_TE | USART_CR1_RE; + val = stm32_port->rx_irq | USART_CR1_TE | USART_CR1_RE; if (stm32_port->fifoen) val |= USART_CR1_FIFOEN; stm32_set_bits(port, ofs->cr1, val); @@ -512,7 +516,8 @@ static void stm32_shutdown(struct uart_port *port) struct stm32_usart_config *cfg = &stm32_port->info->cfg; u32 val; - val = USART_CR1_TXEIE | USART_CR1_RXNEIE | USART_CR1_TE | USART_CR1_RE; + val = USART_CR1_TXEIE | USART_CR1_TE; + val |= stm32_port->rx_irq | USART_CR1_RE; val |= BIT(cfg->uart_enable_bit); if (stm32_port->fifoen) val |= USART_CR1_FIFOEN; @@ -543,7 +548,7 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios, /* Stop serial port and reset value */ writel_relaxed(0, port->membase + ofs->cr1); - cr1 = USART_CR1_TE | USART_CR1_RE | USART_CR1_RXNEIE; + cr1 = USART_CR1_TE | USART_CR1_RE; cr1 |= BIT(cfg->uart_enable_bit); if (stm32_port->fifoen) cr1 |= USART_CR1_FIFOEN; @@ -553,6 +558,13 @@ static void stm32_set_termios(struct uart_port *port, struct ktermios *termios, if (cflag & CSTOPB) cr2 |= USART_CR2_STOP_2B; + if ((ofs->rtor != UNDEF_REG) && (stm32_port->rx_ch)) { + stm32_port->rx_irq = USART_CR1_RTOIE; + writel_relaxed(baud, port->membase + ofs->rtor); + cr2 |= USART_CR2_RTOEN; + } + cr1 |= stm32_port->rx_irq; + if (cflag & PARENB) { cr1 |= USART_CR1_PCE; if ((cflag & CSIZE) == CS8) { @@ -758,6 +770,7 @@ static struct stm32_port *stm32_of_get_stm32_port(struct platform_device *pdev) "st,hw-flow-ctrl"); stm32_ports[id].port.line = id; stm32_ports[id].fifoen = true; + stm32_ports[id].rx_irq = USART_CR1_RXNEIE; return &stm32_ports[id]; } diff --git a/drivers/tty/serial/stm32-usart.h b/drivers/tty/serial/stm32-usart.h index a8999a1..f9fe15b 100644 --- a/drivers/tty/serial/stm32-usart.h +++ b/drivers/tty/serial/stm32-usart.h @@ -225,6 +225,7 @@ struct stm32_port { struct dma_chan *tx_ch; /* dma tx channel */ dma_addr_t tx_dma_buf; /* dma tx buffer bus address */ unsigned char *tx_buf; /* dma tx buffer cpu address */ + u32 rx_irq; /* USART_CR1_RXNEIE or RTOIE */ bool tx_dma_busy; /* dma tx busy */ bool hw_flow_control; bool fifoen; -- 1.9.1