| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250612222100.GD10542@pendragon.ideasonboard.com>
Date: Fri, 13 Jun 2025 01:21:00 +0300
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: Niklas Söderlund <niklas.soderlund+renesas@...natech.se>
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>,
Geert Uytterhoeven <geert+renesas@...der.be>,
Sakari Ailus <sakari.ailus@...ux.intel.com>,
Tomi Valkeinen <tomi.valkeinen+renesas@...asonboard.com>,
linux-media@...r.kernel.org, linux-renesas-soc@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v4 4/4] media: rcar-csi2: Add D-PHY support for V4H
Hi Niklas,
Thank you for the patch.
On Thu, Jun 12, 2025 at 07:59:04PM +0200, Niklas Söderlund wrote:
> Add D-PHY support for V4H in addition to the already supported C-PHY.
> The common start-up procedure for C-PHY and D-PHY is shared, only PHY
> setup differ. Extend the V4H setup with D-PHY support as documented in
> the datasheet (Rev.1.21).
>
> Most of the start-up procedure is only documented as magic values in
> tables, there is little documentation to make the settings more clear.
> Wherever possible formulas or lookup tables are used as they are
> documented in the datasheet.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@...natech.se>
> Tested-by: Tomi Valkeinen <tomi.valkeinen+renesas@...asonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
> ---
> * Fixes since v3
> - Improve spelling in commit message and fix a comment style issue.
> - Use DIV_ROUND_UP() instead of roundup().
> - Correct bad mbps comparison in rcsi2_d_phy_setting_v4h_lut_lookup().
> - Use ilog2() instead of a stacked if .. else if .. else if .. else ..
> construct.
>
> * Fixes since v2
> - Stire DESKEW settings in an array and loop over it instead of opene
> coding it.
>
> * Fixes since v1
> - Init cphy variables to not trigger false -Wmaybe-uninitialized
> warning.
> - Adjust line lengths.
> ---
> drivers/media/platform/renesas/rcar-csi2.c | 230 ++++++++++++++++++++-
> 1 file changed, 220 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-csi2.c b/drivers/media/platform/renesas/rcar-csi2.c
> index 7ba637d8683b..0350eb76df36 100644
> --- a/drivers/media/platform/renesas/rcar-csi2.c
> +++ b/drivers/media/platform/renesas/rcar-csi2.c
> @@ -172,6 +172,7 @@ struct rcar_csi2;
> #define V4H_PPI_RW_LPDCOCAL_TWAIT_CONFIG_REG 0x21c0a
> #define V4H_PPI_RW_LPDCOCAL_VT_CONFIG_REG 0x21c0c
> #define V4H_PPI_RW_LPDCOCAL_COARSE_CFG_REG 0x21c10
> +#define V4H_PPI_RW_DDLCAL_CFG_n_REG(n) (0x21c40 + ((n) * 2)) /* n = 0 - 7 */
> #define V4H_PPI_RW_COMMON_CFG_REG 0x21c6c
> #define V4H_PPI_RW_TERMCAL_CFG_0_REG 0x21c80
> #define V4H_PPI_RW_OFFSETCAL_CFG_0_REG 0x21ca0
> @@ -185,6 +186,13 @@ struct rcar_csi2;
> #define V4H_CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_REG(n) (0x23840 + ((n) * 2)) /* n = 0 - 11 */
> #define V4H_CORE_DIG_RW_COMMON_REG(n) (0x23880 + ((n) * 2)) /* n = 0 - 15 */
> #define V4H_CORE_DIG_ANACTRL_RW_COMMON_ANACTRL_REG(n) (0x239e0 + ((n) * 2)) /* n = 0 - 3 */
> +#define V4H_CORE_DIG_COMMON_RW_DESKEW_FINE_MEM_REG 0x23fe0
> +
> +#define V4H_CORE_DIG_DLANE_l_RW_CFG_n_REG(l, n) (0x26000 + ((l) * 0x400) + ((n) * 2))
> +#define V4H_CORE_DIG_DLANE_l_RW_LP_n_REG(l, n) (0x26080 + ((l) * 0x400) + ((n) * 2))
> +#define V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, n) (0x26100 + ((l) * 0x400) + ((n) * 2))
> +#define V4H_CORE_DIG_DLANE_CLK_RW_LP_n_REG(n) V4H_CORE_DIG_DLANE_l_RW_LP_n_REG(4, (n))
> +#define V4H_CORE_DIG_DLANE_CLK_RW_HS_RX_n_REG(n) V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(4, (n))
>
> /* V4H C-PHY */
> #define V4H_CORE_DIG_RW_TRIO0_REG(n) (0x22100 + ((n) * 2)) /* n = 0 - 3 */
> @@ -1282,11 +1290,193 @@ rcsi2_c_phy_setting_v4h(struct rcar_csi2 *priv, int mbps)
> return conf;
> }
>
> +struct rcsi2_d_phy_setting_v4h_lut_value {
> + unsigned int mbps;
> + unsigned char cfg_1;
> + unsigned char cfg_5_94;
> + unsigned char cfg_5_30;
> + unsigned char lane_ctrl_2_8;
> + unsigned char rw_hs_rx_3_83;
> + unsigned char rw_hs_rx_3_20;
> + unsigned char rw_hs_rx_6;
> + unsigned char rw_hs_rx_1;
> +};
> +
> +static const struct rcsi2_d_phy_setting_v4h_lut_value *
> +rcsi2_d_phy_setting_v4h_lut_lookup(int mbps)
> +{
> + static const struct rcsi2_d_phy_setting_v4h_lut_value values[] = {
> + { 4500, 0x3f, 0x07, 0x00, 0x01, 0x02, 0x01, 0x0d, 0x10 },
> + { 4000, 0x47, 0x08, 0x01, 0x01, 0x05, 0x01, 0x0f, 0x0d },
> + { 3600, 0x4f, 0x09, 0x01, 0x01, 0x06, 0x01, 0x10, 0x0b },
> + { 3230, 0x57, 0x0a, 0x01, 0x01, 0x06, 0x01, 0x12, 0x09 },
> + { 3000, 0x47, 0x08, 0x00, 0x00, 0x03, 0x01, 0x0f, 0x0c },
> + { 2700, 0x4f, 0x09, 0x01, 0x00, 0x06, 0x01, 0x10, 0x0b },
> + { 2455, 0x57, 0x0a, 0x01, 0x00, 0x06, 0x01, 0x12, 0x09 },
> + { 2250, 0x5f, 0x0b, 0x01, 0x00, 0x08, 0x01, 0x13, 0x08 },
> + { 2077, 0x67, 0x0c, 0x01, 0x00, 0x06, 0x02, 0x15, 0x0d },
> + { 1929, 0x6f, 0x0d, 0x02, 0x00, 0x06, 0x02, 0x17, 0x0d },
> + { 1800, 0x77, 0x0e, 0x02, 0x00, 0x06, 0x02, 0x18, 0x0d },
> + { 1688, 0x7f, 0x0f, 0x02, 0x00, 0x08, 0x02, 0x1a, 0x0d },
> + { 1588, 0x87, 0x10, 0x02, 0x00, 0x08, 0x02, 0x1b, 0x0d },
> + { 1500, 0x8f, 0x11, 0x03, 0x00, 0x08, 0x02, 0x1d, 0x0c },
> + };
> +
> + for (unsigned int i = 0; i < ARRAY_SIZE(values); i++)
> + if (mbps >= values[i].mbps)
> + return &values[i];
> +
> + return NULL;
> +}
> +
> +static int rcsi2_d_phy_setting_v4h(struct rcar_csi2 *priv, int mbps)
> +{
> + const struct rcsi2_d_phy_setting_v4h_lut_value *lut =
> + rcsi2_d_phy_setting_v4h_lut_lookup(mbps);
> + u16 val;
> +
> + rcsi2_write16(priv, V4H_CORE_DIG_RW_COMMON_REG(7), 0x0000);
> + rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(7), mbps > 1500 ? 0x0028 : 0x0068);
> + rcsi2_write16(priv, V4H_PPI_STARTUP_RW_COMMON_DPHY_REG(8), 0x0050);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(0), 0x0063);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(7), 0x1132);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(1), 0x1340);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(2), 0x4b13);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(4), 0x000a);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(6), 0x800a);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(7), 0x1109);
> +
> + if (mbps > 1500) {
> + val = DIV_ROUND_UP(5 * mbps, 64);
> + rcsi2_write16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(3), val);
> + }
> +
> + if (lut) {
> + rcsi2_modify16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(1),
> + lut->cfg_1, 0x00ff);
> + rcsi2_modify16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(5),
> + lut->cfg_5_94 << 4, 0x03f0);
> + rcsi2_modify16(priv, V4H_PPI_RW_DDLCAL_CFG_n_REG(5),
> + lut->cfg_5_30 << 0, 0x000f);
> +
> + for (unsigned int l = 0; l < 5; l++)
> + rcsi2_modify16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 8),
> + lut->lane_ctrl_2_8 << 12, 0x1000);
> + }
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_LP_n_REG(l, 0), 0x463c);
> +
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(0, 2), 0x0000);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(1, 2), 0x0000);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(2, 2), 0x0001);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(3, 2), 0x0000);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(4, 2), 0x0000);
> +
> + rcsi2_write16(priv, V4H_CORE_DIG_RW_COMMON_REG(6), 0x0009);
> +
> + val = mbps > 1500 ? 0x0800 : 0x0802;
> + for (unsigned int l = 0; l < 5; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 12), val);
> +
> + val = mbps > 1500 ? 0x0000 : 0x0002;
> + for (unsigned int l = 0; l < 5; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 13), val);
> +
> + if (mbps >= 80) {
> + /* 2560: 6, 1280: 5, 640: 4, 320: 3, 160: 2, 80: 1 */
> + val = ilog2(mbps / 80) + 1;
> + rcsi2_modify16(priv,
> + V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(2, 9),
> + val << 5, 0xe0);
> + }
> +
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_CLK_RW_HS_RX_n_REG(0), 0x091c);
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_CLK_RW_HS_RX_n_REG(7), 0x3b06);
> +
> + val = DIV_ROUND_UP(1200, mbps) + 12;
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_modify16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 0), val << 8, 0xf0);
> +
> + val = mbps > 1500 ? 0x0004 : 0x0008;
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_CFG_n_REG(l, 1), val);
> +
> + val = mbps > 2500 ? 0x669a : mbps > 1500 ? 0xe69a : 0xe69b;
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 2), val);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_LP_n_REG(l, 0), 0x163c);
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_CLK_RW_LP_n_REG(0), 0x163c);
> +
> + if (lut) {
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_modify16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 1),
> + lut->rw_hs_rx_1, 0xff);
> + }
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 3), 0x9209);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 4), 0x0096);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 5), 0x0100);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 6), 0x2d02);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_write16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 7), 0x1b06);
> +
> + if (lut) {
> + /*
> + * Documentation LUT have two values but document writing both
> + * values in a single write.
> + */
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_modify16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 3),
> + lut->rw_hs_rx_3_83 << 3 | lut->rw_hs_rx_3_20, 0x1ff);
> +
> + for (unsigned int l = 0; l < 4; l++)
> + rcsi2_modify16(priv, V4H_CORE_DIG_DLANE_l_RW_HS_RX_n_REG(l, 6),
> + lut->rw_hs_rx_6 << 8, 0xff00);
> + }
> +
> + static const u16 deskew_fine[] = {
> + 0x0404, 0x040c, 0x0414, 0x041c, 0x0423, 0x0429, 0x0430, 0x043a,
> + 0x0445, 0x044a, 0x0450, 0x045a, 0x0465, 0x0469, 0x0472, 0x047a,
> + 0x0485, 0x0489, 0x0490, 0x049a, 0x04a4, 0x04ac, 0x04b4, 0x04bc,
> + 0x04c4, 0x04cc, 0x04d4, 0x04dc, 0x04e4, 0x04ec, 0x04f4, 0x04fc,
> + 0x0504, 0x050c, 0x0514, 0x051c, 0x0523, 0x0529, 0x0530, 0x053a,
> + 0x0545, 0x054a, 0x0550, 0x055a, 0x0565, 0x0569, 0x0572, 0x057a,
> + 0x0585, 0x0589, 0x0590, 0x059a, 0x05a4, 0x05ac, 0x05b4, 0x05bc,
> + 0x05c4, 0x05cc, 0x05d4, 0x05dc, 0x05e4, 0x05ec, 0x05f4, 0x05fc,
> + 0x0604, 0x060c, 0x0614, 0x061c, 0x0623, 0x0629, 0x0632, 0x063a,
> + 0x0645, 0x064a, 0x0650, 0x065a, 0x0665, 0x0669, 0x0672, 0x067a,
> + 0x0685, 0x0689, 0x0690, 0x069a, 0x06a4, 0x06ac, 0x06b4, 0x06bc,
> + 0x06c4, 0x06cc, 0x06d4, 0x06dc, 0x06e4, 0x06ec, 0x06f4, 0x06fc,
> + 0x0704, 0x070c, 0x0714, 0x071c, 0x0723, 0x072a, 0x0730, 0x073a,
> + 0x0745, 0x074a, 0x0750, 0x075a, 0x0765, 0x0769, 0x0772, 0x077a,
> + 0x0785, 0x0789, 0x0790, 0x079a, 0x07a4, 0x07ac, 0x07b4, 0x07bc,
> + 0x07c4, 0x07cc, 0x07d4, 0x07dc, 0x07e4, 0x07ec, 0x07f4, 0x07fc,
> + };
> +
> + for (unsigned int i = 0; i < ARRAY_SIZE(deskew_fine); i++) {
> + rcsi2_write16(priv, V4H_CORE_DIG_COMMON_RW_DESKEW_FINE_MEM_REG,
> + deskew_fine[i]);
> + }
> +
> + return 0;
> +}
> +
> static int rcsi2_start_receiver_v4h(struct rcar_csi2 *priv,
> struct v4l2_subdev_state *state)
> {
> + const struct rcsi2_cphy_setting *cphy = NULL;
> const struct rcar_csi2_format *format;
> - const struct rcsi2_cphy_setting *cphy;
> const struct v4l2_mbus_framefmt *fmt;
> unsigned int lanes;
> int mbps;
> @@ -1318,7 +1508,8 @@ static int rcsi2_start_receiver_v4h(struct rcar_csi2 *priv,
> rcsi2_write(priv, V4H_FLDC_REG, 0);
> rcsi2_write(priv, V4H_FLDD_REG, 0);
> rcsi2_write(priv, V4H_IDIC_REG, 0);
> - rcsi2_write(priv, V4H_PHY_MODE_REG, V4H_PHY_MODE_CPHY);
> + rcsi2_write(priv, V4H_PHY_MODE_REG,
> + priv->cphy ? V4H_PHY_MODE_CPHY : V4H_PHY_MODE_DPHY);
> rcsi2_write(priv, V4H_N_LANES_REG, lanes - 1);
>
> rcsi2_write(priv, V4M_FRXM_REG,
> @@ -1361,9 +1552,15 @@ static int rcsi2_start_receiver_v4h(struct rcar_csi2 *priv,
> rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_CB_CTRL_2_REG(5), 0x4000);
>
> /* T3: PHY settings */
> - cphy = rcsi2_c_phy_setting_v4h(priv, mbps);
> - if (!cphy)
> - return -ERANGE;
> + if (priv->cphy) {
> + cphy = rcsi2_c_phy_setting_v4h(priv, mbps);
> + if (!cphy)
> + return -ERANGE;
> + } else {
> + ret = rcsi2_d_phy_setting_v4h(priv, mbps);
> + if (ret)
> + return ret;
> + }
>
> /* T4: Leave Shutdown mode */
> rcsi2_write(priv, V4H_DPHY_RSTZ_REG, BIT(0));
> @@ -1376,11 +1573,23 @@ static int rcsi2_start_receiver_v4h(struct rcar_csi2 *priv,
> }
>
> /* T6: Analog programming */
> - for (unsigned int l = 0; l < 3; l++) {
> - rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 9),
> - cphy->lane29);
> - rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 7),
> - cphy->lane27);
> + if (priv->cphy) {
> + for (unsigned int l = 0; l < 3; l++) {
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 9),
> + cphy->lane29);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 7),
> + cphy->lane27);
> + }
> + } else {
> + u16 val_2_9 = mbps > 2500 ? 0x14 : mbps > 1500 ? 0x04 : 0x00;
> + u16 val_2_15 = mbps > 1500 ? 0x03 : 0x00;
> +
> + for (unsigned int l = 0; l < 5; l++) {
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 9),
> + val_2_9);
> + rcsi2_write16(priv, V4H_CORE_DIG_IOCTRL_RW_AFE_LANEl_CTRL_2_REG(l, 15),
> + val_2_15);
> + }
> }
>
> /* T7: Wait for stop state */
> @@ -2245,6 +2454,7 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a779g0 = {
> .start_receiver = rcsi2_start_receiver_v4h,
> .use_isp = true,
> .support_cphy = true,
> + .support_dphy = true,
> };
>
> static const struct rcsi2_register_layout rcsi2_registers_v4m = {
--
Regards,
Laurent Pinchart
Powered by blists - more mailing lists