From:   Sherry Sun <sherry.sun@nxp.com>
To:     gregkh@linuxfoundation.org, jirislaby@kernel.org
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH RESEND] tty: serial: fsl_lpuart: don't enable receiver/transmitter before rx/tx dma ready
Date:   Mon, 30 Jan 2023 13:41:07 +0800
Message-Id: <20230130054107.9119-1-sherry.sun@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o78uVfN3XrJgtBKzQczfbJ9tS8wFx+yrKIqJktg1vvq2tRYgbboiQfhjjTTk?=
 =?us-ascii?Q?u2xWJRo7LwmMYLfgiz7jQ+tnDyDXebdhgKojWngGhE8SPQ4yF2OqqQY4fy1l?=
 =?us-ascii?Q?yjyUUWQ9rF2L2Foo/jActdQTrx/32eveW0rZ1VoE88guIOKhh2DMk1iChkbp?=
 =?us-ascii?Q?7gwuJlLnCWpAl1KdV8qa16gA/351IpGMXeVlm3dkIjcuqsi6PC+gocSmwltM?=
 =?us-ascii?Q?34jH2SgNFl8u3qSjMPlq0nUhURmQc/dBsTXaGT8dvyGuzrXXfCzBZF0vHVbS?=
 =?us-ascii?Q?dLu6jJZwebqYPDXvawupUwGA2C4X2c9T9Qqz5A5g8zom5LG0hIfBfnCr2gEy?=
 =?us-ascii?Q?+b5YNmdopEeXrfPdXL9Dr63iOD+3hwNDHggk8vX21cl63vasBGDTccQuNeFo?=
 =?us-ascii?Q?LhE2qvgV07404awOY0FXC7uNlExTpajiqc0no7I73UTg5luToHxicx6SxHbO?=
 =?us-ascii?Q?MdefvqU3myNsjiW1mGR4R5SMkk4uN6luVXoNvUZEVKFOqLLMuG+Vvje3wI9P?=
 =?us-ascii?Q?An+rLuuYN8Vlrw8vMIaexmjtlOFb5WNm0wXUQSbut0f7HRC13eufEwmB9z9m?=
 =?us-ascii?Q?b6DXNypUejn+FEaT6ZKZpnewjTVQSJWu/ofJosNmAeu/l5vrcNVEUzBI8s/5?=
 =?us-ascii?Q?cV3Uw2I32XAIQTMZumFwOEhUjakwyAl2fT5NqQ3Go3gZ07+m2nf09PC+jnpE?=
 =?us-ascii?Q?+VctGF+pUOhWGs9wez8czfBMByOI5QMbP80Q3QRnmRVEqYmX2BZShvQ5X1Vv?=
 =?us-ascii?Q?icdeCj943NRVjYRTLwTfsfs1ZArRdM5R0GeIU+aMEr3HbdK4xBnecQtJMdDD?=
 =?us-ascii?Q?+DDTVsmrHD1FODboFW9T81EJ2CKmDC1uDqf7nhTjxACb96yP42Woor/NSEGB?=
 =?us-ascii?Q?RsR2poxUp90uoTA8DwOPKcx9yP0FWk5KlY3NZ3oEqXk7O8G8xCzGfh8OBH6O?=
 =?us-ascii?Q?ATLj2YSCtxJvUK2iqq51IkZiA2nuv/Lrbpxj4rQpXXSUQHp3QKF537Us/SRX?=
 =?us-ascii?Q?Ld9MQ8Thmz1lOf5lTNsvkhuPkLGrP+iy+YavWydAwWfqIxTg9AEU1bs8+hlo?=
 =?us-ascii?Q?ETYeOvszMFfXZnQ/vdWiZUMoYlVFRHPmzPxfoXQDqiTUbntB7uB+h0IMflZM?=
 =?us-ascii?Q?HMS579p/sUN0OPtOMs+In9WK2V1x8+Xr//Dq/eovm2QIYrnzlbk0N96KAB5z?=
 =?us-ascii?Q?3pIcviO6S9XegpvoZrQxq8fwYyLaW0XOj7hs9ph1bMl4NF4qK7/gsTG6pRc1?=
 =?us-ascii?Q?UT1ziuhcjXRiOExCANaRI5dznF/o7yM48W7MS0HoOxy/ZvESQmd1A9NUwIRr?=
 =?us-ascii?Q?oo4sSGrn62RqLIoMkw202vNefyth7B6JEgPCIjgc5JrgcaI6xWbl1GQGvvP6?=
 =?us-ascii?Q?SnZ2p8ap5DNLvSixoBp71z9E7z349NXUBS7CmDgkjLKM6gXQ73Vq9KIDMPjx?=
 =?us-ascii?Q?WPn503WAZO8NmPTXEHG+FRliSkUZ1pdT/9SH/G6DHZvOFVmR2Mza0qkhbHmy?=
 =?us-ascii?Q?0Orbxqt58sdw/X70LZRrIdvi6/r+KihOghoNIdEnsHfxrHYNpkXPMDTkhco3?=
 =?us-ascii?Q?es2+sITBTZA9JY39EVzdWdOb/Gp0Ho1V6o00qOid?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f151616b-46da-4d0a-3b64-08db0284e3ce
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 05:43:18.5814
 (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: Txn3A9EoFdOOov6AO0NrUnkUfq+tbh5g24xkiogiuRBlCnWX+xx5BmzEgYDTc3RUzdhZiatfcv63YSg5awuL+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB6935
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

lpuart32_setup_watermark_enable() will configure the UART FIFO and
watermark, also enable the receiver and transmitter, this should be done
after the rx/tx dma steup ready.

Also add lpuart32_hw_disable() to make sure the receiver/transmitter and
interrupts are disabled during the dma steup.

Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
---
 drivers/tty/serial/fsl_lpuart.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 04fecff2fa5f..eac5243a9db0 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1702,6 +1702,16 @@ static int lpuart_startup(struct uart_port *port)
 	return 0;
 }
 
+static void lpuart32_hw_disable(struct lpuart_port *sport)
+{
+	unsigned long temp;
+
+	temp = lpuart32_read(&sport->port, UARTCTRL);
+	temp &= ~(UARTCTRL_RIE | UARTCTRL_ILIE | UARTCTRL_RE |
+		  UARTCTRL_TIE | UARTCTRL_TE);
+	lpuart32_write(&sport->port, temp, UARTCTRL);
+}
+
 static void lpuart32_configure(struct lpuart_port *sport)
 {
 	unsigned long temp;
@@ -1726,11 +1736,12 @@ static void lpuart32_hw_setup(struct lpuart_port *sport)
 
 	spin_lock_irqsave(&sport->port.lock, flags);
 
-	lpuart32_setup_watermark_enable(sport);
+	lpuart32_hw_disable(sport);
 
 	lpuart_rx_dma_startup(sport);
 	lpuart_tx_dma_startup(sport);
 
+	lpuart32_setup_watermark_enable(sport);
 	lpuart32_configure(sport);
 
 	spin_unlock_irqrestore(&sport->port.lock, flags);
-- 
2.17.1