fw-api: CL 7221333 - update fw common interface files

Change-Id: Idbe4cfba9eb5ec42842169cbf352f19ab812c053
WMI: rename ROAM_DSM_FILTER_CMD to PDEV_DSM_FILTER_CMD
CRs-Fixed: 2262693

fw/wmi_tlv_defs.h

@@ -981,8 +981,8 @@ typedef enum {
     WMITLV_TAG_STRUC_wmi_wlanfw_iface_cmb_ind_event_fixed_param,
     WMITLV_TAG_STRUC_wmi_wlanfw_iface_combination_param,
     WMITLV_TAG_STRUC_wmi_wlanfw_iface_limit_param,
-    WMITLV_TAG_STRUC_wmi_roam_dsm_filter_fixed_param,
-    WMITLV_TAG_STRUC_wmi_roam_bssid_disallow_list_config_param,
+    WMITLV_TAG_STRUC_wmi_pdev_dsm_filter_fixed_param,
+    WMITLV_TAG_STRUC_wmi_pdev_bssid_disallow_list_config_param,
     WMITLV_TAG_STRUC_wmi_mgmt_hdr,
 } WMITLV_TAG_ID;
 
@@ -1382,7 +1382,7 @@ typedef enum {
     OP(WMI_ROAM_DEAUTH_CONFIG_CMDID) \
     OP(WMI_ROAM_IDLE_CONFIG_CMDID) \
     OP(WMI_IDLE_TRIGGER_MONITOR_CMDID) \
-    OP(WMI_ROAM_DSM_FILTER_CMDID) \
+    OP(WMI_PDEV_DSM_FILTER_CMDID) \
     /* add new CMD_LIST elements above this line */
 
 
@@ -3055,11 +3055,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_IDLE_CONFIG_CMDID);
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_idle_trigger_monitor_cmd_fixed_param, wmi_idle_trigger_monitor_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX)
 WMITLV_CREATE_PARAM_STRUC(WMI_IDLE_TRIGGER_MONITOR_CMDID);
 
-/* DSM roam filter parameters */
-#define WMITLV_TABLE_WMI_ROAM_DSM_FILTER_CMDID(id,op,buf,len) \
-    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_dsm_filter_fixed_param, wmi_roam_dsm_filter_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
-    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_roam_bssid_disallow_list_config_param, bssid_disallow_list, WMITLV_SIZE_VAR)
-WMITLV_CREATE_PARAM_STRUC(WMI_ROAM_DSM_FILTER_CMDID);
+/* DSM filter parameters */
+#define WMITLV_TABLE_WMI_PDEV_DSM_FILTER_CMDID(id,op,buf,len) \
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_dsm_filter_fixed_param, wmi_pdev_dsm_filter_fixed_param, fixed_param, WMITLV_SIZE_FIX) \
+    WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_pdev_bssid_disallow_list_config_param, bssid_disallow_list, WMITLV_SIZE_VAR)
+WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DSM_FILTER_CMDID);
 
 #define WMITLV_TABLE_WMI_ROAM_BLACKLIST_EVENTID(id,op,buf,len) \
     WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_roam_blacklist_event_fixed_param, wmi_roam_blacklist_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) \

fw/wmi_unified.h

@@ -407,6 +407,8 @@ typedef enum {
     WMI_PDEV_PKTLOG_FILTER_CMDID,
     /** wmi command for setting rogue ap configuration */
     WMI_PDEV_SET_RAP_CONFIG_CMDID,
+    /** Specify DSM filters along with disallow bssid filters */
+    WMI_PDEV_DSM_FILTER_CMDID,
 
     /* VDEV (virtual device) specific commands */
     /** vdev create */
@@ -697,8 +699,11 @@ typedef enum {
     WMI_ROAM_DEAUTH_CONFIG_CMDID,
     /** Configure idle roam trigger parameters */
     WMI_ROAM_IDLE_CONFIG_CMDID,
-    /** roaming filter cmd with DSM filters along with existing roam filters */
-    WMI_ROAM_DSM_FILTER_CMDID,
+    /**
+     * WMI_ROAM_DSM_FILTER_CMDID is deprecated and should be unused,
+     * but leave it reserved just to be safe.
+     */
+    DEPRECATED__WMI_ROAM_DSM_FILTER_CMDID,
 
     /** offload scan specific commands */
     /** set offload scan AP profile   */
@@ -12855,6 +12860,7 @@ typedef struct{
 #define WMI_ROAM_INVOKE_SCAN_MODE_CACHE_LIST    1   /* scan cached channel list */
 #define WMI_ROAM_INVOKE_SCAN_MODE_FULL_CH       2   /* scan full channel */
 #define WMI_ROAM_INVOKE_SCAN_MODE_SKIP          3   /* no scan is performed. use beacon/probe resp given by the host */
+#define WMI_ROAM_INVOKE_SCAN_MODE_CACHE_MAP     4   /* scan cached channel map */
 
 #define WMI_ROAM_INVOKE_AP_SEL_FIXED_BSSID      0   /* roam to given BSSID only */
 #define WMI_ROAM_INVOKE_AP_SEL_ANY_BSSID        1   /* roam to any BSSID */
@@ -24023,7 +24029,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command)
         WMI_RETURN_STRING(WMI_ROAM_DEAUTH_CONFIG_CMDID);
         WMI_RETURN_STRING(WMI_ROAM_IDLE_CONFIG_CMDID);
         WMI_RETURN_STRING(WMI_IDLE_TRIGGER_MONITOR_CMDID);
-        WMI_RETURN_STRING(WMI_ROAM_DSM_FILTER_CMDID);
+        WMI_RETURN_STRING(WMI_PDEV_DSM_FILTER_CMDID);
     }
 
     return "Invalid WMI cmd";
@@ -25267,21 +25273,20 @@ typedef enum {
 } WMI_SCREEN_STATUS_NOTIFY_ID;
 
 typedef struct {
-    /** TLV tag and len; tag equals wmi_roam_dsm_filter_fixed_param */
+    /** TLV tag and len; tag equals wmi_pdev_dsm_filter_fixed_param */
     A_UINT32 tlv_header;
-    /** Unique id identifying the VDEV on which new roaming filter(data stall AP mitigation) is adopted */
-    A_UINT32 vdev_id;
     /**
-     * TLV (tag length value) parameter's following roam_dsm_filter_cmd are,
+     * TLV (tag length value) parameter's following pdev_dsm_filter_cmd are,
      *
-     *  wmi_roam_bssid_disallow_list_config_param bssid_disallow_list[]; i.e array containing
-     *  all roam filter lists including the new DSM lists(avoidlist/driver_blacklist) and
-     *  existing roam lists(supplicant_blacklist/rssi_rejectlist etc.)
+     *  wmi_pdev_bssid_disallow_list_config_param bssid_disallow_list[];
+     *      i.e array containing all disallow AP filter lists including
+     *      the new DSM lists (avoidlist / driver_blacklist) and existing
+     *      lists (supplicant_blacklist / rssi_rejectlist etc.)
      */
-} wmi_roam_dsm_filter_fixed_param;
+} wmi_pdev_dsm_filter_fixed_param;
 
 typedef struct {
-    /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_roam_bssid_disallow_list_config_param */
+    /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_bssid_disallow_list_config_param */
     A_UINT32 tlv_header;
     /** bssid type i.e whether bssid falls in avoid list or driver_blacklist etc.
       see WMI_BSSID_DISALLOW_LIST_TYPE **/
@@ -25292,13 +25297,13 @@ typedef struct {
     A_UINT32 remaining_disallow_duration;
     /** AP will be allowed for candidate, when AP RSSI better than expected RSSI units in dBm */
     A_INT32 expected_rssi;
-} wmi_roam_bssid_disallow_list_config_param;
+} wmi_pdev_bssid_disallow_list_config_param;
 
 typedef enum {
     /* USER_SPACE_BLACK_LIST
      * Black Listed AP's by host's user space
      */
-    WMI_BSSID_DISALLOW_USER_SPACE_BLACK_LIST = 0,
+    WMI_BSSID_DISALLOW_USER_SPACE_BLACK_LIST = 1,
     /* DRIVER_BLACK_LIST
      * Black Listed AP's by host driver
      * used for data stall migitation
@@ -25320,6 +25325,12 @@ typedef enum {
     WMI_BSSID_DISALLOW_RSSI_REJECT_LIST,
 } WMI_BSSID_DISALLOW_LIST_TYPE;
 
+/* WLAN_PDEV_MAX_NUM_BSSID_DISALLOW_LIST:
+ * Maximum number of BSSID disallow entries which host is allowed to send
+ * to firmware within the WMI_PDEV_DSM_FILTER_CMDID message.
+ */
+#define WLAN_PDEV_MAX_NUM_BSSID_DISALLOW_LIST  28
+
 typedef struct {
     /*
      * The timestamp is in units of ticks of a 19.2MHz clock.

fw/wmi_version.h

@@ -36,7 +36,7 @@
 #define __WMI_VER_MINOR_    0
 /** WMI revision number has to be incremented when there is a
  *  change that may or may not break compatibility. */
-#define __WMI_REVISION_ 668
+#define __WMI_REVISION_ 669
 
 /** The Version Namespace should not be normally changed. Only
  *  host and firmware of the same WMI namespace will work