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, lukas@wunner.de
Cc:     linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org,
        linux-imx@nxp.com
Subject: [PATCH] Revert "serial: fsl_lpuart: Reset prior to registration"
Date:   Thu, 29 Sep 2022 16:53:18 +0800
Message-Id: <20220929085318.5268-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?tfQh+H+JXdNgxYU6s4iAVP/DnJUsdCFae5rP0/01+ynqmibAZrgSymG7zxWO?=
 =?us-ascii?Q?NPrSlw9YFQs5aEasrWsPYrISZQVH09SmpDYO6zVQGTFdBsQOI/CGs0OlzP63?=
 =?us-ascii?Q?CtsnbLA0y858qBQziKzet2MGK4aNUZFJ6SGlFqNLAcMUOAZ8e3chI5ko9WdT?=
 =?us-ascii?Q?G8bWKezzE0PcNMQC+kH+ly4kDb40gG/DwU64T220ewcg5/BlYF8mu1sJ0f2b?=
 =?us-ascii?Q?49Ohne5+47rePXM3QaCnopMeHiW62TfN0GyFrt79hcrJ8riwSZBXRHPGYzoR?=
 =?us-ascii?Q?9qE4Gm2f82dlH4FunDfYcNDYR2P+eucHOaoSwvca1KIGnqmUSajg0/YFrzxg?=
 =?us-ascii?Q?qUMcI3eYO6gm+mP1zrEC5xAVhshCS4tcF/DFDteTL7r9rmI2uMAz0FOUFYZt?=
 =?us-ascii?Q?/xqGHQuyGUiOwfQ6QvUUrLbfGRP3MlOHdIaPzuuo9Tfolzf75x6K000XURYb?=
 =?us-ascii?Q?Qzk8naLMQ5+6k2NQNJNxMJ7+S1mnLJj1nn6Q9RPciVZYB9EsBFLvoGgqbmv+?=
 =?us-ascii?Q?om1FS06zWbKedFCusgfRL8/Kafk2tXG1ru+0QM4VEFauQPLI3aQjFqt07MEC?=
 =?us-ascii?Q?Kk2++Dpj2A6kh63LrfzP4JduZcpL6iSlCfaSMtoyJRKKI5kfauDeQw3rCH0H?=
 =?us-ascii?Q?G++twiNbqJj419rs92Sg2qo5vhiOCA7rpP3u+QsJoeH/Bt5gUvjokt0aqq4h?=
 =?us-ascii?Q?b2bqaUPLkdQ0qNCwd7nEnD1hRzJv4VYjTZfH7nDV4eKcBz1j0Q0o+XPEHYv2?=
 =?us-ascii?Q?sm1TdyrXKR6yne9CAIfdXxseEJkXqlkFbYX25dXUf1TSW7MTU+Ex4ZcWIg0P?=
 =?us-ascii?Q?U3dkxBF+5020xEeHS2z8Pwkij1fPB/oCz4lVZqzy02gIzrpzbUiesoC0dWmY?=
 =?us-ascii?Q?qQFXmUNKIydJhGF16BlZWDaZlnCN80QeidwNhi73T/cj3FwXs7o4qk39h9y2?=
 =?us-ascii?Q?OY+DqYd1a+Cf1N/opaEERemchE8FzjBWqGJuZTrzI1wT7cqxJaRmWPFKafZ8?=
 =?us-ascii?Q?4pYVOAX7p1rvxjgTjBYY8x6r5YIni7pYQVF9FwbkzPChknDFPlDB2hiKc60A?=
 =?us-ascii?Q?WiUwus14CfHjEAKPVX8Slxp0I9NviX+pPMKs5pI/KhC9r09t60RGmpsoUU4q?=
 =?us-ascii?Q?hABUxFf7GkfY+4EuyoRb9x9vCNzrsji44XcymEMDromU4cSWVdbJZSw1Ebks?=
 =?us-ascii?Q?ku5ryTRLa/JSHR+UX0/WQsss3JE4j/ERUUBL7X1js3FXXZM57eQ7DPPgHiA0?=
 =?us-ascii?Q?JcHO7e7R/5Utfd5aaqYObSHfK8qn03yx9+7f3EPhbHnJ3esvu8mrZgRmYX3M?=
 =?us-ascii?Q?tKj22jOj0uGpcme943UOw+9WmuM7kW9v1D8qpjO7sFUENY8C6uX4Qgf4J84Z?=
 =?us-ascii?Q?Srz9AJDB8SRkf2sjs/A+Ax7ZwXE2RGjpesOI9+YTjL08+sTGCY4oFnrnhniE?=
 =?us-ascii?Q?GI6LhPG80Cav/nQzNoNlbpn/MmL0COM+etituOiVTk+Yeb6LuJi9xdJI779S?=
 =?us-ascii?Q?TtVOOse9BvIALjS/AxTRRKcQFpntmE+6nQcEi1pmfFi6IFENY+ZYM/xGsORc?=
 =?us-ascii?Q?TgWgeYKdGJqE4Dildvj6PwjetnQMY5uyrxGi7gMc?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: cd6dfa3e-85d3-4894-e30a-08daa1f8413a
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8404.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2022 08:54:44.7810
 (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: LsjvZ5SNj8dM7OaC7jkXMGmGDJpZIKQhfYxsuXb+mkswhQAojJiqZlBF9YemKL55IHFA0pn9GcWThJ4nDJGzGw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8851
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

This reverts commit 60f361722ad2ae5ee667d0b0545d40c42f754daf.

commit 60f361722ad2 ("serial: fsl_lpuart: Reset prior to registration")
causes the lpuart console cannot work any more. Since the console is
registered in the uart_add_one_port(), the driver cannot identify the
console port before call uart_add_one_port(), which causes all the uart
ports including the console port will be global reset.
So need to revert this patch to avoid breaking the lpuart console.

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

diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
index 67fa113f77d4..7da46557fcb3 100644
--- a/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@ -2722,10 +2722,6 @@ static int lpuart_probe(struct platform_device *pdev)
 		handler = lpuart_int;
 	}
 
-	ret = lpuart_global_reset(sport);
-	if (ret)
-		goto failed_reset;
-
 	ret = uart_get_rs485_mode(&sport->port);
 	if (ret)
 		goto failed_get_rs485;
@@ -2734,6 +2730,10 @@ static int lpuart_probe(struct platform_device *pdev)
 	if (ret)
 		goto failed_attach_port;
 
+	ret = lpuart_global_reset(sport);
+	if (ret)
+		goto failed_reset;
+
 	ret = devm_request_irq(&pdev->dev, sport->port.irq, handler, 0,
 				DRIVER_NAME, sport);
 	if (ret)
@@ -2742,10 +2742,10 @@ static int lpuart_probe(struct platform_device *pdev)
 	return 0;
 
 failed_irq_request:
+failed_reset:
 	uart_remove_one_port(&lpuart_reg, &sport->port);
 failed_attach_port:
 failed_get_rs485:
-failed_reset:
 	lpuart_disable_clks(sport);
 	return ret;
 }
-- 
2.17.1