From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A5633612D8; Tue, 16 Dec 2025 12:08:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765886890; cv=none; b=l0s3hcCDJNWu4LaaWB+Jk9ya2v2c//5OHQXkyBNkIufrTb41T+CRGy6KUva2B+19dlWqB8uzRtf7fMhRXIcqhKS3PC7ifgI2tqX/0kiJ1tI1L5EI/hGD5xa9R/GQCoYr5zrIuoWu0WHYTePqqsXaFPOka8vgF43YbNgJikzi3WE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765886890; c=relaxed/simple; bh=SZjkO5vVmTOoW/KBTOXHqQefl9EisbIky9jFUUjPUUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S/pl+0QeOuAlTFfGeLncHFX23hoxgFjeavS51IkPb12uYIadVTs3pvayH+h76hWXLHfrbUiieGmz+/BlTb1nzU5Na+UhtIulOn1pPhsANmoEbtk+50/aPbE4t4EzV6rYZ+Lw91XKfBWKZFHyn0ZgEn6GIUjTYHM3cEF6hP6qzZY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C+5RSROg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="C+5RSROg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84773C4CEF1; Tue, 16 Dec 2025 12:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765886889; bh=SZjkO5vVmTOoW/KBTOXHqQefl9EisbIky9jFUUjPUUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C+5RSROg3GuKpdWIVk7m6f/112qq0LSlP95j4FsZhkSiJlrJZt7veln4Z8zwCtDTR P1tPQBr6QoV+SvtqSLnJNHZM+Ty+S4a3gWRlenD3tdnlliuElEyh7NqwVKO1UO3wS0 3Rt54KBMPY4KyXGe9p93SN9nTpFLTs6xDAvta2CI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mavroudis Chatzilazaridis , Stuart Hayhurst , Jiri Kosina , Sasha Levin Subject: [PATCH 6.18 031/614] HID: logitech-hidpp: Do not assume FAP in hidpp_send_message_sync() Date: Tue, 16 Dec 2025 12:06:38 +0100 Message-ID: <20251216111402.437073524@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mavroudis Chatzilazaridis [ Upstream commit aba7963544d47d82cdf36602a6678a093af0299d ] Currently, hidpp_send_message_sync() retries sending the message when the device returns a busy error code, specifically HIDPP20_ERROR_BUSY, which has a different meaning under RAP. This ends up being a problem because this function is used for both FAP and RAP messages. This issue is not noticeable on older receivers with unreachable devices since they return HIDPP_ERROR_RESOURCE_ERROR (0x09), which is not equal to HIDPP20_ERROR_BUSY (0x08). However, newer receivers return HIDPP_ERROR_UNKNOWN_DEVICE (0x08) which happens to equal to HIDPP20_ERROR_BUSY, causing unnecessary retries when the device is not actually busy. This is resolved by checking if the error response is FAP or RAP and picking the respective ERROR_BUSY code. Fixes: 60165ab774cb ("HID: logitech-hidpp: rework one more time the retries attempts") Signed-off-by: Mavroudis Chatzilazaridis Tested-by: Stuart Hayhurst Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-logitech-hidpp.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 5e763de4b94fd..a88f2e5f791c6 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -352,10 +352,15 @@ static int hidpp_send_message_sync(struct hidpp_device *hidpp, do { ret = __do_hidpp_send_message_sync(hidpp, message, response); - if (ret != HIDPP20_ERROR_BUSY) + if (response->report_id == REPORT_ID_HIDPP_SHORT && + ret != HIDPP_ERROR_BUSY) + break; + if ((response->report_id == REPORT_ID_HIDPP_LONG || + response->report_id == REPORT_ID_HIDPP_VERY_LONG) && + ret != HIDPP20_ERROR_BUSY) break; - dbg_hid("%s:got busy hidpp 2.0 error %02X, retrying\n", __func__, ret); + dbg_hid("%s:got busy hidpp error %02X, retrying\n", __func__, ret); } while (--max_retries); mutex_unlock(&hidpp->send_mutex); -- 2.51.0