From nobody Fri Feb 27 02:29:57 2026 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 4fMXNQ06Nwz6T7hK for ; Fri, 27 Feb 2026 02:29:58 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMXNP4bC1z41SG for ; Fri, 27 Feb 2026 02:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772159397; 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=BlVWVEg5LhndkG4mE/6oUGzegFOc4NEUuea5phMkMs0=; b=l7nKPhhIiD/CwIzaRi8mPUMErYJJKxpmSIIkWnsU8ExJWOLopyBE16b+3iiph51cDqC7uH rDRtX8eGb5LW8YO0OV6VSEZtA3jmhecp8Z7JPhCLqlC5hXfrjmyNKJooa7eYq+jTbn93Yj /kH6+q5Mmko5L44dgZ/eu7zFSSmnXEmTk3vez+ouGkCO/Ah0YJC62UAlhMZz3hwNlZkwB3 mvJfyfImwDotaeZ/TqeKwH+Yn71dyFvwP3TaoaOLbpfb2ngKx5pvX77JzOwcjG9bkK8AB8 IY6RaoJ/55kZAkzuAOkM2vz5uAik59WVBzslj1RaEDN50w0bpzd4qC9Iz3vYRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772159397; a=rsa-sha256; cv=none; b=EoJa7osyjMILvszvl0QT9xB+058Kez+0FXOgyrWwjEJyPSB2UVQil0gbjfbnVP4XMPEotq NtCRtt7GuQre8ygCOrGWOk41Jnvt3itpgSegpD3f2ZXpCOvyCVeF/rIHLd/oq4e0s5EJ0+ aUc2xFlkw0UHpczSrwZ+E1+9pbQTzjMHoSGxB6mzNtdxWh0pDKPrHi0ZOnozaQ73Lbyakx MU16mS0ocCsvh4hvuByLEIlND13wQhrpjOyC/mwDiUKuh984bvpS93hsaDrZA9jXhCkw5V zIwZRp2wONyMHwF5brrZDemjGQfrVsAQP8s9mkGbYCYaNUEIqCSLDiHT9keqsQ== 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=1772159397; 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=BlVWVEg5LhndkG4mE/6oUGzegFOc4NEUuea5phMkMs0=; b=m6bgX2D+wd1KcXdK0DzqWBHyaAhcX+bbOG49IsmR/qVksC5Kk1NS+RDxJbCOIqmDuKQrKO tY5Rs+hOPXFhTsVvDkLaK/DgCl97lSqCsBY6gGCNWbiVUZ3WmSOODCTZlN96V8NFhuiRp+ cYz9DuC5HxWF13a+l23MhuoJ15XTKbSfncKwyAOcrWnArlDNmwXDu9G8wMNYaKwBNvNV3R 2r4oyKZH/WClTFPEw/MC8xcqst6ZAiGVZnOQyrw0j7uTwqOZHpGPBatPnBBjKTDJv7VnwP LoK1tYxFtY9b8SPIwtToPjgQ3V1RHVEroPAHMJ2DVaK0pOzenf7yrYoZJqw6iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMXNP426Czy74 for ; Fri, 27 Feb 2026 02:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21293 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 02:29:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5cbfbd5cd0d5 - stable/15 - ath10k: usb: make compile using [a future] linuxkpi_usb 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 5cbfbd5cd0d53d2a396fb6cde8d68cdf62d9f0c1 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 02:29:57 +0000 Message-Id: <69a101a5.21293.5d8151d1@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5cbfbd5cd0d53d2a396fb6cde8d68cdf62d9f0c1 commit 5cbfbd5cd0d53d2a396fb6cde8d68cdf62d9f0c1 Author: Bjoern A. Zeeb AuthorDate: 2026-02-07 22:13:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-02-26 23:05:52 +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" (cherry picked from commit ca83c369755bcc205090093e6e0d045fae24714e) --- 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",