From patchwork Mon Oct 24 11:30:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp697782wru; Mon, 24 Oct 2022 16:14:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5593zWtZzminEYQdKhwSXOp6eto51sjp7/3oBNqRQ9XFCONPZhsYkz5NNPCTOS1ih1stTE X-Received: by 2002:a17:902:d512:b0:181:f1f4:fcb4 with SMTP id b18-20020a170902d51200b00181f1f4fcb4mr36198273plg.102.1666653297252; Mon, 24 Oct 2022 16:14:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666653297; cv=none; d=google.com; s=arc-20160816; b=TQ8mu63r83lFPSDEwUUvV/gwhZu9ElLfaFeKE2bLe5cNJLuNygb0tIKfzU8CoM8otA 3U+r+Ckfn0ZOgPIPlN/GFUYd3e9+hiucYOdN/tMaBT7ManmiiwFmK3DbWi6phzN9WPGC dOTgNoUzD1jhmimpSSKXHHwyQ7pkXODj2aKzj85v9CqCXFpo4T7xelyYgpmj+2EbX4/S v3WBpWtrc/TS2EVwGBs3kh7/lQ7XIvZcF5JaQtqf3UyJGkGI27p1RmlmTDCMyGVA9sdT +B8zLSKr7ZkJ+LY8itJNEc1aOnP75lWoQBta75iSzl2OUJishTxGbKa/460XqswT+/hz j5GA== 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=HbGEfbwf4zkyG0ThGCxvgiiSD90a4lpRYWeg2YMjk64=; b=ABhw8fm5hqvoMgbkwv0lpoEcJPvg8OCn7FbH1tODYo4JlBlf4iLXcGKf5+L152ou99 ij18aRdDf5tYaD4BEt+/PndjVsEi20OTjS76jkVxQQGmm0x4Sch22hrV4dZuCjUmXY7D XSSirjY8gWnGijEhzz1e8NgCWVbwdBCzIaFLV3CzEtteFGkVN40uKsASZYylnfDqpuCg ubJipVHcz39j4sKIm0PMKeiYWOSABaCUvfgr6BuoDPJ3MRiOsBGJtyftRbmS7L2jmMuW DmGidmbKUXTkDIfZ+h4N2VXIduk+5TMKryTfn2rQgu9bOvK85TsEwVf63ZCoEF0BO5zO MxPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vOMKbqFb; 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 u37-20020a631425000000b0046ec2ad4a97si1029517pgl.163.2022.10.24.16.14.44; Mon, 24 Oct 2022 16:14:57 -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=vOMKbqFb; 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 S230000AbiJXXF5 (ORCPT + 99 others); Mon, 24 Oct 2022 19:05:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230048AbiJXXFQ (ORCPT ); Mon, 24 Oct 2022 19:05:16 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D11B13E9D; Mon, 24 Oct 2022 14:26:39 -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 sin.source.kernel.org (Postfix) with ESMTPS id 5B0DACE1358; Mon, 24 Oct 2022 11:52:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54D3EC433C1; Mon, 24 Oct 2022 11:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612365; bh=MnQq42w27sr4o4YFrHTKLGct+XKYyfZLsxJq6akJljY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vOMKbqFb3G7Ljj0B3z/cBInHebuJl+/HW/JCTSl30QGLzun4UbRZ7YI8NM1Qtb/Oa mLNWSiae+QfG9UjWaRYoTztUlpANmIj1qIYsqSaDTsDjgEBPwF1x5FiRT1Xo3KAJox 6adjRixMW/qm0xksQCBmCPuuExgTGn3Jy+mJzItg= 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 4.14 140/210] serial: 8250: Fix restoring termios speed after suspend Date: Mon, 24 Oct 2022 13:30:57 +0200 Message-Id: <20221024113001.529290223@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747612648068133415?= X-GMAIL-MSGID: =?utf-8?q?1747612648068133415?= 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 5d614d645e81..def880039b30 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -3236,8 +3236,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(up, baud, &frac);