From patchwork Mon Oct 24 11:26:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp461283wru; Mon, 24 Oct 2022 06:43:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM55woEclmwP5ne/tJU8D8Q10U7LpXITSz7ca59/dUIX9MUNPKU7a+WgSMhs33MmcgP6mOUU X-Received: by 2002:a17:906:9b87:b0:733:1795:2855 with SMTP id dd7-20020a1709069b8700b0073317952855mr27771246ejc.156.1666619013720; Mon, 24 Oct 2022 06:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619013; cv=none; d=google.com; s=arc-20160816; b=J6P36g31XQnnch6u3+PA4rhNdkzVgm1ZNXW048tzxZ1k6AH8OQnfHoOQnED6EHw9wr LojjzFoaQk8BmzTiieOhIPLXQ2TINAY8vYzhThK/g8ZjRN+rC4e9CN+hif1m+wEhZtK3 vM35DR5hmw+1C6+5/ek0qb+JudrKtS03T60wZQn0mQthM3H2w4jJiqRqEYWoaMFOrQB7 20roZcndgtdAb4mqh3S3nxzsZJErDumQ8g+kQOy7bS4Mr6O7IU+7vQiFKY63EBx6izJA g8PzcUXkl1Fc0mq3xrBnArpEWKspnLY72iVaoMCieIRa5mqEdCwUhMEGL/SM4GEEGBct Rimg== 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=yrAxJG/XtgZhs/323khkO2sTnbK+agcp9vBbp5HXM+Q=; b=0xQ/WdJ/y/iAmwP2lEBkf7Y8CrggO9iH2Vj/IxxiXm6nzfpFu29GjhxI5XUp45fE4U nG2fvqJwD8jiRShbTcZpA519EesZsEQgnUxix1tqefbCekugwwZ/D2EzBbRAh/xF+Ci7 2ZBRSvKo+immwZ/uHWisIUrkXeHmxRGOE+Lb/k14dyKIrxfLJBJZDCuEEVmo4LkI/J88 4WBwSg1ZLu3EB1twe60euzRhCBH9uPKcFd9hDRRURKLrG0xFzH/YdZv9BYeSv1w3k39b qsTqvqr5SysWhfiixETPQqYa+9DJpVnFk4J7dovJvBSJ0xf2GZFvnk4DVlgJ4RuhJ8e9 cA5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=XKJurgiV; 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 s5-20020a17090699c500b0078de44d6693si20863610ejn.350.2022.10.24.06.43.09; Mon, 24 Oct 2022 06:43:33 -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=XKJurgiV; 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 S236151AbiJXNik (ORCPT + 99 others); Mon, 24 Oct 2022 09:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236362AbiJXNf0 (ORCPT ); Mon, 24 Oct 2022 09:35:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F67563FDC; Mon, 24 Oct 2022 05:35: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 39388612B2; Mon, 24 Oct 2022 12:35:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AA19C433C1; Mon, 24 Oct 2022 12:35:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614946; bh=TkNEbl4rXpYuyrYqfn7l0bzdDIybOhdQxIHQuOiiLc8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XKJurgiVbEMMYtYhP19s4075Lm+/+gYAjfhzF1pKv8+3KX2PqX/I2h+IbbugbYdvq lgYsSQ9JW/c2FchHyXB6rN56OlA5RDlgG1P9+J9tzBlfvqtPNuBOqNBQoL8Q7K8AOf 2f/MGA1xW7lFBAdTM9+XYRRL9SJ11QhAw6mfmO0M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Anders Blomdell , "Maciej W. Rozycki" Subject: [PATCH 5.15 062/530] serial: 8250: Let drivers request full 16550A feature probing Date: Mon, 24 Oct 2022 13:26:46 +0200 Message-Id: <20221024113047.850200055@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747576699024993981?= X-GMAIL-MSGID: =?utf-8?q?1747576699024993981?= From: Maciej W. Rozycki commit 9906890c89e4dbd900ed87ad3040080339a7f411 upstream. A SERIAL_8250_16550A_VARIANTS configuration option has been recently defined that lets one request the 8250 driver not to probe for 16550A device features so as to reduce the driver's device startup time in virtual machines. Some actual hardware devices require these features to have been fully determined however for their driver to work correctly, so define a flag to let drivers request full 16550A feature probing on a device-by-device basis if required regardless of the SERIAL_8250_16550A_VARIANTS option setting chosen. Fixes: dc56ecb81a0a ("serial: 8250: Support disabling mdelay-filled probes of 16550A variants") Cc: stable@vger.kernel.org # v5.6+ Reported-by: Anders Blomdell Signed-off-by: Maciej W. Rozycki Link: https://lore.kernel.org/r/alpine.DEB.2.21.2209202357520.41633@angie.orcam.me.uk Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/8250/8250_port.c | 3 ++- include/linux/serial_core.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -1029,7 +1029,8 @@ static void autoconfig_16550a(struct uar up->port.type = PORT_16550A; up->capabilities |= UART_CAP_FIFO; - if (!IS_ENABLED(CONFIG_SERIAL_8250_16550A_VARIANTS)) + if (!IS_ENABLED(CONFIG_SERIAL_8250_16550A_VARIANTS) && + !(up->port.flags & UPF_FULL_PROBE)) return; /* --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -100,7 +100,7 @@ struct uart_icount { __u32 buf_overrun; }; -typedef unsigned int __bitwise upf_t; +typedef u64 __bitwise upf_t; typedef unsigned int __bitwise upstat_t; struct uart_port { @@ -207,6 +207,7 @@ struct uart_port { #define UPF_FIXED_PORT ((__force upf_t) (1 << 29)) #define UPF_DEAD ((__force upf_t) (1 << 30)) #define UPF_IOREMAP ((__force upf_t) (1 << 31)) +#define UPF_FULL_PROBE ((__force upf_t) (1ULL << 32)) #define __UPF_CHANGE_MASK 0x17fff #define UPF_CHANGE_MASK ((__force upf_t) __UPF_CHANGE_MASK)