Received: by 2002:a19:651b:0:0:0:0:0 with SMTP id z27csp3611248lfb; Mon, 9 May 2022 00:00:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzBdOpq6d4iEpxZ22xa3ys048cb5qG0tAu00tE7dAcyvKFIj7vx/Y6e9lnLPV8uni0wss0 X-Received: by 2002:a05:6a00:a1e:b0:50d:bb0c:2e27 with SMTP id p30-20020a056a000a1e00b0050dbb0c2e27mr14756358pfh.49.1652079618184; Mon, 09 May 2022 00:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652079618; cv=none; d=google.com; s=arc-20160816; b=oN5bAIpqMMjzqgQLvIk3AiJndlouuXRl0f7ORR+1vVlKMG9jcnvyOjfv5aNykQUqDf 6cANVoWEg8kW6+Vbx1zJARKSaUhcZ+3IrDTjZUuTv55gfIKzQ3nrX/JnQgM6AF0tyKFh tLy29DyswXnUbVTy8oohKRuXXeG8xFCMXWoDbDbELdLvht4CxbFp99tOjiRfg8gyJlAW GKI4VwRIuc6CVyS2sZUSxqREh7jB54vDf9mPfBmtaqNfBHIae66dz/9L8hfcOj9U1XhT eqljfIuTY71qXidSqoVhD/zKxqNPEVbj0yZX84SOa7fkab2dTLHviXW3oNWZ8kLJYoZr 0m3w== 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=gkdsRWmVSKJKuP+i5XpOv7pxvipd+DHTEO65nKTQncI=; b=nhL92/iSs2uAK7chQ23Pd/0WWC6p9OS9xbTu3oACeNPCjAtKyo7zfiBSRRAsCIx+2m uoCEaaC9ncFF/9n7wVlEYYCrDpkImf+DvRotCuvMl5TNhDSabWfPWid+p4zlcHXMnRV1 qeK4EcYttN/muF1Wxlf/iGoccsUnaBy6vduqhMVe9akrpRp1xNVLmN7CuBComIzY8t1q TvQAkoOtWJw8WGo2lmqXb1k35NK471Jp+AXM3UyPXSkOcIpJOHR5db2TDQ1nVFyFhbM1 gFbfhacRZdImdy+OHcayfVlk4pPKRg+/gB3wEQluyQZ0ClpycYMSceDXFIAUfAHNLPZ7 MJ9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PmmLH9MD; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id w15-20020a170902d70f00b00158e7ff4c26si9755215ply.514.2022.05.09.00.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 00:00:18 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PmmLH9MD; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id F112915E498; Sun, 8 May 2022 23:57:23 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357135AbiEDRbC (ORCPT + 99 others); Wed, 4 May 2022 13:31:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356822AbiEDRJp (ORCPT ); Wed, 4 May 2022 13:09:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50587220D0; Wed, 4 May 2022 09:55:50 -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 E02DA616F8; Wed, 4 May 2022 16:55:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37142C385AA; Wed, 4 May 2022 16:55:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683349; bh=RxD54wOIf+gtesh7VHfBEjiXkcaf7g6pr7I4+AwcUM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmmLH9MD5cPnUF+CNIlgo3DUUq533LWFz3zv/hea2WdPZKnW+PCWyaM5216N41SRO dOscUOsUM8QxHwTF/EIRg1YpvbWgFl/+NIN0LhnPZP+xxq39va9rlvY3dj/cKiWqbQ MaYjTSOBEce7J7XyL+qaeF6fShRpINsI02/fojbc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Maciej W. Rozycki" , Andy Shevchenko Subject: [PATCH 5.17 036/225] serial: 8250: Also set sticky MCR bits in console restoration Date: Wed, 4 May 2022 18:44:34 +0200 Message-Id: <20220504153113.425360432@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Maciej W. Rozycki commit 6e6eebdf5e2455f089ccd000754a0deaeb79af82 upstream. Sticky MCR bits are lost in console restoration if console suspending has been disabled. This currently affects the AFE bit, which works in combination with RTS which we set, so we want to make sure the UART retains control of its FIFO where previously requested. Also specific drivers may need other bits in the future. Signed-off-by: Maciej W. Rozycki Fixes: 4516d50aabed ("serial: 8250: Use canary to restart console after suspend") Cc: stable@vger.kernel.org # v4.0+ Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/alpine.DEB.2.21.2204181518490.9383@angie.orcam.me.uk Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/8250/8250_port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -3340,7 +3340,7 @@ static void serial8250_console_restore(s serial8250_set_divisor(port, baud, quot, frac); serial_port_out(port, UART_LCR, up->lcr); - serial8250_out_MCR(up, UART_MCR_DTR | UART_MCR_RTS); + serial8250_out_MCR(up, up->mcr | UART_MCR_DTR | UART_MCR_RTS); } /*