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 @@ -1,202 +1,204 @@ /*- * Copyright (c) 2020-2021 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * $FreeBSD$ */ #ifndef _IWL_DEBUG_H #define _IWL_DEBUG_H #if defined(__FreeBSD__) #ifdef CONFIG_IWLWIFI_DEBUG #include #endif #endif #include enum iwl_dl { IWL_DL_ASSOC = 0x00000001, IWL_DL_CALIB = 0x00000002, IWL_DL_COEX = 0x00000004, IWL_DL_WOWLAN = 0x00000008, 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, IWL_DL_ISR = 0x00000800, IWL_DL_LAR = 0x00001000, IWL_DL_MAC80211 = 0x00002000, IWL_DL_POWER = 0x00004000, IWL_DL_QUOTA = 0x00008000, IWL_DL_RADIO = 0x00010000, IWL_DL_RATE = 0x00020000, IWL_DL_RF_KILL = 0x00040000, IWL_DL_RX = 0x00080000, IWL_DL_SCAN = 0x00100000, IWL_DL_STATS = 0x00200000, /* = 0x00400000, */ IWL_DL_TDLS = 0x00800000, IWL_DL_TE = 0x01000000, IWL_DL_TEMP = 0x02000000, IWL_DL_TPT = 0x04000000, IWL_DL_TX = 0x08000000, IWL_DL_TX_QUEUES = 0x10000000, IWL_DL_TX_REPLY = 0x20000000, IWL_DL_WEP = 0x40000000, IWL_DL_PCI_RW = 0x80000000, IWL_DL_ANY = 0x7fffffff, }; enum iwl_err_mode { IWL_ERR_MODE_RATELIMIT, IWL_ERR_MODE_REGULAR, IWL_ERR_MODE_RFKILL, /* XXX we do not pass that from anywhere? */ }; void __iwl_crit(struct device *, const char *, ...); void __iwl_info(struct device *, const char *, ...); void __iwl_warn(struct device *, const char *, ...); void __iwl_err(struct device *, enum iwl_err_mode, const char *, ...); #define IWL_CRIT(_subsys, _fmt, ...) \ __iwl_crit((_subsys)->dev, _fmt, ##__VA_ARGS__) #define IWL_INFO(_subsys, _fmt, ...) \ __iwl_info((_subsys)->dev, _fmt, ##__VA_ARGS__) #define IWL_WARN(_subsys, _fmt, ...) \ __iwl_warn((_subsys)->dev, _fmt, ##__VA_ARGS__) /* XXX Not sure what the two bools are good for if never passed. */ #define __IWL_ERR_DEV(_dev, _mode, _fmt, ...) \ __iwl_err((_dev), IWL_ERR_MODE_REGULAR, _fmt, ##__VA_ARGS__) #define IWL_ERR_DEV(_dev, _fmt, ...) \ __IWL_ERR_DEV(_dev, IWL_ERR_MODE_REGULAR, _fmt, ##__VA_ARGS__) #define IWL_ERR(_subsys, _fmt, ...) \ IWL_ERR_DEV((_subsys)->dev, _fmt, ##__VA_ARGS__) #define IWL_ERR_LIMIT(_subsys, _fmt, ...) \ __IWL_ERR_DEV((_subsys)->dev, IWL_ERR_MODE_RATELIMIT, \ _fmt, ##__VA_ARGS__) #define iwl_print_hex_error(_subsys, _pkt, _n) /* XXX-BZ TODO */ #ifdef CONFIG_IWLWIFI_DEBUG bool iwl_have_debug_level(enum iwl_dl); #if defined(__linux__) void iwl_print_hex_dump(void *, enum iwl_dl, const char *, uint8_t *, size_t); #elif defined(__FreeBSD__) void iwl_print_hex_dump(void *, enum iwl_dl, const char *, const uint8_t *, size_t); #endif void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); #define IWL_DPRINTF_DEV_PREFIX(_dev, _e, _prefix, _fmt, ...) \ __iwl_dbg(_dev, _e, false, __func__, #_prefix " " _fmt, ##__VA_ARGS__) #define IWL_DPRINTF_DEV(_dev, _e, _fmt, ...) \ IWL_DPRINTF_DEV_PREFIX(_dev, _e, _e, _fmt, ##__VA_ARGS__) #define IWL_DPRINTF(_subsys, _e, _fmt, ...) \ IWL_DPRINTF_DEV((_subsys)->dev, _e, _fmt, ##__VA_ARGS__) #define IWL_DPRINTF_PREFIX(_subsys, _e, _prefix, _fmt, ...) \ IWL_DPRINTF_DEV_PREFIX((_subsys)->dev, _e, _prefix, _fmt, ##__VA_ARGS__) #else /* !CONFIG_IWLWIFI_DEBUG */ #define IWL_DPRINTF_DEV(_dev, _e, _fmt, ...) #define IWL_DPRINTF(_subsys, _e, _fmt, ...) #define IWL_DPRINTF_PREFIX(_subsys, _e, _prefix, _fmt, ...) #endif /* CONFIG_IWLWIFI_DEBUG */ #define IWL_DEBUG_ASSOC(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_ASSOC, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_CALIB(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_CALIB, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_COEX(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_COEX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_DEV(_dev, _level, _fmt, ...) \ IWL_DPRINTF_DEV((_dev), (_level), _fmt, ##__VA_ARGS__) #define IWL_DEBUG_DROP(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_DROP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_EEPROM(_dev, _fmt, ...) \ IWL_DPRINTF_DEV((_dev), IWL_DL_EEPROM, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_FW(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_FW, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_FW_INFO(_subsys, _fmt, ...) \ IWL_DPRINTF_PREFIX(_subsys, IWL_DL_FW | IWL_DL_INFO, IWL_DL_FW_INFO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_HC(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_HC, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_HT(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_HT, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_INFO(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_INFO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_ISR(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_ISR, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_LAR(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_LAR, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_MAC80211(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_MAC80211, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_POWER(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_POWER, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_QUOTA(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_QUOTA, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RADIO(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_RADIO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RATE(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_RATE, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RF_KILL(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_RF_KILL, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_RX(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_RX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_SCAN(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_SCAN, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_STATS(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_STATS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_STATS_LIMIT(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_STATS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TDLS(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TDLS, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TE(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TE, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TEMP(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TEMP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TPT(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TPT, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TX, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX_QUEUES(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TX_QUEUES, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_TX_REPLY(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_TX_REPLY, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_WEP(_subsys, _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__) #endif /* _IWL_DEBUG_H */ 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 @@ -1,72 +1,78 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} WITH_CONFIG_PM= 0 WITH_DEBUGFS= 1 +WITH_CONFIG_ACPI= 1 KMOD= if_iwlwifi SRCS= iwl-drv.c SRCS+= iwl-dbg-tlv.c iwl-debug.c SRCS+= iwl-io.c iwl-nvm-parse.c iwl-nvm-utils.c iwl-phy-db.c iwl-trans.c SRCS+= cfg/7000.c cfg/8000.c cfg/9000.c cfg/22000.c SRCS+= cfg/ax210.c cfg/bz.c cfg/sc.c SRCS+= fw/dbg.c fw/dump.c fw/img.c fw/notif-wait.c SRCS+= fw/paging.c fw/pnvm.c fw/regulatory.c fw/rs.c fw/smem.c fw/init.c #SRCS+= fw/uefi.c SRCS+= mvm/rs.c mvm/binding.c mvm/coex.c mvm/ftm-initiator.c SRCS+= mvm/ftm-responder.c mvm/fw.c mvm/mac-ctxt.c SRCS+= mvm/mac80211.c mvm/nvm.c mvm/offloading.c mvm/ops.c SRCS+= mvm/phy-ctxt.c mvm/power.c mvm/quota.c mvm/rs-fw.c mvm/rfi.c SRCS+= mvm/rx.c mvm/rxmq.c mvm/scan.c mvm/sf.c mvm/sta.c mvm/tdls.c SRCS+= mvm/time-event.c mvm/tt.c mvm/tx.c mvm/utils.c SRCS+= mvm/link.c SRCS+= mvm/mld-key.c mvm/mld-mac.c mvm/mld-mac80211.c mvm/mld-sta.c SRCS+= mvm/ptp.c mvm/time-sync.c #SRCS+= mvm/led.c SRCS+= pcie/ctxt-info-gen3.c pcie/ctxt-info.c SRCS+= pcie/drv.c pcie/rx.c pcie/trans-gen2.c pcie/trans.c SRCS+= pcie/tx-gen2.c pcie/tx.c .if defined(WITH_DEBUGFS) && ${WITH_DEBUGFS} > 0 SRCS+= fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS CFLAGS+= -DCONFIG_MAC80211_DEBUGFS .endif .if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 SRCS+= mvm/d3.c 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 SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -DKBUILD_MODNAME='"iwlwifi"' CFLAGS+= -DLINUXKPI_VERSION=61100 CFLAGS+= -I${DEVIWLWIFIDIR} CFLAGS+= ${LINUXKPI_INCLUDES} CFLAGS+= -DCONFIG_IWLDVM=0 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 #CFLAGS+= -DCONFIG_IWLWIFI_LEDS=1 #CFLAGS+= -DCONFIG_IWLWIFI_OPMODE_MODULAR=1 CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1 #CFLAGS+= -DCONFIG_LOCKDEP=1 #CFLAGS+= -DCONFIG_NL80211_TESTMODE=1 #CFLAGS+= -DCONFIG_THERMAL=1 #CFLAGS+= -DCONFIG_EFI=1 .include