From patchwork Mon Oct 24 11:31:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9091 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp445995wru; Mon, 24 Oct 2022 06:13:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4hrlVgPcZ7LJ0splXBOBI6ugkkwVCV+H3BWhWEv7wE5zewpauxEjnzHSSADuqrUMa8yd6H X-Received: by 2002:a63:f047:0:b0:46e:b1d4:2a68 with SMTP id s7-20020a63f047000000b0046eb1d42a68mr16879108pgj.496.1666617211146; Mon, 24 Oct 2022 06:13:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666617211; cv=none; d=google.com; s=arc-20160816; b=IXtpP5VSl0svhtW8bzHn4u/nPrv+IowPJLQlSWpgdIl/K36wLcibYkYH3zS/GzMhsA oQv0mACgnr9Fx8Z6oVtrZ+qp5+raGhrDIQTAhQGVxswB9+I3n4pvnBr/sp1kBhavV5J1 ODRazmO1tXKYtqODO4rsA2123bGSqxotytFaR0nCaCImhVICIX4v9ms3utRBiAYTjYmW q3NNh0lvGKndbwXe0rxDBVnlmIy+jpsTH0o3Qfo0CMpJ95CvQJrHb6Gl5TxpCetkK3cx 1Sa4fCI9oAoJoxnhynIrRNMZIX3UVXrexbK6luyP7+lJVWkIAf5SilULEQ9XYctzkFY9 +E/w== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pQ+DTvTfU54KhGo1D7FJyIK4j4vCXcRkb9Nlu/S7bvE=; b=jg1vSJLrDBb1+j4CWuftDoT/yqKBXx/S3BYvBcprorBBGaa1Kvjl4/mJwsjm/8wgx/ FOv5RZ5uM0aZNe++vj9dQ7ljTW3i1ms/8F+BExhI8m2OdfUCsjBYZHVvOCFDqzRpNLu+ K9tM9IlhieQ31DTNfZQTeavw0CA1ijgv06NCKjkJLRdWuolx8keCx1ndidKhisOg2qgh cQ1AOBJQ7/Xx8IqDCf287pTakibKt0Y5FKx1hGziGxgQpOUzjglsbJpJQpVTQXmE0aXb GtlAKJ6AxoHml5o2qVDsPqAb/QFOuL49dwN7N/yJhnSC0g/nXcQLRu35GJEAWRCd0jKy y1GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=butk5ILD; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a170902904400b0017f97fe774fsi7636459plz.445.2022.10.24.06.13.17; Mon, 24 Oct 2022 06:13:31 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=butk5ILD; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235773AbiJXNM4 (ORCPT + 99 others); Mon, 24 Oct 2022 09:12:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235989AbiJXNKV (ORCPT ); Mon, 24 Oct 2022 09:10:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3999A2337; Mon, 24 Oct 2022 05:23:57 -0700 (PDT) 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 92B41612E4; Mon, 24 Oct 2022 12:11:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6AA3C433D6; Mon, 24 Oct 2022 12:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613503; bh=QI9wxZDgrBqPGWPZkZgZkNGHm56xUlzdIwnv5LHH7ho=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=butk5ILDT73S+ubSGXEY/U4v2Km0wyb2LRzZWswbFF4rlOKknXdtLgeA3H1c6ynba zULLkNdxD1VoVO5nXpVWcqHNpe2rNCX7GjU7iu96A10p2/AwN3a+rrC6Z2M2Ql8h4+ hmOBCarFdkNSHBy3pjZoHqxet2H4By2iBVmyHidI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Pali_Roh=C3=A1r?= , Sasha Levin Subject: [PATCH 5.4 154/255] serial: 8250: Fix restoring termios speed after suspend Date: Mon, 24 Oct 2022 13:31:04 +0200 Message-Id: <20221024113007.770480129@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747574808693528561?= X-GMAIL-MSGID: =?utf-8?q?1747574808693528561?= From: Pali Rohár [ Upstream commit 379a33786d489ab81885ff0b3935cfeb36137fea ] Since commit edc6afc54968 ("tty: switch to ktermios and new framework") termios speed is no longer stored only in c_cflag member but also in new additional c_ispeed and c_ospeed members. If BOTHER flag is set in c_cflag then termios speed is stored only in these new members. Since commit 027b57170bf8 ("serial: core: Fix initializing and restoring termios speed") termios speed is available also in struct console. So properly restore also c_ispeed and c_ospeed members after suspend to fix restoring termios speed which is not represented by Bnnn constant. Fixes: 4516d50aabed ("serial: 8250: Use canary to restart console after suspend") Signed-off-by: Pali Rohár Link: https://lore.kernel.org/r/20220924104324.4035-1-pali@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/8250/8250_port.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index f8819f72304a..c1551319684f 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -3180,8 +3180,13 @@ static void serial8250_console_restore(struct uart_8250_port *up) unsigned int baud, quot, frac = 0; termios.c_cflag = port->cons->cflag; - if (port->state->port.tty && termios.c_cflag == 0) + termios.c_ispeed = port->cons->ispeed; + termios.c_ospeed = port->cons->ospeed; + if (port->state->port.tty && termios.c_cflag == 0) { termios.c_cflag = port->state->port.tty->termios.c_cflag; + termios.c_ispeed = port->state->port.tty->termios.c_ispeed; + termios.c_ospeed = port->state->port.tty->termios.c_ospeed; + } baud = serial8250_get_baud_rate(port, &termios, NULL); quot = serial8250_get_divisor(port, baud, &frac);