From nobody Tue Feb 10 00:46:53 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 4f92vK4q8mz6R4Yt for ; Tue, 10 Feb 2026 00:46:53 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f92vK2M8Wz4GCq for ; Tue, 10 Feb 2026 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770684413; 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=WCZScCLWokUyE2ipnuE5yFWkfK4sjtf5ClPsVVvOowk=; b=bmgVMdc/cwxdYZs/LLhsRcsV8K46NJDGSANzy1GiXksZhnBLqX72F8Q/UqKeuJr1dyAQPL SnG/aW7kxfdhBWm4sABVdotQ8bGiFet8/u942hc+R/mOXFdboDg0dTdE5EsI2JHobM1z5V ywGrKV9QuWyIU8KkuqYLN1soBMUSXZwjVp01tk1JSv1YsE4AvcUuLbVaJApuaA/Iev5jgQ YU+tlNsXM62prmw0vnUCHQeCWWhKZLj4FznVgaYUctedT/O9xEpfgcRsLPMQqovxikSdyy 6ObTDNvZL648gx8jfRQplL27EikaSTw+8oIuIpYAc6XZGUl0Q8RA0ZBIRSTbJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770684413; a=rsa-sha256; cv=none; b=EspLtSBALf6GdU4YStZMaLIK3QC9OrnsMg2ylsIkMEn/8Nug3m8nyCjJQVcwpjK3ys8kGA q4bdm8BMX1zQfGFandjHmTAxRY5Rl8r5c0YpSdNuOJPKZUBn7+I1mCsQ1umivT9U3FBKQg NDv8EVODwfA0dCqr0f51yMa/E/zdbzTJmfDWj14KcdVW/39F5EQSdKrMzme1/r6xaCFxvq wpv7Ks35yFysBJ08tZIOOVav5Kua6YgPFditbKE+2sk+4hPtoBOi3kf2uDY5+pQYmvFuVv JMYaXf1BVxRgArIF9QM3BlRExi1lNl86grs3kK07+vss7BYdRgw//6HOuDLP9w== 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=1770684413; 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=WCZScCLWokUyE2ipnuE5yFWkfK4sjtf5ClPsVVvOowk=; b=cSfcs6npovXKuguIa1UziVjoWwqtH9GCYD+4nhsW2hxME0FmL0DMZtKwkwozwYZMaB5l9f Lzr7sQfW5aQy3FVFXV6ihbiPmXP76t+mWzogKJXf8/bGxYR7e+KIjtrhZlejvpemKNlTnI oVt98bCPVh1wsrjWdZX0EdKvA/8Me7moXWNfm4qGUCGyOh1Mkzz8CGgionG6YKlxSmjU0X r3qZDbmJct/VTJkDy2w4YGZvq14IFGFRvxD4MRvseRED4LBclQc9CrfH2ri9iEs5SPPu66 BU6u6K+TsQ0MT/AUoMjcuTFmZk7d3h5yphHjp7GD7AWD9Zej3sevnWdeWVPbBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f92vK1ybBzwHh for ; Tue, 10 Feb 2026 00:46:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31d66 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 10 Feb 2026 00:46:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: ca83c369755b - main - ath10k: usb: make compile using [a future] linuxkpi_usb 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca83c369755bcc205090093e6e0d045fae24714e Auto-Submitted: auto-generated Date: Tue, 10 Feb 2026 00:46:53 +0000 Message-Id: <698a7ffd.31d66.25a37939@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ca83c369755bcc205090093e6e0d045fae24714e commit ca83c369755bcc205090093e6e0d045fae24714e Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:13:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-09 21:49:46 +0000 ath10k: usb: make compile using [a future] linuxkpi_usb Make ath10k usb code compile just to gather more USB bits. Currently (and likely forever) it is useless as the ath10k USB implementation never got finished. At the moment it lacks an entry for the USB bus attachment in core.c ath10k_hw_params_list[]. ath10k_usb0 on uhub1 ath10k_usb0: on usbus0 ath10k_usb0: Warning: ath10k USB support is incomplete, don't expect anything to work! ath10k_usb0: Unsupported hardware version: 0x5020001 ath10k_usb0: could not get hw params (-22) ath10k_usb0: could not probe fw (-22) There is another possible hardware [1] which was also never merged upstream. [1] https://lists.infradead.org/pipermail/ath10k/2024-August/016037.html "[PATCH] wifi: ath10k: add USB device ID for Atheros QCA9377-7" MFC after: 3 days --- sys/contrib/dev/athk/ath10k/usb.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/sys/contrib/dev/athk/ath10k/usb.c b/sys/contrib/dev/athk/ath10k/usb.c index 9dfa179ba610..a825d442fe33 100644 --- a/sys/contrib/dev/athk/ath10k/usb.c +++ b/sys/contrib/dev/athk/ath10k/usb.c @@ -842,14 +842,22 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize)); +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize)); +#endif } else if (ATH10K_USB_IS_INT_EP(endpoint->bmAttributes)) { ath10k_dbg(ar, ATH10K_DBG_USB, "usb %s int ep 0x%2.2x maxpktsz %d interval %d\n", ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize), +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize), +#endif endpoint->bInterval); } else if (ATH10K_USB_IS_ISOC_EP(endpoint->bmAttributes)) { /* TODO for ISO */ @@ -858,7 +866,11 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, ATH10K_USB_IS_DIR_IN (endpoint->bEndpointAddress) ? "rx" : "tx", endpoint->bEndpointAddress, +#if defined(__linux__) le16_to_cpu(endpoint->wMaxPacketSize), +#elif defined(__FreeBSD__) + UGETW(endpoint->wMaxPacketSize), +#endif endpoint->bInterval); } @@ -881,8 +893,13 @@ static int ath10k_usb_setup_pipe_resources(struct ath10k *ar, pipe->ar_usb = ar_usb; pipe->logical_pipe_num = pipe_num; +#if defined(__linux__) pipe->ep_address = endpoint->bEndpointAddress; pipe->max_packet_size = le16_to_cpu(endpoint->wMaxPacketSize); +#elif defined(__FreeBSD__) + pipe->ep_address = endpoint->bEndpointAddress & UE_ADDR; + pipe->max_packet_size = UGETW(endpoint->wMaxPacketSize); +#endif if (ATH10K_USB_IS_BULK_EP(endpoint->bmAttributes)) { if (ATH10K_USB_IS_DIR_IN(pipe->ep_address)) { @@ -1017,8 +1034,13 @@ static int ath10k_usb_probe(struct usb_interface *interface, netif_napi_add(ar->napi_dev, &ar->napi, ath10k_usb_napi_poll); usb_get_dev(dev); +#if defined(__linux__) vendor_id = le16_to_cpu(dev->descriptor.idVendor); product_id = le16_to_cpu(dev->descriptor.idProduct); +#elif defined(__FreeBSD__) + vendor_id = UGETW(dev->descriptor.idVendor); + product_id = UGETW(dev->descriptor.idProduct); +#endif ath10k_dbg(ar, ATH10K_DBG_BOOT, "usb new func vendor 0x%04x product 0x%04x\n",