From nobody Fri Mar 20 00:20:43 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 4fcNWh5fS4z6WC5v for ; Fri, 20 Mar 2026 00:20:48 +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 4fcNWh52XNz3jB8 for ; Fri, 20 Mar 2026 00:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773966048; 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=hLzY2Z20PCmUNZlgIiba8d9NQrAbDOAJ1ZAP7mY3x9M=; b=R5JgVwe1I751fiHiviuMQKRXaCLVtVZspqyPKJ63DQmQsjq2P06zKShbCu2SQnhuLvdrdJ oo21Tfi5dJCsZSNRkcwPGLQBYNGCfYkDUkp0ei2gSvjs5xCRMVYfB3GE6HoXbeKiVYVYBO Mx+IPnxbvJk+SNC+lc2JjFr4a4DDrjK1isxV2CtfmH3QA2YzcLBDODxBCYmemYNWtAwf21 nlwbNP1BGU2exta5EAIG7ORyXAX4OiKnBWOpsTMPyMZusk/MeLQEl4P+GDD4mgbq5IPuV7 naPU2iXjeNh2d+Vv/ZpF8LSiW9dqx5ht08exSiicpO4Hic7CIUL6X+zhZWGAIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773966048; a=rsa-sha256; cv=none; b=qHFPw6ItHQb2a3V5VsgQo7S9H/pVL8FuWR84RoB6n4/ZH+F1GrKLXXtnt3465LAfI0qV9e gStFEnTqR+Xw2kB7CilSBNgLVE66PIK3VddhzsZuR8qcBwBRXiv21d4+sFCyHQobsTlsCi YhHw/hOGe99Gax2bYzjHYQwSOtSB9FH5gXmpJpEQI+GIa2v7eYwE1Rhn7OSu6Zu3yNbx5A AZhcPeOVQ+8kqmZ6RiLyUWP9dtmZUW/6agk70Yw2rKEtAAvRTGQ4YJMtElzmhfrZnq0KI2 /jCryfzjsJzZ7hekICpz4tA6CCcHqtcP47nCTNrOsncVEX/HGBftTeIET/FC/w== 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=1773966048; 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=hLzY2Z20PCmUNZlgIiba8d9NQrAbDOAJ1ZAP7mY3x9M=; b=WMjlQRPClizvZSnIN3BHf+V07zr1aWL0rqW8h2e/c4leAn0oURMdTvYZh0zEAXVMoTtVNB lmis+8WQvma/uMyXdCsJAkr1tC72mrg1beI+Y6k+KIQYi550MPso1HSomnss0FN/2ii0GZ I2D/5pCu3+pjDECZhu6yR9rSp75vMZksAMIDRyUOmBhTy8y1kcY1Fd2gg39A2p6VNjeQSk DTEPZ3p+jfxZGNoDWTbewzyU15w9T+Zs6nHJQadZOTE11qKIX5GBEj7HPXqXwWn5Vah7BL +daYPl1qrvTfrLwSZy02d1RATqaioejd7G0rqwdu9dp8OBXfnVLniTO8eFA64w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcNWh4Jcxz1HHZ for ; Fri, 20 Mar 2026 00:20:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38ceb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Mar 2026 00:20:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f97956154150 - main - ath11k: restore module Makefile 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: f9795615415074b23faf8e5d937c2ef31045d3d0 Auto-Submitted: auto-generated Date: Fri, 20 Mar 2026 00:20:43 +0000 Message-Id: <69bc92db.38ceb.d676218@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f9795615415074b23faf8e5d937c2ef31045d3d0 commit f9795615415074b23faf8e5d937c2ef31045d3d0 Author: Bjoern A. Zeeb AuthorDate: 2026-03-20 00:17:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-20 00:17:41 +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 MFC after: 3 days --- 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