From nobody Wed Apr 1 14:08:24 2026 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 DD7213F7AA1; Tue, 31 Mar 2026 10:28:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774952897; cv=none; b=s/4tTS5poWTRC0y4pHHTso2vyhrQ7DVJSZIhFmlcMrpTAkys23ZwIHEBkQUp48DPJwmFAPZrXQ7AbzBIeqpL38GFtS83l0rZSwN/mx3jQRHf+KdJVkKUvsFHSIWZmQM7ablBUxIboCfcK6UHfCV+ZrkzsnIev+F44/6g32LztQU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774952897; c=relaxed/simple; bh=qH4nCv8vXyo9/IPFH82Fal0ZJSpo50I0muPguZaT6k8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CiUXYGNHp+DAdI3sm3IYHZhH81+5q4RDk9DA/0rAe6UExhCgWaHV7zJbbEokKrsgW54rlos0gnkMzgqO9rngbxSE8UL0IWfLfFXf+e6/5bnP3WKBIjpmLVdpbXjLzcvmZzFjUiYEDkhFchpFv3+RQe9TcaPC34dsFMxZNhGPlPI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=QMEmwKSt; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="QMEmwKSt" Received: from [100.93.44.16] (net-93-65-100-155.cust.vodafonedsl.it [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1AB8A25B5; Tue, 31 Mar 2026 12:26:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774952801; bh=qH4nCv8vXyo9/IPFH82Fal0ZJSpo50I0muPguZaT6k8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=QMEmwKStJs7VvCRgcSozLd5YmmMmw/gpj4qNtlQ9+v0qsiHPC727VIisQnghe00Yg jjDYKgkVnCctR5aBAp0H/yZ3r04Suj3xlxJZ40Reu6CzxW3uuOjuxXbIyNrWdd8niO LCthb62CIiHClodMJzQlXp2vZsUIHQUF+ajWg0z0= From: Jacopo Mondi Date: Tue, 31 Mar 2026 12:27:43 +0200 Subject: [PATCH v2 13/15] media: rzg2l-cru: Remove the 'state' variable Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260331-b4-cru-rework-v2-13-f94b238b35d4@ideasonboard.com> References: <20260331-b4-cru-rework-v2-0-f94b238b35d4@ideasonboard.com> In-Reply-To: <20260331-b4-cru-rework-v2-0-f94b238b35d4@ideasonboard.com> To: Mauro Carvalho Chehab , Laurent Pinchart , Biju Das , Hans Verkuil , Sakari Ailus , Tommaso Merciai Cc: Daniel Scally , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= , Lad Prabhakar , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Jacopo Mondi , Jacopo Mondi X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=6353; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=QxY8Z5F5lVXBXuCYF7kEh7KCYBVT9AiINb5jhs28FgY=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpy6Gplhmal/K0mu4J6lIZ26gzwG5S5mO6+UTEM EEcGQdCdGaJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCacuhqQAKCRByNAaPFqFW PGmbEACCItw5KabMCeXY6r3/MGulNUId0apEf8AnqTYnaKk/4y1rXBtQWbKiY2Rm+DUSUPsdeqI rh6pEDGpEPOLqeNhXdqn+GuA2tThDo5jHL6711pcbcIzwFk9NRQE0PtHTHi0p9NUPLxPM1TcVe4 r1UmALurtVs6WMzAGVNj4J27uX4CiCIk8NfmNLZ+gwono5Nb9aV8/YEE+GYgZqN/e7srjvpC1bE 8HL8Tc3kU4bPMzyiCwckpMnmi7zM6CI3WKsT9cPVWWVkAAWjSIySw7qXGPn3goKIZhe6vI7rdWE wRbNoUHFHjkQt4G0zLNBy4oertyAULRsS82U2BbWeqfwEPI5/k4/WpzwB8WvBHRMb5yOHTcMwMD gxM/wJp0c0rurNiIJMUKDfmSHWR17Uk3arddjgaQ5gsdZJO3VzY7IM4cYumzcgUAc7rJgd2UDuK PkTWaJiCO1OPwVq+UxofMywdgtQZxLenEReLFjMz/6/+p0Vp/gL+hNXMHe7cVfV5QiLoS/tsNOD AmA56I/kNgNdg0GbF4ee6e+yxr9XM2VKfhM/8SPoYiCev0a/1BN61dP6JZ3nBMmGb2jXFY5Vya1 5lSO9fKVKdLT28bxqmcPqntiJoaiXifGnuiC2hKRIt4EM4qGm/rqg31mR7f0Y9yR05W/mSa8TcP hv2FohSzKHlnCfw== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B From: Jacopo Mondi The cru driver uses a 'state' variable for debugging purpose in the interrupt handler. The state is used to detect invalid usage conditions that are not meant to happen unless the driver has a bug in handling the stop and start conditions. Remove the state variable which seems to be a debugging leftover. Signed-off-by: Jacopo Mondi Reviewed-by: Daniel Scally --- .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 15 ----- .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 71 +-----------------= ---- 2 files changed, 3 insertions(+), 83 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h b/drivers= /media/platform/renesas/rzg2l-cru/rzg2l-cru.h index 25f17069585c..5bf334e173d2 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru.h @@ -38,20 +38,6 @@ enum rzg2l_csi2_pads { =20 struct rzg2l_cru_dev; =20 -/** - * enum rzg2l_cru_dma_state - DMA states - * @RZG2L_CRU_DMA_STOPPED: No operation in progress - * @RZG2L_CRU_DMA_STARTING: Capture starting up - * @RZG2L_CRU_DMA_RUNNING: Operation in progress have buffers - * @RZG2L_CRU_DMA_STOPPING: Stopping operation - */ -enum rzg2l_cru_dma_state { - RZG2L_CRU_DMA_STOPPED =3D 0, - RZG2L_CRU_DMA_STARTING, - RZG2L_CRU_DMA_RUNNING, - RZG2L_CRU_DMA_STOPPING, -}; - struct rzg2l_cru_csi { struct v4l2_async_connection *asd; struct v4l2_subdev *subdev; @@ -174,7 +160,6 @@ struct rzg2l_cru_dev { struct vb2_v4l2_buffer *queue_buf[RZG2L_CRU_HW_BUFFER_MAX]; struct list_head buf_list; unsigned int sequence; - enum rzg2l_cru_dma_state state; =20 struct v4l2_pix_format format; }; diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drive= rs/media/platform/renesas/rzg2l-cru/rzg2l-video.c index f061bee51ea8..721057edca6b 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -398,8 +398,6 @@ void rzg2l_cru_stop_image_processing(struct rzg2l_cru_d= ev *cru) if (icnms) dev_err(cru->dev, "Failed stop HW, something is seriously broken\n"); =20 - cru->state =3D RZG2L_CRU_DMA_STOPPED; - /* Wait until the FIFO becomes empty */ for (retries =3D 5; retries > 0; retries--) { if (cru->info->fifo_empty(cru)) @@ -587,8 +585,6 @@ static int rzg2l_cru_set_stream(struct rzg2l_cru_dev *c= ru, int on) =20 static void rzg2l_cru_stop_streaming(struct rzg2l_cru_dev *cru) { - cru->state =3D RZG2L_CRU_DMA_STOPPING; - rzg2l_cru_set_stream(cru, 0); } =20 @@ -600,8 +596,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data) u32 amnmbs; int slot; =20 - guard(spinlock_irqsave)(&cru->hw_lock); - irq_status =3D rzg2l_cru_read(cru, CRUnINTS); if (!irq_status) return IRQ_RETVAL(handled); @@ -610,20 +604,9 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data) =20 rzg2l_cru_write(cru, CRUnINTS, rzg2l_cru_read(cru, CRUnINTS)); =20 - /* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */ - if (cru->state =3D=3D RZG2L_CRU_DMA_STOPPED) { - dev_dbg(cru->dev, "IRQ while state stopped\n"); - return IRQ_RETVAL(handled); - } - - /* Increase stop retries if capture status is 'RZG2L_CRU_DMA_STOPPING' */ - if (cru->state =3D=3D RZG2L_CRU_DMA_STOPPING) { - if (irq_status & CRUnINTS_SFS) - dev_dbg(cru->dev, "IRQ while state stopping\n"); - return IRQ_RETVAL(handled); - } + /* Calculate slot and prepare for new capture. */ + guard(spinlock_irqsave)(&cru->hw_lock); =20 - /* Prepare for capture and update state */ amnmbs =3D rzg2l_cru_read(cru, AMnMBS); cru->active_slot =3D amnmbs & AMnMBS_MBSTS; =20 @@ -636,20 +619,6 @@ irqreturn_t rzg2l_cru_irq(int irq, void *data) else slot =3D cru->active_slot - 1; =20 - /* - * To hand buffers back in a known order to userspace start - * to capture first from slot 0. - */ - if (cru->state =3D=3D RZG2L_CRU_DMA_STARTING) { - if (slot !=3D 0) { - dev_dbg(cru->dev, "Starting sync slot: %d\n", slot); - return IRQ_RETVAL(handled); - } - - dev_dbg(cru->dev, "Capture start synced!\n"); - cru->state =3D RZG2L_CRU_DMA_RUNNING; - } - /* Capture frame */ if (cru->queue_buf[slot]) { cru->queue_buf[slot]->field =3D cru->format.field; @@ -677,49 +646,18 @@ irqreturn_t rzg3e_cru_irq(int irq, void *data) u32 irq_status; int slot; =20 - guard(spinlock)(&cru->hw_lock); - irq_status =3D rzg2l_cru_read(cru, CRUnINTS2); if (!irq_status) return IRQ_NONE; =20 - dev_dbg(cru->dev, "CRUnINTS2 0x%x\n", irq_status); - rzg2l_cru_write(cru, CRUnINTS2, rzg2l_cru_read(cru, CRUnINTS2)); =20 - /* Nothing to do if capture status is 'RZG2L_CRU_DMA_STOPPED' */ - if (cru->state =3D=3D RZG2L_CRU_DMA_STOPPED) { - dev_dbg(cru->dev, "IRQ while state stopped\n"); - return IRQ_HANDLED; - } - - if (cru->state =3D=3D RZG2L_CRU_DMA_STOPPING) { - if (irq_status & CRUnINTS2_FExS(0) || - irq_status & CRUnINTS2_FExS(1) || - irq_status & CRUnINTS2_FExS(2) || - irq_status & CRUnINTS2_FExS(3)) - dev_dbg(cru->dev, "IRQ while state stopping\n"); - return IRQ_HANDLED; - } - + guard(spinlock)(&cru->hw_lock); slot =3D cru->active_slot; cru->active_slot =3D rzg2l_cru_slot_next(cru, cru->active_slot); =20 dev_dbg(cru->dev, "Current written slot: %d\n", slot); =20 - /* - * To hand buffers back in a known order to userspace start - * to capture first from slot 0. - */ - if (cru->state =3D=3D RZG2L_CRU_DMA_STARTING) { - if (slot !=3D 0) { - dev_dbg(cru->dev, "Starting sync slot: %d\n", slot); - return IRQ_HANDLED; - } - dev_dbg(cru->dev, "Capture start synced!\n"); - cru->state =3D RZG2L_CRU_DMA_RUNNING; - } - /* Capture frame */ if (cru->queue_buf[slot]) { struct vb2_v4l2_buffer *buf =3D cru->queue_buf[slot]; @@ -788,7 +726,6 @@ static int rzg2l_cru_start_streaming_vq(struct vb2_queu= e *vq, unsigned int count goto out; } =20 - cru->state =3D RZG2L_CRU_DMA_STARTING; dev_dbg(cru->dev, "Starting to capture\n"); return 0; =20 @@ -861,8 +798,6 @@ int rzg2l_cru_dma_register(struct rzg2l_cru_dev *cru) spin_lock_init(&cru->hw_lock); spin_lock_init(&cru->qlock); =20 - cru->state =3D RZG2L_CRU_DMA_STOPPED; - for (i =3D 0; i < RZG2L_CRU_HW_BUFFER_MAX; i++) cru->queue_buf[i] =3D NULL; =20 --=20 2.53.0