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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C5E3C47DD9 for ; Mon, 22 Jan 2024 15:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8vsZXFVhOtOtH/aQQEBA5ljlTCw2YPELQA5HOaBX7xc=; b=BnzzNIKwIcct29 iqvQ8aLM2iKSS3N1SDE65GTb71VKBbCwEc7S4MQ/rfsgsbh8jxp8QuJ1YqSI+3xxrnfoxiIYtk5Sp uGC4LHjP3yy9khqWK9iPgPsii+pHCNGCtE04SJ6Czb/mzgvOBO6yxdUdCkaXYg7RRs/PSpBWXLLNh 3ST83GvpD0QOfufVKyWZ5aA7acqVZ2axzVUon+65GiF33VNiO5wqMubvgDvs32b/Kh9xrXzGfeHEf IbHT/Ic7QJuleHf6XDbOhfkY4d7H2nwVc1rQxAqHQQOgne11wmsWy7HTwxm6H9RCuEvgZQhtQhBmo kqpgB7Jm/+ji8ly3Wgsg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rRvx2-00CcCu-1Z; Mon, 22 Jan 2024 15:11:04 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rRvwu-00Cc5v-08; Mon, 22 Jan 2024 15:10:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id E28D5CE2B0F; Mon, 22 Jan 2024 15:10:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A10EC43399; Mon, 22 Jan 2024 15:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705936252; bh=RS24I3RMlh5SunniZKPOGnIwCQFjxcZVZKSV7iwDCkg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hSPVquO+avespa4ESeU9fdza6Q9+/c/0wb1vi/o527CIOrynCzU/KKfQMRTtSmVNJ 3UqdILSvqLzxv8tzBxW5TRhw3jn3+6Dt4Hf+WXw2jSAKG5+z0Yoflwvddhyp7laTyo tfSZOelNlO93hSGF8eDSmVB0UZtQsKu2kEXlPsTce5idPY7Q1tljbXtC58trcUtNRJ XvePiDR8AAjeVnNiPLTTYJB9J376uLdgxn+7pRTBs8L9KVoJAHFxhuj2GJiJXbBMGo gTROWwC2cPrNXHcF+w8crJ3Vhr8+gUfo9XVDgoja4NAk45Bj6oVQYqWJO3BnYfWsz+ ZIkIH5qtUIcZA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tomi Valkeinen , Adam Ford , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , dafna@fastmail.com, heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 24/53] media: rkisp1: Fix IRQ handler return values Date: Mon, 22 Jan 2024 10:08:25 -0500 Message-ID: <20240122150949.994249-24-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122150949.994249-1-sashal@kernel.org> References: <20240122150949.994249-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.74 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240122_071056_279185_3A7366CB X-CRM114-Status: GOOD ( 11.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Tomi Valkeinen [ Upstream commit 3eb7910e1b16a2c136be26a8380f21469225b2f6 ] The IRQ handler rkisp1_isr() calls sub-handlers, all of which returns an irqreturn_t value, but rkisp1_isr() ignores those values and always returns IRQ_HANDLED. Fix this by collecting the return values, and returning IRQ_HANDLED or IRQ_NONE as appropriate. Link: https://lore.kernel.org/r/20231207-rkisp-irq-fix-v3-2-358a2c871a3c@ideasonboard.com Tested-by: Adam Ford #imx8mp-beacon Signed-off-by: Tomi Valkeinen Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index e2352a056098..01c831fb3240 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -442,17 +442,25 @@ static int rkisp1_entities_register(struct rkisp1_device *rkisp1) static irqreturn_t rkisp1_isr(int irq, void *ctx) { + irqreturn_t ret = IRQ_NONE; + /* * Call rkisp1_capture_isr() first to handle the frame that * potentially completed using the current frame_sequence number before * it is potentially incremented by rkisp1_isp_isr() in the vertical * sync. */ - rkisp1_capture_isr(irq, ctx); - rkisp1_isp_isr(irq, ctx); - rkisp1_csi_isr(irq, ctx); - return IRQ_HANDLED; + if (rkisp1_capture_isr(irq, ctx) == IRQ_HANDLED) + ret = IRQ_HANDLED; + + if (rkisp1_isp_isr(irq, ctx) == IRQ_HANDLED) + ret = IRQ_HANDLED; + + if (rkisp1_csi_isr(irq, ctx) == IRQ_HANDLED) + ret = IRQ_HANDLED; + + return ret; } static const char * const px30_isp_clks[] = { -- 2.43.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel