From patchwork Mon Oct 24 11:30:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10217 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp642663wru; Mon, 24 Oct 2022 13:39:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7cLpReL1bo9pSBVLVSJVqffcDydx+DGBiodRXC/AeFTX/dT5T0hVN2N97i8y8JTgOcTizr X-Received: by 2002:a17:902:b117:b0:186:a1fd:c3df with SMTP id q23-20020a170902b11700b00186a1fdc3dfmr8308752plr.23.1666643949137; Mon, 24 Oct 2022 13:39:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643949; cv=none; d=google.com; s=arc-20160816; b=FO+Ppt/WGLaclrcx9P2LTWn6d1hS3ba2XM8Bah2eFXAZ+aekjQWRRWWh5iNq8POzAM Ig0bx76zmy4C3+Oh8/6TuTlxcHyrPULIJfZufNWcclUs/bP5VZ+0dHozZEnDbzuRp/oA B0uCbV/u7nHHJSS/V6w9WnhfpdskwpCzLxw7vPd2+ZSrzEMMQiw48hQPYATeMx68c5m9 dLgtzSzxjg5jS2wv+W9gQl/Gaaq6HThFYgufJglCzZdvBwdC4CpibSxRrjVPDzd7k/xt WijOGGAp45bi9ZxeWcL0NG26571jweON+/tiGcYEvvdpvOhWeHIlfB91wmH2I6zUUZ+H sSwQ== 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=WfkXqYA93xROFtWoTxi5v6B999hBzjivZUmpzZrf87M=; b=AMJmOIc8ITTr9aEa2YZyeLM1zKIsC119cX8FmCe/okxmmC5iiw2YVnCwtGq32aJB7D QQ2RtiM6z9m5uBJ4zoqN0xr8znrMnFzMEp74KvDioWq2PifzNLXtefmtEogK3WYR15Nj +rBeKmxoKNZHnj/MED+BOrQvlaCXsvLLanTATQYAVqi9LDI9nLqIF/AE5qwcnriQA4/c Whtu3P1XaC9jxAX+CxTf/hLt2bQ3yUAjyOiwuSfRXcRiQRnFUJGv0YZp71cAuo3BraFc jKh2TvxI/6IfZ0mO0ENsIPVsFKS5LNznMXCy89362BaVu9HYmpEVmsL+h8t2xEPhnuZm zTnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=o45Wi3FI; 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 k2-20020aa790c2000000b00548d480e340si591588pfk.92.2022.10.24.13.38.55; Mon, 24 Oct 2022 13:39:09 -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=o45Wi3FI; 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 S234519AbiJXUhy (ORCPT + 99 others); Mon, 24 Oct 2022 16:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234345AbiJXUhU (ORCPT ); Mon, 24 Oct 2022 16:37:20 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90CFA3BC63; Mon, 24 Oct 2022 11:48:44 -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 ams.source.kernel.org (Postfix) with ESMTPS id B16DCB819C9; Mon, 24 Oct 2022 12:45:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1273AC433C1; Mon, 24 Oct 2022 12:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615528; bh=QvZyrofpx2RDc7Q95XGcOIix7KgJLsvg8cGVQruO/Sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o45Wi3FIdkw4MlwuqlnsvgtndWjzX19br+GpA6DFf7VZ5H/6HJjZt9aYgN8F058X5 f4NWO+jfqXoaQe8/7qteLlSx/euYBWWiojUuskiwbIOsarkwqHav9E4ROJNbHj60ER UoWm3KN0mJG04l7HO/DMSLfKpfWXPARVuJn8Z0zM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shubhrajyoti Datta , Sasha Levin Subject: [PATCH 5.15 285/530] tty: xilinx_uartps: Fix the ignore_status Date: Mon, 24 Oct 2022 13:30:29 +0200 Message-Id: <20221024113057.949533730@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?1747602845861754176?= X-GMAIL-MSGID: =?utf-8?q?1747602845861754176?= From: Shubhrajyoti Datta [ Upstream commit b8a6c3b3d4654fba19881cc77da61eac29f57cae ] Currently the ignore_status is not considered in the isr. Add a check to add the ignore_status. Fixes: 61ec9016988f ("tty/serial: add support for Xilinx PS UART") Signed-off-by: Shubhrajyoti Datta Link: https://lore.kernel.org/r/20220729114748.18332-5-shubhrajyoti.datta@xilinx.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/xilinx_uartps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index d5e243908d9f..815e3e26ee20 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -375,6 +375,8 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id) isrstatus &= ~CDNS_UART_IXR_TXEMPTY; } + isrstatus &= port->read_status_mask; + isrstatus &= ~port->ignore_status_mask; /* * Skip RX processing if RX is disabled as RXEMPTY will never be set * as read bytes will not be removed from the FIFO.