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:   Mon, 17 Apr 2023 12:20:18 +0300
From:   Matti Vaittinen <mazziesaccount@gmail.com>
To:     Matti Vaittinen <mazziesaccount@gmail.com>,
        Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Cc:     Jonathan Cameron <jic23@kernel.org>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Matti Vaittinen <mazziesaccount@gmail.com>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] iio: gts-helpers: fix integration time units
Message-ID: <eeacd192c259e885850b5a2dd8b776bccfc44fa8.1681722914.git.mazziesaccount@gmail.com>
References: <cover.1681722914.git.mazziesaccount@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="UVr4ML6isnaPQ+Co"
Content-Disposition: inline
In-Reply-To: <cover.1681722914.git.mazziesaccount@gmail.com>
Precedence: bulk


--UVr4ML6isnaPQ+Co
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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/industrial=
io-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;
 }
=20
+static void iio_gts_us_to_int_micro(int *time_us, int *int_micro_times,
+				    int num_times)
+{
+	int i;
+
+	for (i =3D 0; i < num_times; i++) {
+		int_micro_times[i * 2] =3D time_us[i] / 1000000;
+		int_micro_times[i * 2 + 1] =3D time_us[i] % 1000000;
+	}
+}
+
 /**
  * iio_gts_build_avail_time_table - build table of available integration t=
imes
  * @gts:	Gain time scale descriptor
@@ -351,7 +362,7 @@ static int iio_gts_build_avail_scale_table(struct iio_g=
ts *gts)
  */
 static int iio_gts_build_avail_time_table(struct iio_gts *gts)
 {
-	int *times, i, j, idx =3D 0;
+	int *times, i, j, idx =3D 0, *int_micro_times;
=20
 	if (!gts->num_itime)
 		return 0;
@@ -360,6 +371,7 @@ static int iio_gts_build_avail_time_table(struct iio_gt=
s *gts)
 	if (!times)
 		return -ENOMEM;
=20
+
 	/* Sort times from all tables to one and remove duplicates */
 	for (i =3D gts->num_itime - 1; i >=3D 0; i--) {
 		int new =3D 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 =3D 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 =3D idx;
+
+	/* create a list of times formatted as list of IIO_VAL_INT_PLUS_MICRO */
+	int_micro_times =3D 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 =3D idx;
+		iio_gts_us_to_int_micro(times, int_micro_times, idx);
+	}
+
+	gts->avail_time_tables =3D int_micro_times;
+	kfree(times);
+
+	if (!int_micro_times)
+		return -ENOMEM;
=20
 	return 0;
 }
@@ -683,8 +706,8 @@ int iio_gts_avail_times(struct iio_gts *gts,  const int=
 **vals, int *type,
 		return -EINVAL;
=20
 	*vals =3D gts->avail_time_tables;
-	*type =3D IIO_VAL_INT;
-	*length =3D gts->num_avail_time_tables;
+	*type =3D IIO_VAL_INT_PLUS_MICRO;
+	*length =3D gts->num_avail_time_tables * 2;
=20
 	return IIO_AVAIL_LIST;
 }
--=20
2.39.2


--=20
Matti Vaittinen, Linux device drivers
ROHM Semiconductors, Finland SWDC
Kiviharjunlenkki 1E
90220 OULU
FINLAND

~~~ "I don't think so," said Rene Descartes. Just then he vanished ~~~
Simon says - in Latin please.
~~~ "non cogito me" dixit Rene Descarte, deinde evanescavit ~~~
Thanks to Simon Glass for the translation =3D]=20

--UVr4ML6isnaPQ+Co
Content-Type: application/pgp-signature; name="signature.asc"

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

iQEzBAEBCAAdFiEEIx+f8wZb28fLKEhTeFA3/03aocUFAmQ9D1IACgkQeFA3/03a
ocUjfQf/dufR2mfyjCq3mWntJ0bmsQuSCWRZdwOY2KayWtdyzuCFCKVhQJuhFh1+
Iyci9B+g62lrrw7lRvqo771plKsJaHlok+uHQN9bAA1cmy3pe8ajETc4btXQVFYf
coLM6F1nI23X/pAaGJx+DPeebHqfJdyCXwn12O9wpD4omztYjKfEx1zWqBNqJfCL
XqPPQMvwAHXqQo/Bae8EV30ETP85Q9Wev8BFNKMEZXYZUkA2oj6x3vdeGtBWsxIJ
62k4uuLwKY+s8Pi167k6O4UaTL+JihtOryEwATANEUQL7fdcptZwW68oC+LVUDxk
Tw50sXtbsPFSpXWuo8ODCWaUC4APZg==
=K+89
-----END PGP SIGNATURE-----

--UVr4ML6isnaPQ+Co--