From nobody Sun Sep 06 19:48:33 2026 X-Original-To: dev-commits-src-main@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 4hdLNd6xlSz6rcJL for ; Sun, 06 Sep 2026 19:48:33 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hdLNd5hk7z3hWc for ; Sun, 06 Sep 2026 19:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788724113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJlTsUyXQTHit8Wnziff5MqYpJpHAyqzHMerTAcsg=; b=rofgz243RmE064CNfcXmsKKb8GF+4v0U9jWBCEDkxPe04ZKi5Y8tXgKUxFd0JC7ZnRQtTo jv/1VZ1F11NWVU71SSM5mk/PpwRjY//eG/6c/FGTTeBXZhyS1u2ivsiovTmZsTHilPDGJG HFgE5dAZkFIEZn1wVN9ThZTOyzdptL5Zq/oEIzh1gxDDYG/1jdLJfJ3QikoiBEZH7qoxzK 7+hdZ3QPSTonq8XVc5nuO4kcCWiBRK+ZEk8q1omGtmshol85RGoFcVevF3/QReMbMTY22f /ApIt9694yzt7K/z45t1ZKinem8/OY2BVRC0Scj78L29vJarsmUvveF3f4Fm+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788724113; a=rsa-sha256; cv=none; b=nD/bQM73RYukpqncCyAWAVDPUFT0uBdDFBYoBuivyJYN05qySyOujlWeqd/fbW6tVx8lfy s8Yr7s3Bua4zf4Ed/ywGSO36aeqh59kSyqsAjRJtH9BY33yhdIAfkw4HcP+UYtXHwc1b0I p9tM9MLjxj99rhFwh9euHacTYvBNwLWNF5iF1ZExJAu6zUWMqesXgXEhfQOydG/32HJjtr hCt+PiqUjQf8dxg8ak4gMEXrXvmyst+9Zni640jr1PuBhK69KnQgByNzg6UNvsX/4N2Z80 XJ5UL89A1p+CQ6bWSh2vTPuoKQMRapRR4UZpP2f8iOpLxZo+W+hj2crVK2Zi3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788724113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OLYJlTsUyXQTHit8Wnziff5MqYpJpHAyqzHMerTAcsg=; b=QDLbWipS90bDUD2e25h5RSQHYbN9OlQE3E6QU5fugMdK45dxMXxeBUF4Llp9aTXTf7Q9dj fnMa6jkwbYcmZxVNGxTHeeOogW5gUlQqt9D5wVxPwhoo2zicNh4ctTSbeuZc87honaCz5U DNuW1zVm4Q2qzygwLAoGFy8i15Q041dc8bYTnFdyBtQEjlwqb6ya/7vJFTLXXT5gMdS8f6 ziHjmpRy6lw21Z0iR991vCeki3WER1zzZFKBoW322aCYnvoHfrInNQ6Inw0DX7pc7Mevrv dcv13KUTA5kZELrz0ktXeVJrVnW9gsqCN3C+BLzmcYRxR9JILdZD4exAzDEZOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdLNd3kptzlvw for ; Sun, 06 Sep 2026 19:48:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b273 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 19:48:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: c0ec1e0e60ca - main - apple_bce: fix C_CONNECT_STATUS during port reset List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.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: 8bit X-Git-Committer: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0ec1e0e60caf513e4cfa42b995631f19d376a26 Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 19:48:33 +0000 Message-Id: <6a9dc391.3b273.1f7394f0@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=c0ec1e0e60caf513e4cfa42b995631f19d376a26 commit c0ec1e0e60caf513e4cfa42b995631f19d376a26 Author: Abdelkader Boudih AuthorDate: 2026-09-06 19:16:33 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-06 19:47:44 +0000 apple_bce: fix C_CONNECT_STATUS during port reset Only set the port change bit when the corresponding status bit actually transitioned, instead of unconditionally flagging C_CONNECT_STATUS on every port change event. Also clear any flaky C_CONNECT_STATUS that the port change taskqueue may have set while the bus lock was dropped during a successful port reset. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58875 --- sys/dev/apple_bce/apple_bce_vhci.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sys/dev/apple_bce/apple_bce_vhci.c b/sys/dev/apple_bce/apple_bce_vhci.c index 7056f8e2fb97..56d519e715c1 100644 --- a/sys/dev/apple_bce/apple_bce_vhci.c +++ b/sys/dev/apple_bce/apple_bce_vhci.c @@ -1007,8 +1007,12 @@ bce_vhci_port_chg_task(void *arg, int pending __unused) USB_BUS_LOCK(&vhci->sc_bus); if (error == 0) { + uint16_t changed, old_status; + port_status = (uint32_t)reply.param2; + old_status = vhci->sc_port_status[port]; + vhci->sc_port_status[port] = 0; if (vhci->sc_port_power[port]) vhci->sc_port_status[port] |= @@ -1025,8 +1029,24 @@ bce_vhci_port_chg_task(void *arg, int pending __unused) if (port_status & BCE_VHCI_PORT_OVERCURRENT) vhci->sc_port_status[port] |= UPS_OVERCURRENT_INDICATOR; + + changed = old_status ^ vhci->sc_port_status[port]; + + if (changed & UPS_CURRENT_CONNECT_STATUS) + vhci->sc_port_change[port] |= + UPS_C_CONNECT_STATUS; + if (changed & UPS_PORT_ENABLED) + vhci->sc_port_change[port] |= + UPS_C_PORT_ENABLED; + if (changed & UPS_SUSPEND) + vhci->sc_port_change[port] |= + UPS_C_SUSPEND; + if (changed & UPS_OVERCURRENT_INDICATOR) + vhci->sc_port_change[port] |= + UPS_C_OVERCURRENT_INDICATOR; + } else { + vhci->sc_port_change[port] |= UPS_C_CONNECT_STATUS; } - vhci->sc_port_change[port] |= UPS_C_CONNECT_STATUS; USB_BUS_UNLOCK(&vhci->sc_bus); } @@ -4107,6 +4127,8 @@ bce_vhci_roothub_exec(struct usb_device *udev, UPS_HIGH_SPEED; vhci->sc_port_change[index - 1] |= UPS_C_PORT_RESET; + vhci->sc_port_change[index - 1] &= + ~UPS_C_CONNECT_STATUS; } else { device_printf(vhci->sc_dev, "port %d reset failed: %d\n",