From: Johannes Berg Date: Mon, 11 May 2026 17:36:30 +0000 (+0300) Subject: wifi: iwlwifi: fw: api: add/fix some UHR sniffer definitions X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=06bc6f66ecab27a8717f2b2cd0d68ad800faf0c3;p=thirdparty%2Flinux.git wifi: iwlwifi: fw: api: add/fix some UHR sniffer definitions Add some remaining definitions for the UHR sniffer API, and fix the ELR where instead of usig_a2_uhr we'll get usig_a2_uhr_elr. Signed-off-by: Johannes Berg Link: https://patch.msgid.link/20260511203428.458cd2ff6623.Ia76e0371adac431b6a5fb93004640278d8572f09@changeid Signed-off-by: Miri Korenblit --- diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h index e46e2fe46eaa..aa4e5e9d4d4e 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h @@ -1172,8 +1172,14 @@ struct iwl_he_tb_sigs { #define OFDM_UCODE_TRIG_BASE_RX_BANDWIDTH 0x00007000 #define OFDM_UCODE_TRIG_BASE_PS160 0x00008000 #define OFDM_UCODE_EHT_TRIG_CONTROL_CHANNEL 0x000f0000 +/* for UHR, since PE RF: */ +#define OFDM_UCODE_TRIG_BASE_RX_MCS_UHR_AND_LATER 0x01f00000 +#define OFDM_UCODE_RX_IS_DRU 0x02000000 +#define OFDM_UCODE_RX_IS_2XLDPC_ENABLED 0x04000000 +#define OFDM_UCODE_RX_DRU_DBW 0x60000000 __le32 tb_rx0; -#define OFDM_UCODE_TRIG_BASE_RX_MCS 0x0000000f +/* prior to PE RF, cannot have 5 bits needed for UHR: */ +#define OFDM_UCODE_TRIG_BASE_RX_MCS_PRE_UHR 0x0000000f #define OFDM_UCODE_TRIG_BASE_RX_DCM 0x00000010 #define OFDM_UCODE_TRIG_BASE_RX_GI_LTF_TYPE 0x00000060 #define OFDM_UCODE_TRIG_BASE_RX_NSTS 0x00000380 @@ -1287,6 +1293,7 @@ struct iwl_uhr_sigs { #define OFDM_RX_FRAME_UHR_TRIG_SPATIAL_REUSE_1 0x000f0000 #define OFDM_RX_FRAME_UHR_TRIG_SPATIAL_REUSE_2 0x00f00000 #define OFDM_RX_FRAME_UHR_TRIG_USIG2_DISREGARD 0x1f000000 +#define OFDM_RX_FRAME_UHR_USIG_CRC_OK 0x40000000 __le32 usig_a2_uhr; #define OFDM_RX_FRAME_UHR_SPATIAL_REUSE 0x0000000f #define OFDM_RX_FRAME_UHR_GI_LTF_TYPE 0x00000030 @@ -1308,6 +1315,7 @@ struct iwl_uhr_sigs { #define OFDM_RX_FRAME_UHR_CODING 0x00000200 #define OFDM_RX_FRAME_UHR_SPATIAL_CONFIG 0x00003c00 #define OFDM_RX_FRAME_UHR_STA_RU 0x003fc000 +#define OFDM_RX_FRAME_UHR_STA_RU_P80 0x00004000 #define OFDM_RX_FRAME_UHR_STA_RU_PS160 0x00400000 #define OFDM_RX_FRAME_UHR_UEQM 0x00800000 #define OFDM_RX_FRAME_UHR_2XLDPC 0x01000000 @@ -1333,7 +1341,12 @@ struct iwl_uhr_tb_sigs { struct iwl_uhr_elr_sigs { /* same as UHR above */ - __le32 usig_a1, usig_a2_uhr; + __le32 usig_a1; +#define OFDM_RX_VECTOR_UHR_ELR_PPDU_TYPE 0x00000003 +#define OFDM_RX_VECTOR_UHR_ELR_USIG_STA_ID 0x00001ffc +#define OFDM_RX_VECTOR_UHR_ELR_VALIDATE 0x0000e000 +#define OFDM_RX_VECTOR_UHR_ELR_CRC_OK 0x00010000 + __le32 usig_a2_uhr_elr; #define OFDM_RX_VECTOR_UHR_ELR_VER_ID 0x00000007 #define OFDM_RX_VECTOR_UHR_ELR_UPLINK_FLAG 0x00000008 #define OFDM_RX_VECTOR_UHR_ELR_MCS 0x00000010