From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 79330C43381 for ; Tue, 12 Mar 2019 18:04:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 495FF2087C for ; Tue, 12 Mar 2019 18:04:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552413868; bh=c1pBNRG3GSkXxjdgv79/yjnFrZ4Rfl8dUZsfZ0uqxY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MyS6PgWri3nmAN+dAtPfOoX7r51QnzROGH1IzU/0D1UHkQoSnrQBF/zMPHK7lCqYC mk7TkPpdJaq/tfPb011e6bntFcM5sN0L1XIquZ1EfKyjId/+BuEbGg0HwWHBwkLO6A afoAUMPOf4fUEq+GfkyPoeCtkZ6TnSe/8G7yBCDA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727655AbfCLRMt (ORCPT ); Tue, 12 Mar 2019 13:12:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:48654 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727646AbfCLRMs (ORCPT ); Tue, 12 Mar 2019 13:12:48 -0400 Received: from localhost (unknown [104.133.8.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D83252177E; Tue, 12 Mar 2019 17:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410768; bh=c1pBNRG3GSkXxjdgv79/yjnFrZ4Rfl8dUZsfZ0uqxY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=snpQMmqp2RvW81HP93zWVDtbHyemTKWwU1cm7u4s+fCw4rUUdXDyAVS1zQ/KcTGO8 IcR8OLw++xf1Bae+kHu2NggVK5Qkl3a0WvwQBVPlSBXbsOWPBSOiWfoNSi/pgAbXoB pk6/ywOE/pE/t84jltIJNIvXX8b7iFVMmLTCwE1s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Madalin Bucur , Roy Pledge , Li Yang , Sasha Levin Subject: [PATCH 4.20 082/171] soc: fsl: qbman: avoid race in clearing QMan interrupt Date: Tue, 12 Mar 2019 10:07:42 -0700 Message-Id: <20190312170355.108075771@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170347.868927101@linuxfoundation.org> References: <20190312170347.868927101@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 89857a8a5c89a406b967ab2be7bd2ccdbe75e73d ] By clearing all interrupt sources, not only those that already occurred, the existing code may acknowledge by mistake interrupts that occurred after the code checks for them. Signed-off-by: Madalin Bucur Signed-off-by: Roy Pledge Signed-off-by: Li Yang Signed-off-by: Sasha Levin --- drivers/soc/fsl/qbman/qman.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/soc/fsl/qbman/qman.c b/drivers/soc/fsl/qbman/qman.c index 5ce24718c2fd..d8b3ba047c28 100644 --- a/drivers/soc/fsl/qbman/qman.c +++ b/drivers/soc/fsl/qbman/qman.c @@ -1124,18 +1124,19 @@ static void qm_mr_process_task(struct work_struct *work); static irqreturn_t portal_isr(int irq, void *ptr) { struct qman_portal *p = ptr; - - u32 clear = QM_DQAVAIL_MASK | p->irq_sources; u32 is = qm_in(&p->p, QM_REG_ISR) & p->irq_sources; + u32 clear = 0; if (unlikely(!is)) return IRQ_NONE; /* DQRR-handling if it's interrupt-driven */ - if (is & QM_PIRQ_DQRI) + if (is & QM_PIRQ_DQRI) { __poll_portal_fast(p, QMAN_POLL_LIMIT); + clear = QM_DQAVAIL_MASK | QM_PIRQ_DQRI; + } /* Handling of anything else that's interrupt-driven */ - clear |= __poll_portal_slow(p, is); + clear |= __poll_portal_slow(p, is) & QM_PIRQ_SLOW; qm_out(&p->p, QM_REG_ISR, clear); return IRQ_HANDLED; } -- 2.19.1