From patchwork Wed Oct 19 08:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp214895wrs; Wed, 19 Oct 2022 02:14:03 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6CD3NS4gCNS6W//nTAFPKxJh20NGYc0JGhX83cbEJNJow3qL3W8xrAaQcQJZbOq5A92hvM X-Received: by 2002:a05:6402:5191:b0:45c:dea0:2c7 with SMTP id q17-20020a056402519100b0045cdea002c7mr6339602edd.239.1666170843000; Wed, 19 Oct 2022 02:14:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170842; cv=none; d=google.com; s=arc-20160816; b=eybS/mZdQ80o2XsJw/+YIp8O8q0tBTbF4Kcstpf8fAE3I7DZFFAo4KLrBUz8z3PB6K 4en0sQybxJgAW2bnaOr7psfWXxSRQxBq7TnA046/xoQDH9+GBaR9M5NSA45gBKeVg5Sv R2nxhXeWOQ+DXkXR/GLrfgITCx5l13rOIhwmdvDFhWHshK71o7YeHImfZyGj29xNv0aJ ZLfZN9nrb9sPJsaMWZx/Jpp31XRvDloYZd2tGedqBM2MFE8LrTn5KveNtJfpxzfwKcbP z58jPQNaV/Qh0pXZld/no0UcbV0UGL1KlHM8qNP5atc63l9e+BUBEC96ps0Mf75hSy6Z XxVw== 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=vTOk1xQQIk8fkcD/ent6ImaHoRpVsStjGAj1GuG2Hl0=; b=Zc1CO9aBDNtYGi7wo1w52R1yKM8mE1sqyL6fbYRf9YaFgPFtjhBx+3WjW6TXKiJ2Oa 2f/N9h7erTMEzMBYtASRhcc9huti8xpefu9AvReK4hR7Qno7HB38ytPGVD/B/LbPWKZQ KsXtOD1XPh8MKRlh6HPksbB/XRhbJHwkq0+YVniz8kY+C8swQTDjbT5QU8Kz5wAhjg2Y FvOimInsupZb0LjEODiSvhnhTnpIBGcxIo0w2NbJ2lc1Ff4bXlPbEw+UBIxd72qpnQ1e jSZ7V7IzQsDCWanDtnzf1sTDxeux465H9zFtwAnQw8IqCBIUJjpGYjtmOYGjrcuA2kel 0XSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=As8ZGEpM; 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 qw21-20020a1709066a1500b007811e006b46si13943213ejc.470.2022.10.19.02.13.38; Wed, 19 Oct 2022 02:14:02 -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=As8ZGEpM; 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 S232956AbiJSJMp (ORCPT + 99 others); Wed, 19 Oct 2022 05:12:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233055AbiJSJKC (ORCPT ); Wed, 19 Oct 2022 05:10:02 -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 DE95253001; Wed, 19 Oct 2022 02:01:34 -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 6374A61802; Wed, 19 Oct 2022 09:01:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79CA2C433C1; Wed, 19 Oct 2022 09:01:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170093; bh=Hn4JxalTNSwTzfXzV9WoJbF8SYgGMxOueUMP+zwt/8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=As8ZGEpMYGjEAsyuRtAbUz4QmvKeQWHuqbzejpIPWl+njk9uqKb74xsFNFTqVHrKY hodkcXJViZfBfULwfSREZfyBnMHzDWTCI+O4XhZsh0/MvQIfFT0sQa9D3aX29vF84L KUqHrRoMrrQOnqGMxeCYUlqjK2QJycvI/OoVHgSA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shubhrajyoti Datta , Sasha Levin Subject: [PATCH 6.0 488/862] tty: xilinx_uartps: Fix the ignore_status Date: Wed, 19 Oct 2022 10:29:35 +0200 Message-Id: <20221019083311.550741287@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747106757718520156?= X-GMAIL-MSGID: =?utf-8?q?1747106757718520156?= 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 51fd09e14eda..769044dfe990 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -361,6 +361,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.