From patchwork Tue Mar 7 16:44:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 65701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2537730wrd; Tue, 7 Mar 2023 08:52:39 -0800 (PST) X-Google-Smtp-Source: AK7set+5DM4jLYtkBOxGinZJ33I8ZXzu4cJ1EGNc+kaAFBR6YES0LndT94uyL23esKustpg8bVMu X-Received: by 2002:a17:906:a14:b0:8b1:7de3:cfb3 with SMTP id w20-20020a1709060a1400b008b17de3cfb3mr14241551ejf.1.1678207959036; Tue, 07 Mar 2023 08:52:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678207959; cv=none; d=google.com; s=arc-20160816; b=qRsO54HX3RIYHU9RzgMcNIh7p6r/BYxw32AZIC41DZd+Wxtx6cnXLurgOaar/Egrqh /j7hFGCTdzHTx+i1RR/sywOiuLneG+AGbzzHUGwBO6pByTK023/dPhVMbe4VIHjvkgwq zWosrWwBXadq64V3Mw2xnSm8ZaI8QpBhqse9v7t8vPRBhoSN9WU5GPkKcmO0639ybcsh SJh+oQ0YQKZzbn9klGi9Yk0cUu+oTTP8QgcBfiAPDxcdS645Lt632kSieKAwLsQWcRBT l/GXHP7/iGc+XroQXciGQcOMGEXINleO8mavt93P4B0hTEgtmDcPL1U0knsfQo6xbFgl Xnig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=og2bJFZYTWC27fXWGlJ2eZxj6MIJufT13z+NvRyZcpc=; b=nRV0O3kyo7jxzYPlJWT6ubxh/Adp//ge9+OXLrDPXVitCjga7PsfGk4IBq8N7+auuP vK8nXYJwqM9BDR05mWuv5rEYZ5Sqd1SxQdISzASi95q2fJmVEkSqAofVMOptkgzmwMSn lhfyZxOAbqqsme1LXZjxoEAEPK1SpbKRoOykZnjowEK3dv9RanI2H8X5gGTJuf9JukBp p0d1JsiIkWMnsAiQYjDb6KMyocRPntelnXEHIlY6b9EqmiLCbs8mKvl/8oucyOIWvgng fd+JABe73y5IcXqjdJcMRpMW92mrRU2hV40OMO/aMX6xQ4j3nKsN4qGG5wLvjQt4Dni0 WQMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="G6i/dTXZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gs20-20020a1709072d1400b008de9287d513si18328454ejc.7.2023.03.07.08.52.10; Tue, 07 Mar 2023 08:52:39 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="G6i/dTXZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231206AbjCGQrC (ORCPT + 99 others); Tue, 7 Mar 2023 11:47:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229973AbjCGQqg (ORCPT ); Tue, 7 Mar 2023 11:46:36 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0AA9596C2F; Tue, 7 Mar 2023 08:43:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C1F82614DF; Tue, 7 Mar 2023 16:43:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FC29C433B4; Tue, 7 Mar 2023 16:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678207417; bh=YjMTLeqUrjD3XZwpoLNymTfC9unMud9yDlDAEDjzs2U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G6i/dTXZ9vd1pcjWL1vwbzOt3WQ0cnyPYlHSN4wG2WigiFGDIZ97wiYCw9tjrL69S /3o5tXP6e9nwGRYuY21FaxZje5XxUsTtD36CzApzwQsUyCDHnzT/BnimU+sz9/EeRg mZBN4837pTcZt8XzHCULsRREs2n3+vcja7AJFQmM8Cdx7w6CDouhxINQ/gkidc4Sby rIwHehqOxIjxuCLrPD1tEzyg67IQZdEhX1+dVBapqrOyeJvqNh3fnNVhfRFA14/4Zx 7nSB3y+zWZtTHb+lMvx7mQFrttS4vRknRa2M4o9hYWsRfX2fDL5SoEbFOY/7JVqXSX xqKa77+PSN++w== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pZaQG-0003hq-UG; Tue, 07 Mar 2023 17:44:20 +0100 From: Johan Hovold To: Greg Kroah-Hartman Cc: Bjorn Andersson , Andy Gross , Konrad Dybcio , Jiri Slaby , Bartosz Golaszewski , Douglas Anderson , Daniel Thompson , linux-arm-msm@vger.kernel.org, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 1/4] serial: qcom-geni: fix console shutdown hang Date: Tue, 7 Mar 2023 17:44:02 +0100 Message-Id: <20230307164405.14218-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307164405.14218-1-johan+linaro@kernel.org> References: <20230307164405.14218-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759728588438708760?= X-GMAIL-MSGID: =?utf-8?q?1759728588438708760?= A recent commit added back the calls top stop tx and rx to shutdown() which had previously been removed by commit e83766334f96 ("tty: serial: qcom_geni_serial: No need to stop tx/rx on UART shutdown") in order to be able to use kgdb after stopping the getty. Not only did this again break kgdb, but it also broke serial consoles more generally by hanging TX when stopping the getty during reboot. The underlying problem has been there since the driver was first merged and fixing it is going to be a bit involved so simply stop calling the broken stop functions during shutdown for consoles for now. Fixes: d8aca2f96813 ("tty: serial: qcom-geni-serial: stop operations in progress at shutdown") Cc: Bartosz Golaszewski Signed-off-by: Johan Hovold Reviewed-by: Douglas Anderson --- drivers/tty/serial/qcom_geni_serial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/tty/serial/qcom_geni_serial.c b/drivers/tty/serial/qcom_geni_serial.c index d69592e5e2ec..11da05d8f848 100644 --- a/drivers/tty/serial/qcom_geni_serial.c +++ b/drivers/tty/serial/qcom_geni_serial.c @@ -1070,6 +1070,10 @@ static int setup_fifos(struct qcom_geni_serial_port *port) static void qcom_geni_serial_shutdown(struct uart_port *uport) { disable_irq(uport->irq); + + if (uart_console(uport)) + return; + qcom_geni_serial_stop_tx(uport); qcom_geni_serial_stop_rx(uport); }