wifi: iwlwifi: rx: add sniffer support for EHT mode

Start by adding a parsing option for all the new fields coming from FW
and checking that we have the right version for parsing EHT.

Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
Link: https://lore.kernel.org/r/20230127002430.ba9b364fbacf.I469af2a07b3ff51cbd8d67e572478f4c56ce22ba@changeid
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h b/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
index 9263413ee06fb1b875f8a0e1a3c035c2144addc5..8b38a00730779ad1c6f8446a72ce3d96edf36780 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h
@@ -83,7 +83,7 @@ enum iwl_data_path_subcmd_ids {
        MONITOR_NOTIF = 0xF4,
 
        /**
-        * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data
+        * @RX_NO_DATA_NOTIF: &struct iwl_rx_no_data or &struct iwl_rx_no_data_ver_3
         */
        RX_NO_DATA_NOTIF = 0xF5,
 

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
index 74a01888715b144af519c20c26764bd4e018975c..ffa9f3409a9b751fa1d989b7e5adcde08da07261 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rx.h
@@ -645,6 +645,7 @@ struct iwl_rx_mpdu_desc {
 
 #define RX_NO_DATA_RX_VEC0_HE_NSTS_MSK 0x03800000
 #define RX_NO_DATA_RX_VEC0_VHT_NSTS_MSK        0x38000000
+#define RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK        0x00f00000
 
 /**
  * struct iwl_rx_no_data - RX no data descriptor
@@ -670,6 +671,33 @@ struct iwl_rx_no_data {
 } __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,
               RX_NO_DATA_NTFY_API_S_VER_2 */
 
+/**
+ * struct iwl_rx_no_data_ver_3 - RX no data descriptor
+ * @info: 7:0 frame type, 15:8 RX error type
+ * @rssi: 7:0 energy chain-A,
+ *     15:8 chain-B, measured at FINA time (FINA_ENERGY), 16:23 channel
+ * @on_air_rise_time: GP2 during on air rise
+ * @fr_time: frame time
+ * @rate: rate/mcs of frame
+ * @phy_info: &enum iwl_rx_phy_data0 and &enum iwl_rx_phy_info_type
+ * @rx_vec: DW-12:9 raw RX vectors from DSP according to modulation type.
+ *     for VHT: OFDM_RX_VECTOR_SIGA1_OUT, OFDM_RX_VECTOR_SIGA2_OUT
+ *     for HE: OFDM_RX_VECTOR_HE_SIGA1_OUT, OFDM_RX_VECTOR_HE_SIGA2_OUT
+ *     for EHT: OFDM_RX_VECTOR_USIG_A1_OUT, OFDM_RX_VECTOR_USIG_A2_OUT,
+ *     OFDM_RX_VECTOR_EHT_OUT, OFDM_RX_VECTOR_EHT_USER_FIELD_OUT
+ */
+struct iwl_rx_no_data_ver_3 {
+       __le32 info;
+       __le32 rssi;
+       __le32 on_air_rise_time;
+       __le32 fr_time;
+       __le32 rate;
+       __le32 phy_info[2];
+       __le32 rx_vec[4];
+} __packed; /* RX_NO_DATA_NTFY_API_S_VER_1,
+              RX_NO_DATA_NTFY_API_S_VER_2
+              RX_NO_DATA_NTFY_API_S_VER_3 */
+
 struct iwl_frame_release {
        u8 baid;
        u8 reserved;

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
index a6f0aed5a81524e254b539c1d112d7829d5c17fa..76d836689f21b7b534d7014380f415dbe39833d9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
@@ -2072,7 +2072,7 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
 {
        struct ieee80211_rx_status *rx_status;
        struct iwl_rx_packet *pkt = rxb_addr(rxb);
-       struct iwl_rx_no_data *desc = (void *)pkt->data;
+       struct iwl_rx_no_data_ver_3 *desc = (void *)pkt->data;
        u32 rssi;
        u32 info_type;
        struct ieee80211_sta *sta = NULL;
@@ -2108,6 +2108,18 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
 
        format = phy_data.rate_n_flags & RATE_MCS_MOD_TYPE_MSK;
 
+       if (iwl_fw_lookup_notif_ver(mvm->fw, DATA_PATH_GROUP,
+                                   RX_NO_DATA_NOTIF, 0) >= 3) {
+               if (unlikely(iwl_rx_packet_payload_len(pkt) <
+                   sizeof(struct iwl_rx_no_data_ver_3)))
+               /* invalid len for ver 3 */
+                       return;
+       } else {
+               if (format == RATE_MCS_EHT_MSK)
+                       /* no support for EHT before version 3 API */
+                       return;
+       }
+
        /* Dont use dev_alloc_skb(), we'll have enough headroom once
         * ieee80211_hdr pulled.
         */
@@ -2159,6 +2171,10 @@ void iwl_mvm_rx_monitor_no_data(struct iwl_mvm *mvm, struct napi_struct *napi,
                        le32_get_bits(desc->rx_vec[0],
                                      RX_NO_DATA_RX_VEC0_HE_NSTS_MSK) + 1;
                break;
+       case RATE_MCS_EHT_MSK:
+               rx_status->nss =
+                       le32_get_bits(desc->rx_vec[2],
+                                     RX_NO_DATA_RX_VEC2_EHT_NSTS_MSK) + 1;
        }
 
        rcu_read_lock();