Skip to contentSkip to conversation

Input: ads7846 - fix unaligned access on 7845

PATCH In review Dmitry Torokhov 2 participants 3 messages Nov 12, 2020 – Nov 18, 2020

Subsystems (2)
lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

PATCH 1/1 Input: ads7846 - fix unaligned access on 7845

req->sample[1] is not naturally aligned at word boundary, and therefore we should use get_unaligned_be16() when accessing it.

Fixes 3eac5c7e44f3 ("Input: ads7846 - extend the driver for ads7845 controller support")

---

Not tested on hardware, so if somebody has the controller and can verify that would be great.

 drivers/input/touchscreen/ads7846.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ads7846.c +2 -1
index 95e89f675ad5..35d14bc44aff 100644
@@ -33,6 +33,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/unaligned.h>
 
 /*
  * This code has been heavily tested on a Nokia 770, and lightly
@@ -443,7 +444,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
 
 	if (status == 0) {
 		/* BE12 value, then padding */
-		status = be16_to_cpu(*((u16 *)&req->sample[1]));
+		status = get_unaligned_be16(&req->sample[1]);
 		status = status >> 3;
 		status &= 0x0fff;
 	}
Signature · 5 lines
2.29.2.222.g5d2a92d10f8-goog


-- 
Dmitry
#1 lore raw

Hello Dmitry,

Am 12.11.20 um 02:27 schrieb Dmitry Torokhov:

Quoted 5 lines

req->sample[1] is not naturally aligned at word boundary, and therefore we should use get_unaligned_be16() when accessing it.

Fixes 3eac5c7e44f3 ("Input: ads7846 - extend the driver for ads7845 controller support")

I do not have ads7845, but i assume i need to resend my patch with the same fix. Correct?

Quoted 23 lines

---

Not tested on hardware, so if somebody has the controller and can verify that would be great.

 drivers/input/touchscreen/ads7846.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/input/touchscreen/ads7846.c +1 -0
index 95e89f675ad5..35d14bc44aff 100644
@@ -33,6 +33,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <asm/irq.h>
+#include <asm/unaligned.h>
 
 /*
  * This code has been heavily tested on a Nokia 770, and lightly

drivers/input/touchscreen/ads7846.c static int ads7845_read12_ser(struct device *dev, unsigned command) · line 450

Quoted 8 lines
drivers/input/touchscreen/ads7846.c +1 -1
@@ -443,7 +444,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
 
 	if (status == 0) {
 		/* BE12 value, then padding */
-		status = be16_to_cpu(*((u16 *)&req->sample[1]));
+		status = get_unaligned_be16(&req->sample[1]);
 		status = status >> 3;
 		status &= 0x0fff;
 	}

--
Regards,
Oleksij

author maintainer
#2 lore raw
Quoted 10 lines · Oleksij Rempel

Hello Dmitry,

Am 12.11.20 um 02:27 schrieb Dmitry Torokhov:

Quoted 5 lines

req->sample[1] is not naturally aligned at word boundary, and therefore we should use get_unaligned_be16() when accessing it.

Fixes 3eac5c7e44f3 ("Input: ads7846 - extend the driver for ads7845 controller support")

I do not have ads7845, but i assume i need to resend my patch with the same fix. Correct?

I do not think your patches are affected, so I just applied it together with yours.

Thanks.

Signature · 1 line
Dmitry