Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752613AbdGCG6z (ORCPT ); Mon, 3 Jul 2017 02:58:55 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:60985 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbdGCG6y (ORCPT ); Mon, 3 Jul 2017 02:58:54 -0400 Date: Mon, 3 Jul 2017 08:58:49 +0200 From: Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= To: Romain Perier Cc: Greg Kroah-Hartman , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Nandor Han , kernel@pengutronix.de Subject: Re: [PATCH 4/7] serial: imx: Simplify DMA disablement Message-ID: <20170703065849.u55umof2lkjmgohf@pengutronix.de> References: <20170630120446.13994-1-romain.perier@collabora.com> <20170630120446.13994-5-romain.perier@collabora.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20170630120446.13994-5-romain.perier@collabora.com> User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:5054:ff:fe2a:3aa X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2521 Lines: 82 On Fri, Jun 30, 2017 at 02:04:43PM +0200, Romain Perier wrote: > From: Nandor Han > > This commits simplify the function imx_disable_dma() by moving > the code for disabling RX and TX DMAs to dedicated functions. I'd point out there that this prepares the next commit because in the current state I'd prefer just improved comments. > Also move away CTSC and CTS as this is not related to DMA. Hmm, maybe this is related to the rs485 breakage we're seeing and deserves a separate commit? This also has the advantage that the refactoring change is semantically a no-op. > Signed-off-by: Nandor Han > Signed-off-by: Romain Perier > --- > drivers/tty/serial/imx.c | 31 ++++++++++++++++++++----------- > 1 file changed, 20 insertions(+), 11 deletions(-) > > diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c > index 81fb413..e8cf7cf 100644 > --- a/drivers/tty/serial/imx.c > +++ b/drivers/tty/serial/imx.c > @@ -1208,6 +1208,24 @@ static int imx_uart_dma_init(struct imx_port *sport) > return ret; > } > > +static void imx_stop_tx_dma(struct imx_port *sport) > +{ > + unsigned long temp; > + > + temp = readl(sport->port.membase + UCR1); > + temp &= ~UCR1_TDMAEN; > + writel(temp, sport->port.membase + UCR1); > +} > + > +static void imx_stop_rx_dma(struct imx_port *sport) > +{ > + unsigned long temp; > + > + temp = readl(sport->port.membase + UCR1); > + temp &= ~(UCR1_RDMAEN | UCR1_ATDMAEN); > + writel(temp, sport->port.membase + UCR1); > +} > + > static void imx_enable_dma(struct imx_port *sport) > { > unsigned long temp; > @@ -1233,17 +1251,8 @@ static void imx_enable_dma(struct imx_port *sport) > > static void imx_disable_dma(struct imx_port *sport) > { > - unsigned long temp; > - > - /* clear UCR1 */ > - temp = readl(sport->port.membase + UCR1); > - temp &= ~(UCR1_RDMAEN | UCR1_TDMAEN | UCR1_ATDMAEN); > - writel(temp, sport->port.membase + UCR1); > - > - /* clear UCR2 */ > - temp = readl(sport->port.membase + UCR2); > - temp &= ~(UCR2_CTSC | UCR2_CTS | UCR2_ATEN); You also dropped clearing ATEN without mentioning that in the commit log. Is this done on purpose? > - writel(temp, sport->port.membase + UCR2); > + imx_stop_rx_dma(sport); > + imx_stop_tx_dma(sport); > > imx_setup_ufcr(sport, TXTL_DEFAULT, RXTL_DEFAULT); Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |