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 48F0B2222B2; Mon, 9 Feb 2026 14:42:53 +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=1770648173; cv=none; b=ZX5ALHC9HDghKAW6eRp45F4L5EgdXlD/IPEcwDtQFsKYxwI0ZHAKV3DEdUMp+l0v2Krt1EUE+JlQtxedVSVrFvY1H5J5uYUzo0rI3mxh2HklOUp3vK4+38Y6stiZN4kA5AcifgMnWCRCVVBjjaM28TlwYOvznn1ziT93Z0Y2mVw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770648173; c=relaxed/simple; bh=8Kzzv7RRVLeZLdrvSukudifhF8hoUDogAzeQbDBDEhY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iPkxSWCt1P/D4phwLt6jTMigWJBoNP9xmUhzg4hlrnB1mxVGXK8nF3f5eAlCYU1I8GBW35rdEEDmbJktZJBDIubM3IrvdNljJV4KmU8IFWHFdIgYXo6H5/G4OlOVl5V81hDvElBMjWu8iPqX/IJKsfy+lcNguwrRfiy1X+wvWuU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xoNA88yY; 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="xoNA88yY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6B32C116C6; Mon, 9 Feb 2026 14:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770648173; bh=8Kzzv7RRVLeZLdrvSukudifhF8hoUDogAzeQbDBDEhY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xoNA88yY0/BzPBUFvJNKR7+4Gbv5i8tgfHWchax4znra2Stt5scnSviJBzgN/GG+r 80i6M+jx9F/FtHpwShRfWyw/qJEOmBxDSdmbluffjsrwS4EHL9vcmePexobnlFECC0 mFEF7pN4JZuQLESBMBfInKWfbo88KHxS8Ix+gw90= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Lixu , Srinivas Pandruvada , Benjamin Tissoires , Sasha Levin Subject: [PATCH 6.1 28/69] HID: intel-ish-hid: Reset enum_devices_done before enumeration Date: Mon, 9 Feb 2026 15:23:56 +0100 Message-ID: <20260209142302.939654899@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260209142301.913348974@linuxfoundation.org> References: <20260209142301.913348974@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Lixu [ Upstream commit 56e230723e3a818373bd62331bccb1c6d2b3881b ] Some systems have enabled ISH without any sensors. In this case sending HOSTIF_DM_ENUM_DEVICES results in 0 sensors. This triggers ISH hardware reset on subsequent enumeration after S3/S4 resume. The enum_devices_done flag was not reset before sending the HOSTIF_DM_ENUM_DEVICES command. On subsequent enumeration calls (such as after S3/S4 resume), this flag retains its previous true value, causing the wait loop to be skipped and returning prematurely to hid_ishtp_cl_init(). If 0 HID devices are found, hid_ishtp_cl_init() skips getting HID device descriptors and sets init_done to true. When the delayed enumeration response arrives with init_done already true, the driver treats it as a bad packet and triggers an ISH hardware reset. Set enum_devices_done to false before sending the enumeration command, consistent with similar functions like ishtp_get_hid_descriptor() and ishtp_get_report_descriptor() which reset their respective flags. Signed-off-by: Zhang Lixu Acked-by: Srinivas Pandruvada Signed-off-by: Benjamin Tissoires Signed-off-by: Sasha Levin --- drivers/hid/intel-ish-hid/ishtp-hid-client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hid/intel-ish-hid/ishtp-hid-client.c b/drivers/hid/intel-ish-hid/ishtp-hid-client.c index e3d70c5460e96..a0c1dc0941497 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid-client.c +++ b/drivers/hid/intel-ish-hid/ishtp-hid-client.c @@ -496,6 +496,7 @@ static int ishtp_enum_enum_devices(struct ishtp_cl *hid_ishtp_cl) int rv; /* Send HOSTIF_DM_ENUM_DEVICES */ + client_data->enum_devices_done = false; memset(&msg, 0, sizeof(struct hostif_msg)); msg.hdr.command = HOSTIF_DM_ENUM_DEVICES; rv = ishtp_cl_send(hid_ishtp_cl, (unsigned char *)&msg, -- 2.51.0