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 2/6] tty: serial: fsl_lpuart: set receive watermark for imx8qxp platform
Date:   Mon, 30 Jan 2023 14:44:45 +0800
Message-Id: <20230130064449.9564-3-sherry.sun@nxp.com>
In-Reply-To: <20230130064449.9564-1-sherry.sun@nxp.com>
References: <20230130064449.9564-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?kq5/7/WvfNLxFNEzq9e7Fhzm+AtDUp4LXbMvjFlrWc6qM4+BuZTv1BnO7SB/?=
 =?us-ascii?Q?qnOnSAs1BjNhm+J1ZjhIMrCefGzz0n3VjnHj47jgIqh+FUKyKDwQIBgNLapQ?=
 =?us-ascii?Q?2/3klmYwuFGzdelqaDKxbvJEqfDGSqS4HqV8NmC+6sLKp0gq3wW8W9Tl7dvt?=
 =?us-ascii?Q?9nesluuq23vWOlNPlKakG20gesgkKkDdMkE34BT0nbULd9hOjxs8DkIXH3Gb?=
 =?us-ascii?Q?LshpT4hjrEvJ4JTXGcuo0meXhv+P9KufzIR7VBwlfjITT5PtTUhA5itFSZm8?=
 =?us-ascii?Q?z+cBACyvOrS3DZ8Ei4yTwpEUmCLt+15DWpo168JUjdyMfSVjpU/8QXB779xa?=
 =?us-ascii?Q?N13mMkOZqxPT7kKr5XLUixzbNw6cKUaO6M/yoD7GDUXC9D2LxQNW0YQOMRn2?=
 =?us-ascii?Q?IrLY+FOiYDOqscZ4JQg7N1e+3iwt4gNK0AVMyNUOUxpFpIIAED8uWLkjj4v4?=
 =?us-ascii?Q?SyOhsvLVeRUM5shblyKKFVSVtcKAdxNrzVueQCQ/74YXlgt0o8wBH9Jxm6Zr?=
 =?us-ascii?Q?Rzx0g/l5J0bQJf89YodtZZmXXs6iI14pLZLsmmR8/RZAA/4q3ecD7PJyMrHM?=
 =?us-ascii?Q?X+MdmxjXttGqzd/HSgq7eioD4vMrF0p8mut+Gb7s/Yb6h8QCMySUQgJ4EqvM?=
 =?us-ascii?Q?36sivi+SeWDMMiT/LCIkNo9UpVTgSuR2WU5/pw+ynJJR0Kh3iP2AZcHJKukY?=
 =?us-ascii?Q?5UOsUMIONAH/L1z36ZjJwSNbtDw6lpLdtfN3p4ueX1lYWinGoypoufv/gUfn?=
 =?us-ascii?Q?FOcrYX1hTUGPxvGprV3jGUyFCkH5/P0N5TYBRylcgwYpSI6UXlEBD5XlIVeu?=
 =?us-ascii?Q?8nvDDaetwEByoq2XdYnZqc79+XXr39wZu/zNgdxolJIqE08NtOIcbnYn6k+h?=
 =?us-ascii?Q?fYsWO5hEb9Agd/8LtkKW1hmq6fdNr9EdObQAIZlZWMvaOXpUkWlk2L5JXMDa?=
 =?us-ascii?Q?76ggVyCB7OrMPBE9TcPuoEyPdvAtjtpuILnh32bmp1GWnEwsyaRzdA/AlTtH?=
 =?us-ascii?Q?JGjBSsr75gtIYOfhc0OXfx60VAqNhelFqpyl5TBZbuwOcREYtOLtbj/zEOrK?=
 =?us-ascii?Q?b+sU/SStjY/k4PfP5w6XLP208PCs82bFhfnCl6vf2pFBtSwlykFeICp24o19?=
 =?us-ascii?Q?s5N2rXKtEANcoCBHvv0NLqxwmCroj5BDlwLKRboTD1iv8Fx847JufqpvgoBB?=
 =?us-ascii?Q?H8Ljice8P0I+1/RcGTm3XiTJfP4glbwIiz/SblcoZ+QuEiV7oog23JQkuUpy?=
 =?us-ascii?Q?XO6HdGt629S2Y/pQWxDqoTrd+v6sr3aadPLTBc7bJYpdVAEie2yzekqv69CG?=
 =?us-ascii?Q?iHrl5wDpOWZnZ2rHNxipvcvyI8qwDFjN4ZnnkBCD5XnEAGq0peB9tIbZxYq4?=
 =?us-ascii?Q?+A+ZEEnNHzebeNv8CDOPH69tL5qHX6BuDOnnrOEKKVugwJdBuc3vXOAdtOHk?=
 =?us-ascii?Q?hCHoSDWi2mdc2BbOfpK0Ir6WVyTIqPisbeDyrLae5wXaTKxYYXIpTcOKPHzp?=
 =?us-ascii?Q?9ocyi53XTQZIPNaCCTpmLm0Crfy1yqs/xr5ZKqr0jifoKgs1UcFLNCzUlVhW?=
 =?us-ascii?Q?1TNeMwvsTJtVM69TqZ8XNumamKuFL3Ik9vBQ3wXZ?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2a0963f8-cb49-4da4-b734-08db028de057
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2023 06:47:38.2577
 (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: 075NZQkmUZdXBnE5rLUAZv1VDSwqK5CnWL8ywJrTf04Zv89n575gf3FWNZxzIlJV2XAU1cMYSGFlwBshlWNpUg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7228
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Since imx8qxp RX FIFO depth is 64 datawords, it will be better to set
the rx watermark as 31, which means when the number of datawords in the
receive FIFO(>= 32) is greater than the watermark, an interrupt or a DMA
request is generated.
Also keep the console rx watermark as 1 to make sure it responsive.

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

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index e4aa161e61bf..868c2783d2c7 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -321,7 +321,7 @@ static struct lpuart_soc_data imx8qxp_data = {
 	.devtype = IMX8QXP_LPUART,
 	.iotype = UPIO_MEM32,
 	.reg_off = IMX_REG_OFF,
-	.rx_watermark = 1,
+	.rx_watermark = 31,
 };
 static struct lpuart_soc_data imxrt1050_data = {
 	.devtype = IMXRT1050_LPUART,
@@ -1527,6 +1527,8 @@ static void lpuart_setup_watermark(struct lpuart_port *sport)
 		writeb(UARTSFIFO_RXUF, sport->port.membase + UARTSFIFO);
 	}
 
+	if (uart_console(&sport->port))
+		sport->rx_watermark = 1;
 	writeb(0, sport->port.membase + UARTTWFIFO);
 	writeb(sport->rx_watermark, sport->port.membase + UARTRWFIFO);
 
@@ -1563,6 +1565,8 @@ static void lpuart32_setup_watermark(struct lpuart_port *sport)
 	lpuart32_write(&sport->port, val, UARTFIFO);
 
 	/* set the watermark */
+	if (uart_console(&sport->port))
+		sport->rx_watermark = 1;
 	val = (sport->rx_watermark << UARTWATER_RXWATER_OFF) |
 	      (0x0 << UARTWATER_TXWATER_OFF);
 	lpuart32_write(&sport->port, val, UARTWATER);
-- 
2.17.1