From nobody Sat Apr 18 11:01:17 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 4fyTMR0gv8z6ZVQd for ; Sat, 18 Apr 2026 11:01: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 4fyTMQ6LwCz47vY for ; Sat, 18 Apr 2026 11:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776510083; 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=8UGgE7GFdKiq/555n8EUCqNh17RsLLjSHNrc+4ZUSg4=; b=IFZMGYAsnKbnruPmm1ZxClNN0fF/9vc6hViSFCx1XUh49mkqCwvfjjhNJxlapSOo0/LJB8 GaONefkH5vhTuxa39G7+ev15QclTvFNc7dBs3WbI3ruSSfiKx+Jps8F80G+wEQLzRUmi1T 1fNGise7+7jJmY00Flb/8bv7vsBRXdXAgxILnS32WdIuUcJy5BHyWqpcGdiCV9+FX5CPd5 f6nYzepTbgUSd2PBH/yGG2nLA9j/wjMFCWrJuLzwLOGpFs05TIBo7SehVna+k0TdZt/fLs LsJIaAjdmdRwtwN4OgTo9zlC2C47NesPmyPfklKC56PUSh+sWtgveXDjTwN9oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776510083; a=rsa-sha256; cv=none; b=BChiFzwQ41Z+sZqNA7HOtWZBPZIHc3KxHGo6WHZPX5GigIu5pevIjprA+mW56w+zidFT/I kqH46sHfqVVnv1BMYkH2qbhmEqLLJbe/MoQxqln1AmYzZ3F5nRwSUTKEspOpxy3zzNVr4t /VLIgM9wjJnb0O0Y6AtgUlfb8Ir2GmGB1W0v+r49DiKFln8Y62dDq7kkZksBin9d/N5ag/ Hc2ZzPIORim6ee6umlhgQbkjIYpXvpV2txnj0j+mITg+dsWq2s1VOeTBT8w9zVLTHK5/HL b6+LJ3IcJD6aw6DTVGLgzwweadnnQy9HAX3UslfMmi9EZ0pQzhHjd/V6ldvybQ== 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=1776510082; 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=8UGgE7GFdKiq/555n8EUCqNh17RsLLjSHNrc+4ZUSg4=; b=QybgYaTMaNNxxm5pnnKoFSAoYAGK2ECls4rtPpJD3KQVxlQzdENMpJOMQAQy2GEhO7eMNE 0RncLVTyfu5HpJvMEEilEeE19goMWJ3jj4TACQdUqhN3yz5GbzSUFFpijlM04oomeeK1Ze xfsZ8x08u0JUk49CNjiJPd8QXd9lV66+OoSBmMf5rlKRZ2mvDSqfbFAS0ePvY2wDDo4ON0 giOq/h6Y5aEscMonY8lD9ouWf1sGuSflny8Zjx4SIsUojlg+0kIbpMEUbBOHbImslmUagP qQWWKH1+GzoK/h7shqMSTP/w/n8hwVJLtQDBRFH8T5b4/wzqZwhUq3OzrtzZLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fyTMQ5FTyzdHH for ; Sat, 18 Apr 2026 11:01:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3424d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 18 Apr 2026 11:01:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f5f3c16d9256 - stable/15 - ath11k: restore module Makefile 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: f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 Auto-Submitted: auto-generated Date: Sat, 18 Apr 2026 11:01:17 +0000 Message-Id: <69e3647d.3424d.5be25e95@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 commit f5f3c16d9256fb8bb2c38e1dd91ca420f240bfd6 Author: Bjoern A. Zeeb AuthorDate: 2026-03-20 00:17:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-04-18 02:33:01 +0000 ath11k: restore module Makefile During the subtree merge and checking out the updated version of ath12k parts of the previous ath11k merge were accidentally undone. Retore the ath11k Makefile as well after 3c4eef5d838b restored the driver bits. Fixes: a96550206e4b ("ath12k: update Atheros/QCA's ath12k ..") Sponsored by: The FreeBSD Foundation (cherry picked from commit f9795615415074b23faf8e5d937c2ef31045d3d0) --- sys/modules/ath11k/Makefile | 63 +++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index 42aa9b9936cd..d17e76255802 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -2,30 +2,62 @@ DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} -WITH_DEBUGFS= 0 # Does not yet compile -WITH_CONFIG_PM= 0 +ATH11K_DEBUGFS= 0 +ATH11K_TRACE= 0 +ATH11K_THERMAL= 0 +ATH11K_SPECTRAL= 0 +ATH11K_PM= 0 +ATH11K_DEV_COREDUMP= 0 KMOD= if_ath11k SRCS+= core.c hal.c hal_tx.c hal_rx.c SRCS+= wmi.c mac.c reg.c htc.c qmi.c SRCS+= dp.c dp_tx.c dp_rx.c debug.c -SRCS+= ce.c peer.c dbring.c hw.c -SRCS+= coredump.c fw.c p2p.c +SRCS+= ce.c peer.c dbring.c hw.c pcic.c +SRCS+= fw.c p2p.c -SRCS+= mhi.c pci.c pcic.c +# PCI +SRCS+= mhi.c pci.c -.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 -CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +# AHB +#SRCS+= ahb.c + +.if defined(ATH11K_DEBUGFS) && ${ATH11K_DEBUGFS} > 0 +SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c +CFLAGS+= -DCONFIG_ATH11K_DEBUGFS +CFLAGS+= -DCONFIG_MAC80211_DEBUGFS +.endif + +.if defined(ATH11K_TRACE) && ${ATH11K_TRACE} > 0 +SRCS+= trace.c +CFLAGS+= -DCONFIG_ATH11K_TRACING +.endif + +.if defined(ATH11K_THERMAL) && ${ATH11K_THERMAL} > 0 +SRCS+= thermal.c +CFLAGS+= -DCONFIG_ATH11K_THERMAL +.endif + +.if defined(ATH11K_SPECTRAL) && ${ATH11K_SPECTRAL} > 0 +SRCS+= spectral.c +CFLAGS+= -DCONFIG_ATH11K_SPECTRAL +.endif + +.if defined(ATH11K_PM) && ${ATH11K_PM} > 0 +CFLAGS+= -DCONFIG_PM SRCS+= wow.c .endif +.if defined(ATH11K_DEV_COREDUMP) && ${ATH11K_DEV_COREDUMP} > 0 +CFLAGS+= -DCONFIG_DEV_COREDUMP +SRCS+= coredump.c +.endif + # Other SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h -CFLAGS+= -DKBUILD_MODNAME='"ath11k"' - CFLAGS+= -I${DEVATH11KDIR} CFLAGS+= -I${DEVATH11KDIR}/.. CFLAGS+= ${LINUXKPI_INCLUDES} @@ -34,16 +66,7 @@ CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_ATH11K_DEBUG -.if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 -SRCS+= debugfs.c debugfs_htt_stats.c debugfs_sta.c -CFLAGS+= -DCONFIG_ATH11K_DEBUGFS=${WITH_DEBUGFS} -CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} -.endif - -#CFLAGS+= -DCONFIG_ATH11K_SPECTRAL -#CFLAGS+= -DCONFIG_ATH11K_TRACING -#CFLAGS+= -DCONFIG_NL80211_TESTMODE -#CFLAGS+= -DCONFIG_PM -#CFLAGS+= -DCONFIG_THERMAL +CFLAGS+= -DKBUILD_MODNAME='"ath11k"' +CFLAGS+= -DLINUXKPI_VERSION=61900 .include