| Message ID | eeacd192c259e885850b5a2dd8b776bccfc44fa8.1681722914.git.mazziesaccount@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: Fix integration time unit | expand |
On Mon, 17 Apr 2023 12:20:18 +0300 Matti Vaittinen <mazziesaccount@gmail.com> wrote: > The IIO ABI mandates expressing integration times in seconds. The GTS > helper errorneously uses micro seconds in integration_times_available. > Fix this by converting the lists to IIO_VAL_INT_PLUS_MICRO. > > Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> > --- > drivers/iio/industrialio-gts-helper.c | 43 ++++++++++++++++++++------- > 1 file changed, 33 insertions(+), 10 deletions(-) > > diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c > index 8bb68975b259..2ab8d2dce019 100644 > --- a/drivers/iio/industrialio-gts-helper.c > +++ b/drivers/iio/industrialio-gts-helper.c > @@ -337,6 +337,17 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) > return ret; > } > > +static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times, > + int num_times) > +{ > + int i; > + > + for (i = 0; i < num_times; i++) { > + int_micro_times[i * 2] = time_us[i] / 1000000; > + int_micro_times[i * 2 + 1] = time_us[i] % 1000000; > + } > +} > + > /** > * iio_gts_build_avail_time_table - build table of available integration times > * @gts: Gain time scale descriptor > @@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) > */ > static int iio_gts_build_avail_time_table(struct iio_gts *gts) > { > - int *times, i, j, idx = 0; > + int *times, i, j, idx = 0, *int_micro_times; > > if (!gts->num_itime) > return 0; > @@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) > if (!times) > return -ENOMEM; > > + Grumble. If nothing else comes up I'll tidy that stray line up when applying. Note that these will need to wait for after rc1 now so my fixes branch has moved on to include the code being fixed. > /* Sort times from all tables to one and remove duplicates */ > for (i = gts->num_itime - 1; i >= 0; i--) { > int new = gts->itime_table[i].time_us; > @@ -378,13 +390,24 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) > } > } > } > - gts->avail_time_tables = times; > - /* > - * This is just to survive a unlikely corner-case where times in the > - * given time table were not unique. Else we could just trust the > - * gts->num_itime. > - */ > - gts->num_avail_time_tables = idx; > + > + /* create a list of times formatted as list of IIO_VAL_INT_PLUS_MICRO */ > + int_micro_times = kcalloc(idx, sizeof(int) * 2, GFP_KERNEL); > + if (int_micro_times) { > + /* > + * This is just to survive a unlikely corner-case where times in > + * the given time table were not unique. Else we could just > + * trust the gts->num_itime. > + */ > + gts->num_avail_time_tables = idx; > + iio_gts_us_to_int_micro(times, int_micro_times, idx); > + } > + > + gts->avail_time_tables = int_micro_times; > + kfree(times); > + > + if (!int_micro_times) > + return -ENOMEM; > > return 0; > } > @@ -683,8 +706,8 @@ int iio_gts_avail_times(struct iio_gts *gts, const int **vals, int *type, > return -EINVAL; > > *vals = gts->avail_time_tables; > - *type = IIO_VAL_INT; > - *length = gts->num_avail_time_tables; > + *type = IIO_VAL_INT_PLUS_MICRO; > + *length = gts->num_avail_time_tables * 2; > > return IIO_AVAIL_LIST; > }
On 4/23/23 14:18, Jonathan Cameron wrote: > On Mon, 17 Apr 2023 12:20:18 +0300 > Matti Vaittinen <mazziesaccount@gmail.com> wrote: > >> The IIO ABI mandates expressing integration times in seconds. The GTS >> helper errorneously uses micro seconds in integration_times_available. >> Fix this by converting the lists to IIO_VAL_INT_PLUS_MICRO. >> >> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> >> --- >> drivers/iio/industrialio-gts-helper.c | 43 ++++++++++++++++++++------- >> 1 file changed, 33 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c >> index 8bb68975b259..2ab8d2dce019 100644 >> --- a/drivers/iio/industrialio-gts-helper.c >> +++ b/drivers/iio/industrialio-gts-helper.c >> @@ -337,6 +337,17 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) >> return ret; >> } >> >> +static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times, >> + int num_times) >> +{ >> + int i; >> + >> + for (i = 0; i < num_times; i++) { >> + int_micro_times[i * 2] = time_us[i] / 1000000; >> + int_micro_times[i * 2 + 1] = time_us[i] % 1000000; >> + } >> +} >> + >> /** >> * iio_gts_build_avail_time_table - build table of available integration times >> * @gts: Gain time scale descriptor >> @@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) >> */ >> static int iio_gts_build_avail_time_table(struct iio_gts *gts) >> { >> - int *times, i, j, idx = 0; >> + int *times, i, j, idx = 0, *int_micro_times; >> >> if (!gts->num_itime) >> return 0; >> @@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) >> if (!times) >> return -ENOMEM; >> >> + > > Grumble. Oh. I wonder how things like this tend to slip-in. Maybe I should change my password, it must be someone else has cracked my it and is typing these in at night while I am sleeping ^_^; > If nothing else comes up I'll tidy that stray line up when applying. Thanks! > Note that these will need to wait for after rc1 now so my fixes branch > has moved on to include the code being fixed. Well, that's Ok. Please, let me know if you want me to rebase to rc1 and respin the series. --Matti
On Mon, 24 Apr 2023 05:09:36 +0000 "Vaittinen, Matti" <Matti.Vaittinen@fi.rohmeurope.com> wrote: > On 4/23/23 14:18, Jonathan Cameron wrote: > > On Mon, 17 Apr 2023 12:20:18 +0300 > > Matti Vaittinen <mazziesaccount@gmail.com> wrote: > > > >> The IIO ABI mandates expressing integration times in seconds. The GTS > >> helper errorneously uses micro seconds in integration_times_available. > >> Fix this by converting the lists to IIO_VAL_INT_PLUS_MICRO. > >> > >> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> > >> --- > >> drivers/iio/industrialio-gts-helper.c | 43 ++++++++++++++++++++------- > >> 1 file changed, 33 insertions(+), 10 deletions(-) > >> > >> diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c > >> index 8bb68975b259..2ab8d2dce019 100644 > >> --- a/drivers/iio/industrialio-gts-helper.c > >> +++ b/drivers/iio/industrialio-gts-helper.c > >> @@ -337,6 +337,17 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) > >> return ret; > >> } > >> > >> +static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times, > >> + int num_times) > >> +{ > >> + int i; > >> + > >> + for (i = 0; i < num_times; i++) { > >> + int_micro_times[i * 2] = time_us[i] / 1000000; > >> + int_micro_times[i * 2 + 1] = time_us[i] % 1000000; > >> + } > >> +} > >> + > >> /** > >> * iio_gts_build_avail_time_table - build table of available integration times > >> * @gts: Gain time scale descriptor > >> @@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) > >> */ > >> static int iio_gts_build_avail_time_table(struct iio_gts *gts) > >> { > >> - int *times, i, j, idx = 0; > >> + int *times, i, j, idx = 0, *int_micro_times; > >> > >> if (!gts->num_itime) > >> return 0; > >> @@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) > >> if (!times) > >> return -ENOMEM; > >> > >> + > > > > Grumble. > > Oh. I wonder how things like this tend to slip-in. Maybe I should change > my password, it must be someone else has cracked my it and is typing > these in at night while I am sleeping ^_^; > > > If nothing else comes up I'll tidy that stray line up when applying. > > Thanks! > > > Note that these will need to wait for after rc1 now so my fixes branch > > has moved on to include the code being fixed. > > Well, that's Ok. Please, let me know if you want me to rebase to rc1 and > respin the series. No need as not much changed around these (not I'm not at rc1 yet, but char-misc-linus now includes these so I rebased on that) Applied to the fixes-togreg branch of iio.git with fixes tags added now the commits are upstream. Thanks, Jonathan > > --Matti >
diff --git a/drivers/iio/industrialio-gts-helper.c b/drivers/iio/industrialio-gts-helper.c index 8bb68975b259..2ab8d2dce019 100644 --- a/drivers/iio/industrialio-gts-helper.c +++ b/drivers/iio/industrialio-gts-helper.c @@ -337,6 +337,17 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) return ret; } +static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times, + int num_times) +{ + int i; + + for (i = 0; i < num_times; i++) { + int_micro_times[i * 2] = time_us[i] / 1000000; + int_micro_times[i * 2 + 1] = time_us[i] % 1000000; + } +} + /** * iio_gts_build_avail_time_table - build table of available integration times * @gts: Gain time scale descriptor @@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_gts *gts) */ static int iio_gts_build_avail_time_table(struct iio_gts *gts) { - int *times, i, j, idx = 0; + int *times, i, j, idx = 0, *int_micro_times; if (!gts->num_itime) return 0; @@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) if (!times) return -ENOMEM; + /* Sort times from all tables to one and remove duplicates */ for (i = gts->num_itime - 1; i >= 0; i--) { int new = gts->itime_table[i].time_us; @@ -378,13 +390,24 @@ static int iio_gts_build_avail_time_table(struct iio_gts *gts) } } } - gts->avail_time_tables = times; - /* - * This is just to survive a unlikely corner-case where times in the - * given time table were not unique. Else we could just trust the - * gts->num_itime. - */ - gts->num_avail_time_tables = idx; + + /* create a list of times formatted as list of IIO_VAL_INT_PLUS_MICRO */ + int_micro_times = kcalloc(idx, sizeof(int) * 2, GFP_KERNEL); + if (int_micro_times) { + /* + * This is just to survive a unlikely corner-case where times in + * the given time table were not unique. Else we could just + * trust the gts->num_itime. + */ + gts->num_avail_time_tables = idx; + iio_gts_us_to_int_micro(times, int_micro_times, idx); + } + + gts->avail_time_tables = int_micro_times; + kfree(times); + + if (!int_micro_times) + return -ENOMEM; return 0; } @@ -683,8 +706,8 @@ int iio_gts_avail_times(struct iio_gts *gts, const int **vals, int *type, return -EINVAL; *vals = gts->avail_time_tables; - *type = IIO_VAL_INT; - *length = gts->num_avail_time_tables; + *type = IIO_VAL_INT_PLUS_MICRO; + *length = gts->num_avail_time_tables * 2; return IIO_AVAIL_LIST; }
The IIO ABI mandates expressing integration times in seconds. The GTS helper errorneously uses micro seconds in integration_times_available. Fix this by converting the lists to IIO_VAL_INT_PLUS_MICRO. Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> --- drivers/iio/industrialio-gts-helper.c | 43 ++++++++++++++++++++------- 1 file changed, 33 insertions(+), 10 deletions(-)