From nobody Mon Nov 02 03:02:51 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 4jHxMw039kz6yVtX for ; Mon, 02 Nov 2026 03:02:52 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHxMv2SSRz4SNZ for ; Mon, 02 Nov 2026 03:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793588571; 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=jPgOfGwRg+wWe7VyB0P/a0C4zDnYH8Zm7+0a92nU3n0=; b=QJFRGo7GlAD56s4HPICpdyiFNlAuTk/KUqkqzR7b9UWS6cWH2cqGZ5bI4p11z+FWvi1hke Hw1gj8cCUydcxlrAcVULpfyhlo99V6sMkgsoLYwzPN9TbF5z6WKPLgsw3joOPCK6r7I66M rxPcJT/lpJBJ7B7nhMv7qfnTEzUx6Y7/38BeYMpdovkthjZRtzabSEMPjE0gyFbNbdKeab rLHMCfGtV6K6UTkJO2lYCG1Cf7VD6lU213YJIqHTIpEBNLaQhSsyLOicK6yFnoN3q9MuMA 3pnmHihx/fLULcfa3DKizannIqvzrTN/MUbn9XAvMWl6Ia+IrS7foXuOsvB6Rg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793588571; b=labD0dBKZTSb5JTXpG1VpGlfbaJ3nxYDX0U6FsZXlrudbNUmXlhhB/v+41nJX6NleNy+pL EvCcpGTmQ+iJ0epg6JXm2JwDgWaRc6FhKf2Lo3E9tcD/hc4X0JWnwZuDKkelJRREMgx5Vs qIf0WjY+TQ2T0AJW1y6I4TeSKjHbFXZKAV+BhnQqmN/CChcIHAKUJ3FrtOT4f9trV7Kw4w vc2MkSPJb7+eys/VsiVrvFb+75ejCe/jSdhw5HadxRlgn3h4FM4HvdVqh56vgegvpP58/n qb8RdiKwnOGQsExkGU5V96MVMBOlWSnwK+dJ8l/Ckt/T8igz4qYPcKNflrZPyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793588571; 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=jPgOfGwRg+wWe7VyB0P/a0C4zDnYH8Zm7+0a92nU3n0=; b=JfmTVH5v0UMcxgF/3HrvOZIukgrKOq1SsnWZvESC/dIWiyWt6pIwy3Ulwdz8MR122xQgIG 4v6FeQz1xpjGvSW6gpunxCU3Uwmehsy4f0pb/M/VBAw3s04ruZ/wJjRXbBsgr91qVIUPyd Qsqd1VG4cmBpc3oOqcSmVVuFDXsOpmv6ThlPp/2KdK/eiLsIX2VluJiuAZ56XUgl/mIl5/ ygsfelccAwTJm2pOUJz5cgK75dqhXGYc0frbjY8ma48s6uPHwwdWEMwRd6SfGsxFUlKFe3 1AAXwKjHqrm7KTn+QEHAWPCd0upg3K51qwSbum/v5rDyZOzU9pfgaBZzblmwog== 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 4jHxMv27BnzRPD for ; Mon, 02 Nov 2026 03:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b603 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 03:02:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 2f79adc28976 - main - usb: Implement usbd_req_get_bos_descriptor helper List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f79adc28976870f4f5ad3a2ce61f2f8da0eb131 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 03:02:51 +0000 Message-Id: <6ae7fd5b.3b603.9636629@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=2f79adc28976870f4f5ad3a2ce61f2f8da0eb131 commit 2f79adc28976870f4f5ad3a2ce61f2f8da0eb131 Author: ShengYi Hung AuthorDate: 2026-05-22 16:21:06 +0000 Commit: ShengYi Hung CommitDate: 2026-11-02 03:02:11 +0000 usb: Implement usbd_req_get_bos_descriptor helper Get the header or the complete BOS descriptor of SS+ devices. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57202 --- sys/dev/usb/usb.h | 3 +++ sys/dev/usb/usb_request.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ sys/dev/usb/usb_request.h | 4 +++ 3 files changed, 69 insertions(+) diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h index 8eb36a24bbcd..90078df11361 100644 --- a/sys/dev/usb/usb.h +++ b/sys/dev/usb/usb.h @@ -309,6 +309,9 @@ struct usb_device_descriptor { } __packed; typedef struct usb_device_descriptor usb_device_descriptor_t; +/* Maximum sane wTotalLength for a BOS descriptor */ +#define USB_BOS_DESC_MAX_LEN 4096 + /* Binary Device Object Store (BOS) */ struct usb_bos_descriptor { uByte bLength; diff --git a/sys/dev/usb/usb_request.c b/sys/dev/usb/usb_request.c index df6dadae541b..2a57c75a85d2 100644 --- a/sys/dev/usb/usb_request.c +++ b/sys/dev/usb/usb_request.c @@ -1535,6 +1535,68 @@ usbd_req_get_ss_hub_descriptor(struct usb_device *udev, struct mtx *mtx, return (usbd_do_request(udev, mtx, &req, hd)); } +/*------------------------------------------------------------------------* + * usbd_req_get_bos_descriptor + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +usb_error_t +usbd_req_get_bos_descriptor(struct usb_device *udev, struct mtx *mtx, + struct usb_bos_descriptor *bd) +{ + return (usbd_req_get_desc(udev, mtx, NULL, bd, sizeof(*bd), + sizeof(*bd), 0, UDESC_BOS, 0, 3)); +} + +/*------------------------------------------------------------------------* + * usbd_req_get_bos_descriptor_full + * + * Returns: + * 0: Success + * Else: Failure + *------------------------------------------------------------------------*/ +usb_error_t +usbd_req_get_bos_descriptor_full(struct usb_device *udev, struct mtx *mtx, + struct usb_bos_descriptor **bdp) +{ + struct usb_bos_descriptor bd; + struct usb_bos_descriptor *bdesc; + uint32_t len; + usb_error_t err; + + *bdp = NULL; + + err = usbd_req_get_bos_descriptor(udev, mtx, &bd); + if (err) + return (err); + + len = UGETW(bd.wTotalLength); + if (len < sizeof(bd) || len > USB_BOS_DESC_MAX_LEN) { + DPRINTFN(0, "BOS descriptor wTotalLength %u is invalid\n", + len); + return (USB_ERR_INVAL); + } + + bdesc = malloc(len, M_USBDEV, M_WAITOK | M_ZERO); + if (bdesc == NULL) + return (USB_ERR_NOMEM); + err = usbd_req_get_desc(udev, mtx, NULL, bdesc, len, len, 0, + UDESC_BOS, 0, 3); + if (err) { + free(bdesc, M_USBDEV); + return (err); + } + if (UGETW(bdesc->wTotalLength) != len) { + DPRINTFN(0, "BOS descriptor length changed\n"); + free(bdesc, M_USBDEV); + return (USB_ERR_INVAL); + } + *bdp = bdesc; + return (0); +} + /*------------------------------------------------------------------------* * usbd_req_get_hub_status * diff --git a/sys/dev/usb/usb_request.h b/sys/dev/usb/usb_request.h index f7ccd84eb69c..8e7d3632322e 100644 --- a/sys/dev/usb/usb_request.h +++ b/sys/dev/usb/usb_request.h @@ -60,6 +60,10 @@ usb_error_t usbd_req_get_hub_descriptor(struct usb_device *udev, usb_error_t usbd_req_get_ss_hub_descriptor(struct usb_device *udev, struct mtx *mtx, struct usb_hub_ss_descriptor *hd, uint8_t nports); +usb_error_t usbd_req_get_bos_descriptor(struct usb_device *udev, + struct mtx *mtx, struct usb_bos_descriptor *desc); +usb_error_t usbd_req_get_bos_descriptor_full(struct usb_device *udev, + struct mtx *mtx, struct usb_bos_descriptor **pdesc); usb_error_t usbd_req_get_hub_status(struct usb_device *udev, struct mtx *mtx, struct usb_hub_status *st); usb_error_t usbd_req_get_port_status(struct usb_device *udev, struct mtx *mtx,