From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <bentiss@kernel.org>,
Gideon Heinz <gideonheinz02@gmail.com>
Cc: "Filipe Laíns" <lains@riseup.net>,
"Bastien Nocera" <hadess@hadess.net>,
"Hans de Goede" <hansg@kernel.org>,
"Edwin Velds" <e.velds@gmail.com>,
"Stuart Hayhurst" <stuart.a.hayhurst@gmail.com>,
"Andrey Smirnov" <andrew.smirnov@gmail.com>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 26/33] HID: logitech-hidpp: use unaligned accessors for multi-byte values
Date: Tue, 10 Nov 2026 22:48:24 -0800 [thread overview]
Message-ID: <20261110-hid-logitech-hidpp-v2-26-30743e91d83b@gmail.com> (raw)
In-Reply-To: <20261110-hid-logitech-hidpp-v2-0-30743e91d83b@gmail.com>
Several paths in the Logitech HID++ driver manually split and reassemble
16-bit protocol values using shifts and masks instead of using standard
kernel helpers, which obscures endianness intent and adds unnecessary
noise.
Replace open-coded 16-bit big-endian packing and unpacking with
get_unaligned_be16() and put_unaligned_be16().
Tested-by: Gideon Heinz <gideonheinz02@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/hid/hid-logitech-hidpp.c | 84 +++++++++++++++-------------------------
1 file changed, 31 insertions(+), 53 deletions(-)
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
index 1d80e7b7a99e..df0bcaaf8647 100644
--- a/drivers/hid/hid-logitech-hidpp.c
+++ b/drivers/hid/hid-logitech-hidpp.c
@@ -960,7 +960,9 @@ static int hidpp_root_get_feature(struct hidpp_device *hidpp, u16 feature,
{
struct hidpp_report response;
int ret;
- u8 params[2] = { feature >> 8, feature & 0x00FF };
+ u8 params[2];
+
+ put_unaligned_be16(feature, params);
ret = hidpp_send_fap_command_sync(hidpp,
HIDPP_PAGE_ROOT_IDX,
@@ -2108,7 +2110,7 @@ static int hidpp_solar_battery_event(struct hidpp_device *hidpp,
switch (function) {
case EVENT_SOLAR_BATTERY_LIGHT_MEASURE:
- lux = (report->fap.params[1] << 8) | report->fap.params[2];
+ lux = get_unaligned_be16(&report->fap.params[1]);
if (lux > 200)
status = POWER_SUPPLY_STATUS_CHARGING;
else
@@ -2410,7 +2412,6 @@ static void hidpp_ff_work_handler(struct work_struct *w)
&response);
if (ret)
hid_err(data->hidpp->hid_dev, "Failed to send command to device!\n");
-
atomic_dec(&data->workqueue_size);
kfree(wd);
}
@@ -2455,23 +2456,18 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
/* set common parameters */
params[0] = old ? data->slots[effect->id] : 0;
- params[2] = effect->replay.length >> 8;
- params[3] = effect->replay.length & 255;
- params[4] = effect->replay.delay >> 8;
- params[5] = effect->replay.delay & 255;
+ put_unaligned_be16(effect->replay.length, ¶ms[2]);
+ put_unaligned_be16(effect->replay.delay, ¶ms[4]);
switch (effect->type) {
case FF_CONSTANT:
force = (effect->u.constant.level * fixp_sin16((effect->direction * 360) >> 16)) >> 15;
params[1] = HIDPP_FF_EFFECT_CONSTANT;
- params[6] = force >> 8;
- params[7] = force & 255;
+ put_unaligned_be16(force, ¶ms[6]);
params[8] = effect->u.constant.envelope.attack_level >> 7;
- params[9] = effect->u.constant.envelope.attack_length >> 8;
- params[10] = effect->u.constant.envelope.attack_length & 255;
+ put_unaligned_be16(effect->u.constant.envelope.attack_length, ¶ms[9]);
params[11] = effect->u.constant.envelope.fade_level >> 7;
- params[12] = effect->u.constant.envelope.fade_length >> 8;
- params[13] = effect->u.constant.envelope.fade_length & 255;
+ put_unaligned_be16(effect->u.constant.envelope.fade_length, ¶ms[12]);
size = 14;
dbg_hid("Uploading constant force level=%d in dir %d = %d\n",
effect->u.constant.level,
@@ -2506,20 +2502,14 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
effect->u.periodic.waveform);
return -EINVAL;
}
- params[6] = effect->u.periodic.magnitude >> 8;
- params[7] = effect->u.periodic.magnitude & 255;
- params[8] = effect->u.periodic.offset >> 8;
- params[9] = effect->u.periodic.offset & 255;
- params[10] = effect->u.periodic.period >> 8;
- params[11] = effect->u.periodic.period & 255;
- params[12] = effect->u.periodic.phase >> 8;
- params[13] = effect->u.periodic.phase & 255;
+ put_unaligned_be16(effect->u.periodic.magnitude, ¶ms[6]);
+ put_unaligned_be16(effect->u.periodic.offset, ¶ms[8]);
+ put_unaligned_be16(effect->u.periodic.period, ¶ms[10]);
+ put_unaligned_be16(effect->u.periodic.phase, ¶ms[12]);
params[14] = effect->u.periodic.envelope.attack_level >> 7;
- params[15] = effect->u.periodic.envelope.attack_length >> 8;
- params[16] = effect->u.periodic.envelope.attack_length & 255;
+ put_unaligned_be16(effect->u.periodic.envelope.attack_length, ¶ms[15]);
params[17] = effect->u.periodic.envelope.fade_level >> 7;
- params[18] = effect->u.periodic.envelope.fade_length >> 8;
- params[19] = effect->u.periodic.envelope.fade_length & 255;
+ put_unaligned_be16(effect->u.periodic.envelope.fade_length, ¶ms[18]);
size = 20;
dbg_hid("Uploading periodic force mag=%d/dir=%d, offset=%d, period=%d ms, phase=%d\n",
effect->u.periodic.magnitude, effect->direction,
@@ -2536,17 +2526,13 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
case FF_RAMP:
params[1] = HIDPP_FF_EFFECT_RAMP;
force = (effect->u.ramp.start_level * fixp_sin16((effect->direction * 360) >> 16)) >> 15;
- params[6] = force >> 8;
- params[7] = force & 255;
+ put_unaligned_be16(force, ¶ms[6]);
force = (effect->u.ramp.end_level * fixp_sin16((effect->direction * 360) >> 16)) >> 15;
- params[8] = force >> 8;
- params[9] = force & 255;
+ put_unaligned_be16(force, ¶ms[8]);
params[10] = effect->u.ramp.envelope.attack_level >> 7;
- params[11] = effect->u.ramp.envelope.attack_length >> 8;
- params[12] = effect->u.ramp.envelope.attack_length & 255;
+ put_unaligned_be16(effect->u.ramp.envelope.attack_length, ¶ms[11]);
params[13] = effect->u.ramp.envelope.fade_level >> 7;
- params[14] = effect->u.ramp.envelope.fade_length >> 8;
- params[15] = effect->u.ramp.envelope.fade_length & 255;
+ put_unaligned_be16(effect->u.ramp.envelope.fade_length, ¶ms[14]);
size = 16;
dbg_hid("Uploading ramp force level=%d -> %d in dir %d = %d\n",
effect->u.ramp.start_level,
@@ -2563,18 +2549,12 @@ static int hidpp_ff_upload_effect(struct input_dev *dev, struct ff_effect *effec
case FF_SPRING:
case FF_DAMPER:
params[1] = HIDPP_FF_CONDITION_CMDS[effect->type - FF_SPRING];
- params[6] = effect->u.condition[0].left_saturation >> 9;
- params[7] = (effect->u.condition[0].left_saturation >> 1) & 255;
- params[8] = effect->u.condition[0].left_coeff >> 8;
- params[9] = effect->u.condition[0].left_coeff & 255;
- params[10] = effect->u.condition[0].deadband >> 9;
- params[11] = (effect->u.condition[0].deadband >> 1) & 255;
- params[12] = effect->u.condition[0].center >> 8;
- params[13] = effect->u.condition[0].center & 255;
- params[14] = effect->u.condition[0].right_coeff >> 8;
- params[15] = effect->u.condition[0].right_coeff & 255;
- params[16] = effect->u.condition[0].right_saturation >> 9;
- params[17] = (effect->u.condition[0].right_saturation >> 1) & 255;
+ put_unaligned_be16(effect->u.condition[0].left_saturation >> 1, ¶ms[6]);
+ put_unaligned_be16(effect->u.condition[0].left_coeff, ¶ms[8]);
+ put_unaligned_be16(effect->u.condition[0].deadband >> 1, ¶ms[10]);
+ put_unaligned_be16(effect->u.condition[0].center, ¶ms[12]);
+ put_unaligned_be16(effect->u.condition[0].right_coeff, ¶ms[14]);
+ put_unaligned_be16(effect->u.condition[0].right_saturation >> 1, ¶ms[16]);
size = 18;
dbg_hid("Uploading %s force left coeff=%d, left sat=%d, right coeff=%d, right sat=%d\n",
HIDPP_FF_CONDITION_NAMES[effect->type - FF_SPRING],
@@ -2665,10 +2645,10 @@ static void hidpp_ff_set_autocenter(struct input_dev *dev, u16 magnitude)
params[0] = g920->slot_autocenter;
params[1] = HIDPP_FF_EFFECT_SPRING | HIDPP_FF_EFFECT_AUTOSTART;
/* set coeff to 25% of saturation */
- params[8] = params[14] = magnitude >> 11;
- params[9] = params[15] = (magnitude >> 3) & 255;
- params[6] = params[16] = magnitude >> 9;
- params[7] = params[17] = (magnitude >> 1) & 255;
+ put_unaligned_be16(magnitude >> 3, ¶ms[8]);
+ put_unaligned_be16(magnitude >> 3, ¶ms[14]);
+ put_unaligned_be16(magnitude >> 1, ¶ms[6]);
+ put_unaligned_be16(magnitude >> 1, ¶ms[16]);
hidpp_ff_queue_work(data, HIDPP_FF_DOWNLOAD_EFFECT, params, ARRAY_SIZE(params));
}
@@ -2680,8 +2660,7 @@ static void hidpp_ff_set_gain(struct input_dev *dev, u16 gain)
dbg_hid("Setting gain to %d.\n", gain);
- params[0] = gain >> 8;
- params[1] = gain & 255;
+ put_unaligned_be16(gain, params);
hidpp_ff_queue_work(data, HIDPP_FF_SET_GLOBAL_GAINS, params, ARRAY_SIZE(params));
}
@@ -2711,8 +2690,7 @@ static ssize_t hidpp_ff_range_store(struct device *dev, struct device_attribute
range = clamp_val(range, 180, 900);
- params[0] = range >> 8;
- params[1] = range & 0x00FF;
+ put_unaligned_be16(range, params);
error = hid_hw_open(hid);
if (error)
--
2.56.0.542.g3ef89b7020-goog
next prev parent reply other threads:[~2026-11-11 6:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-11 6:47 [PATCH v2 00/33] HID: logitech-hidpp: G920 force-feedback fixes, rework, and cleanups Dmitry Torokhov
2026-11-11 6:47 ` [PATCH v2 01/33] HID: logitech-hidpp: fix G920 force-feedback initialization timeout Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 02/33] HID: logitech-hidpp: use GFP_ATOMIC in hidpp_ff_queue_work() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 03/33] HID: logitech-hidpp: drain G920 FF workqueue before closing transport Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 04/33] HID: logitech-hidpp: disable works before stopping transport Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 05/33] HID: logitech-hidpp: do not store ERR_PTR in battery->ps Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 06/33] HID: logitech-hidpp: avoid NULL subtraction in consumer key report fixup Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 07/33] HID: logitech-hidpp: fix off-by-one in G920 force-feedback slot tracking Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 08/33] HID: logitech-hidpp: do not retry timeouts and transport errors in hidpp_send_message_sync() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 09/33] HID: logitech-hidpp: initialize response buffer before publishing send_receive_buf Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 10/33] HID: logitech-hidpp: fix HID++ 1.0 battery mileage event parsing Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 11/33] HID: logitech-hidpp: handle negative errors in hidpp20_get_adc_measurement_1f20() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 12/33] HID: logitech-hidpp: mark device online on unified battery 0x1004 events Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 13/33] HID: logitech-hidpp: fix K750 solar battery feature lookup and reconnect Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 14/33] HID: logitech-hidpp: expose charge_type property for battery voltage feature Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 15/33] HID: logitech-hidpp: keep connect work disabled until hid_connect() completes Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 16/33] HID: logitech-hidpp: preserve transport error codes in __hidpp_send_report() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 17/33] HID: logitech-hidpp: return negative error codes from hidpp_send_message_sync() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 18/33] HID: logitech-hidpp: rework G920 force-feedback initialization Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 19/33] HID: logitech-hidpp: use sysfs_emit() in hidpp_ff_range_show() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 20/33] HID: logitech-hidpp: manage G920 range sysfs attribute via dev_groups Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 21/33] HID: logitech-hidpp: execute G920 range sysfs store synchronously Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 22/33] HID: logitech-hidpp: shut down G920 force feedback on input unregister Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 23/33] HID: logitech-hidpp: index G920 force-feedback slots by effect ID Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 24/33] HID: logitech-hidpp: execute G920 effect upload and erase synchronously Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 25/33] HID: logitech-hidpp: clean up G920 force-feedback helpers Dmitry Torokhov
2026-11-11 6:48 ` Dmitry Torokhov [this message]
2026-11-11 6:48 ` [PATCH v2 27/33] HID: logitech-hidpp: store device serial as a byte array Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 28/33] HID: logitech-hidpp: use guard() for send_mutex Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 29/33] HID: logitech-hidpp: use __free(kfree) for temporary allocations Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 30/33] HID: logitech-hidpp: use alloc_ordered_workqueue() for FF queue Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 31/33] HID: logitech-hidpp: manage send_mutex with devm_mutex_init() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 32/33] HID: logitech-hidpp: manage ps_attribute_group with devm_device_add_group() Dmitry Torokhov
2026-11-11 6:48 ` [PATCH v2 33/33] HID: logitech-hidpp: remove unused kfifo and clean up minor helpers Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261110-hid-logitech-hidpp-v2-26-30743e91d83b@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andrew.smirnov@gmail.com \
--cc=bentiss@kernel.org \
--cc=e.velds@gmail.com \
--cc=gideonheinz02@gmail.com \
--cc=hadess@hadess.net \
--cc=hansg@kernel.org \
--cc=jikos@kernel.org \
--cc=lains@riseup.net \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stuart.a.hayhurst@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®