From nobody Thu Mar 19 23:32:34 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 4fcMS32tMcz6W8Qq for ; Thu, 19 Mar 2026 23:32:35 +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 4fcMS30FJSz3bLS for ; Thu, 19 Mar 2026 23:32:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773963155; 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=sNX/KQPJVj402iM9L4CRY/sRcZqUWN+vdlYWNRpM220=; b=MrJv8rzzcF680mTe0lic0t5OEGHc2Ft5pogjpqLCSOshRsS9GpM9dnZ3swhKhRFlHk5XHq Ml44z0FW3dF5irKxv0yNmqym1/vY6p80mT9NsK6q/6l7RAXP91Avbn1qlVCOeBhLDwkPw0 9QgpgAlJwwhqebIqC3Svjiou7hehDoKYX/52PTbPVor8w8AsurGrNBWw14qxHg+JkAQ14k RL7sU/Evn+bj1yxMC/I8gu650OQLEWZHeLe3AZaXafzrO5o0wrYfGy0TjSjGtwdikUPrfg Io+wDZuIhYCUBHaYQVGXTW74k2w+Tymg1wVew4abS4nmDengUqKBgUlR1UPgUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773963155; a=rsa-sha256; cv=none; b=b3moEqFdM+abm5DKvvPuNLbSkrMXgsA5lEkXdhlFnQuf+kJ9jEphKvnbtwaJjzwAQqWFbm 5ilB2SsTMfvo3cYfnVaoS3UXP3Qc0FB4sFqDv9G0imvM2hCOeUq1PIaXh8NntpJRwXuGf0 3H/+a0TkJvqDGcydIceu7v7sEDkEY97oezXKROPnguLVXVt5IJiPxKzepYjcHO/BEtQhKO /Y/ZDdUcpcR7UO+BICK+U4CZOBh0eQupaB+7IEDwtd0d8FBKrQBIzZ4hkzSxSUgElNK/zF ATpr25pyav+Lt7yULwlKdBLmt87bWkK5j9vUeVt0xzg7spbTRoaBH03bG3g4oA== 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=1773963155; 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=sNX/KQPJVj402iM9L4CRY/sRcZqUWN+vdlYWNRpM220=; b=sqxck7RQ42DJHFiybDY0qE3EmAsWjRjVpzdCx8PLfpHALryMnP1Z4tdvl6lXnGkxhSyOM+ n9STtG158gXOAISDAs5TGaKxLkjBdMU+9qb6hUVubeoHwFPpDrWUVVgzZLOJx/bnRk0yvM o0bSaGClWWVLN2w/AfQQMfEPXBJD2jAbw4Fh9NpmDLKYXg4EKRXFgoZCX50TuIV5pN5P+u PReQ0YdgZEf25S2SR1913MbXglxg3QIyajzqZiY+NPfXKUShgj5cCKRPerdskH5/npLVdL er8Csn3qkYPy0Ha6Kr0vCazlN40fRgun+lBHb0gpANZSzWXQ49eNwvY+8TlEaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fcMS26hSHz1G2P for ; Thu, 19 Mar 2026 23:32:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33195 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 19 Mar 2026 23:32:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 09cacabd8ca0 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 09cacabd8ca0cc89c8d46b2f4c1dcdd6bb1e1cab Auto-Submitted: auto-generated Date: Thu, 19 Mar 2026 23:32:34 +0000 Message-Id: <69bc8792.33195.7aa4da9e@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=09cacabd8ca0cc89c8d46b2f4c1dcdd6bb1e1cab commit 09cacabd8ca0cc89c8d46b2f4c1dcdd6bb1e1cab Author: Bjoern A. Zeeb AuthorDate: 2026-03-12 20:24:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-03-19 23:31:23 +0000 ath11k: update module Makefile after vendor import of v6.19[-rc6] 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