Skip to contentSkip to conversation

thermal: imx8mm: Fix build warning of incorrect argument type

PATCH In review Anson Huang 2 participants 4 messages Mar 23, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thermal: imx8mm: Fix build warning of incorrect argument type

Fix below sparse warning:

drivers/thermal/imx8mm_thermal.c:82:36: sparse: sparse: incorrect type in argument 2 (different address spaces), expected unsigned long const volatile *addr drivers/thermal/imx8mm_thermal.c:82:36: sparse: expected unsigned long const volatile *addr

---
 drivers/thermal/imx8mm_thermal.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/thermal/imx8mm_thermal.c +3 -4
index c32308b..0d60f8d 100644
@@ -75,15 +75,14 @@ static int imx8mp_tmu_get_temp(void *data, int *temp)
 {
 	struct tmu_sensor *sensor = data;
 	struct imx8mm_tmu *tmu = sensor->priv;
+	unsigned long val;
 	bool ready;
-	u32 val;
 
-	ready = test_bit(probe_status_offset(sensor->hw_id),
-			 tmu->base + TRITSR);
+	val = readl_relaxed(tmu->base + TRITSR);
+	ready = test_bit(probe_status_offset(sensor->hw_id), &val);
 	if (!ready)
 		return -EAGAIN;
 
-	val = readl_relaxed(tmu->base + TRITSR);
 	val = sensor->hw_id ? FIELD_GET(TRITSR_TEMP1_VAL_MASK, val) :
 	      FIELD_GET(TRITSR_TEMP0_VAL_MASK, val);
 	if (val & SIGN_BIT) /* negative */
Signature · 1 line
2.7.4
#1 lore raw
Quoted 18 lines · Anson Huang

Fix below sparse warning:

drivers/thermal/imx8mm_thermal.c:82:36: sparse: sparse: incorrect type in argument 2 (different address spaces), expected unsigned long const volatile *addr drivers/thermal/imx8mm_thermal.c:82:36: sparse: expected unsigned long const volatile *addr

---
 drivers/thermal/imx8mm_thermal.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/thermal/imx8mm_thermal.c +0 -0
index c32308b..0d60f8d 100644
@@ -75,15 +75,14 @@ static int imx8mp_tmu_get_temp(void *data, int *temp)
 {
 	struct tmu_sensor *sensor = data;
 	struct imx8mm_tmu *tmu = sensor->priv;

drivers/thermal/imx8mm_thermal.c static int imx8mp_tmu_get_temp(void *data, int *temp) · line 84

Quoted 10 lines
drivers/thermal/imx8mm_thermal.c +3 -3
+	unsigned long val;
 	bool ready;
-	u32 val;
 
-	ready = test_bit(probe_status_offset(sensor->hw_id),
-			 tmu->base + TRITSR);
+	val = readl_relaxed(tmu->base + TRITSR);
+	ready = test_bit(probe_status_offset(sensor->hw_id), &val);
 	if (!ready)
 		return -EAGAIN;

Doesn't this patch also fix a bug because the read was done after testing the bit? :)

Quoted 5 lines
drivers/thermal/imx8mm_thermal.c +0 -1
-	val = readl_relaxed(tmu->base + TRITSR);
 	val = sensor->hw_id ? FIELD_GET(TRITSR_TEMP1_VAL_MASK, val) :
 	      FIELD_GET(TRITSR_TEMP0_VAL_MASK, val);
 	if (val & SIGN_BIT) /* negative */
 
Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
#2 lore raw

Hi, Daniel

Quoted 30 lines

Subject: Re: [PATCH] thermal: imx8mm: Fix build warning of incorrect argument type

Quoted 26 lines · Anson Huang

Fix below sparse warning:

drivers/thermal/imx8mm_thermal.c:82:36: sparse: sparse: incorrect type in argument 2 (different address spaces), expected unsigned long const volatile *addr
drivers/thermal/imx8mm_thermal.c:82:36: sparse: expected unsigned long const volatile *addr

---
 drivers/thermal/imx8mm_thermal.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/thermal/imx8mm_thermal.c +1 -1
index c32308b..0d60f8d 100644
@@ -75,15 +75,14 @@ static int imx8mp_tmu_get_temp(void *data, int
 *temp)  {
 	struct tmu_sensor *sensor = data;
 	struct imx8mm_tmu *tmu = sensor->priv;
+	unsigned long val;
 	bool ready;
-	u32 val;
 
Quoted 9 lines

drivers/thermal/imx8mm_thermal.c static int imx8mp_tmu_get_temp(void *data, int *temp) · line 84

Quoted 6 lines
drivers/thermal/imx8mm_thermal.c +2 -2
-	ready = test_bit(probe_status_offset(sensor->hw_id),
-			 tmu->base + TRITSR);
+	val = readl_relaxed(tmu->base + TRITSR);
+	ready = test_bit(probe_status_offset(sensor->hw_id), &val);
 	if (!ready)
 		return -EAGAIN;

Doesn't this patch also fix a bug because the read was done after testing the bit? :)

Yes😊 Previous patch reads the register twice at different time, may cause a sync issue of checking the ready bit and reading the temperature using register values read at different time.

Do I need to improve the commit log? I guess no need?

Thanks,
Anson
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw
Quoted 42 lines · Anson Huang

Hi, Daniel

Quoted 30 lines

Subject: Re: [PATCH] thermal: imx8mm: Fix build warning of incorrect argument type

Quoted 26 lines · Anson Huang

Fix below sparse warning:

drivers/thermal/imx8mm_thermal.c:82:36: sparse: sparse: incorrect type in argument 2 (different address spaces), expected unsigned long const volatile *addr
drivers/thermal/imx8mm_thermal.c:82:36: sparse: expected unsigned long const volatile *addr

---
 drivers/thermal/imx8mm_thermal.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/thermal/imx8mm_thermal.c +1 -1
index c32308b..0d60f8d 100644
@@ -75,15 +75,14 @@ static int imx8mp_tmu_get_temp(void *data, int
 *temp)  {
 	struct tmu_sensor *sensor = data;
 	struct imx8mm_tmu *tmu = sensor->priv;
+	unsigned long val;
 	bool ready;
-	u32 val;
 
Quoted 9 lines

drivers/thermal/imx8mm_thermal.c static int imx8mp_tmu_get_temp(void *data, int *temp) · line 84

Quoted 6 lines
drivers/thermal/imx8mm_thermal.c +2 -2
-	ready = test_bit(probe_status_offset(sensor->hw_id),
-			 tmu->base + TRITSR);
+	val = readl_relaxed(tmu->base + TRITSR);
+	ready = test_bit(probe_status_offset(sensor->hw_id), &val);
 	if (!ready)
 		return -EAGAIN;

Doesn't this patch also fix a bug because the read was done after testing the bit? :)

Quoted 5 lines

Yes😊 Previous patch reads the register twice at different time, may cause a sync issue of checking the ready bit and reading the temperature using register values read at different time.

Do I need to improve the commit log? I guess no need?

No need, it is fine.

Signature · 5 lines
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog