Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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] tty: serial: fsl_lpuart: don't enable receiver/transmitter before rx/tx dma ready
Date:   Mon, 28 Nov 2022 13:02:08 +0800
Message-Id: <20221128050208.28086-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?V4p+R3rA2UaLs4CiOBSpAI0Z0gPIjwFQLCA0Uk14lnEEj4fCE8g6y260GYwj?=
 =?us-ascii?Q?Iv2dGkm9gyByqcsJeMtMWZUFDi8t0oJSyeT20crhJb1D1MxuwR4PKxxON/DP?=
 =?us-ascii?Q?9yKcxmIjcQdQahIXDRpq9kXLp72ZnHCt6AOGx2kfVkeoaUO0cf0paxKbk2Sc?=
 =?us-ascii?Q?lwSktFFMg/5vhYakvMHpvVWpIToM+U+PNx8ddfcFnFR2NisYMXze7jymRvXk?=
 =?us-ascii?Q?k7182cCFtootQyHNDF9UYWPX2R7prnTEiD4Mm8xJ3Dgfqf02W3B+mK4KIKvN?=
 =?us-ascii?Q?IRszz+ni1qZDXdZ2PJ0gAxj/aTagQk8W1OUMTEwtVchqABiaKmo7xtvYb5UZ?=
 =?us-ascii?Q?lcD1AuDZFoh9YZl9VnPcu6lOGuTWrKBGWleZgIfJ7d39CyDhWdFoAINzZioq?=
 =?us-ascii?Q?M9FWIQ+Odt4x51wO2Z2+7+UZs2IcSpY5SN7JNyaWTy38Pj4XdKth30y5ECUO?=
 =?us-ascii?Q?4fW9UrI4g7PuuKTnE6GQuu+yVZXDhN6s7jy4Qce96yzsbNQc7kQ63b8n+8Sy?=
 =?us-ascii?Q?wd+Z/juJUpX9TNAwzZZxOtBQm1km9z2WA1E10ej7+MfFvSq3rt/PVCPBLVVQ?=
 =?us-ascii?Q?9sLEmBI+D6DyfLu9kI3K1TFfqQtHfEWK8tfJwlsGlm/9yhIShpWz88dCTLi7?=
 =?us-ascii?Q?/H/thMrjuIw92KuhZcZmg/oep9ZyYiqS/9ObEUXU03uSHqmh/RLaG5AuXJWH?=
 =?us-ascii?Q?Yb8o3/s5b6P8PFCI7flnxt8yjivPhv/w3usObUTT59Se9tWi2/WCXH28c02E?=
 =?us-ascii?Q?9ATkWmCH9Aj27IW/Mhmv8OsFUecrogkSi0wssC60qwzvz2Z8CwDct72yuQiO?=
 =?us-ascii?Q?aX5547XmPOj6r2BWdD9mKQj0T72Y7OQ8NGPVlYLNtBAEkMUUCoK85rh3TCMY?=
 =?us-ascii?Q?r2bzh/tpyqvLkt1sGs2hzchSfYbv6Dg3P1nwzg9JeEmaTrTiNC5aO7N56hqS?=
 =?us-ascii?Q?S/9B/VJQ6Ji2OyLL9u2sEPMhf0r0H9V3OZLKDopU+LT+ZqTo6+BqU+bTfKRF?=
 =?us-ascii?Q?6k4CNMe06pkbEh0rhOiLSHpaTfQ/kJZ4u3Y6aeGJpM9Kf++Uc+xWvz6vPGVM?=
 =?us-ascii?Q?FRkcg5Y5zJKAEVgW2dFlBJg/OjlQaz11InI1nTcb4YVzxfrL99ZFlETmNLzq?=
 =?us-ascii?Q?+sf4RlUJKTc+CKkFLJPKkn6MQhQRUlo7nKdcOqIGf7w4NjN0fsFDy3a3aViY?=
 =?us-ascii?Q?X6mWSpYe+0gAyu45bTGOrIS/ZHVM7rdWzyTk7SHg83I08AUkqtbMValPifon?=
 =?us-ascii?Q?s3aUh5hUf4fpYw8OG0tEYQD+zGHgvehfA/vl5uEXuM3Iql8vV/focvUrD+AJ?=
 =?us-ascii?Q?VRATr/14biyVpMF7D8BhHhduTzytfn/mYZb2A6kNnxZCUC1xHD/Jy6PgV3VL?=
 =?us-ascii?Q?gi27D9YAUGZVaG3ATVKvBmS+P1YJrvOoChX+GRa+6lpYTCQyofityHT2tzKA?=
 =?us-ascii?Q?MsOCzGzknShvg+d5Ej229ijpMiV+YQ9+ojh1iyAht2Nv6voHUj7I0gb5X5Fs?=
 =?us-ascii?Q?ItekzA7W/x05NZLDhUAlzgDhdrbuwyqzf6hYBK7NCql9Ulj0h10x5XTIGiZJ?=
 =?us-ascii?Q?YFqsEnmtuuwj7/2TU9DfxmIaR93cFgCEfBgMk/g1?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d14aefd-69b3-4809-b062-08dad0fdf1d7
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 05:03:55.2538
 (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: eYsYeRQw4lTMrpmwguy3yi1TOPnbhoOaRJPnX6clm+y3q/moCOFw4zNgJzOi2WdBL0UOhX5MJT4YIVuIGCeazA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9442
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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 8918e08bb19e..bb12b328e224 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -1682,6 +1682,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;
@@ -1706,11 +1716,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