From nobody Sun Sep 06 19:48:34 2026 X-Original-To: dev-commits-src-all@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 4hdLNg3Xftz6rcCx for ; Sun, 06 Sep 2026 19:48:35 +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 4hdLNf6fhbz3hg7 for ; Sun, 06 Sep 2026 19:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1788724114; 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=B8Iuj+g74bCKbMB105Wi2CWc59FDBUNaaeVlCI2UjF8=; b=TNDYqV/EAoDU9HPwQIE8p57rRGgIvXJ4Sx1ZDDxPo7i52vjHQJ0aF8Af0PoZwnUYUgrwto ckXLPtQEpSaiBR1ZbYY+0IXdnLD1DkW08+MbPPlYPHj8O7/Itvkh9bk+Cfj+uZT2DC8OXk 5NAKV2XjHOd20WGFgOAkg74mQQwHKAZCkADBwodZNoQgo4e9z16RTblk2cOso6juIXZAqq DX84WXFu9jmEZqWIldgdMxD0mp3Is0dAjC5pv7aloByJDmgFVvu3z55owU/PYNk8dldlON iSEU/Z6+qSlcCVN8yB+B7+87kR8aMNYK0jGmV4Dkf5HnY1WF2wcVPKCrno9UGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1788724114; a=rsa-sha256; cv=none; b=xwKLF+okzVSfWUfgM0BTXvrXJGFcz1VbQmDI+Ww8iIihwkdIX2JUeQr8haH7APD5hW8dh2 wxeFJPSP1kwkGk1Uola4HmAedqear9Fxu/2Dk8MAnM3Zwn9LedbnpznIObgfczjFGE4+7t YhVejhYyfzoiV3ipnwY4/T/YezY+Nw4IUsK8zUGgd6iPnO/HIgi6ShlDxrt73M2qiiZnSf Md1sXA+dpk2x3Nze8HYD5hLKr537yTFUsVSkNSakgB6AUqxcVyguWuuT3ASMakw656yrZ+ pEgu3SgdUQc27v5tQ0u6Y8tqTb7cR7Y72sncJSgwt8FqC1sTtYwnI66BpeZcQA== 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=1788724114; 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=B8Iuj+g74bCKbMB105Wi2CWc59FDBUNaaeVlCI2UjF8=; b=jI3srbNVADl/8uqpmZCzVSheG+d6DdC/Zdqs82FBXdLSk68DUNDAbG5XsQY9oTw9IQxNYm Hgf+koS0oTEGlXznE3su5PBzj+/qfFarnWDbC8FWSlHd0m5hd4Z97wxVumY8wVxuhIGE4b sdu2/3YoqI3hYcYAdJADSu4irwSjxKX9O98qsnr81v0u3Tk6+ea2RZVpMDfsD/BE4g8Nay EhUGveg71Gr68kX0J6jdquinyi6qrqAILI+Orw4qtJ6OHcdPdxnaqQjdfIcLV42wmEnLGP HohFGVPalCCWK/VX1XIp2m1XhC7n8wGr4pKubsYKaNYIOvKkvdR6BXQWsJ7Tmg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hdLNf4ZbMzlvx for ; Sun, 06 Sep 2026 19:48:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bc74 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 06 Sep 2026 19:48:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: e8018942942e - main - apple_bce: initiate IN data phase for control transfers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: e8018942942e212ba5a664f0265f1101e6c48930 Auto-Submitted: auto-generated Date: Sun, 06 Sep 2026 19:48:34 +0000 Message-Id: <6a9dc392.3bc74.398a89c7@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=e8018942942e212ba5a664f0265f1101e6c48930 commit e8018942942e212ba5a664f0265f1101e6c48930 Author: Abdelkader Boudih AuthorDate: 2026-09-06 19:47:34 +0000 Commit: Abdelkader Boudih CommitDate: 2026-09-06 19:47:44 +0000 apple_bce: initiate IN data phase for control transfers For IN control transfers, the firmware does not send TRANSFER_REQUEST for the data phase the host must send BCE_VHCI_CMD_TRANSFER_REQUEST with an IN DMA buffer once the setup phase completes. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D58872 --- sys/dev/apple_bce/apple_bce_vhci.c | 70 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/sys/dev/apple_bce/apple_bce_vhci.c b/sys/dev/apple_bce/apple_bce_vhci.c index 56d519e715c1..e8bef8566cd6 100644 --- a/sys/dev/apple_bce/apple_bce_vhci.c +++ b/sys/dev/apple_bce/apple_bce_vhci.c @@ -176,6 +176,8 @@ static void bce_vhci_handle_transfer_request(struct bce_vhci_softc *vhci, struct bce_vhci_message *msg); static void bce_vhci_complete_ctrl_locked(struct bce_vhci_softc *vhci, struct bce_vhci_transfer_queue *tq, struct bce_vhci_message *msg); +static void bce_vhci_ctrl_start_in_data(struct bce_vhci_softc *vhci, + struct bce_vhci_transfer_queue *tq); static void bce_vhci_handle_ctrl_status(struct bce_vhci_softc *vhci, struct bce_vhci_message *msg); static uint16_t bce_vhci_handle_endpoint_req_state(struct bce_vhci_softc *vhci, @@ -1643,6 +1645,71 @@ bce_vhci_submit_pending_out(struct bce_vhci_softc *vhci, } } +static void +bce_vhci_ctrl_start_in_data(struct bce_vhci_softc *vhci, + struct bce_vhci_transfer_queue *tq) +{ + struct bce_vhci_message treq; + struct bce_qe_submission *si; + struct usb_xfer *xfer; + uint32_t dlen; + + dlen = tq->ctrl_data_len; + if (dlen > BCE_VHCI_XFER_BUFSZ) + dlen = BCE_VHCI_XFER_BUFSZ; + + xfer = tq->active_xfer; + tq->ctrl_state = BCE_VHCI_CTRL_STATUS; + USB_BUS_UNLOCK(&vhci->sc_bus); + + memset(&treq, 0, sizeof(treq)); + treq.cmd = BCE_VHCI_CMD_TRANSFER_REQUEST; + treq.param1 = ((uint32_t)tq->endp_addr << 8) | tq->dev_addr; + treq.param2 = dlen; + + bus_dmamap_sync(tq->dma_tag, tq->dma_map, BUS_DMASYNC_PREREAD); + + mtx_lock_spin(&vhci->sc_async_lock); + if (bce_reserve_submission(vhci->msg_asynchronous.sq) != 0) { + mtx_unlock_spin(&vhci->sc_async_lock); + goto fail; + } + mtx_unlock_spin(&vhci->sc_async_lock); + + mtx_lock_spin(&tq->lock); + if (bce_reserve_submission(tq->sq_in) != 0) { + mtx_unlock_spin(&tq->lock); + mtx_lock_spin(&vhci->sc_async_lock); + atomic_add_int( + &vhci->msg_asynchronous.sq->available_commands, 1); + mtx_unlock_spin(&vhci->sc_async_lock); + goto fail; + } + si = bce_next_submission(tq->sq_in); + si->addr = tq->dma_addr; + si->length = dlen; + si->segl_addr = 0; + si->segl_length = 0; + bce_submit_to_device(vhci->sc_bce, tq->sq_in); + mtx_unlock_spin(&tq->lock); + + mtx_lock_spin(&vhci->sc_async_lock); + bce_vhci_msg_queue_write(vhci, &vhci->msg_asynchronous, &treq); + mtx_unlock_spin(&vhci->sc_async_lock); + + USB_BUS_LOCK(&vhci->sc_bus); + return; + +fail: + USB_BUS_LOCK(&vhci->sc_bus); + if (tq->active_xfer == xfer) { + tq->active_xfer = NULL; + tq->dma_inflight = 0; + tq->ctrl_state = BCE_VHCI_CTRL_IDLE; + usbd_transfer_done(xfer, USB_ERR_IOERROR); + } +} + /* * Transfer queue DMA completion callback. Fires when the firmware * has consumed (OUT) or filled (IN) a DMA buffer we submitted. @@ -1791,6 +1858,9 @@ bce_vhci_tq_completion(struct bce_queue_sq *sq) vhci, tq, &tq->ctrl_status_msg); } + if (tq->ctrl_state == BCE_VHCI_CTRL_DATA && + tq->ctrl_dir == UE_DIR_IN) + bce_vhci_ctrl_start_in_data(vhci, tq); } else if (tq->ctrl_state == BCE_VHCI_CTRL_STATUS && tq->ctrl_dir == UE_DIR_OUT) {