Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 13 Jun 2023 18:34:33 +0200
From:   Sebastian Reichel <sebastian.reichel@collabora.com>
To:     Sascha Hauer <s.hauer@pengutronix.de>
Cc:     linux-rockchip@lists.infradead.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        linux-pm@vger.kernel.org, Heiko Stuebner <heiko@sntech.de>,
        Kyungmin Park <kyungmin.park@samsung.com>,
        MyungJoo Ham <myungjoo.ham@samsung.com>,
        Will Deacon <will@kernel.org>,
        Mark Rutland <mark.rutland@arm.com>, kernel@pengutronix.de,
        Michael Riesch <michael.riesch@wolfvision.net>,
        Robin Murphy <robin.murphy@arm.com>,
        Vincent Legoll <vincent.legoll@gmail.com>,
        Rob Herring <robh+dt@kernel.org>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Conor Dooley <conor+dt@kernel.org>, devicetree@vger.kernel.org
Subject: Re: [PATCH v5 07/25] PM / devfreq: rockchip-dfi: introduce channel
 mask
Message-ID: <20230613163433.lvb4f7toliq3y2bt@mercury.elektranox.org>
References: <20230524083153.2046084-1-s.hauer@pengutronix.de>
 <20230524083153.2046084-8-s.hauer@pengutronix.de>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="6fr3okublbgywb5d"
Content-Disposition: inline
In-Reply-To: <20230524083153.2046084-8-s.hauer@pengutronix.de>
Precedence: bulk


--6fr3okublbgywb5d
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Wed, May 24, 2023 at 10:31:35AM +0200, Sascha Hauer wrote:
> Different Rockchip SoC variants have a different number of channels.
> Introduce a channel mask to make the number of channels configurable
> from SoC initialization code.
>=20
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian

>  drivers/devfreq/event/rockchip-dfi.c | 23 +++++++++++++++++------
>  1 file changed, 17 insertions(+), 6 deletions(-)
>=20
> diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event=
/rockchip-dfi.c
> index 126bb744645b6..82de24a027579 100644
> --- a/drivers/devfreq/event/rockchip-dfi.c
> +++ b/drivers/devfreq/event/rockchip-dfi.c
> @@ -18,10 +18,11 @@
>  #include <linux/list.h>
>  #include <linux/of.h>
>  #include <linux/of_device.h>
> +#include <linux/bits.h>
> =20
>  #include <soc/rockchip/rk3399_grf.h>
> =20
> -#define RK3399_DMC_NUM_CH	2
> +#define DMC_MAX_CHANNELS	2
> =20
>  /* DDRMON_CTRL */
>  #define DDRMON_CTRL	0x04
> @@ -44,7 +45,7 @@ struct dmc_count_channel {
>  };
> =20
>  struct dmc_count {
> -	struct dmc_count_channel c[RK3399_DMC_NUM_CH];
> +	struct dmc_count_channel c[DMC_MAX_CHANNELS];
>  };
> =20
>  /*
> @@ -61,6 +62,7 @@ struct rockchip_dfi {
>  	struct regmap *regmap_pmu;
>  	struct clk *clk;
>  	u32 ddr_type;
> +	unsigned int channel_mask;
>  };
> =20
>  static void rockchip_dfi_start_hardware_counter(struct devfreq_event_dev=
 *edev)
> @@ -95,7 +97,9 @@ static void rockchip_dfi_read_counters(struct devfreq_e=
vent_dev *edev, struct dm
>  	u32 i;
>  	void __iomem *dfi_regs =3D dfi->regs;
> =20
> -	for (i =3D 0; i < RK3399_DMC_NUM_CH; i++) {
> +	for (i =3D 0; i < DMC_MAX_CHANNELS; i++) {
> +		if (!(dfi->channel_mask & BIT(i)))
> +			continue;
>  		count->c[i].access =3D readl_relaxed(dfi_regs +
>  				DDRMON_CH0_DFI_ACCESS_NUM + i * 20);
>  		count->c[i].total =3D readl_relaxed(dfi_regs +
> @@ -145,9 +149,14 @@ static int rockchip_dfi_get_event(struct devfreq_eve=
nt_dev *edev,
>  	rockchip_dfi_read_counters(edev, &count);
> =20
>  	/* We can only report one channel, so find the busiest one */
> -	for (i =3D 0; i < RK3399_DMC_NUM_CH; i++) {
> -		u32 a =3D count.c[i].access - last->c[i].access;
> -		u32 t =3D count.c[i].total - last->c[i].total;
> +	for (i =3D 0; i < DMC_MAX_CHANNELS; i++) {
> +		u32 a, t;
> +
> +		if (!(dfi->channel_mask & BIT(i)))
> +			continue;
> +
> +		a =3D count.c[i].access - last->c[i].access;
> +		t =3D count.c[i].total - last->c[i].total;
> =20
>  		if (a > access) {
>  			access =3D a;
> @@ -185,6 +194,8 @@ static int rk3399_dfi_init(struct rockchip_dfi *dfi)
>  	dfi->ddr_type =3D (val >> RK3399_PMUGRF_DDRTYPE_SHIFT) &
>  			RK3399_PMUGRF_DDRTYPE_MASK;
> =20
> +	dfi->channel_mask =3D GENMASK(1, 0);
> +
>  	return 0;
>  };
> =20
> --=20
> 2.39.2
>=20

--6fr3okublbgywb5d
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAmSImpgACgkQ2O7X88g7
+pq0FRAAm0yMOi0AXifDjOJhY1PK9Fb13r/jJtrgxxw3FMQW4iwQ+yKQfRVrdntu
1un74SUeA9CihxErK9dW+ouu9rhTOuA2stUW3l2qaITIMlFe/Kb2G9K4/gYmViNc
++SInz8NCAnRmuK5qKWIXFLd7hWv3M9P37j1rrGBt/JDgEbvt5ClBVJVxw+64+DP
fHui203XqWe+b3wGnGcs8wNZ+6u7imBSaoJqbDKuX7cPM5inY29YhccRgrysdi2Y
U87wzsiYD1WtTq9mVdXgeL5mQjWU4RDLMR9Aekhx2sANW7ajolX/NRrgOFQJtba4
OfaufXV7bqw/c3PxnqTSo/+U7RX4cv/9BC8fMEj5Ac7r8J2XSNbskuboc3ak7Kcf
EKH/I2r1F+8QuQCU3Z1fF53LGnswHdUQQ9sDwXj7DAFnaU0wiHHRl6txUPouJ1Ij
vawXD9fn2HQctMu7G08LAZuwevCwijqHirOXEOZVzvA48IPvw2hQo1kXi8pt6o5K
K8CdHL1NxzTRb1lCurDNZLMhdr2/0JAtizLK3SXUcsmheG/FhhFmuSxkOhQcr6Xs
1yU3oaU93tdUgB4D0wh9m2xfYtTvCHgp0mpKMLQEEOBJYNa9bS+YEQf+brG+6+C6
mV7UXE/gGTmF7IHnLdBuAOxAJNhETQW7y996jdA60zQGmgPWjlQ=
=Uoaj
-----END PGP SIGNATURE-----

--6fr3okublbgywb5d--