The branch stable/14 has been updated by bz:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c4496f82680c5edb0820598817ea22e322250317
commit c4496f82680c5edb0820598817ea22e322250317
Author: Bjoern A. Zeeb <b...@freebsd.org>
AuthorDate: 2025-06-15 10:46:22 +0000
Commit: Bjoern A. Zeeb <b...@freebsd.org>
CommitDate: 2025-07-13 19:26:25 +0000
iwlwifi: compile in ACPI support
Now that LinuxKPI supports the lower case Linux ACPI spellings under
LINUXKPI_WANT_LINUX_ACPI we only need to provide the debug macro to
allow us to compile in ACPI support.
This ties into regulatory and will be used, e.g., for 11ax, 11be,
and Per Platform Antenna Gain (PPAG) settings.
Sponsored by: The FreeBSD Foundation
(cherry picked from commit 228b43c258d24c293b135ae94c120e7ccf0a7aea)
---
sys/contrib/dev/iwlwifi/iwl-debug.h | 4 +++-
sys/modules/iwlwifi/Makefile | 8 +++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h
b/sys/contrib/dev/iwlwifi/iwl-debug.h
index 43288a5a8d74..7b3b402766b4 100644
--- a/sys/contrib/dev/iwlwifi/iwl-debug.h
+++ b/sys/contrib/dev/iwlwifi/iwl-debug.h
@@ -47,7 +47,7 @@ enum iwl_dl {
IWL_DL_DROP = 0x00000010,
IWL_DL_EEPROM = 0x00000020,
IWL_DL_FW = 0x00000040,
- /* = 0x00000080, */
+ IWL_DL_DEV_RADIO = 0x00000080,
IWL_DL_HC = 0x00000100,
IWL_DL_HT = 0x00000200,
IWL_DL_INFO = 0x00000400,
@@ -195,6 +195,8 @@ void __iwl_dbg(struct device *, u32, bool, const char *,
const char *fmt, ...);
IWL_DPRINTF(_subsys, IWL_DL_WEP, _fmt, ##__VA_ARGS__)
#define IWL_DEBUG_WOWLAN(_subsys, _fmt, ...)
\
IWL_DPRINTF(_subsys, IWL_DL_WOWLAN, _fmt, ##__VA_ARGS__)
+#define IWL_DEBUG_DEV_RADIO(_dev, _fmt, ...)
\
+ IWL_DPRINTF_DEV((_dev), IWL_DL_DEV_RADIO, _fmt, ##__VA_ARGS__)
#define IWL_DEBUG_PCI_RW(_subsys, _fmt, ...)
\
IWL_DPRINTF(_subsys, IWL_DL_PCI_RW, _fmt, ##__VA_ARGS__)
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
index fd11e670b540..7f4ef7d8d32d 100644
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -5,6 +5,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi
WITH_CONFIG_PM= 0
WITH_DEBUGFS= 1
+WITH_CONFIG_ACPI= 1
KMOD= if_iwlwifi
@@ -41,6 +42,12 @@ CFLAGS+= -DCONFIG_PM
CFLAGS+= -DCONFIG_PM_SLEEP
.endif
+.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
+SRCS+= fw/acpi.c
+CFLAGS+= -DCONFIG_ACPI
+CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI
+.endif
+
SRCS+= iwl-devtrace.c
# Other
@@ -57,7 +64,6 @@ CFLAGS+= -DCONFIG_IWLMVM=1
# Helpful after fresh imports.
#CFLAGS+= -ferror-limit=0
-#CFLAGS+= -DCONFIG_ACPI=1
#CFLAGS+= -DCONFIG_INET=1 # Need LKPI TSO implementation.
#CFLAGS+= -DCONFIG_IPV6=1
CFLAGS+= -DCONFIG_IWLWIFI_DEBUG=1
