iio:common:ssp_sensors fix warnings due to 32 bit instead of 64 bit passed to do_div
Jonathan Cameron
maintainerPATCH 1/1 iio:common:ssp_sensors fix warnings due to 32 bit instead of 64 bit passed to do_div
Fixes warnings with asm-generic/div64.h do_div such as:
In file included from drivers/iio/common/ssp_sensors/ssp_iio.c:20:0:
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h: In function 'ssp_convert_to_freq':
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:16: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: right shift count >= width of type [enabled by default]
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
include/asm-generic/div64.h:35:17: note: expected 'uint64_t *' but argument is of type 'int *' drivers/iio/common/ssp_sensors/ssp_iio.c: In function 'ssp_common_process_data':
include/linux/iio/buffer.h:142:32: warning: 'calculated_time' may be used uninitialized in this function [-Wuninitialized] drivers/iio/common/ssp_sensors/ssp_iio.c:83:10: note: 'calculated_time' was declared here
Fixed by using straight coded version as per the description in the div64.h header, thus ensuring no issue with 32 bit integers.
--- drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +2 -1
@@ -53,7 +53,8 @@ static inline void ssp_convert_to_freq(u32 time, int *integer_part, } *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + *fractional = *integer_part %SSP_INVERTED_SCALING_FACTOR ; + *integer_part = *integer_part /SSP_INVERTED_SCALING_FACTOR ; }/* Converts frequency to time in ms */
Signature · 1 line
2.2.2
Jonathan Cameron
maintainerQuoted 11 lines · Jonathan Cameron
Fixes warnings with
asm-generic/div64.hdo_divsuch as:
In file included fromdrivers/iio/common/ssp_sensors/ssp_iio.c:20:0:
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h: In function 'ssp_convert_to_freq':Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:16: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: right shift count >= width of type [enabled by default]Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
include/asm-generic/div64.h:35:17: note: expected 'uint64_t*' but argument is of type 'int *'drivers/iio/common/ssp_sensors/ssp_iio.c: In function 'ssp_common_process_data':
include/linux/iio/buffer.h:142:32: warning: 'calculated_time' may be used uninitialized in this function [-Wuninitialized]drivers/iio/common/ssp_sensors/ssp_iio.c:83:10: note: 'calculated_time' was declared here
Quoted 5 lines
Fixed by using straight coded version as per the description in the
div64.hheader, thus ensuring no issue with 32 bit integers.Reported-by kbuild test robot <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
hmm. failed the build tests. I'd missed SSP_INVERTED_SCALING_FACTOR is forced to be ULL. Any reason for that?
I can't immediately see that it is necessary. Being rather tired and running out of evening, I've pushed a version with the LL dropped out to testing to see if that causes any build issues.
What fun,
Jonathan
Quoted 19 lines
--- drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +2
-1@@ -53,7 +53,8 @@ static inline void ssp_convert_to_freq(u32 time, int *integer_part, } *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + *fractional = *integer_part %SSP_INVERTED_SCALING_FACTOR ; + *integer_part = *integer_part /SSP_INVERTED_SCALING_FACTOR ; }/* Converts frequency to time in ms */
Jonathan Cameron
maintainerQuoted 17 lines · Jonathan Cameron
Quoted 11 lines · Jonathan Cameron
Fixes warnings with
asm-generic/div64.hdo_divsuch as:
In file included fromdrivers/iio/common/ssp_sensors/ssp_iio.c:20:0:
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h: In function 'ssp_convert_to_freq':Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:16: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: right shift count >= width of type [enabled by default]Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
include/asm-generic/div64.h:35:17: note: expected 'uint64_t*' but argument is of type 'int *'drivers/iio/common/ssp_sensors/ssp_iio.c: In function 'ssp_common_process_data':
include/linux/iio/buffer.h:142:32: warning: 'calculated_time' may be used uninitialized in this function [-Wuninitialized]drivers/iio/common/ssp_sensors/ssp_iio.c:83:10: note: 'calculated_time' was declared hereQuoted 5 lines
Fixed by using straight coded version as per the description in the
div64.hheader, thus ensuring no issue with 32 bit integers.Reported-by kbuild test robot <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Quoted 8 lines
hmm. failed the build tests. I'd missed
SSP_INVERTED_SCALING_FACTORis forced to be ULL. Any reason for that?I can't immediately see that it is necessary. Being rather tired and running out of evening, I've pushed a version with the LL dropped out to testing to see if that causes any build issues.
What fun,
Had one final look. It looks like we might need that constant to be 64 bit to force integer promotion when converting the other way.
Hence, perhaps we just need a temporary u64 in this function? How about... (and I know it is ugly).
Karol, what do you think?
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +5 -2
@@ -46,14 +46,17 @@ int ssp_common_process_data(struct iio_dev *indio_dev, void *buf,static inline void ssp_convert_to_freq (u32 time,int *integer_part,int *fractional) { +u64 integer_part64; +if (time ==0 ) { *fractional =0 ; *integer_part =0 ;return ; } - *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + integer_part64 =SSP_FACTOR_WITH_MS / time; + *fractional =do_div (integer_part64,SSP_INVERTED_SCALING_FACTOR ); + *integer_part = integer_part64; }/* Converts frequency to time in ms */
Quoted 27 lines
Jonathan
Quoted 10 lines
--- drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +0
-0drivers/iio/common/ssp_sensors/ssp_iio_sensor.h static inline void ssp_convert_to_freq(u32 time, int *integer_part, · line 60
Quoted 9 lines
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +2
-1@@ -53,7 +53,8 @@ static inline void ssp_convert_to_freq(u32 time, int *integer_part, } *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + *fractional = *integer_part %SSP_INVERTED_SCALING_FACTOR ; + *integer_part = *integer_part /SSP_INVERTED_SCALING_FACTOR ; }/* Converts frequency to time in ms */ --
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
I apologise for a such mess.
For me the first fix plus this:
-#define SSP_INVERTED_SCALING_FACTOR 1000000ULL +#define SSP_INVERTED_SCALING_FACTOR 1000000U
is better. I think there is no sense to do local 64 bit val to use specially do_div.
When converting the other way I think we can cast first value to u64.
I wonder what is turned on in kbuild robot that it shows more then during normal build?
@@ -61,7 +61,7 @@ static inline int ssp_convert_to_time(int integer_part,
int fractional)
{
u64 value;
- value = integer_part * SSP_INVERTED_SCALING_FACTOR + fractional;
+ value = (u64)integer_part * SSP_INVERTED_SCALING_FACTOR + fractional; if (value == 0)
return 0;
2015-01-30 23:10 GMT+01:00 Jonathan Cameron <[email protected]>:
Quoted 107 lines · Jonathan Cameron
Quoted 4 lines · Jonathan Cameron
Quoted 3 lines
Fixes warnings with
asm-generic/div64.hdo_divsuch as:
In file included fromdrivers/iio/common/ssp_sensors/ssp_iio.c:20:0:
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h: In function'
ssp_convert_to_freq':Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:16: warning:comparison of distinct pointer types lacks a cast [enabled by default]
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: rightshift count >= width of type [enabled by default]
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning:passing argument 1 of '
__div64_32' from incompatible pointer type [enabled by default]Quoted 1 line
Quoted 1 line
include/asm-generic/div64.h:35:17: note: expected 'uint64_t *' butargument is of type 'int *'
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio.c: In function'
ssp_common_process_data':Quoted 1 line
Quoted 1 line
include/linux/iio/buffer.h:142:32: warning: 'calculated_time' may beused uninitialized in this function [-Wuninitialized]
Quoted 1 line
Quoted 1 line
drivers/iio/common/ssp_sensors/ssp_iio.c:83:10: note:'
calculated_time' was declared hereQuoted 7 lines
Quoted 6 lines
Fixed by using straight coded version as per the description in the
div64.hheader, thus ensuring no issue with 32 bit integers.Reported-by kbuild test robot <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>hmm. failed the build tests. I'd missed
SSP_INVERTED_SCALING_FACTORisforced
Quoted 7 lines
to be ULL. Any reason for that?
I can't immediately see that it is necessary. Being rather tired and running out of evening, I've pushed a version with the LL dropped out to testing to see if that causes any build issues.
What fun,
Had one final look. It looks like we might need that constant to be 64 bit to force integer promotion when converting the other way.
Hence, perhaps we just need a temporary u64 in this function? How about... (and I know it is ugly).
Karol, what do you think?
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +5
-2@@ -46,14 +46,17 @@ int ssp_common_process_data(struct iio_dev *indio_dev,void *buf, static inline void ssp_convert_to_freq(u32 time, int *integer_part, int *fractional) { + u64 integer_part64; +if (time ==0 ) { *fractional =0 ; *integer_part =0 ;return ; } - *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + integer_part64 =SSP_FACTOR_WITH_MS / time; + *fractional =do_div (integer_part64,SSP_INVERTED_SCALING_FACTOR ); + *integer_part = integer_part64; }/* Converts frequency to time in ms */
Quoted 7 lines
Jonathan
Review
Quoted 5 lines
--- drivers/iio/common/ssp_sensors/ssp_iio_sensor.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/iio/common/ssp_sensors/ssp_iio_sensor.hQuoted 4 lines
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h static inline void ssp_convert_to_freq(u32 time, int
Quoted 4 lines
index
dda267c9bd2a..fdf61a8c499a100644drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +0
-0@@ -53,7 +53,8 @@ static inline void ssp_convert_to_freq(u32 time, int
*integer_part,Quoted 8 lines
Quoted 8 lines
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +2
-1} *integer_part =SSP_FACTOR_WITH_MS / time; - *fractional =do_div (*integer_part,SSP_INVERTED_SCALING_FACTOR ); + *fractional = *integer_part %SSP_INVERTED_SCALING_FACTOR ; + *integer_part = *integer_part /SSP_INVERTED_SCALING_FACTOR ; }Quoted 8 lines
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h int ssp_common_process_data(struct iio_dev *indio_dev, void *buf, · line 62
Quoted 2 lines
drivers/iio/common/ssp_sensors/ssp_iio_sensor.h +0
-0/* Converts frequency to time in ms */ --
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 10 lines · Karol Wrona
I apologise for a such mess.
For me the first fix plus this:
(quoted diff) +1
-1-#define SSP_INVERTED_SCALING_FACTOR1000000ULL +#define SSP_INVERTED_SCALING_FACTOR1000000Uis better. I think there is no sense to do local 64 bit val to use specially
do_div.When converting the other way I think we can cast first value to u64.
I wonder what is turned on in kbuild robot that it shows more then during normal build?
It's building for a lot more architectures, some of which have different implementations of these divide functions... Also tends to have more variants of gcc than either you or I are likely to try!
Review
Quoted 9 lines
@@ -61,7 +61,7 @@ static inline int
ssp_convert_to_time(int integer_part, int fractional){
u64 value;(quoted diff) +1
-1-value = integer_part * SSP_INVERTED_SCALING_FACTOR + fractional; +value = (u64)integer_part * SSP_INVERTED_SCALING_FACTOR + fractional; if (value == 0) return 0;
I've also tweaked the final divide in this function as the div_u64 is 64bit / 32bit and you were doing 32bit/64bit. I've changed it to.
- return div_u64(SSP_FACTOR_WITH_MS, value);
+ return div64_u64((u64)SSP_FACTOR_WITH_MS, value);
Feels rather like we need to take another look at what is 64 bit and what isn't in here, but that can happen later as what we have should 'work'.
Quoted 99 lines
2015-01-30 23:10 GMT+01:00 Jonathan Cameron <[email protected] <mailto:[email protected]>>:
On 30/01/15 21:55, Jonathan Cameron wrote:
> On 30/01/15 18:25, Jonathan Cameron wrote:
>> Fixes warnings withasm-generic/div64.hdo_divsuch as:
>> In file included fromdrivers/iio/common/ssp_sensors/ssp_iio.c:20:0:
>>drivers/iio/common/ssp_sensors/ssp_iio_sensor.h: In function 'ssp_convert_to_freq':
>>>>drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:16: warning: comparison of distinct pointer types lacks a cast [enabled by default]
>>drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: right shift count >= width of type [enabled by default]
>>>>drivers/iio/common/ssp_sensors/ssp_iio_sensor.h:56:2: warning: passing argument 1 of '__div64_32' from incompatible pointer type [enabled by default]
>>include/asm-generic/div64.h:35:17: note: expected 'uint64_t*' but argument is of type 'int *'
>>drivers/iio/common/ssp_sensors/ssp_iio.c: In function 'ssp_common_process_data':
>>include/linux/iio/buffer.h:142:32: warning: 'calculated_time' may be used uninitialized in this function [-Wuninitialized]
>>drivers/iio/common/ssp_sensors/ssp_iio.c:83:10: note: 'calculated_time' was declared here
>>
>> Fixed by using straight coded version as per the description in the
>>div64.hheader, thus ensuring no issue with 32 bit integers.
>>
>> Reported-by: kbuild test robot <[email protected] <mailto:[email protected]>>
>> Signed-off-by: Jonathan Cameron <[email protected] <mailto:[email protected]>>
> hmm. failed the build tests. I'd missedSSP_INVERTED_SCALING_FACTORis forced
> to be ULL. Any reason for that?
>
> I can't immediately see that it is necessary. Being rather tired and
> running out of evening, I've pushed a version with the LL dropped out
> to testing to see if that causes any build issues.
>
> What fun,Had one final look. It looks like we might need that constant to be 64 bit to force integer promotion when converting the other way.
Hence, perhaps we just need a temporary u64 in this function? How about... (and I know it is ugly).
Karol, what do you think?
diff --git
a/drivers/iio/common/ssp_sensors/ssp_iio_sensor.hb/drivers/iio/common/ssp_sensors/ssp_iio_sensor.hindexdda267c9bd2a..40dac417734e100644
---a/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
+++b/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
@@ -46,14 +46,17 @@ int ssp_common_process_data(structiio_dev*indio_dev, void *buf,
static inline void ssp_convert_to_freq(u32 time, int*integer_part,
int *fractional)
{
+ u64integer_part64;
+
if (time == 0) {
*fractional = 0;
*integer_part= 0;
return;
}-
*integer_part=SSP_FACTOR_WITH_MS/ time;
- *fractional =do_div(*integer_part, SSP_INVERTED_SCALING_FACTOR);
+integer_part64=SSP_FACTOR_WITH_MS/ time;
+ *fractional =do_div(integer_part64, SSP_INVERTED_SCALING_FACTOR);
+*integer_part=integer_part64;
}/* Converts frequency to time in ms */
>
> Jonathan
>> ---
>>drivers/iio/common/ssp_sensors/ssp_iio_sensor.h| 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --gita/drivers/iio/common/ssp_sensors/ssp_iio_sensor.hb/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h>> indexdda267c9bd2a..fdf61a8c499a100644
>> ---a/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
>> +++b/drivers/iio/common/ssp_sensors/ssp_iio_sensor.h
>> @@ -53,7 +53,8 @@ static inline void ssp_convert_to_freq(u32 time, int*integer_part,
>> }
>>
>>*integer_part=SSP_FACTOR_WITH_MS/ time;
>> - *fractional =do_div(*integer_part, SSP_INVERTED_SCALING_FACTOR);
>> + *fractional =*integer_part%SSP_INVERTED_SCALING_FACTOR;
>> +*integer_part=*integer_part/SSP_INVERTED_SCALING_FACTOR;
>> }
>>
>> /* Converts frequency to time in ms */
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to [email protected] <mailto:[email protected]>
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected] <mailto:[email protected]> More majordomo info at http://vger.kernel.org/majordomo-info.html