iwlwifi: mvm: add trigger for time events

This will allow to collect data when a time event
notifcation with a certain id and action is coming from
the firmware. This can be very useful to debug various
flows.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 7783ac8761c49b45cd491e3e0f6f966310e75e49..e7475629c44e29e0c903eabf0b1ce80cfa8ab78c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -1237,6 +1237,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
                sizeof(struct iwl_fw_dbg_trigger_low_rssi);
        trigger_tlv_sz[FW_DBG_TRIGGER_TXQ_TIMERS] =
                sizeof(struct iwl_fw_dbg_trigger_txq_timer);
+       trigger_tlv_sz[FW_DBG_TRIGGER_TIME_EVENT] =
+               sizeof(struct iwl_fw_dbg_trigger_time_event);
 
        for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++) {
                if (pieces->dbg_trigger_tlv[i]) {

diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
index 37652857b8d0554f8b67a5b2f9efade08b38f7b9..251bf8dc4a12133b4ae77757170436c67219afc9 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
@@ -252,6 +252,8 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)
  *     goes below a threshold.
  * @FW_DBG_TRIGGER_TXQ_TIMERS: configures the timers for the Tx queue hang
  *     detection.
+ * @FW_DBG_TRIGGER_TIME_EVENT: trigger log collection upon time events related
+ *     events.
  */
 enum iwl_fw_dbg_trigger {
        FW_DBG_TRIGGER_INVALID = 0,
@@ -264,6 +266,7 @@ enum iwl_fw_dbg_trigger {
        FW_DBG_TRIGGER_STATS,
        FW_DBG_TRIGGER_RSSI,
        FW_DBG_TRIGGER_TXQ_TIMERS,
+       FW_DBG_TRIGGER_TIME_EVENT,
 
        /* must be last */
        FW_DBG_TRIGGER_MAX,

diff --git a/drivers/net/wireless/iwlwifi/iwl-fw-file.h b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
index cc789cb3c0521fdbf6ff6dc08da86c05b13decc3..ee149482061f8165ca1b929a7e7f781c76c438dc 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-fw-file.h
+++ b/drivers/net/wireless/iwlwifi/iwl-fw-file.h
@@ -636,6 +636,22 @@ struct iwl_fw_dbg_trigger_txq_timer {
        __le32 reserved[4];
 } __packed;
 
+/**
+ * struct iwl_fw_dbg_trigger_time_event - configures a time event trigger
+ * time_Events: a list of tuples <id, action_bitmap>. The driver will issue a
+ *     trigger each time a time event notification that relates to time event
+ *     id with one of the actions in the bitmap is received and
+ *     BIT(notif->status) is set in status_bitmap.
+ *
+ */
+struct iwl_fw_dbg_trigger_time_event {
+       struct {
+               __le32 id;
+               __le32 action_bitmap;
+               __le32 status_bitmap;
+       } __packed time_events[16];
+} __packed;
+
 /**
  * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration.
  * @id: conf id

diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c
index bd519597eb2d013840da4bc25560e502bcba0e71..647822366fe5ed08b2d1feb42c75f9dff835b878 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@ -226,6 +226,44 @@ iwl_mvm_te_handle_notify_csa(struct iwl_mvm *mvm,
        iwl_mvm_te_clear_data(mvm, te_data);
 }
 
+static void iwl_mvm_te_check_trigger(struct iwl_mvm *mvm,
+                                    struct iwl_time_event_notif *notif,
+                                    struct iwl_mvm_time_event_data *te_data)
+{
+       struct iwl_fw_dbg_trigger_tlv *trig;
+       struct iwl_fw_dbg_trigger_time_event *te_trig;
+       int i;
+
+       if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_TIME_EVENT))
+               return;
+
+       trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_TIME_EVENT);
+       te_trig = (void *)trig->data;
+
+       if (!iwl_fw_dbg_trigger_check_stop(mvm, te_data->vif, trig))
+               return;
+
+       for (i = 0; i < ARRAY_SIZE(te_trig->time_events); i++) {
+               u32 trig_te_id = le32_to_cpu(te_trig->time_events[i].id);
+               u32 trig_action_bitmap =
+                       le32_to_cpu(te_trig->time_events[i].action_bitmap);
+               u32 trig_status_bitmap =
+                       le32_to_cpu(te_trig->time_events[i].status_bitmap);
+
+               if (trig_te_id != te_data->id ||
+                   !(trig_action_bitmap & le32_to_cpu(notif->action)) ||
+                   !(trig_status_bitmap & BIT(le32_to_cpu(notif->status))))
+                       continue;
+
+               iwl_mvm_fw_dbg_collect_trig(mvm, trig,
+                                           "Time event %d Action 0x%x received status: %d",
+                                           te_data->id,
+                                           le32_to_cpu(notif->action),
+                                           le32_to_cpu(notif->status));
+               break;
+       }
+}
+
 /*
  * Handles a FW notification for an event that is known to the driver.
  *
@@ -243,6 +281,8 @@ static void iwl_mvm_te_handle_notif(struct iwl_mvm *mvm,
                     le32_to_cpu(notif->unique_id),
                     le32_to_cpu(notif->action));
 
+       iwl_mvm_te_check_trigger(mvm, notif, te_data);
+
        /*
         * The FW sends the start/end time event notifications even for events
         * that it fails to schedule. This is indicated in the status field of
@@ -324,6 +364,8 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,
        if (!aux_roc_te) /* Not a Aux ROC time event */
                return -EINVAL;
 
+       iwl_mvm_te_check_trigger(mvm, notif, te_data);
+
        if (!le32_to_cpu(notif->status)) {
                IWL_DEBUG_TE(mvm,
                             "ERROR: Aux ROC Time Event %s notification failure\n",