From nobody Wed Nov 19 18:20:25 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCF6m2Mz6J4bB for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dBVCF6DXpz3Xrj for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=S781TiANa1H9E8JS385sqnDCLDM03IHdUw+9VfQV+2RkB7rkl89YuJmFKX+KzaX6yBMOrd WloJ0k8XDPdn4Eh86gmjdfLgcDL9hbS+Jk653yE2an8snQHr62ZOB/My4FRvJA1UnKsSnr dA9VViTx/wsSGe2IWAgekl//HSlxgDo5Jykg3MCI8geW5ltHb0jRBUBUIU4TJHAE9fqpAJ b/P1bGmTptAbyReB3EA8A4f4QgSfrkmvHjH4Jcb0nT4GYBKNbOt1fd5tbdHivUhqkRKTDY ktkvWkqpSqgnzBG6c7NgFFNPJYF05b3SlyI1XTbGEqo/7sH2iJRZfXGvLlHyIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763576425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fTlR/Zu9cGarsHf20PPZYshutdStx1gjJ5Ik0CsVrDg=; b=d9SfJ/jZxZTqoMIJ5kKFQLuHp+HS4XKx1Srz5BCYkkzzQU0b/wW6WBmUfsJeVGa7+eUME1 X5sA6x5f4JbPfoXzuieUN13HDfst7eMpEv7RBZFZTJDGa5u7tKMraqJClA+CNIhdHUWYnm sNMPfoKp6C9Xs3kWGy15RIMmcS9m3zherMjJM4Xz9mmLvchSFTTDyxR0XV64tf6cUDcUF4 U34W7TLCDcqivEhAOskE3FoizXv5Cy5TCesulLSzcmTF2/jspfFWnDBRrkJApcuW6bxIkH dwRwmVaMQMls8UAcHTrA3hrI1Blpup/v9Km9SMKiQRPLtMdf4t7WHil7UpC1yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763576425; a=rsa-sha256; cv=none; b=pGkt3SkSEM+AwubUclj6XPZko4a6JcwJ/9g+PlVuzhcp2eDknUjY2yASgKUMooagZXi91d ZFJ2rP4ggQ7D0CfDLHtucJtPI9TQyG05arN2bHb+zfde2CtuEA1lBcxSBK7kDVsFfrjXQN tnwgG05PVT5bu04jc474vt9awy7cALdhVk4UJ9Nb7N8vJpuIcUuSNVj+Qsxr/rHJghIS2Q 48Iyjr7despxRnU93FllNxGxqDRkcd1W84UZusVpbbKJ6cTfQLvbX/aAePyZFIP2lTjgUA isF3rFEmZS0vwVkVWNh9+HY2UkH9p6KdYy60hB4ptRIZKkSP+5LBvHTv8ZWS1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dBVCF5dykzrkW for ; Wed, 19 Nov 2025 18:20:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d3cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 18:20:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Ed Maste Subject: git: d61be9d99470 - stable/15 - iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d61be9d994702ffb8443c686f3ae2a5c702df3c7 Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 18:20:25 +0000 Message-Id: <691e0a69.d3cc.7d8aab3c@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d61be9d994702ffb8443c686f3ae2a5c702df3c7 commit d61be9d994702ffb8443c686f3ae2a5c702df3c7 Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Ed Maste CommitDate: 2025-11-19 18:20:09 +0000 iichid: The IICHID spec defines the response to the RESET command as two bytes of zeros. Our recent changes to iichid.c has caused us to attempt to read a full REPORT instead, and at least one keyboard hangs solid when we do that. This patch changes us to be spec-compliant. Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) --- sys/dev/iicbus/iichid.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index 5ca3f1b84e48..430066bd8f52 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -271,6 +271,8 @@ static int iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, iichid_size_t *actual_len) { + int error; + /* * 6.1.3 - Retrieval of Input Reports * DEVICE returns the length (2 Bytes) and the entire Input Report. @@ -280,7 +282,10 @@ iichid_cmd_read(struct iichid_softc* sc, void *buf, iichid_size_t maxlen, struct iic_msg msgs[] = { { sc->addr, IIC_M_RD, maxlen, buf }, }; - int error; + + if (!sc->reset_acked) { + msgs[0].len = 2; + } error = iicbus_transfer(sc->dev, msgs, nitems(msgs)); if (error != 0)