Skip to contentSkip to conversation

types: Complement the aligned types with signed 64-bit one

PATCH In review Andy Shevchenko 2 participants 9 messages Aug 15, 2023 – Aug 29, 2023

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

PATCH 1/3 types: Complement the aligned types with signed 64-bit one

Some user may want to use aligned signed 64-bit type. Provide it for them.

---
 include/linux/types.h      | 3 ++-
 include/uapi/linux/types.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
include/linux/types.h +2 -1
index 253168bb3fe1..78d87c751ff5 100644
@@ -115,8 +115,9 @@ typedef u64			u_int64_t;
 typedef s64			int64_t;
 #endif
 
-/* this is a special 64bit data type that is 8-byte aligned */
+/* These are the special 64-bit data types that are 8-byte aligned */
 #define aligned_u64		__aligned_u64
+#define aligned_s64		__aligned_s64
 #define aligned_be64		__aligned_be64
 #define aligned_le64		__aligned_le64
 
include/uapi/linux/types.h +1 -0
index 6375a0684052..48b933938877 100644
@@ -53,6 +53,7 @@ typedef __u32 __bitwise __wsum;
  * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
  */
 #define __aligned_u64 __u64 __attribute__((aligned(8)))
+#define __aligned_s64 __s64 __attribute__((aligned(8)))
 #define __aligned_be64 __be64 __attribute__((aligned(8)))
 #define __aligned_le64 __le64 __attribute__((aligned(8)))
 
Signature · 1 line
2.40.0.1.gaa8946217a0b
#1 lore raw

PATCH 2/3 iio: imu: st_lsm6dsx: Use aligned data type for timestamp

Use __aligned_s64 for the timestamp field.

---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1 -2
index c19237717e81..d3d4b3281aa6 100644
@@ -442,10 +442,9 @@ struct st_lsm6dsx_hw {
 	const struct st_lsm6dsx_settings *settings;
 
 	struct iio_mount_matrix orientation;
-	/* Ensure natural alignment of buffer elements */
 	struct {
 		__le16 channels[3];
-		s64 ts __aligned(8);
+		__aligned_s64 ts;
 	} scan[ST_LSM6DSX_ID_MAX];
 };
 
Signature · 1 line
2.40.0.1.gaa8946217a0b
maintainer
#2 lore raw

Re: [PATCH v1 2/3] iio: imu: st_lsm6dsx: Use aligned data type for timestamp

Quoted 12 lines · On Tue, 15 Aug 2023 18:40:26 +0300 Andy Shevchenko…

Use __aligned_s64 for the timestamp field.

---
 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0 -0
index c19237717e81..d3d4b3281aa6 100644

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h struct st_lsm6dsx_hw { · line 447

Quoted 8 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1 -2
@@ -442,10 +442,9 @@ struct st_lsm6dsx_hw {
 	const struct st_lsm6dsx_settings *settings;
 
 	struct iio_mount_matrix orientation;
-	/* Ensure natural alignment of buffer elements */
 	struct {
 		__le16 channels[3];
-		s64 ts __aligned(8);
+		__aligned_s64 ts;

aligned_s64 as it's internal to the kernel?

Quoted 3 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +0 -0
 	} scan[ST_LSM6DSX_ID_MAX];
 };
 
#3 lore raw

Re: [PATCH v1 2/3] iio: imu: st_lsm6dsx: Use aligned data type for timestamp

Quoted 2 lines · Jonathan Cameron

On Tue, 15 Aug 2023 18:40:26 +0300
Andy Shevchenko <[email protected]> wrote:

...

Quoted 6 lines

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h struct st_lsm6dsx_hw { · line 447

Quoted 4 lines
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +1 -1
 	struct {
 		__le16 channels[3];
-		s64 ts __aligned(8);
+		__aligned_s64 ts;

aligned_s64 as it's internal to the kernel?

Either works, but strictly speaking you are right, better no underscored variant.

Quoted 1 line
Quoted 1 line

} scan[ST_LSM6DSX_ID_MAX];

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw

PATCH 3/3 iio: hid-sensor: Use aligned data type for timestamp

In reply to Andy Shevchenko

Use aligned_s64 for the timestamp field.

Note, the actual data is signed, hence with this we also amend that. While at it, drop redundant __alignment directive.

---
 drivers/iio/accel/hid-sensor-accel-3d.c              | 3 +--
 drivers/iio/gyro/hid-sensor-gyro-3d.c                | 2 +-
 drivers/iio/humidity/hid-sensor-humidity.c           | 2 +-
 drivers/iio/light/hid-sensor-als.c                   | 2 +-
 drivers/iio/orientation/hid-sensor-incl-3d.c         | 2 +-
 drivers/iio/orientation/hid-sensor-rotation.c        | 4 ++--
 drivers/iio/position/hid-sensor-custom-intel-hinge.c | 2 +-
 drivers/iio/pressure/hid-sensor-press.c              | 2 +-
 drivers/iio/temperature/hid-sensor-temperature.c     | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)
drivers/iio/accel/hid-sensor-accel-3d.c +1 -2
index 5eac7ea19993..f739589564c5 100644
@@ -25,10 +25,9 @@ struct accel_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
 	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
-	/* Ensure timestamp is naturally aligned */
 	struct {
 		u32 accel_val[3];
-		s64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/gyro/hid-sensor-gyro-3d.c +1 -1
index 698c50da1f10..a7050a6328d6 100644
@@ -27,7 +27,7 @@ struct gyro_3d_state {
 	struct hid_sensor_hub_attribute_info gyro[GYRO_3D_CHANNEL_MAX];
 	struct {
 		u32 gyro_val[GYRO_3D_CHANNEL_MAX];
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/humidity/hid-sensor-humidity.c +1 -1
index fa0fe404a70a..0e484b78b735 100644
@@ -18,7 +18,7 @@ struct hid_humidity_state {
 	struct hid_sensor_hub_attribute_info humidity_attr;
 	struct {
 		s32 humidity_data;
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/light/hid-sensor-als.c +1 -1
index eb1aedad7edc..8a906d95edd4 100644
@@ -27,7 +27,7 @@ struct als_state {
 	struct hid_sensor_hub_attribute_info als_illum;
 	struct {
 		u32 illum[CHANNEL_SCAN_INDEX_MAX];
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/orientation/hid-sensor-incl-3d.c +1 -1
index ba5b581d5b25..3e5f2c58dfa9 100644
@@ -29,7 +29,7 @@ struct incl_3d_state {
 	struct hid_sensor_hub_attribute_info incl[INCLI_3D_CHANNEL_MAX];
 	struct {
 		u32 incl_val[INCLI_3D_CHANNEL_MAX];
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/orientation/hid-sensor-rotation.c +2 -2
index a033699910e8..864ecbcad26e 100644
@@ -19,8 +19,8 @@ struct dev_rot_state {
 	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info quaternion;
 	struct {
-		s32 sampled_vals[4] __aligned(16);
-		u64 timestamp __aligned(8);
+		s32 sampled_vals[4];
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/position/hid-sensor-custom-intel-hinge.c +1 -1
index 07c30d217255..48005b568dd9 100644
@@ -39,7 +39,7 @@ struct hinge_state {
 	const char *labels[CHANNEL_SCAN_INDEX_MAX];
 	struct {
 		u32 hinge_val[3];
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 
 	int scale_pre_decml;
drivers/iio/pressure/hid-sensor-press.c +1 -1
index a9215eb32d70..a964c7b65402 100644
@@ -24,7 +24,7 @@ struct press_state {
 	struct hid_sensor_hub_attribute_info press_attr;
 	struct {
 		u32 press_data;
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/temperature/hid-sensor-temperature.c +1 -1
index d40f235af1d4..32f4b13fd554 100644
@@ -18,7 +18,7 @@ struct temperature_state {
 	struct hid_sensor_hub_attribute_info temperature_attr;
 	struct {
 		s32 temperature_data;
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
Signature · 1 line
2.40.0.1.gaa8946217a0b
maintainer
#5 lore raw

Re: [PATCH v1 3/3] iio: hid-sensor: Use aligned data type for timestamp

Quoted 23 lines · On Tue, 15 Aug 2023 18:40:27 +0300 Andy Shevchenko…

Use aligned_s64 for the timestamp field.

Note, the actual data is signed, hence with this we also amend that. While at it, drop redundant __alignment directive.

---
 drivers/iio/accel/hid-sensor-accel-3d.c              | 3 +--
 drivers/iio/gyro/hid-sensor-gyro-3d.c                | 2 +-
 drivers/iio/humidity/hid-sensor-humidity.c           | 2 +-
 drivers/iio/light/hid-sensor-als.c                   | 2 +-
 drivers/iio/orientation/hid-sensor-incl-3d.c         | 2 +-
 drivers/iio/orientation/hid-sensor-rotation.c        | 4 ++--
 drivers/iio/position/hid-sensor-custom-intel-hinge.c | 2 +-
 drivers/iio/pressure/hid-sensor-press.c              | 2 +-
 drivers/iio/temperature/hid-sensor-temperature.c     | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)
drivers/iio/accel/hid-sensor-accel-3d.c +0 -0
index 5eac7ea19993..f739589564c5 100644

drivers/iio/accel/hid-sensor-accel-3d.c struct accel_3d_state { · line 28

Quoted 4 lines
drivers/iio/accel/hid-sensor-accel-3d.c +0 -1
@@ -25,10 +25,9 @@ struct accel_3d_state {
 	struct hid_sensor_hub_callbacks callbacks;
 	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info accel[ACCEL_3D_CHANNEL_MAX];
-	/* Ensure timestamp is naturally aligned */

Comment is still true and no more or less obvious than it was with the old code I think so I don't really see why it should be removed with this change.

Quoted 7 lines
drivers/iio/accel/hid-sensor-accel-3d.c +1 -1
 	struct {
 		u32 accel_val[3];
-		s64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;

...

drivers/iio/orientation/hid-sensor-rotation.c struct dev_rot_state { · line 22

Quoted 11 lines
drivers/iio/orientation/hid-sensor-rotation.c +1 -2
index a033699910e8..864ecbcad26e 100644
@@ -19,8 +19,8 @@ struct dev_rot_state {
 	struct hid_sensor_common common_attributes;
 	struct hid_sensor_hub_attribute_info quaternion;
 	struct {
-		s32 sampled_vals[4] __aligned(16);
-		u64 timestamp __aligned(8);
+		s32 sampled_vals[4];

Hmm. I can't immediately recall why that aligned(16) is therebut
it's not related to the rest of this change so I'm not sure we should touch it. I don't think we ever required quaternions to be aligned as a whole so this does feel odd but in the category of something we should be careful touching or at very least do it in a different patch where it stands out.

Quoted 43 lines
drivers/iio/orientation/hid-sensor-rotation.c +1 -0
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/position/hid-sensor-custom-intel-hinge.c +1 -1
index 07c30d217255..48005b568dd9 100644
@@ -39,7 +39,7 @@ struct hinge_state {
 	const char *labels[CHANNEL_SCAN_INDEX_MAX];
 	struct {
 		u32 hinge_val[3];
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 
 	int scale_pre_decml;
drivers/iio/pressure/hid-sensor-press.c +1 -1
index a9215eb32d70..a964c7b65402 100644
@@ -24,7 +24,7 @@ struct press_state {
 	struct hid_sensor_hub_attribute_info press_attr;
 	struct {
 		u32 press_data;
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
drivers/iio/temperature/hid-sensor-temperature.c +1 -1
index d40f235af1d4..32f4b13fd554 100644
@@ -18,7 +18,7 @@ struct temperature_state {
 	struct hid_sensor_hub_attribute_info temperature_attr;
 	struct {
 		s32 temperature_data;
-		u64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;
 	int scale_pre_decml;
 	int scale_post_decml;
#6 lore raw

Re: [PATCH v1 3/3] iio: hid-sensor: Use aligned data type for timestamp

Quoted 2 lines · Jonathan Cameron

On Tue, 15 Aug 2023 18:40:27 +0300
Andy Shevchenko <[email protected]> wrote:

...

Quoted 4 lines

drivers/iio/accel/hid-sensor-accel-3d.c struct accel_3d_state { · line 28

Quoted 1 line
drivers/iio/accel/hid-sensor-accel-3d.c +0 -1
-	/* Ensure timestamp is naturally aligned */

Comment is still true and no more or less obvious than it was with the old code I think so I don't really see why it should be removed with this change.

Doesn't the prefix "aligned" make this comment somehow redundant?

Quoted 5 lines
Quoted 5 lines
drivers/iio/accel/hid-sensor-accel-3d.c +1 -1
 	struct {
 		u32 accel_val[3];
-		s64 timestamp __aligned(8);
+		aligned_s64 timestamp;
 	} scan;

...

Quoted 8 lines

drivers/iio/orientation/hid-sensor-rotation.c struct dev_rot_state { · line 22

Quoted 2 lines
drivers/iio/orientation/hid-sensor-rotation.c +1 -1
-		s32 sampled_vals[4] __aligned(16);
+		s32 sampled_vals[4];

Hmm. I can't immediately recall why that aligned(16) is therebut it's not related to the rest of this change so I'm not sure we should touch it. I don't think we ever required quaternions to be aligned as a whole so this does feel odd but in the category of something we should be careful touching or at very least do it in a different patch where it stands out.

I have checked the code and find nothing that justifies this, I can split it to a separate patch, though.

Note, among ISH HID drivers it's the only one with a such...

Quoted 2 lines
Quoted 2 lines
(quoted diff) +1 -0
+		aligned_s64 timestamp;
 	} scan;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#7 lore raw
In reply to Andy Shevchenko
Quoted 4 lines · On Tue, 15 Aug 2023 18:40:25 +0300 Andy Shevchenko…

Some user may want to use aligned signed 64-bit type. Provide it for them.

Excellent. I'll pick this up once the minor things in the first two users are resolved (as long as no one argues we shouldn't have this for some reason!)

Jonathan

Quoted 32 lines
---
 include/linux/types.h      | 3 ++-
 include/uapi/linux/types.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
include/linux/types.h +2 -1
index 253168bb3fe1..78d87c751ff5 100644
@@ -115,8 +115,9 @@ typedef u64			u_int64_t;
 typedef s64			int64_t;
 #endif
 
-/* this is a special 64bit data type that is 8-byte aligned */
+/* These are the special 64-bit data types that are 8-byte aligned */
 #define aligned_u64		__aligned_u64
+#define aligned_s64		__aligned_s64
 #define aligned_be64		__aligned_be64
 #define aligned_le64		__aligned_le64
 
include/uapi/linux/types.h +1 -0
index 6375a0684052..48b933938877 100644
@@ -53,6 +53,7 @@ typedef __u32 __bitwise __wsum;
  * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
  */
 #define __aligned_u64 __u64 __attribute__((aligned(8)))
+#define __aligned_s64 __s64 __attribute__((aligned(8)))
 #define __aligned_be64 __be64 __attribute__((aligned(8)))
 #define __aligned_le64 __le64 __attribute__((aligned(8)))
 
#8 lore raw
Quoted 10 lines · Jonathan Cameron
Quoted 4 lines · On Tue, 15 Aug 2023 18:40:25 +0300 Andy Shevchenko…

Some user may want to use aligned signed 64-bit type. Provide it for them.

Excellent. I'll pick this up once the minor things in the first two users are resolved (as long as no one argues we shouldn't have this for some reason!)

I'll cook a new series sooner than later. Thank you for the review!

Signature · 2 lines
With Best Regards,
Andy Shevchenko