diff mbox series

thermal/drivers/qoriq: fix getting tmu range

Message ID 20231020081337.3141488-1-peng.fan@oss.nxp.com (mailing list archive)
State New, archived
Delegated to: Daniel Lezcano
Headers show
Series thermal/drivers/qoriq: fix getting tmu range | expand

Commit Message

Peng Fan (OSS) Oct. 20, 2023, 8:13 a.m. UTC 
From: Peng Fan <peng.fan@nxp.com>

TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs.
So limit the len to 4 will report "invalid range data" for i.MX93.

This patch drop the local array with allocated ttrcr array and
able to support larger tmu ranges.

Fixes: f12d60c81fce ("thermal/drivers/qoriq: Support version 2.1")
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/thermal/qoriq_thermal.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Comments

Sascha Hauer Jan. 11, 2024, 9:56 a.m. UTC | #1 
Hi Peng,

On Fri, Oct 20, 2023 at 04:13:37PM +0800, Peng Fan (OSS) wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs.
> So limit the len to 4 will report "invalid range data" for i.MX93.
> 
> This patch drop the local array with allocated ttrcr array and
> able to support larger tmu ranges.
> 
> Fixes: f12d60c81fce ("thermal/drivers/qoriq: Support version 2.1")
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/thermal/qoriq_thermal.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index ccc2eea7f9f5..404f01cca4da 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -57,6 +57,9 @@
>  #define REGS_TTRnCR(n)	(0xf10 + 4 * (n)) /* Temperature Range n
>  					   * Control Register
>  					   */
> +#define NUM_TTRCR_V1	4
> +#define NUM_TTRCR_MAX	16
> +
>  #define REGS_IPBRR(n)		(0xbf8 + 4 * (n)) /* IP Block Revision
>  						   * Register n
>  						   */
> @@ -71,6 +74,7 @@ struct qoriq_sensor {
>  
>  struct qoriq_tmu_data {
>  	int ver;
> +	u32 ttrcr[NUM_TTRCR_MAX];
>  	struct regmap *regmap;
>  	struct clk *clk;
>  	struct qoriq_sensor	sensor[SITES_MAX];
> @@ -182,17 +186,17 @@ static int qoriq_tmu_calibration(struct device *dev,
>  				 struct qoriq_tmu_data *data)
>  {
>  	int i, val, len;
> -	u32 range[4];

Why don't you keep the array locally on the stack? Will it be needed
elsewhere later?

Other than that:

Tested-by: Sascha Hauer <s.hauer@pengutronix.de>

Would be great if this could be picked up anytime soon.

Sascha
Peng Fan Jan. 11, 2024, 10:47 a.m. UTC | #2 
Hi Sascha,

> Subject: Re: [PATCH] thermal/drivers/qoriq: fix getting tmu range
>
> Hi Peng,
>
> On Fri, Oct 20, 2023 at 04:13:37PM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs.
> > So limit the len to 4 will report "invalid range data" for i.MX93.
> >
> > This patch drop the local array with allocated ttrcr array and able to
> > support larger tmu ranges.
> >
> > Fixes: f12d60c81fce ("thermal/drivers/qoriq: Support version 2.1")
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  drivers/thermal/qoriq_thermal.c | 12 ++++++++----
> >  1 file changed, 8 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/thermal/qoriq_thermal.c
> > b/drivers/thermal/qoriq_thermal.c index ccc2eea7f9f5..404f01cca4da
> > 100644
> > --- a/drivers/thermal/qoriq_thermal.c
> > +++ b/drivers/thermal/qoriq_thermal.c
> > @@ -57,6 +57,9 @@
> >  #define REGS_TTRnCR(n)     (0xf10 + 4 * (n)) /* Temperature Range n
> >                                        * Control Register
> >                                        */
> > +#define NUM_TTRCR_V1       4
> > +#define NUM_TTRCR_MAX      16
> > +
> >  #define REGS_IPBRR(n)              (0xbf8 + 4 * (n)) /* IP Block Revision
> >                                                * Register n
> >                                                */
> > @@ -71,6 +74,7 @@ struct qoriq_sensor {
> >
> >  struct qoriq_tmu_data {
> >     int ver;
> > +   u32 ttrcr[NUM_TTRCR_MAX];
> >     struct regmap *regmap;
> >     struct clk *clk;
> >     struct qoriq_sensor     sensor[SITES_MAX];
> > @@ -182,17 +186,17 @@ static int qoriq_tmu_calibration(struct device
> *dev,
> >                              struct qoriq_tmu_data *data)
> >  {
> >     int i, val, len;
> > -   u32 range[4];
>
> Why don't you keep the array locally on the stack? Will it be needed
> elsewhere later?

Because max 16 as of now, it will consume 64bytes in stack, so I
move it out.

>
> Other than that:
>
> Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
>

Thanks for testing this patch.

Thanks,
Peng.

> Would be great if this could be picked up anytime soon.
>
> Sascha
>
> --
> Pengutronix e.K.                           |                             |
> Steuerwalder Str. 21                       |
> http://www.p/
> engutronix.de%2F&data=05%7C02%7Cpeng.fan%40nxp.com%7C227277d8c0
> 20468aaf6e08dc128ba2ab%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%
> 7C0%7C638405638133353126%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC
> 4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%
> 7C%7C%7C&sdata=ilwPz4Bs6f7CLf2snic7S%2FUsff0AYCgsFuZP9d2UExo%3D&
> reserved=0  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
Peng Fan Jan. 25, 2024, 11:07 a.m. UTC | #3 
Hi Daniel,

> Subject: [PATCH] thermal/drivers/qoriq: fix getting tmu range
> 

Would you pick up this patch?

Thanks,
Peng.

> From: Peng Fan <peng.fan@nxp.com>
> 
> TMU Version 1 has 4 TTRCRs, while TMU Version >=2 has 16 TTRCRs.
> So limit the len to 4 will report "invalid range data" for i.MX93.
> 
> This patch drop the local array with allocated ttrcr array and able to support
> larger tmu ranges.
> 
> Fixes: f12d60c81fce ("thermal/drivers/qoriq: Support version 2.1")
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  drivers/thermal/qoriq_thermal.c | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/thermal/qoriq_thermal.c
> b/drivers/thermal/qoriq_thermal.c index ccc2eea7f9f5..404f01cca4da
> 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -57,6 +57,9 @@
>  #define REGS_TTRnCR(n)	(0xf10 + 4 * (n)) /* Temperature Range n
>  					   * Control Register
>  					   */
> +#define NUM_TTRCR_V1	4
> +#define NUM_TTRCR_MAX	16
> +
>  #define REGS_IPBRR(n)		(0xbf8 + 4 * (n)) /* IP Block Revision
>  						   * Register n
>  						   */
> @@ -71,6 +74,7 @@ struct qoriq_sensor {
> 
>  struct qoriq_tmu_data {
>  	int ver;
> +	u32 ttrcr[NUM_TTRCR_MAX];
>  	struct regmap *regmap;
>  	struct clk *clk;
>  	struct qoriq_sensor	sensor[SITES_MAX];
> @@ -182,17 +186,17 @@ static int qoriq_tmu_calibration(struct device *dev,
>  				 struct qoriq_tmu_data *data)
>  {
>  	int i, val, len;
> -	u32 range[4];
>  	const u32 *calibration;
>  	struct device_node *np = dev->of_node;
> 
>  	len = of_property_count_u32_elems(np, "fsl,tmu-range");
> -	if (len < 0 || len > 4) {
> +	if (len < 0 || (data->ver == TMU_VER1 && len > NUM_TTRCR_V1) ||
> +	    (data->ver > TMU_VER1 && len > NUM_TTRCR_MAX)) {
>  		dev_err(dev, "invalid range data.\n");
>  		return len;
>  	}
> 
> -	val = of_property_read_u32_array(np, "fsl,tmu-range", range, len);
> +	val = of_property_read_u32_array(np, "fsl,tmu-range", data->ttrcr,
> +len);
>  	if (val != 0) {
>  		dev_err(dev, "failed to read range data.\n");
>  		return val;
> @@ -200,7 +204,7 @@ static int qoriq_tmu_calibration(struct device *dev,
> 
>  	/* Init temperature range registers */
>  	for (i = 0; i < len; i++)
> -		regmap_write(data->regmap, REGS_TTRnCR(i), range[i]);
> +		regmap_write(data->regmap, REGS_TTRnCR(i), data->ttrcr[i]);
> 
>  	calibration = of_get_property(np, "fsl,tmu-calibration", &len);
>  	if (calibration == NULL || len % 8) {
> --
> 2.37.1
diff mbox series

Patch

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index ccc2eea7f9f5..404f01cca4da 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -57,6 +57,9 @@ 
 #define REGS_TTRnCR(n)	(0xf10 + 4 * (n)) /* Temperature Range n
 					   * Control Register
 					   */
+#define NUM_TTRCR_V1	4
+#define NUM_TTRCR_MAX	16
+
 #define REGS_IPBRR(n)		(0xbf8 + 4 * (n)) /* IP Block Revision
 						   * Register n
 						   */
@@ -71,6 +74,7 @@  struct qoriq_sensor {
 
 struct qoriq_tmu_data {
 	int ver;
+	u32 ttrcr[NUM_TTRCR_MAX];
 	struct regmap *regmap;
 	struct clk *clk;
 	struct qoriq_sensor	sensor[SITES_MAX];
@@ -182,17 +186,17 @@  static int qoriq_tmu_calibration(struct device *dev,
 				 struct qoriq_tmu_data *data)
 {
 	int i, val, len;
-	u32 range[4];
 	const u32 *calibration;
 	struct device_node *np = dev->of_node;
 
 	len = of_property_count_u32_elems(np, "fsl,tmu-range");
-	if (len < 0 || len > 4) {
+	if (len < 0 || (data->ver == TMU_VER1 && len > NUM_TTRCR_V1) ||
+	    (data->ver > TMU_VER1 && len > NUM_TTRCR_MAX)) {
 		dev_err(dev, "invalid range data.\n");
 		return len;
 	}
 
-	val = of_property_read_u32_array(np, "fsl,tmu-range", range, len);
+	val = of_property_read_u32_array(np, "fsl,tmu-range", data->ttrcr, len);
 	if (val != 0) {
 		dev_err(dev, "failed to read range data.\n");
 		return val;
@@ -200,7 +204,7 @@  static int qoriq_tmu_calibration(struct device *dev,
 
 	/* Init temperature range registers */
 	for (i = 0; i < len; i++)
-		regmap_write(data->regmap, REGS_TTRnCR(i), range[i]);
+		regmap_write(data->regmap, REGS_TTRnCR(i), data->ttrcr[i]);
 
 	calibration = of_get_property(np, "fsl,tmu-calibration", &len);
 	if (calibration == NULL || len % 8) {