diff --git a/fw/wmi_services.h b/fw/wmi_services.h index e1ed82e0c3..50ecbb2f5e 100644 --- a/fw/wmi_services.h +++ b/fw/wmi_services.h @@ -241,6 +241,7 @@ typedef enum { WMI_SERVICE_SUPPORT_DIRECT_DMA=146, /* indicates target supports direct DMA, * host will rely on WMI_DMA_RING_CAPABILITIES to get supported modules */ WMI_SERVICE_AP_OBSS_DETECTION_OFFLOAD=147, /* Support SAP mode OBSS detection offload */ + WMI_SERVICE_11K_NEIGHBOUR_REPORT_SUPPORT=148, /* Support for 11k neighbor report */ /******* ADD NEW SERVICES HERE *******/ diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 72fc4ed9cd..9bd021501a 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -883,6 +883,9 @@ typedef enum { WMITLV_TAG_STRUC_wmi_sar_get_limits_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_sar_get_limits_event_fixed_param, WMITLV_TAG_STRUC_wmi_sar_get_limits_event_row, + WMITLV_TAG_STRUC_wmi_offload_11k_report_fixed_param, + WMITLV_TAG_STRUC_wmi_invoke_neighbor_report_fixed_param, + WMITLV_TAG_STRUC_wmi_neighbor_report_offload_tlv_param, } WMITLV_TAG_ID; /* @@ -1237,6 +1240,8 @@ typedef enum { OP(WMI_SAP_OBSS_DETECTION_CFG_CMDID) \ OP(WMI_PDEV_DMA_RING_CFG_REQ_CMDID) \ OP(WMI_SAR_GET_LIMITS_CMDID)\ + OP(WMI_11K_OFFLOAD_REPORT_CMDID) \ + OP(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -1548,6 +1553,19 @@ WMITLV_CREATE_PARAM_STRUC(WMI_WOW_ENABLE_ICMPV6_NA_FLT_CMDID); WMITLV_CREATE_PARAM_STRUC(WMI_RMV_BCN_FILTER_CMDID); +/* Offload 11k related requests */ +#define WMITLV_TABLE_WMI_11K_OFFLOAD_REPORT_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_offload_11k_report_fixed_param, wmi_11k_offload_report_fixed_param,fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_neighbor_report_11k_offload_tlv_param, offload_neighbor_report_param, WMITLV_SIZE_VAR) + +WMITLV_CREATE_PARAM_STRUC(WMI_11K_OFFLOAD_REPORT_CMDID); + +/* invoke 11k neighbor report req from FW */ +#define WMITLV_TABLE_WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_invoke_neighbor_report_fixed_param,wmi_11k_offload_invoke_neighbor_report_fixed_param, fixed_param, WMITLV_SIZE_FIX) + +WMITLV_CREATE_PARAM_STRUC(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID); + /** Service bit WMI_SERVICE_ROAM_OFFLOAD for Roaming feature */ /* Roam scan mode Cmd */ #define WMITLV_TABLE_WMI_ROAM_SCAN_MODE(id,op,buf,len) \ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index e9c8380983..4a839d606a 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -241,6 +241,7 @@ typedef enum { WMI_GRP_REGULATORY, /* 0x3a */ WMI_GRP_HW_DATA_FILTER, /* 0x3b */ WMI_GRP_WLM, /* 0x3c WLAN Latency Manager */ + WMI_GRP_11K_OFFLOAD, /* 0x3d */ } WMI_GRP_ID; #define WMI_CMD_GRP_START_ID(grp_id) (((grp_id) << 12) | 0x1) @@ -877,6 +878,11 @@ typedef enum { /* Thermal Throttling SET CONF commands */ WMI_THERM_THROT_SET_CONF_CMDID, + /* Offload 11k related requests */ + WMI_11K_OFFLOAD_REPORT_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_11K_OFFLOAD), + /* invoke neighbor report from FW */ + WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID, + /* GPIO Configuration */ WMI_GPIO_CONFIG_CMDID = WMI_CMD_GRP_START_ID(WMI_GRP_GPIO), WMI_GPIO_OUTPUT_CMDID, @@ -3245,6 +3251,41 @@ typedef struct { /* followed by WMITLV_TAG_ARRAY_BYTE */ } wmi_diag_event_fixed_param; +#define WMI_11K_OFFLOAD_BITMAP_NEIGHBOR_REPORT_REQ 0x1 + +typedef struct { + A_UINT32 time_offset; /* positive offset in secs from the time 11k offload command has been received, 0xFFFFFFFF if offset is not valid */ + A_UINT32 low_rssi_offset; /* positive offset in dB from current low rssi roaming trigger to send neighbor req, 0xFFFFFFFF if offset is not valid */ + A_UINT32 bmiss_count_trigger; /* value 1 is to send neighbor report at 1st BMISS, 0xFFFFFFFF if input is not valid */ + A_UINT32 per_threshold_offset; /* percentage offset from the current per_threshold, 0xFFFFFFFF if input is not valid */ + A_UINT32 neighbor_report_cache_timeout; /* cache timeout in secs after which neighbor cache is not valid in FW, 0xFFFFFFFF if input is not valid */ + A_UINT32 max_neighbor_report_req_cap; /* 0xFFFFFFFF if input is not valid, else positive number per every roam, these are the maximum number of + * neighbor report requests that will be sent by FW after every roam */ + wmi_ssid ssid; /* ssid of current connected AP FW might choose to use this SSID in the neighbor report req frame if it is + * interested in candidate of the same SSID */ +} wmi_neighbor_report_offload; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_offload_11k_report_fixed_param */ + A_UINT32 vdev_id; + A_UINT32 offload_11k; /* bitmask to indicate to FW what all 11k features are offloaded */ +} wmi_11k_offload_report_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_neighbor_report_offload_tlv_param */ + wmi_neighbor_report_offload neighbor_rep_ofld_params; +} wmi_neighbor_report_11k_offload_tlv_param; + +#define WMI_INVOKE_NEIGHBOR_REPORT_FLAGS_SEND_RESP_TO_HOST 0x1 + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_invoke_neighbor_report_fixed_param */ + A_UINT32 vdev_id; + A_UINT32 flags; + wmi_ssid ssid; /* if ssid.len == 0, firmware doesn't include ssid sub-element. + * In that case AP gives all the candidates in ESS without SSID filter + * If host wants to insert ssid subelement in the neighbor report request frame, then it can specify the ssid here */ +} wmi_11k_offload_invoke_neighbor_report_fixed_param; #define WMI_MAX_PMKID_LEN 16 #define WMI_MAX_PMK_LEN 64 @@ -21021,6 +21062,8 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_PDEV_SET_RX_FILTER_PROMISCUOUS_CMDID); WMI_RETURN_STRING(WMI_SAP_OBSS_DETECTION_CFG_CMDID); WMI_RETURN_STRING(WMI_PDEV_DMA_RING_CFG_REQ_CMDID); + WMI_RETURN_STRING(WMI_11K_OFFLOAD_REPORT_CMDID); + WMI_RETURN_STRING(WMI_11K_INVOKE_NEIGHBOR_REPORT_CMDID); } return "Invalid WMI cmd"; diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 24a0debd44..092c050d8c 100644 --- a/fw/wmi_version.h +++ b/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_ 482 +#define __WMI_REVISION_ 483 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work