From nobody Sun Dec 28 00:49:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC351C4332F for ; Thu, 14 Dec 2023 07:44:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443389AbjLNHoN (ORCPT ); Thu, 14 Dec 2023 02:44:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235474AbjLNHoL (ORCPT ); Thu, 14 Dec 2023 02:44:11 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DA75107 for ; Wed, 13 Dec 2023 23:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=VVjT4+Cf8UWpO5evrM+cr4MAL3lYVdc9S4k3S2b2RlM=; b=V2GxAr 04gWg0Pm3WkCF8taGYt0SD+yl7ohG17it02O5kv50LdcVrON7dIXgELHWRLtwQh0 aSZ4LywLPmb4SG9irpXFNuRHqFsq00X730cCscQmxk8QepO9cPTJ3QMmFuwEAzMt 2ymgESdec6/fbpJ6M+jHxVIBjsOnD9SWSEX4uGMW4/XNEFjocHk+rhRus2/opoY7 ndurazDmIi9g5LmqBI+1TpH6BrKbsTMRM8Vl+FqcL1T8jWjHPSF+XUTxTgXylsmo TxAapWApsgANHpvnMdaKu3rck/7fSfj5fST5WCziGG78vdmPIvX4vtSECLgi2sMx FXOflEF5zOuIToCg== Received: (qmail 826984 invoked from network); 14 Dec 2023 08:44:13 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 14 Dec 2023 08:44:13 +0100 X-UD-Smtp-Session: l3s3148p1@1CUsc3MMvK8ujnuR From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Geert Uytterhoeven , Magnus Damm , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] i2c: rcar: introduce Gen4 devices Date: Thu, 14 Dec 2023 08:43:57 +0100 Message-Id: <20231214074358.8711-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231214074358.8711-1-wsa+renesas@sang-engineering.com> References: <20231214074358.8711-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" So far, we treated Gen4 as Gen3. But we are soon adding FM+ as a Gen4 specific feature, so prepare the code for the new devtype. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Reviewed-by: Geert Uytterhoeven --- Changes since v1: * rebased to 6.7-rc4 * moved S4 specific handling to patch 2 drivers/i2c/busses/i2c-rcar.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 829ac053bbb7..973811a6c27b 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -132,6 +132,7 @@ enum rcar_i2c_type { I2C_RCAR_GEN1, I2C_RCAR_GEN2, I2C_RCAR_GEN3, + I2C_RCAR_GEN4, }; =20 struct rcar_i2c_priv { @@ -431,8 +432,8 @@ static void rcar_i2c_cleanup_dma(struct rcar_i2c_priv *= priv, bool terminate) dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg), sg_dma_len(&priv->sg), priv->dma_direction); =20 - /* Gen3 can only do one RXDMA per transfer and we just completed it */ - if (priv->devtype =3D=3D I2C_RCAR_GEN3 && + /* Gen3+ can only do one RXDMA per transfer and we just completed it */ + if (priv->devtype >=3D I2C_RCAR_GEN3 && priv->dma_direction =3D=3D DMA_FROM_DEVICE) priv->flags |=3D ID_P_NO_RXDMA; =20 @@ -886,8 +887,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *ada= p, if (ret < 0) goto out; =20 - /* Gen3 needs a reset before allowing RXDMA once */ - if (priv->devtype =3D=3D I2C_RCAR_GEN3) { + /* Gen3+ needs a reset. That also allows RXDMA once */ + if (priv->devtype >=3D I2C_RCAR_GEN3) { priv->flags &=3D ~ID_P_NO_RXDMA; ret =3D rcar_i2c_do_reset(priv); if (ret) @@ -1075,7 +1076,7 @@ static const struct of_device_id rcar_i2c_dt_ids[] = =3D { { .compatible =3D "renesas,rcar-gen1-i2c", .data =3D (void *)I2C_RCAR_GEN= 1 }, { .compatible =3D "renesas,rcar-gen2-i2c", .data =3D (void *)I2C_RCAR_GEN= 2 }, { .compatible =3D "renesas,rcar-gen3-i2c", .data =3D (void *)I2C_RCAR_GEN= 3 }, - { .compatible =3D "renesas,rcar-gen4-i2c", .data =3D (void *)I2C_RCAR_GEN= 3 }, + { .compatible =3D "renesas,rcar-gen4-i2c", .data =3D (void *)I2C_RCAR_GEN= 4 }, {}, }; MODULE_DEVICE_TABLE(of, rcar_i2c_dt_ids); @@ -1151,7 +1152,7 @@ static int rcar_i2c_probe(struct platform_device *pde= v) if (of_property_read_bool(dev->of_node, "smbus")) priv->flags |=3D ID_P_HOST_NOTIFY; =20 - if (priv->devtype =3D=3D I2C_RCAR_GEN3) { + if (priv->devtype >=3D I2C_RCAR_GEN3) { priv->rstc =3D devm_reset_control_get_exclusive(&pdev->dev, NULL); if (IS_ERR(priv->rstc)) { ret =3D PTR_ERR(priv->rstc); --=20 2.35.1 From nobody Sun Dec 28 00:49:35 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F797C4167B for ; Thu, 14 Dec 2023 07:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231157AbjLNHoR (ORCPT ); Thu, 14 Dec 2023 02:44:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235521AbjLNHoM (ORCPT ); Thu, 14 Dec 2023 02:44:12 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F0F0112 for ; Wed, 13 Dec 2023 23:44:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= sang-engineering.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=k1; bh=sLux8hEi9/sjtoNpGdoaEH5UG27zo1G6S1tRWJJq7VI=; b=WYq0W0 rV/3w0jLnvYX1Hbq4O/e8ngeKUf+TFRzIGQEAcneiQzYZnrGKtN7sndG9/TR2qa9 5MDN1HAvumjLFgk2CvTeZujnMh+W9KO7qTwsib59E6pPtW1Ctrf7UKQWnnin/wVu DzcPAk1P5hK17nQPK7T8z4hy0/4zYFaNTvLl2RpKg75VOgOuv4m0t/5po9nKgFCe 0pL0yvzW0k482FkVlrEVhNWlkmekVvTV8bmZ7ORof7uiWfd6I3+4BVFO9zdThz/u OryOPyBNR/E0aZNGnLgQzyaw3nM3v3uyWk9IZTiyQNZQUqlsqrszO/qCv2kDNZls Yepqwg3QZvoGWZ1g== Received: (qmail 827056 invoked from network); 14 Dec 2023 08:44:14 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 14 Dec 2023 08:44:14 +0100 X-UD-Smtp-Session: l3s3148p1@aI05c3MMwK8ujnuR From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Andi Shyti , Geert Uytterhoeven , Magnus Damm , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] i2c: rcar: add FastMode+ support for Gen4 Date: Thu, 14 Dec 2023 08:43:58 +0100 Message-Id: <20231214074358.8711-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231214074358.8711-1-wsa+renesas@sang-engineering.com> References: <20231214074358.8711-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" To support FM+, we mainly need to turn the SMD constant into a parameter and set it accordingly. That also means we can finally fix SMD to our needs instead of bailing out. A sanity check for SMD then becomes a sanity check for 'x =3D=3D 0'. After all that, activating the enable bit for FM+ is all we need to do. Tested with a Renesas Falcon board using R-Car V3U. Signed-off-by: Wolfram Sang Reviewed-by: Andi Shyti Reviewed-by: Geert Uytterhoeven --- Changes since v1: * rebased to 6.7-rc4 * gained S4 specific handling from patch 1 * keep SCL filters active for FM+ by still writing to CDF * if default SMD is too large, fix it instead of bailing out drivers/i2c/busses/i2c-rcar.c | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index 973811a6c27b..828aa2ea0fe4 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -89,6 +89,7 @@ #define TMDMAE BIT(0) /* DMA Master Transmitted Enable */ =20 /* ICCCR2 */ +#define FMPE BIT(7) /* Fast Mode Plus Enable */ #define CDFD BIT(2) /* CDF Disable */ #define HLSE BIT(1) /* HIGH/LOW Separate Control Enable */ #define SME BIT(0) /* SCL Mask Enable */ @@ -122,11 +123,12 @@ #define ID_NACK BIT(4) #define ID_EPROTO BIT(5) /* persistent flags */ +#define ID_P_FMPLUS BIT(27) #define ID_P_NOT_ATOMIC BIT(28) #define ID_P_HOST_NOTIFY BIT(29) #define ID_P_NO_RXDMA BIT(30) /* HW forbids RXDMA sometimes */ #define ID_P_PM_BLOCKED BIT(31) -#define ID_P_MASK GENMASK(31, 28) +#define ID_P_MASK GENMASK(31, 27) =20 enum rcar_i2c_type { I2C_RCAR_GEN1, @@ -149,6 +151,7 @@ struct rcar_i2c_priv { u32 icccr; u16 schd; u16 scld; + u8 smd; u8 recovery_icmcr; /* protected by adapter lock */ enum rcar_i2c_type devtype; struct i2c_client *slave; @@ -240,9 +243,14 @@ static void rcar_i2c_init(struct rcar_i2c_priv *priv) if (priv->devtype < I2C_RCAR_GEN3) { rcar_i2c_write(priv, ICCCR, priv->icccr); } else { - rcar_i2c_write(priv, ICCCR2, CDFD | HLSE | SME); + u32 icccr2 =3D CDFD | HLSE | SME; + + if (priv->flags & ID_P_FMPLUS) + icccr2 |=3D FMPE; + + rcar_i2c_write(priv, ICCCR2, icccr2); rcar_i2c_write(priv, ICCCR, priv->icccr); - rcar_i2c_write(priv, ICMPR, RCAR_DEFAULT_SMD); + rcar_i2c_write(priv, ICMPR, priv->smd); rcar_i2c_write(priv, ICHPR, priv->schd); rcar_i2c_write(priv, ICLPR, priv->scld); rcar_i2c_write(priv, ICFBSCR, TCYC17); @@ -279,6 +287,7 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_pri= v *priv) =20 /* Fall back to previously used values if not supplied */ i2c_parse_fw_timings(dev, &t, false); + priv->smd =3D RCAR_DEFAULT_SMD; =20 /* * calculate SCL clock @@ -304,6 +313,11 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_pr= iv *priv) if (cdf >=3D 1U << cdf_width) goto err_no_val; =20 + if (t.bus_freq_hz > I2C_MAX_FAST_MODE_FREQ && priv->devtype >=3D I2C_RCAR= _GEN4) + priv->flags |=3D ID_P_FMPLUS; + else + priv->flags &=3D ~ID_P_FMPLUS; + /* On Gen3+, we use cdf only for the filters, not as a SCL divider */ ick =3D rate / (priv->devtype < I2C_RCAR_GEN3 ? (cdf + 1) : 1); =20 @@ -345,30 +359,30 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_p= riv *priv) * x as a base value for the SCLD/SCHD ratio: * * SCL =3D clkp / (8 + 2 * SMD + SCLD + SCHD + F[(ticf + tr + intd) * cl= kp]) - * SCL =3D clkp / (8 + 2 * RCAR_DEFAULT_SMD + RCAR_SCLD_RATIO * x + * SCL =3D clkp / (8 + 2 * SMD + RCAR_SCLD_RATIO * x * + RCAR_SCHD_RATIO * x + F[...]) * * with: sum_ratio =3D RCAR_SCLD_RATIO + RCAR_SCHD_RATIO - * and: smd =3D RCAR_DEFAULT_SMD * * SCL =3D clkp / (8 + 2 * smd + sum_ratio * x + F[...]) * 8 + 2 * smd + sum_ratio * x + F[...] =3D clkp / SCL * x =3D ((clkp / SCL) - 8 - 2 * smd - F[...]) / sum_ratio */ x =3D DIV_ROUND_UP(rate, t.bus_freq_hz ?: 1); - x =3D DIV_ROUND_UP(x - 8 - 2 * RCAR_DEFAULT_SMD - round, sum_ratio); - scl =3D rate / (8 + 2 * RCAR_DEFAULT_SMD + sum_ratio * x + round); + x =3D DIV_ROUND_UP(x - 8 - 2 * priv->smd - round, sum_ratio); + scl =3D rate / (8 + 2 * priv->smd + sum_ratio * x + round); =20 - /* Bail out if values don't fit into 16 bit or SMD became too large */ - if (x * RCAR_SCLD_RATIO > 0xffff || RCAR_DEFAULT_SMD > x * RCAR_SCHD_RAT= IO) + if (x =3D=3D 0 || x * RCAR_SCLD_RATIO > 0xffff) goto err_no_val; =20 priv->icccr =3D cdf; priv->schd =3D RCAR_SCHD_RATIO * x; priv->scld =3D RCAR_SCLD_RATIO * x; + if (priv->smd >=3D priv->schd) + priv->smd =3D priv->schd - 1; =20 - dev_dbg(dev, "clk %u/%u(%lu), round %u, CDF: %u SCHD %u SCLD %u\n", - scl, t.bus_freq_hz, rate, round, cdf, priv->schd, priv->scld); + dev_dbg(dev, "clk %u/%u(%lu), round %u, CDF: %u SCHD %u SCLD %u SMD %u\n= ", + scl, t.bus_freq_hz, rate, round, cdf, priv->schd, priv->scld, priv->smd= ); } =20 return 0; @@ -1073,6 +1087,8 @@ static const struct of_device_id rcar_i2c_dt_ids[] = =3D { { .compatible =3D "renesas,i2c-r8a7794", .data =3D (void *)I2C_RCAR_GEN2 = }, { .compatible =3D "renesas,i2c-r8a7795", .data =3D (void *)I2C_RCAR_GEN3 = }, { .compatible =3D "renesas,i2c-r8a7796", .data =3D (void *)I2C_RCAR_GEN3 = }, + /* S4 has no FM+ bit */ + { .compatible =3D "renesas,i2c-r8a779f0", .data =3D (void *)I2C_RCAR_GEN3= }, { .compatible =3D "renesas,rcar-gen1-i2c", .data =3D (void *)I2C_RCAR_GEN= 1 }, { .compatible =3D "renesas,rcar-gen2-i2c", .data =3D (void *)I2C_RCAR_GEN= 2 }, { .compatible =3D "renesas,rcar-gen3-i2c", .data =3D (void *)I2C_RCAR_GEN= 3 }, --=20 2.35.1