From nobody Wed Apr 1 13:54:32 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 C70943EDADB; Tue, 31 Mar 2026 10:27:57 +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=1774952879; cv=none; b=CyxtYkQRYJHMndmPTWyuw8t6tj5rMmoHPNEMZKOscdhroP6XJuHm3lOyh6KUwXBlmc6+4FPNs4Op0d/pzK4wHlTZVY6kdFaCfjNTtixWFTBhoStcVZ/m79X+nmErNHitzGfie0aZIVyyfVpOPdiTrANNqbc8czrWbkRchsuYwIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774952879; c=relaxed/simple; bh=qjqN3UVBZddPw7k6SBUknSInyEUjzkn/TIchzSfs5R8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=huYAD9TS2/NDBY5Jle3kMRokp75aAcaqE8tx+cKVfSjg5A0bo9jz48KSe2rbTOgJ4nOfmlVJP6gItiblWjRS12/TJ9OjBUPtMEKL1rOT8SslrWbO6+8Jn5pT5HLgWl1rX+05HuG/u+va5xAhV0GJBW968zSNzqIxbtxhXEEyyAY= 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=RsHTDxub; 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="RsHTDxub" 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 72D5610D4; Tue, 31 Mar 2026 12:26:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774952793; bh=qjqN3UVBZddPw7k6SBUknSInyEUjzkn/TIchzSfs5R8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RsHTDxub8mfkK4PFbVmxwh9/Pn4FDM5HLA0+cYSulzAfToHifVig9vDhxuYicaQ1x mDkCZyH2FJ77iHSI/u5As4A+IjWuFXWTumIxuiNchs4u36Xqd0pl1XSifGvwSImSRx tK0WY7+D648JgR1jhVAGCSyH8opPmmVZvgKl0TkY= From: Jacopo Mondi Date: Tue, 31 Mar 2026 12:27:31 +0200 Subject: [PATCH v2 01/15] media: rzg2l-cru: Skip ICnMC configuration when ICnSVC is used 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-1-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 , stable@vger.kernel.org, Jacopo Mondi X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2714; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=yMSf/Uh8D73dR+HGREaX3F3oHZpFtzwWwYAbsWP52Ro=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpy6GnXbqkbG+4f3JMYo1XhH3+2rgfcwcfs3sh5 cicvmSZrlOJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCacuhpwAKCRByNAaPFqFW PC1GD/4717/irmi3QQw8GvRMYixn+0OWioLYu/XHeCGs2XlzKOMgi6/XzFKJeW+43LvZzx1Cpmq vQ35G70ouKk/r0kaDsFyn45quqKBawDwyXJxoAoow9mEYqNaTh7v0Q3DrZm4LbCWRqdqSTVbpkr mTDh2VJvJGEV1dnoOdNkD/CNAY8Rr5XttMi+WpZ3uOlh/BdZrpuiEELd+YwI1BSOHIZpVKr2dz6 ZX1wMLujDteJyFdb2lDUwxNe6qyZiuSrbll2STLMn2RrLU1rKYcCTmmQj9A9ZTuckIf6Q7L7uZX qN/F4A4aewZQhO1pcynN0XJVD/CFd431KWiyggUTv5MJevb/Dd6IjpV21wwPFzHxsx2D31/zUlz Y/tY4gseSCte2YKSFIC530hO0nzjs38D3iNOUEYyemDiTz0oKaoN8s9IJbRH/l2qxXu7l0w1Ukq KPm5bsIVGYfXA0KP9ijLErkCmc3WH161bkqQ/Ki3IPPFFnP9+MVZqqzf23aLjmiHjtsoPVoPSYP lJ5xawdDqwtzInf5/BrUb7vqpetzXQjPY4D13yz/bCEgF4rAIyUb8w4Pw04kCY1z4AWaD2cxC/1 1mLQEmNzGP9KEO7y4ZA3mc3X1S4bPN82z8gPLtH1QyvwZM22TjxilHZaNipc2DfIGqufd5aZFFl laHnHLO/GoPfa+Q== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B From: Tommaso Merciai When the CRU is configured to use ICnSVC for virtual channel mapping, as on the RZ/{G3E, V2H/P} SoC, the ICnMC register must not be programmed. Return early after setting up ICnSVC to avoid overriding the ICnMC register, which is not applicable in this mode. This prevents unintended register programming when ICnSVC is enabled. Fixes: 3c5ca0a48bb0 ("media: rzg2l-cru: Drop function pointer to configure = CSI") Cc: stable@vger.kernel.org Signed-off-by: Tommaso Merciai [Rework to not break image format programming] Signed-off-by: Jacopo Mondi Reviewed-by: Lad Prabhakar --- .../media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h | 1 + drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c | 17 +++++++++++--= ---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h b/dr= ivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h index a5a57369ef0e..10e62f2646d0 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-cru-regs.h @@ -60,6 +60,7 @@ #define ICnMC_CSCTHR BIT(5) #define ICnMC_INF(x) ((x) << 16) #define ICnMC_VCSEL(x) ((x) << 22) +#define ICnMC_VCSEL_MASK GENMASK(23, 22) #define ICnMC_INF_MASK GENMASK(21, 16) =20 #define ICnMS_IA BIT(2) diff --git a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c b/drive= rs/media/platform/renesas/rzg2l-cru/rzg2l-video.c index 162e2ace6931..6aea7c244df1 100644 --- a/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +++ b/drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c @@ -262,19 +262,24 @@ static void rzg2l_cru_csi2_setup(struct rzg2l_cru_dev= *cru, u8 csi_vc) { const struct rzg2l_cru_info *info =3D cru->info; - u32 icnmc =3D ICnMC_INF(ip_fmt->datatype); + u32 icnmc =3D rzg2l_cru_read(cru, info->image_conv) & ~(ICnMC_INF_MASK | + ICnMC_VCSEL_MASK); + icnmc |=3D ICnMC_INF(ip_fmt->datatype); =20 + /* + * VC filtering goes through SVC register on G3E/V2H. + * + * FIXME: virtual channel filtering is likely broken and only VC=3D0 + * works. + */ if (cru->info->regs[ICnSVC]) { rzg2l_cru_write(cru, ICnSVCNUM, csi_vc); rzg2l_cru_write(cru, ICnSVC, ICnSVC_SVC0(0) | ICnSVC_SVC1(1) | ICnSVC_SVC2(2) | ICnSVC_SVC3(3)); + } else { + icnmc |=3D ICnMC_VCSEL(csi_vc); } =20 - icnmc |=3D rzg2l_cru_read(cru, info->image_conv) & ~ICnMC_INF_MASK; - - /* Set virtual channel CSI2 */ - icnmc |=3D ICnMC_VCSEL(csi_vc); - rzg2l_cru_write(cru, info->image_conv, icnmc); } =20 --=20 2.53.0