Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Andy Duan <fugang.duan@nxp.com>
To:     Michael Walle <michael@walle.cc>,
        "linux-serial@vger.kernel.org" <linux-serial@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     Jiri Slaby <jslaby@suse.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Leonard Crestez <leonard.crestez@nxp.com>
Subject: RE: [EXT] [PATCH v2 1/2] tty: serial: fsl_lpuart: move
 dma_request_chan()
Thread-Topic: [EXT] [PATCH v2 1/2] tty: serial: fsl_lpuart: move
 dma_request_chan()
Thread-Index: AQHWAoTFksFC9Hjm7kudzC7IE2Rl+KhZE/PA
Date:   Wed, 25 Mar 2020 10:03:13 +0000
Message-ID: <VI1PR0402MB36008DD884D7623C12DF2709FFCE0@VI1PR0402MB3600.eurprd04.prod.outlook.com>
References: <20200325090658.25967-1-michael@walle.cc>
In-Reply-To: <20200325090658.25967-1-michael@walle.cc>
Accept-Language: zh-CN, en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b4d6e59f-2adb-45b5-4e5a-08d7d0a3bb82
X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Mar 2020 10:03:13.8681
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: Y9Hcio84Kg5J8P7DAghKKw43jDaNB1ReIczzziLyU+wmItUvc5HHQ29IX2QapRA+Pae4kkr4fWCRuGo2pvc62w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3856
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Michael Walle <michael@walle.cc> Sent: Wednesday, March 25, 2020 5:07=
 PM
> 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.
>=20
> Fixes: 159381df1442f ("tty: serial: fsl_lpuart: fix DMA operation when us=
ing
> IOMMU")
> Reported-by: Leonard Crestez <leonard.crestez@nxp.com>
> Signed-off-by: Michael Walle <michael@walle.cc>

Reviewed-by: Fugang Duan <fugang.duan@nxp.com>

> ---
> changes since v1:
>  - instead of just moving the dev_info_once() out of the spinlock protect=
ed
>    section, move the whole dma_request_chan(). Thanks Andy!
>=20
> 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 y=
ou
> have something like console=3DttyLP0,115200.
>=20
>  drivers/tty/serial/fsl_lpuart.c | 36 +++++++++++++++++++++------------
>  1 file changed, 23 insertions(+), 13 deletions(-)
>=20
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpu=
art.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);  }
>=20
> -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 =3D 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 =3D NULL;
> -               goto err;
>         }
>=20
> +       sport->dma_rx_chan =3D 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 =3D NULL;
> +       }
> +}
> +
> +static void lpuart_tx_dma_startup(struct lpuart_port *sport) {
> +       u32 uartbaud;
> +       int ret;
> +
> +       if (!sport->dma_tx_chan)
> +               goto err;
> +
>         ret =3D 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;
>=20
> -       sport->dma_rx_chan =3D 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 =3D NULL;
> +       if (!sport->dma_rx_chan)
>                 goto err;
> -       }
>=20
>         ret =3D lpuart_start_rx_dma(sport);
>         if (ret)
> @@ -1592,6 +1599,8 @@ static int lpuart_startup(struct uart_port *port)
>         sport->rxfifo_size =3D UARTFIFO_DEPTH((temp >>
> UARTPFIFO_RXSIZE_OFF) &
>=20
> UARTPFIFO_FIFOSIZE_MASK);
>=20
> +       lpuart_request_dma(sport);
> +
>         spin_lock_irqsave(&sport->port.lock, flags);
>=20
>         lpuart_setup_watermark_enable(sport);
> @@ -1649,11 +1658,12 @@ static int lpuart32_startup(struct uart_port
> *port)
>                 sport->port.fifosize =3D sport->txfifo_size;
>         }
>=20
> +       lpuart_request_dma(sport);
> +
>         spin_lock_irqsave(&sport->port.lock, flags);
>=20
>         lpuart32_setup_watermark_enable(sport);
>=20
> -
>         lpuart_rx_dma_startup(sport);
>         lpuart_tx_dma_startup(sport);
>=20
> --
> 2.20.1