Linux-Serial Archive on lore.kernel.org
 help / color / Atom feed
From: Leonard Crestez <leonard.crestez@nxp.com>
To: Michael Walle <michael@walle.cc>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Jiri Slaby <jslaby@suse.com>, Andy Duan <fugang.duan@nxp.com>
Subject: Re: [PATCH v2 1/2] tty: serial: fsl_lpuart: move dma_request_chan()
Date: Wed, 25 Mar 2020 18:05:16 +0000
Message-ID: <VI1PR04MB69417B19A6FFF0AA22585884EECE0@VI1PR04MB6941.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20200325090658.25967-1-michael@walle.cc>

On 2020-03-25 11:07 AM, Michael Walle wrote:
> Move dma_request_chan() out of the atomic context. First this call
> should not be in the atomic context at all and second the
> dev_info_once() may cause a hang because because the console takes this
> spinlock, too.
> 
> Fixes: 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when using IOMMU")
> Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
> changes since v1:
>   - instead of just moving the dev_info_once() out of the spinlock protected
>     section, move the whole dma_request_chan(). Thanks Andy!
> 
> I've tested this on my board. Andy, Leonard, can you double check it? For
> all which are not aware, this deadlock happens only if you have the kernel
> console output on the lpuart, so if someone wants to test it, make sure you
> have something like console=ttyLP0,115200.
> 
>   drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
>   1 file changed, 23 insertions(+), 13 deletions(-)

Tested-by: Leonard Crestez <leonard.crestez@nxp.com>

Since the original commit only made it into next it might make sense to 
squash the commits in the tty tree.

This way future bisections won't get stuck on a boot failure.

> 
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 9c6a018b1390..131018979b77 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -1510,20 +1510,33 @@ static void rx_dma_timer_init(struct lpuart_port *sport)
>   	add_timer(&sport->lpuart_timer);
>   }
>   
> -static void lpuart_tx_dma_startup(struct lpuart_port *sport)
> +static void lpuart_request_dma(struct lpuart_port *sport)
>   {
> -	u32 uartbaud;
> -	int ret;
> -
>   	sport->dma_tx_chan = dma_request_chan(sport->port.dev, "tx");
>   	if (IS_ERR(sport->dma_tx_chan)) {
>   		dev_info_once(sport->port.dev,
>   			      "DMA tx channel request failed, operating without tx DMA (%ld)\n",
>   			      PTR_ERR(sport->dma_tx_chan));
>   		sport->dma_tx_chan = NULL;
> -		goto err;
>   	}
>   
> +	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
> +	if (IS_ERR(sport->dma_rx_chan)) {
> +		dev_info_once(sport->port.dev,
> +			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
> +			      PTR_ERR(sport->dma_rx_chan));
> +		sport->dma_rx_chan = NULL;
> +	}
> +}
> +
> +static void lpuart_tx_dma_startup(struct lpuart_port *sport)
> +{
> +	u32 uartbaud;
> +	int ret;
> +
> +	if (!sport->dma_tx_chan)
> +		goto err;
> +
>   	ret = lpuart_dma_tx_request(&sport->port);
>   	if (!ret)
>   		goto err;
> @@ -1549,14 +1562,8 @@ static void lpuart_rx_dma_startup(struct lpuart_port *sport)
>   {
>   	int ret;
>   
> -	sport->dma_rx_chan = dma_request_chan(sport->port.dev, "rx");
> -	if (IS_ERR(sport->dma_rx_chan)) {
> -		dev_info_once(sport->port.dev,
> -			      "DMA rx channel request failed, operating without rx DMA (%ld)\n",
> -			      PTR_ERR(sport->dma_rx_chan));
> -		sport->dma_rx_chan = NULL;
> +	if (!sport->dma_rx_chan)
>   		goto err;
> -	}
>   
>   	ret = lpuart_start_rx_dma(sport);
>   	if (ret)
> @@ -1592,6 +1599,8 @@ static int lpuart_startup(struct uart_port *port)
>   	sport->rxfifo_size = UARTFIFO_DEPTH((temp >> UARTPFIFO_RXSIZE_OFF) &
>   					    UARTPFIFO_FIFOSIZE_MASK);
>   
> +	lpuart_request_dma(sport);
> +
>   	spin_lock_irqsave(&sport->port.lock, flags);
>   
>   	lpuart_setup_watermark_enable(sport);
> @@ -1649,11 +1658,12 @@ static int lpuart32_startup(struct uart_port *port)
>   		sport->port.fifosize = sport->txfifo_size;
>   	}
>   
> +	lpuart_request_dma(sport);
> +
>   	spin_lock_irqsave(&sport->port.lock, flags);
>   
>   	lpuart32_setup_watermark_enable(sport);
>   
> -
>   	lpuart_rx_dma_startup(sport);
>   	lpuart_tx_dma_startup(sport);
>   
> 


  parent reply index

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-25  9:06 Michael Walle
2020-03-25  9:06 ` [PATCH v2 2/2] tty: serial: fsl_lpuart: fix return value checking Michael Walle
2020-03-25 10:07   ` [EXT] " Andy Duan
2020-03-25 10:03 ` [EXT] [PATCH v2 1/2] tty: serial: fsl_lpuart: move dma_request_chan() Andy Duan
2020-03-25 18:05 ` Leonard Crestez [this message]
2020-03-26 14:32   ` Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=VI1PR04MB69417B19A6FFF0AA22585884EECE0@VI1PR04MB6941.eurprd04.prod.outlook.com \
    --to=leonard.crestez@nxp.com \
    --cc=fugang.duan@nxp.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=michael@walle.cc \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Serial Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-serial/0 linux-serial/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-serial linux-serial/ https://lore.kernel.org/linux-serial \
		linux-serial@vger.kernel.org
	public-inbox-index linux-serial

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-serial


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git