From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A2E2FBF2; Sat, 3 Feb 2024 04:17:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933859; cv=none; b=HoC641GRDlmjj/qVWsgBNubCWT0ljdgV6qH9JJrxW9oRWvrGD6apBCBJy875ZlQ8PiKWJ3Lht8G48ZXHHpJpY57Cyhja90jf9l+bsbnxDo6Uji5YM3Pj1UIgEoXVKylI4L6hLumEhhf5S2FToJ6y8VVyx0WidUA38bZYQvokVlE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933859; c=relaxed/simple; bh=5ArGNyb3OZ4y3zIGBVD+8BQ/zpy230uSCtfbDfl4jq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KC/WPA+5LeT717+C3WrA2r5Kic9gd9GadzplPH0QvCJ1dwHJ8Jj0dqljYzj/JxG5x1A9Y2fopCSrV6LshA1Pr77QMPPxLFCDv0e6XjXNETQW0iDfvu1t1jrdLL8IptzZrzWTUn5nsPRC4zzryTMNjLBTLlV+Zs3UrX8PVbOisW0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ImCs7+zK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ImCs7+zK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35106C433F1; Sat, 3 Feb 2024 04:17:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933859; bh=5ArGNyb3OZ4y3zIGBVD+8BQ/zpy230uSCtfbDfl4jq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ImCs7+zK57VeNEHMX6rsVCI3uhah6f8TreLRxgLyZycytJ/mhD4vKC2m2F5nNVVL3 h1UpblwqK/WRK9nMSazaGVbCKiaIL0VAaF0nYs+LxNDKQ5QaA3AEZxpXDBQ0LQG0g5 yJleZ0EXSbx5xTO+8SFqnwRmiZ6RPakA9eWo4UgM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tomi Valkeinen , Laurent Pinchart , Mauro Carvalho Chehab , Sasha Levin , Adam Ford Subject: [PATCH 6.7 191/353] media: rkisp1: Fix IRQ handler return values Date: Fri, 2 Feb 2024 20:05:09 -0800 Message-ID: <20240203035409.714455556@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035403.657508530@linuxfoundation.org> References: <20240203035403.657508530@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ 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 b676db9bff62..7b8a361d4c4a 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