| Message ID | 20230318144206.14309-1-msizanoen@qtmlabs.xyz |
|---|---|
| State | New |
| Headers | show |
| Series | input: alps: fix compatibility with -funsigned-char | expand |
Hi, On 3/18/23 15:42, msizanoen wrote: > The AlpsPS/2 code previously relied on the assumption that `char` is a > signed type, which was true on x86 platforms (the only place where this > driver is used) before kernel 6.2. However, on 6.2 and later, this > assumption is broken due to the introduction of -funsigned-char as a new > global compiler flag. > > Fix this by explicitly specifying the signedness of `char` when sign > extending the values received from the device. > > Fixes: f3f33c677699 ("Input: alps - Rushmore and v7 resolution support") > Cc: stable@vger.kernel.org > Signed-off-by: msizanoen <msizanoen@qtmlabs.xyz> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/input/mouse/alps.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > index 989228b5a0a4..1c570d373b30 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -2294,20 +2294,20 @@ static int alps_get_v3_v7_resolution(struct psmouse *psmouse, int reg_pitch) > if (reg < 0) > return reg; > > - x_pitch = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ > + x_pitch = (signed char)(reg << 4) >> 4; /* sign extend lower 4 bits */ > x_pitch = 50 + 2 * x_pitch; /* In 0.1 mm units */ > > - y_pitch = (char)reg >> 4; /* sign extend upper 4 bits */ > + y_pitch = (signed char)reg >> 4; /* sign extend upper 4 bits */ > y_pitch = 36 + 2 * y_pitch; /* In 0.1 mm units */ > > reg = alps_command_mode_read_reg(psmouse, reg_pitch + 1); > if (reg < 0) > return reg; > > - x_electrode = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ > + x_electrode = (signed char)(reg << 4) >> 4; /* sign extend lower 4 bits */ > x_electrode = 17 + x_electrode; > > - y_electrode = (char)reg >> 4; /* sign extend upper 4 bits */ > + y_electrode = (signed char)reg >> 4; /* sign extend upper 4 bits */ > y_electrode = 13 + y_electrode; > > x_phys = x_pitch * (x_electrode - 1); /* In 0.1 mm units */
Might be wise to clean up a few other ones in that file? Or not. Up to you: diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 989228b5a0a4..afbf67c2488a 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -852,8 +852,8 @@ static void alps_process_packet_v6(struct psmouse *psmouse) x = y = z = 0; /* Divide 4 since trackpoint's speed is too fast */ - input_report_rel(dev2, REL_X, (char)x / 4); - input_report_rel(dev2, REL_Y, -((char)y / 4)); + input_report_rel(dev2, REL_X, (signed char)x / 4); + input_report_rel(dev2, REL_Y, -((signed char)y / 4)); psmouse_report_standard_buttons(dev2, packet[3]); @@ -1104,8 +1104,8 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse) ((packet[3] & 0x20) << 1); z = (packet[5] & 0x3f) | ((packet[3] & 0x80) >> 1); - input_report_rel(dev2, REL_X, (char)x); - input_report_rel(dev2, REL_Y, -((char)y)); + input_report_rel(dev2, REL_X, (signed char)x); + input_report_rel(dev2, REL_Y, -((signed char)y)); input_report_abs(dev2, ABS_PRESSURE, z); psmouse_report_standard_buttons(dev2, packet[1]); diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 5f0d75a45c80..43a1116c5852 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -382,7 +382,7 @@ static unsigned int elan_convert_resolution(u8 val, u8 pattern) * ((value from firmware) + 3) * 100 = dpi */ int res = pattern <= 0x01 ? - (int)(char)val * 10 + 790 : ((int)(char)val + 3) * 100; + (int)(signed char)val * 10 + 790 : ((int)(signed char)val + 3) * 100; /* * We also have to convert dpi to dots/mm (*10/254 to avoid floating * point).
On Sunday 19 March 2023 18:45:08 Jason A. Donenfeld wrote: > Might be wise to clean up a few other ones in that file? Or not. Up to > you: > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > index 989228b5a0a4..afbf67c2488a 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -852,8 +852,8 @@ static void alps_process_packet_v6(struct psmouse *psmouse) > x = y = z = 0; > > /* Divide 4 since trackpoint's speed is too fast */ > - input_report_rel(dev2, REL_X, (char)x / 4); > - input_report_rel(dev2, REL_Y, -((char)y / 4)); > + input_report_rel(dev2, REL_X, (signed char)x / 4); > + input_report_rel(dev2, REL_Y, -((signed char)y / 4)); Anyway, is casting here needed at all? Is not just plain -(y / 4) enough? > > psmouse_report_standard_buttons(dev2, packet[3]); > > @@ -1104,8 +1104,8 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse) > ((packet[3] & 0x20) << 1); > z = (packet[5] & 0x3f) | ((packet[3] & 0x80) >> 1); > > - input_report_rel(dev2, REL_X, (char)x); > - input_report_rel(dev2, REL_Y, -((char)y)); > + input_report_rel(dev2, REL_X, (signed char)x); > + input_report_rel(dev2, REL_Y, -((signed char)y)); > input_report_abs(dev2, ABS_PRESSURE, z); > > psmouse_report_standard_buttons(dev2, packet[1]); > diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c > index 5f0d75a45c80..43a1116c5852 100644 > --- a/drivers/input/mouse/elan_i2c_core.c > +++ b/drivers/input/mouse/elan_i2c_core.c > @@ -382,7 +382,7 @@ static unsigned int elan_convert_resolution(u8 val, u8 pattern) > * ((value from firmware) + 3) * 100 = dpi > */ > int res = pattern <= 0x01 ? > - (int)(char)val * 10 + 790 : ((int)(char)val + 3) * 100; > + (int)(signed char)val * 10 + 790 : ((int)(signed char)val + 3) * 100; > /* > * We also have to convert dpi to dots/mm (*10/254 to avoid floating > * point). Please move elantech change into separate commit/patch. As it has nothing with alps driver. It is completely different hardware.
Hi, On Mon, Mar 20, 2023 at 01:17:31AM +0100, msizanoen wrote: > The AlpsPS/2 code previously relied on the assumption that `char` is a > signed type, which was true on x86 platforms (the only place where this > driver is used) before kernel 6.2. However, on 6.2 and later, this > assumption is broken due to the introduction of -funsigned-char as a new > global compiler flag. > > Fix this by explicitly specifying the signedness of `char` when sign > extending the values received from the device. > > v2: > Add explicit signedness to more places > > Fixes: f3f33c677699 ("Input: alps - Rushmore and v7 resolution support") > Cc: stable@vger.kernel.org > Signed-off-by: msizanoen <msizanoen@qtmlabs.xyz> Please use s8 instead of signed char. Also, could you please tell me if "msizanoen" is your real name? It is required in the DCO. Apologies if it really is. Thanks.
On Mon, Mar 20, 2023 at 05:52:29AM +0100, msizanoen1 wrote: > From: msizanoen <msizanoen@qtmlabs.xyz> > > The AlpsPS/2 code previously relied on the assumption that `char` is a > signed type, which was true on x86 platforms (the only place where this > driver is used) before kernel 6.2. However, on 6.2 and later, this > assumption is broken due to the introduction of -funsigned-char as a new > global compiler flag. > > Fix this by explicitly specifying the signedness of `char` when sign > extending the values received from the device. > > v2: > Add explicit signedness to more places > > v3: > Use `s8` instead of `signed char` > > Fixes: f3f33c677699 ("Input: alps - Rushmore and v7 resolution support") > Cc: stable@vger.kernel.org > Signed-off-by: msizanoen <msizanoen@qtmlabs.xyz> Applied, thank you.
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 989228b5a0a4..1c570d373b30 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -2294,20 +2294,20 @@ static int alps_get_v3_v7_resolution(struct psmouse *psmouse, int reg_pitch) if (reg < 0) return reg; - x_pitch = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_pitch = (signed char)(reg << 4) >> 4; /* sign extend lower 4 bits */ x_pitch = 50 + 2 * x_pitch; /* In 0.1 mm units */ - y_pitch = (char)reg >> 4; /* sign extend upper 4 bits */ + y_pitch = (signed char)reg >> 4; /* sign extend upper 4 bits */ y_pitch = 36 + 2 * y_pitch; /* In 0.1 mm units */ reg = alps_command_mode_read_reg(psmouse, reg_pitch + 1); if (reg < 0) return reg; - x_electrode = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_electrode = (signed char)(reg << 4) >> 4; /* sign extend lower 4 bits */ x_electrode = 17 + x_electrode; - y_electrode = (char)reg >> 4; /* sign extend upper 4 bits */ + y_electrode = (signed char)reg >> 4; /* sign extend upper 4 bits */ y_electrode = 13 + y_electrode; x_phys = x_pitch * (x_electrode - 1); /* In 0.1 mm units */
The AlpsPS/2 code previously relied on the assumption that `char` is a signed type, which was true on x86 platforms (the only place where this driver is used) before kernel 6.2. However, on 6.2 and later, this assumption is broken due to the introduction of -funsigned-char as a new global compiler flag. Fix this by explicitly specifying the signedness of `char` when sign extending the values received from the device. Fixes: f3f33c677699 ("Input: alps - Rushmore and v7 resolution support") Cc: stable@vger.kernel.org Signed-off-by: msizanoen <msizanoen@qtmlabs.xyz> --- drivers/input/mouse/alps.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)