From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.172 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795164269; b=iq+bAPT/8+FUT5IFQvSDuUDxByJCEqqpAgXajuO7QAOpi1Ib98A03J0uGJvp+URiy+Cy Gytah0CDf+ZY8GEyodzWSGytyW97seT1DOX8ya3cJnF1SGFF1GsM1/jr9YmzZDsZvjEBI DCiToel8f44/EOnM9MNANE8SZ1SpzTrtbw4sr8OXkK+nPVsLMEfv/gmMl3lLfWsWHVEvw vllylK4gYNuvKWUH1tkOZPSvkuy66WKKx/43FKmHm+vu3RyR3AvIYe+uacNTwstOkx5n1 7RASN3BDZIZHyMEsmLtBuMpn6H7LX5KvvqTEE8msWhOaj+oeyYatr2KIsh04SNKClYg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795164269; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:Date:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding: Message-Id:References:In-Reply-To:To:Cc:X-Mailer; bh=KKrF/3OPdL6xEz+lwHbSUSyJUkI7uH9V+JtYaC3j1O4=; b=bDx+1AAw3j72b8hoByGTigISZop8/xNxHaBgoBwsROiJaw27RJ2+7tW+0rXy2Vc0pZ7z pzKIeJLFO4ctk0mcUEoQIAlXKvuXQe+JLoXPs19GEnbGzM7vZT+iRQU8O6jAmA9qJJ6dq 9g0bIzDVKbwbsr128/4GpGeEpK0Jm0vw049+5d1FmebV3JTg1PTIOYnLRCoP1i2HLr+TG JcT6pIoJCLCRZCqluljUUD6cD2NX8IIkPW5E8LO/kOe3/Qa3Sy1pnNxIiRNMFNDDE1CjW p5IjoFdxvwcwupIYDXG4PoWRh0nSpR+bYpxhXqOyLbriTkcc9xREAI4KKBroUP9psaw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=yd9jYDWx; arc=none smtp.remote-ip=74.125.82.172 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.172]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74A960A6F53 for ; Fri, 20 Nov 2026 08:44:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E74A960A6F53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=yd9jYDWx Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-382f4710a17so1027412eec.0 for ; Fri, 20 Nov 2026 00:44:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1795164268; x=1795769068; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=KKrF/3OPdL6xEz+lwHbSUSyJUkI7uH9V+JtYaC3j1O4=; b=yd9jYDWxSnmgfJHfqSyZKGNcKL/4y3T65i/88mjFwS/JVSxqz54bPJPG4GqpAnZcnI k2ffPZi6N+Qkdf2dCKrjADsxfVgg8BDLybdEkLUNSldSHnR+vCIzHW3i2NTvL8olii7B Qqd34k+aOruNNgNBnpcT4OtsUY9vffa4DqX5atq7pb7NHNnbRaRzqMgy+DKoKhmErgZx iUO99Pi/nnXWxbU4qBAngA8LqSmIJnT+HaqSoXxvZmnvpSKD71tQm9jRNVNVA68pK9C2 PNQl6q3sfbokF7YW6N+1hlR7NDIf9036MRnwbbO1FLQeZu9aYSY8OPPo2Mdd7f1orZ54 GCrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795164268; x=1795769068; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=KKrF/3OPdL6xEz+lwHbSUSyJUkI7uH9V+JtYaC3j1O4=; b=arSnsQu9IGHq2DgGbOBrbzNd2nUCIKoUjarF8jta/3x9IX92KI9+tFO2oaN3916KPD hFkSjbCl4iaC+5624t7JN24Xcb0EcxWMYUM41jNFgCppnZGzY3xV/0d9MGEX5JmFh3Se YNhmBRHShg0g1eSSLi18Fz5AJk/g0Gsb1YB4P0QTr1D7NL87Yja/ofrglL5XmVxoEfW3 Qqu7z03EMfldsisuUTLJdI8KxP+yOREEvuWPxZVSj3paUpuKVZqArVU0pWJX06Ej3qQ1 QBVm+26sYxUvA3RZeBsIoGFJyQdGCCv2LYpuTMSzD6zmCw3nX2byCIk+EJ7W0TGu44y+ D+kw== X-Forwarded-Encrypted: i=1; AL+hErG4QoO0ujEPm1JTtJtVJHgYDqT8eU7MMTBaVpWrosV+RVCbM4glpte/BlNJDyLnDBXbU1NxMFq7yBUm7Sc=@vger.kernel.org X-Gm-Message-State: APuU4Z+JjCF2EJtZf+s9g7S2rvTKJeqcq4Dn8CqYswPXVpAZYmnEZn+C umFVSA3P51vUYRD7GqmyVXSc/xfSDLDESACPKXO3y1fLSefkaFHnAU9x X-Gm-Gg: AYBFou1z2JLiw6Z6nBjUg8S6lHP+jAZpa09q8PR+E4Z19jfiRPh9BjgMbicHY6e26TJ K5RwL1sAZc4ATgncqP9eadzNIt+lorJydnyp28j/Q0NzNMAcpko5OJLWYCA+KjJGN16kIMXlloL wrkpaDLVRyBOwL313+8/p9vHwcyQr/6vHnIuKwaV6J5iwtnuA1njQSYkyeK6VBnhFR6bJhtoKQc z9nIUnIShVJRkar4+qCGESPTEqxDH/B20Xn4qmXFAmlZ1OkTvFK+YqXY2e0EYnX6pRG6i2bQ7gy SA16pn885g9FVc3v3uiUXnvxCAWXA9XB3nZVolCvrtBJ779PmXBXpjcrOHUS5p0Z7+DhV/QY0h6 53g02Cf5N48HPOuxyHqMdqfEFBqyFw9uQfq6cyvlhYyWuvTa5UmOZk2cbsTXLUMxLu9Q/uIg3vX Yrtsf1KS7oCgNt5WF7X03qDrwoSE4BJyZdf/GPxynhpVOpXMwGg5JKBorbSpkcHaVxqMA1xO+ip d91CLya3O4vw9XD/sfYP7fJVzAZ+UIeEWk1yNjWFLrqdlv4pK0D7CVGdRHt3tQOCHIIr9D9fkNd a/jKscTuElL2Mo6GtyhcIE1y2A90UAn6bIUH68EoMlv7ekIAFAGpFO3f6Gr8QxqIxhXeCD4XytR J/WT2I/D5rZFK8eaW3w== X-Received: by 2002:a05:7023:a5b:20b0:191:a5b2:ef4a with SMTP id a92af1059eb24-1b5568b9f5dmr2015605c88.28.1795164267919; Fri, 20 Nov 2026 00:44:27 -0800 (PST) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:ea97:e47d:2ebc:210c]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1b5569bffd2sm4808244c88.0.2026.11.20.00.44.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Nov 2026 00:44:27 -0800 (PST) From: Dmitry Torokhov Date: Fri, 20 Nov 2026 00:44:02 -0800 Subject: [PATCH v3 11/18] HID: logitech-hidpp: use unaligned accessors for multi-byte values X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261120-hid-logitech-hidpp-next-v3-11-ba39242d4336@gmail.com> References: <20261120-hid-logitech-hidpp-next-v3-0-ba39242d4336@gmail.com> In-Reply-To: <20261120-hid-logitech-hidpp-next-v3-0-ba39242d4336@gmail.com> To: Jiri Kosina , Benjamin Tissoires , Gideon Heinz Cc: =?utf-8?q?Filipe_La=C3=ADns?= , Bastien Nocera , Hans de Goede , Edwin Velds , Stuart Hayhurst , Andrey Smirnov , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.17-dev-6b8b8 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 Signed-off-by: Dmitry Torokhov --- 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 54e7ee824063..16fb52634437 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, @@ -2113,7 +2115,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 @@ -2415,7 +2417,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); } @@ -2460,23 +2461,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, @@ -2511,20 +2507,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, @@ -2541,17 +2531,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, @@ -2568,18 +2554,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], @@ -2670,10 +2650,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)); } @@ -2685,8 +2665,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)); } @@ -2716,8 +2695,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.1.750.gf70dc682cf-goog