From nobody Wed Nov 19 21:44:29 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 4dBZkj5h7Bz6JKBW for ; Wed, 19 Nov 2025 21:44:29 +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 4dBZkj40JWz3CJS for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; 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=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=tZXMeQI9FU4HhTUv4wuyNkvsG9ZGbLcc4yree/TNfFdGkW6k3+zKdNHfZVw+WrigtDc/F/ gMNeJgt/7rYNpCOCBuiVPJpAqQc0HJ0PeG5q3+oWcM2TgvYa2JGQhzrEv4+S0EjuACSliV 9u5XYIp4Gat+TuOT+c3wlxwqOKx8Mc3VaYSo5JFBR22b6oD7MfGp7T+3MVhlFgw+jKAhnU 8DFpQO4I6ewYW9hbIW9KCrontQPlO66cBfRlOnDrYCbNYTz7q5yDM9K7MKOlcUCnoAgDf7 vcymsoKyRMmhbszsmPVwAXAt4Y8Mnb/Ak+nduwryIlr/1PV8VtdI16CYBXIpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763588669; 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=FlYRvSNpI2vPYX+XwM8ndlhNPgoOm0GynvQBWWkIoSk=; b=EE2vC6zt7TZoQOXq0RbS6bc/h5lHL8uhBvIb2YaOAz9fRatzeA5OUVg0hLN21hUzeFqMXC Ae2l1F+QUrGojjK84N+CGlTvPIVO3whxJ4gI1A2l4DEcHLfHn9fKSsZXKE9aWSA9cSGeFk Q3PeAALwtiqPFrh1AiVfku5cGgcankQSh0l6GGhkZnw2k2wiLzjK+ZM3eOGgT2MqQ6M/aW H/M7nzKC2nV4SF4BTWNy3+fVTfXRVf+v1TegxabVUSqBO8qmv29yGK8cRnN23bvM+lgmL/ nvaxbQjrM8aYe7MopsBLhhyigo7it5dNvh6SDsm3qEseX1ZCAKDmn5HA9NdC6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763588669; a=rsa-sha256; cv=none; b=YOesEk0oWOrDauaPYVogm2OQPLOkmcqd2AvIa4Ei2onWCjRqiorSsNqc8wdZ4lAp5QYhHd k83PN7HExeSqEGx89M5lh6p4ovcYsgpZNUgadnacBZumzitzzuNc9okcxjzpB/Y1ZIR1qp h5tyga/4AJYqdlMvlsUJpX+dRMAjMpAdnnUcmlHPKoP9vUsrlVBLdt6A8H5sJbGL0WvOTS sKIIo//0m/xx1FXeNIkGDESmvV30ZcGGcfaBg7vIj58I2CbDxR4K3WZjGBnCFt1nlfwS6y Sy+WkhYNdoh/J/QjeKYsdnlCRDJI369wcHGU80Qj/tFuOcCC3fhsw6l5flu/eA== 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 4dBZkj3Llwzy3N for ; Wed, 19 Nov 2025 21:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33775 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 21:44:29 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Poul-Henning Kamp From: Colin Percival Subject: git: d02a08f89932 - releng/15.0 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: d02a08f899322dd9ed34cbf77e917068ba59b3ff Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 21:44:29 +0000 Message-Id: <691e3a3d.33775.6905fe84@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d02a08f899322dd9ed34cbf77e917068ba59b3ff commit d02a08f899322dd9ed34cbf77e917068ba59b3ff Author: Poul-Henning Kamp AuthorDate: 2025-11-18 19:22:01 +0000 Commit: Colin Percival CommitDate: 2025-11-19 21:36:49 +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. Approved by: re (cperciva) Differential Revision: https://reviews.freebsd.org/D53803 MFC after: 1 day Approved by: re(ccperciva) (cherry picked from commit 5d53462af1d0e892da77b52b701b337119b2f5d7) (cherry picked from commit d61be9d994702ffb8443c686f3ae2a5c702df3c7) --- 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)