iwlwifi: mvm: Set RRM_ENABLED bit in scan commands

[deliverable/linux.git] / drivers / net / wireless / iwlwifi / mvm / fw-api.h

diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api.h b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
index 94342dbe69e913b2330f34bcfe3b9a5d9695a3fc..a2c662808a88df8d7e3bc6f7decf9fc4e88b087f 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/fw-api.h
+++ b/drivers/net/wireless/iwlwifi/mvm/fw-api.h
@@ -75,9 +75,6 @@
 #include "fw-api-coex.h"
 #include "fw-api-scan.h"
 
-/* maximal number of Tx queues in any platform */
-#define IWL_MVM_MAX_QUEUES     20
-
 /* Tx queue numbers */
 enum {
        IWL_MVM_OFFCHANNEL_QUEUE = 8,
@@ -208,6 +205,10 @@ enum {
        REPLY_SF_CFG_CMD = 0xd1,
        REPLY_BEACON_FILTERING_CMD = 0xd2,
 
+       /* DTS measurements */
+       CMD_DTS_MEASUREMENT_TRIGGER = 0xdc,
+       DTS_MEASUREMENT_NOTIFICATION = 0xdd,
+
        REPLY_DEBUG_CMD = 0xf0,
        DEBUG_LOG_MSG = 0xf7,
 
@@ -553,7 +554,7 @@ enum iwl_time_event_type {
        TE_WIDI_TX_SYNC,
 
        /* Channel Switch NoA */
-       TE_P2P_GO_CSA_NOA,
+       TE_CHANNEL_SWITCH_PERIOD,
 
        TE_MAX
 }; /* MAC_EVENT_TYPE_API_E_VER_1 */
@@ -1604,19 +1605,49 @@ enum iwl_sf_scenario {
 
 #define SF_LONG_DELAY_AGING_TIMER 1000000      /* 1 Sec */
 
+#define SF_CFG_DUMMY_NOTIF_OFF BIT(16)
+
 /**
  * Smart Fifo configuration command.
- * @state: smart fifo state, types listed in iwl_sf_sate.
+ * @state: smart fifo state, types listed in enum %iwl_sf_sate.
  * @watermark: Minimum allowed availabe free space in RXF for transient state.
  * @long_delay_timeouts: aging and idle timer values for each scenario
  * in long delay state.
  * @full_on_timeouts: timer values for each scenario in full on state.
  */
 struct iwl_sf_cfg_cmd {
-       enum iwl_sf_state state;
+       __le32 state;
        __le32 watermark[SF_TRANSIENT_STATES_NUMBER];
        __le32 long_delay_timeouts[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES];
        __le32 full_on_timeouts[SF_NUM_SCENARIO][SF_NUM_TIMEOUT_TYPES];
 } __packed; /* SF_CFG_API_S_VER_2 */
 
+/* DTS measurements */
+
+enum iwl_dts_measurement_flags {
+       DTS_TRIGGER_CMD_FLAGS_TEMP      = BIT(0),
+       DTS_TRIGGER_CMD_FLAGS_VOLT      = BIT(1),
+};
+
+/**
+ * iwl_dts_measurement_cmd - request DTS temperature and/or voltage measurements
+ *
+ * @flags: indicates which measurements we want as specified in &enum
+ *        iwl_dts_measurement_flags
+ */
+struct iwl_dts_measurement_cmd {
+       __le32 flags;
+} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_CMD_S */
+
+/**
+ * iwl_dts_measurement_notif - notification received with the measurements
+ *
+ * @temp: the measured temperature
+ * @voltage: the measured voltage
+ */
+struct iwl_dts_measurement_notif {
+       __le32 temp;
+       __le32 voltage;
+} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S */
+
 #endif /* __fw_api_h__ */