From nobody Wed Apr 22 21:09:22 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 4g1Bg70KlXz6bLJQ for ; Wed, 22 Apr 2026 21:09:23 +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" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g1Bg63czXz3mDc for ; Wed, 22 Apr 2026 21:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776892162; 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=/NbbzpbeEvovlJk5aPVPyrGVyg81/gdJ8Tt9pZqIgf8=; b=vbRY0qeGucInUBd4vZ1SB1yFi6pQFaqBxb7xFv9RHoDjUw0u9GPakOF7YHh4lYZx8BMVed Od8v9cev/nze+TEjvKxvDBrltkpQjjoLHVdxIJzyNsmYNKZ6CsqQ3sbrOR6GFfi317dd34 4/ne4anzKn/RySBORo4zVKSPh/2jeVb77cLKPkq3QVnpmULI7DZLSBJFeOXu3IMZ5SgHVn ke5daM96WidpRqpcU3l+TYQh2mr2C6GHWPys0Krk4KcwWIT4iLSo31iG9EAYJ7R4UdnJxx cS5cIEh4fJBwec1Yr7HG0Rjua33hJF/aWsJrVoBORr3Mw2LlQN4Tr7d1OO+KoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776892162; a=rsa-sha256; cv=none; b=XYm7RgH7TeaOcY2K0JZGkJynLPtenMOen42RL85Umot/qNWo7GeaOFnOWQTlRhIftN4eNF /GOu5h7JrKW0h+lXzG6cILNL0hXT/fVjdGEtDJx42mju8fZtKxFRYXtN3gYgx1/l78CUDt 7JprTqPRB2it8KK2mSEax8+ADYLDr+NjlbGHFmsD3l+LmpD0p0d9BnvQpEfhxMOL//gJ6w S60iIfIe8Ypp7uwYvmoXbQJAF0c9jIkLJeOYrEImrR+H9fZQx7jldPSkErCZQHmlrCzP/X ayOfr9cFQ4eRqOlEcb5c9pgYvUFy6cWX06dQt9JAiVwvoQ63V9R3Z73biEPjcw== 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=1776892162; 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=/NbbzpbeEvovlJk5aPVPyrGVyg81/gdJ8Tt9pZqIgf8=; b=PHbZmIG2LnY2mOlZhvDskIyBp+QTjiU9SR3iR/1wBwWjbBp03ffFtgyDyXI9sdwBnZwTrd X9ZLJQQniLUJuQuW/1A2dayqeIvj2Q3FUPmVu+B1vI7NfFXeOwm2EXWLx3vy9Nyj+/NtGM sOzidZDGRbzQ/4BcSXQTMZCD6BnJSW9ySuOVUoxs9kv6V2tcfFpfvTAkJq72s/Rs6a6kqO HgfYA4wfH0QhTw9X7CHdGPaJeCMprxo9MF3cm3Pkc2iBs7JM5Zhz/MaAr8S1jnKD3O7Hzx idgRAvwWdvk95SsRcxkjCD5nZ+FJHBP86hw4v+WQDg74tsEmBg69RMAtEKGpMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g1Bg63BV5znjq for ; Wed, 22 Apr 2026 21:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 22 Apr 2026 21:09:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: dd8d3ae8e531 - stable/15 - ath12k: update module Makefiles for v7.0 driver version 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/stable/15 X-Git-Reftype: branch X-Git-Commit: dd8d3ae8e531c5843f1638aa34b290267dca88e6 Auto-Submitted: auto-generated Date: Wed, 22 Apr 2026 21:09:22 +0000 Message-Id: <69e93902.30a8b.5696cc54@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dd8d3ae8e531c5843f1638aa34b290267dca88e6 commit dd8d3ae8e531c5843f1638aa34b290267dca88e6 Author: Bjoern A. Zeeb AuthorDate: 2026-04-19 15:48:58 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-22 20:57:17 +0000 ath12k: update module Makefiles for v7.0 driver version Update LINUXKPI_VERSION to reflect that the driver is based on Linux v7.0. Handle the file changes and the extra wifi7/ subdirectory. Sponsored by: The FreeBSD Foundation (cherry picked from commit 5cfadb6633128dccc32b1e4f84386ad705adc721) --- sys/modules/ath12k/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/modules/ath12k/Makefile b/sys/modules/ath12k/Makefile index 018504812995..ecca0bc3b409 100644 --- a/sys/modules/ath12k/Makefile +++ b/sys/modules/ath12k/Makefile @@ -13,13 +13,21 @@ ATH12K_TRACING= 0 KMOD= if_ath12k -SRCS+= core.c hal.c hal_tx.c hal_rx.c +SRCS+= core.c hal.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c dp_mon.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c fw.c p2p.c +SRCS+= ce.c peer.c dbring.c fw.c p2p.c +SRCS+= dp_htt.c dp_peer.c + +SRCS+= wifi7/ce.c wifi7/core.c +SRCS+= wifi7/dp.c wifi7/dp_mon.c wifi7/dp_rx.c wifi7/dp_tx.c +SRCS+= wifif/hal.c wifi7/hal_tx.c wifi7/hal_rx.c +SRCS+= wifi7/hal_qcc2072.c wifi7/hal_qcn9274.c wifi7/hal_wcn7850.c +SRCS+= wifi7/hw.c wifi7/wmi.c .if defined(ATH12K_PCI) && ${ATH12K_PCI} > 0 && ${KERN_OPTS:MDEV_PCI} SRCS+= mhi.c pci.c +SRCS+= wifi7/mhi.c wifi7/pci.c .else .error ath12k requires PCI support compiled in at this point .endif @@ -27,6 +35,7 @@ SRCS+= mhi.c pci.c .if defined(ATH12K_AHB) && ${ATH12K_AHB} > 0 CFLAGS+= -DCONFIG_ATH12K_AHB SRCS+= ahb.c +SRCS+= wifi7/ahb.c .endif .if defined(ATH12K_DEBUGFS) && ${ATH12K_DEBUGFS} > 0 CFLAGS+= -DCONFIG_ATH12K_DEBUGFS @@ -62,6 +71,6 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH12K_DEBUG CFLAGS+= -DKBUILD_MODNAME='"ath12k"' -CFLAGS+= -DLINUXKPI_VERSION=61900 +CFLAGS+= -DLINUXKPI_VERSION=70000 .include