From nobody Tue Mar 31 20:28:10 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 4flfnl2mjCz6Y05y for ; Tue, 31 Mar 2026 20:28:11 +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 4flfnk6xp6z3Qsq for ; Tue, 31 Mar 2026 20:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774988891; 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=kLWal8+aWz/Xhh/00i6hTBk9kpRw+Q89/IBz4rvGM1k=; b=BrfK0ESdoVhrQzxty1nJ2L81GaW9G2mfptDb5WfnVlwWmqIebOt3ERLtKMnmvn0DX3KEQ5 SnTKVDTL6Jk39g7OIHLu+lpI4PN3aut1psnKg+qA0lM1pD9DFxtLU73PEuCz35xMuhd43c S36Kfq4R8zoavWpl71xOZRAPQGAE1qYGJ+bgZhHl37gjEGjk15tUifEiMCW/8toyjmCUVz eXrmnqlQt0k0gWDgaicIanhbW7nm2J4IH/XOW49TxUTtlpuxcezdW9e5ACl8ay6bTdWuix 52PgiHl0m3VCvVghSynTIRPj6Wk6+fYscgV+8lxYn3jZAcD1S+7IDZCnjTaVJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774988891; a=rsa-sha256; cv=none; b=uG0Su+9ccnBplvulWMxuBEbBrWPsTrIf7yV1u89cabvmH+/gZCvhModJ8yUWTfQTW0by+1 7EjZG5F/jU3jBYX+22KFPcqtMDyUWD9yk9Pt0BovLLNFu6x7lovT+fFtkO52xY7WpKcAco vlJVjeND6IVaEUBJwf2PL13J1wBx9zxxVwleDGqqhJMuyu36pm2vStje/FeETFqNqUWhXH IHGes/d5lp90+gmkJGAlFn60Wd1/JQbbZnA1ilFoSTKqzxvoPYtjAi6HDZqwmDO/Be1/KL cUzOAELXGDTB9mOUxzUbPfBCiCPAniY1NRkL3+LQ+Bcyq+CALxJ5XET3RVilmQ== 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=1774988891; 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=kLWal8+aWz/Xhh/00i6hTBk9kpRw+Q89/IBz4rvGM1k=; b=tl+MePHObf1N2hNQQYRJon05+jesOJAWxlT1I5atdQ7Fq11/aD3xNbFmVf8D3y5reOpYMG KwfhDLxsVnh6Q6qAIYIVandyqly3+c2JnPADlaq1tK5Pj1zvB0eABcOq/l/rpfBx06EBGQ WsLGTSuG/ml8qx8mQhb8gJj9ldr2kyKbYp2nQV/N8Rw5raP7q7wdBgykZYAa9G2Os6rtUe vxg9yGB/XgngmA7HwQ47/6B4QPBDc4MGoC8tN6q9wyPibnBf+RDLngzjlB3iUM+pKbYwD1 fcpmjPrvpls2ShBwSVb6fQP09UeHh9Bgf5hJSGOoVDM4ZIFMbr3FcmUdgi1T+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flfnk6Y4Gzl16 for ; Tue, 31 Mar 2026 20:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26d0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 20:28:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 5a35d505bf0c - stable/15 - ath11k: update module Makefile after vendor import of v6.19[-rc6] 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: 5a35d505bf0c4d16ef94477bfcbc85b9a87b2c0c Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 20:28:10 +0000 Message-Id: <69cc2e5a.26d0f.a66fc94@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5a35d505bf0c4d16ef94477bfcbc85b9a87b2c0c commit 5a35d505bf0c4d16ef94477bfcbc85b9a87b2c0c Author: Bjoern A. Zeeb AuthorDate: 2026-03-12 20:24:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-31 16:19:44 +0000 ath11k: update module Makefile after vendor import of v6.19[-rc6] Sponsored by: The FreeBSD Foundation (cherry picked from commit 09cacabd8ca0cc89c8d46b2f4c1dcdd6bb1e1cab) --- 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