Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2328252iob; Thu, 5 May 2022 23:27:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg/SCz805C2DdSdwQE+9D06KIVPVQ0ov0AH7qbwZkF9Hh2+f7yCBEQAIDHzwoOSX5OWeN/ X-Received: by 2002:a17:90a:930b:b0:1bf:ac1f:6585 with SMTP id p11-20020a17090a930b00b001bfac1f6585mr2410705pjo.88.1651818428194; Thu, 05 May 2022 23:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651818428; cv=none; d=google.com; s=arc-20160816; b=qUGleicvwwNQuHkuKdpx8QLgkvwU/9E5NFue5yNStP3u5PrZBIaxFv9Rlg2x0mj2vB gBbtkm6XoCQEGXdp3W5HdPWULlsxOMU6MFq7pIszjjx6hs0dHJ36Bpbb9G4RDe5kfR0L 2CHCjdG6+LpGjXr/9JcJpDt6twCniNgQqFQX2SAf9ckGb4Pcifq/ibzXizl2F1ASuhZs c0J6aJ7oVEInDze9TVdp7AEl9Z9oegOGD0h7w7XtaW/2C5suSkk+1etceD8ywvP9QIxc J3XvJYgVSFg2xnbCPsWZwlkMvNX2LwP0nM5h2SAkA7rbGqwqdor/ubV8dnf7iSALgFFK p/Aw== 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=WbWtsu59IEmnxVGwUux92TBGlD7QAOGuNnRbEHLo+WU=; b=bfNQ9efRujPlIMk4N9tBnpj0i6U/HHgzJ1zqmwuPZrUOimnoECKeG/7WUCvbJi3hPl CcGojJbBFdtq4CpGICOBwyaoZhWKfpKjca1dc1/aZmgS+jl/q/QC2VPuYvu4kBSIee1L rpna6oYAV09FPpYHnOhbB7suJ0DNos1mjzulO4GBe0CR/UXBABou60b1BM607XqXaeGV aT2WupbpyO/2qfverbt/VUdOBXLabEQvS/J6kprXwGECX5ukMEx8yOvqr+9nR9xyJ5HP bYBIYPUOeMsyFXffgBtUkfv+O8/XPtT0nJBpfroiiogjGUgMMVRfXhCwXjehtx6x+p3m TDFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=EyYZQ3XO; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ij21-20020a170902ab5500b0015d168a0c8bsi1118022plb.231.2022.05.05.23.26.53; Thu, 05 May 2022 23:27:08 -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=EyYZQ3XO; 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 S1358752AbiEDRjD (ORCPT + 99 others); Wed, 4 May 2022 13:39:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39210 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356820AbiEDRJp (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 5C3272180D; Wed, 4 May 2022 09:55:48 -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 ECB0961851; Wed, 4 May 2022 16:55:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 416C0C385AA; Wed, 4 May 2022 16:55:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683347; bh=touYmIpRMlAmSx5iLm7raW6VOjHJA2RLrzYNwqDKRrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EyYZQ3XOM25Y0XMoc9t1CzdBIUa5o7sK7CfrJ2D94ogdGppuZNYbW/H1orW2Rqo74 BeBWqaXIfPmoHHYj3Svf2AmqoNFBhAirn1UrYRQHVcb9XdNLQQrW6LydXbuw5jM/Lp BCRcUJoORZHXH8x1Y/7gRfNlop8oIl3HEHRzUhZ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Johan Hovold Subject: [PATCH 5.17 034/225] serial: imx: fix overrun interrupts in DMA mode Date: Wed, 4 May 2022 18:44:32 +0200 Message-Id: <20220504153113.272038237@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=-7.7 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,T_SCC_BODY_TEXT_LINE 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 From: Johan Hovold commit 3ee82c6e41f3d2212647ce0bc5a05a0f69097824 upstream. Commit 76821e222c18 ("serial: imx: ensure that RX irqs are off if RX is off") accidentally enabled overrun interrupts unconditionally when deferring DMA enable until after the receiver has been enabled during startup. Fix this by using the DMA-initialised instead of DMA-enabled flag to determine whether overrun interrupts should be enabled. Note that overrun interrupts are already accounted for in imx_uart_clear_rx_errors() when using DMA since commit 41d98b5da92f ("serial: imx-serial - update RX error counters when DMA is used"). Fixes: 76821e222c18 ("serial: imx: ensure that RX irqs are off if RX is off") Cc: stable@vger.kernel.org # 4.17 Cc: Uwe Kleine-König Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20220411081957.7846-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -1438,7 +1438,7 @@ static int imx_uart_startup(struct uart_ imx_uart_writel(sport, ucr1, UCR1); ucr4 = imx_uart_readl(sport, UCR4) & ~(UCR4_OREN | UCR4_INVR); - if (!sport->dma_is_enabled) + if (!dma_is_inited) ucr4 |= UCR4_OREN; if (sport->inverted_rx) ucr4 |= UCR4_INVR;