diff options
| -rwxr-xr-x | fw/wmi_services.h | 2 | ||||
| -rwxr-xr-x | fw/wmi_tlv_defs.h | 27 | ||||
| -rwxr-xr-x | fw/wmi_unified.h | 118 | ||||
| -rwxr-xr-x | fw/wmi_version.h | 2 |
4 files changed, 148 insertions, 1 deletions
diff --git a/fw/wmi_services.h b/fw/wmi_services.h index 4f709b0c0f78..d50e115357a9 100755 --- a/fw/wmi_services.h +++ b/fw/wmi_services.h @@ -187,6 +187,8 @@ typedef enum { WMI_SERVICE_11D_OFFLOAD=118, /* support 11D scan offload in FW */ WMI_SERVICE_HW_DATA_FILTERING=119, WMI_SERVICE_MULTIPLE_VDEV_RESTART=120, /* Support for single command for multiple vdev restart */ + WMI_SERVICE_PKT_ROUTING=121, /* Support for routing specific data packets to selected destination rings */ + WMI_SERVICE_CHECK_CAL_VERSION=122, /* Support cal version check */ /******* ADD NEW SERVICES HERE UNTIL ALL VALUES UP TO 128 ARE USED *******/ diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 39f6d9a8ecae..b7c33cadc3ef 100755 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -798,6 +798,10 @@ typedef enum { WMITLV_TAG_STRUC_wmi_chip_power_save_failure_detected_fixed_param, WMITLV_TAG_STRUC_wmi_pdev_multiple_vdev_restart_request_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_pdev_csa_switch_count_status_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_update_pkt_routing_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_cmd_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_event_fixed_param, + WMITLV_TAG_STRUC_wmi_pdev_set_diversity_gain_cmd_fixed_param, } WMITLV_TAG_ID; /* @@ -1120,6 +1124,9 @@ typedef enum { OP(WMI_HW_DATA_FILTER_CMDID) \ OP(WMI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID) \ OP(WMI_LPI_OEM_REQ_CMDID) \ + OP(WMI_PDEV_UPDATE_PKT_ROUTING_CMDID) \ + OP(WMI_PDEV_CHECK_CAL_VERSION_CMDID) \ + OP(WMI_PDEV_SET_DIVERSITY_GAIN_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -1297,6 +1304,7 @@ typedef enum { OP(WMI_PEER_OPER_MODE_CHANGE_EVENTID) \ OP(WMI_PDEV_CHIP_POWER_SAVE_FAILURE_DETECTED_EVENTID) \ OP(WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID) \ + OP(WMI_PDEV_CHECK_CAL_VERSION_EVENTID) \ /* add new EVT_LIST elements above this line */ @@ -3217,6 +3225,20 @@ WMITLV_CREATE_PARAM_STRUC(WMI_HW_DATA_FILTER_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_channel, wmi_channel, chan, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID); +#define WMITLV_TABLE_WMI_PDEV_UPDATE_PKT_ROUTING_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_update_pkt_routing_cmd_fixed_param, wmi_pdev_update_pkt_routing_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_UPDATE_PKT_ROUTING_CMDID); + +/* Get cal version cmd */ +#define WMITLV_TABLE_WMI_PDEV_CHECK_CAL_VERSION_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_cmd_fixed_param, wmi_pdev_check_cal_version_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CHECK_CAL_VERSION_CMDID); + +#define WMITLV_TABLE_WMI_PDEV_SET_DIVERSITY_GAIN_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_set_diversity_gain_cmd_fixed_param, wmi_pdev_set_diversity_gain_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_BYTE, A_UINT8, diversity_gains, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_DIVERSITY_GAIN_CMDID); + /************************** TLV definitions of WMI events *******************************/ @@ -4291,6 +4313,11 @@ WMITLV_CREATE_PARAM_STRUC(WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_STATUS_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_UINT32, A_UINT32, vdev_ids, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID); +/* cal version response event */ +#define WMITLV_TABLE_WMI_PDEV_CHECK_CAL_VERSION_EVENTID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_event_fixed_param, wmi_pdev_check_cal_version_event_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_CHECK_CAL_VERSION_EVENTID); + #ifdef __cplusplus } diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index d4df49bb1b2f..83dbc34bc968 100755 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -358,6 +358,12 @@ typedef enum { WMI_PDEV_SET_STATS_THRESHOLD_CMDID, /** vdev restart request for multiple vdevs */ WMI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID, + /** Pdev update packet routing command */ + WMI_PDEV_UPDATE_PKT_ROUTING_CMDID, + /** Get Calibration data version details */ + WMI_PDEV_CHECK_CAL_VERSION_CMDID, + /** Set Diversity Gain */ + WMI_PDEV_SET_DIVERSITY_GAIN_CMDID, /* VDEV (virtual device) specific commands */ /** vdev create */ @@ -1100,6 +1106,9 @@ typedef enum { /* Event to report the switch count in csa of one or more VDEVs */ WMI_PDEV_CSA_SWITCH_COUNT_STATUS_EVENTID, + /** Report the caldata version to host */ + WMI_PDEV_CHECK_CAL_VERSION_EVENTID, + /* VDEV specific events */ /** VDEV started event in response to VDEV_START request */ WMI_VDEV_START_RESP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_VDEV), @@ -3919,6 +3928,16 @@ typedef enum { * 0 - Disallow mesh mcast traffic */ WMI_PDEV_PARAM_MESH_MCAST_ENABLE, + /** Enable/Disable smart chainmask scheme + * 1 - Enable smart chainmask scheme + * 0 - Disable smart chainmask scheme + */ + WMI_PDEV_PARAM_SMART_CHAINMASK_SCHEME, + /** Enable/Disable alternate chainmask scheme + * 1 - Enable alternate chainmask scheme + * 0 - Disable alternate chainmask scheme + */ + WMI_PDEV_PARAM_ALTERNATIVE_CHAINMASK_SCHEME, } WMI_PDEV_PARAM; @@ -12801,6 +12820,18 @@ enum { #define GET_PDEV_PARAM_TXPOWER_REASON(txpower_param) \ (((txpower_param) & PDEV_PARAM_TXPOWER_REASON_MASK) >> PDEV_PARAM_TXPOWER_REASON_SHIFT) +#define PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_MASK 0x00000001 +#define PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_SHIFT 0 + +#define SET_PDEV_SMART_CHAINMASK_SCHEME_DECISION(param, value) \ + do { \ + (param) &= ~PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_MASK; \ + (param) |= (value) << PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_SHIFT; \ + while (0) + +#define GET_PDEV_SMART_CHAINMASK_SCHEME_DECISION(param) \ + (((param) & PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_MASK) >> PDEV_PARAM_SMART_CHAINMASK_SCHEME_DECISION_SHIFT) + /** * This command is sent from WLAN host driver to firmware to * notify the current modem power state. Host would receive a @@ -15726,6 +15757,15 @@ typedef struct { * (units are seconds) */ A_UINT32 per_rest_time; + /* This is the total time for which PER monitoring will be run. + * After completion of time windows, the average PER over the window + * will be computed. + * The parameter value stores specifications for both TX and RX + * monitor times. + * The two least-significant bytes (0 & 1) hold the RX monitor time; + * the two most-significant bytes (2 & 3) hold the TX monitor time. + */ + A_UINT32 pkt_err_rate_mon_time; /* units = seconds */ } wmi_roam_per_config_fixed_param; typedef struct { @@ -17728,6 +17768,9 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_HW_DATA_FILTER_CMDID); WMI_RETURN_STRING(MI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID); WMI_RETURN_STRING(WMI_LPI_OEM_REQ_CMDID); + WMI_RETURN_STRING(WMI_PDEV_UPDATE_PKT_ROUTING_CMDID); + WMI_RETURN_STRING(WMI_PDEV_CHECK_CAL_VERSION_CMDID); + WMI_RETURN_STRING(WMI_PDEV_SET_DIVERSITY_GAIN_CMDID); } return "Invalid WMI cmd"; @@ -17970,6 +18013,81 @@ typedef struct { */ } wmi_pdev_csa_switch_count_status_event_fixed_param; +/* Operation types for packet routing command */ +typedef enum { + WMI_PDEV_ADD_PKT_ROUTING, + WMI_PDEV_DEL_PKT_ROUTING, +} wmi_pdev_pkt_routing_op_code; + +/* Packet routing types based on specific data types */ +typedef enum { + WMI_PDEV_ROUTING_TYPE_ARP_IPV4, + WMI_PDEV_ROUTING_TYPE_NS_IPV6, + WMI_PDEV_ROUTING_TYPE_IGMP_IPV4, + WMI_PDEV_ROUTING_TYPE_MLD_IPV6, + WMI_PDEV_ROUTING_TYPE_DHCP_IPV4, + WMI_PDEV_ROUTING_TYPE_DHCP_IPV6, +} wmi_pdev_pkt_routing_type; + +/* This command shall be sent only when no VDEV is up. If the command is sent after any VDEV is up, target will ignore the command */ +typedef struct { + /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_update_pkt_routing_cmd_fixed_param */ + A_UINT32 tlv_header; + /** Identifies pdev on which routing needs to be applied */ + A_UINT32 pdev_id; + /** Indicates the routing operation type: add/delete */ + A_UINT32 op_code; /* wmi_pdev_pkt_routing_op_code */ + /** Bitmap of multiple pkt routing types for a given destination ring and meta data */ + A_UINT32 routing_type_bitmap; /* see wmi_pdev_pkt_routing_type */ + /** 5 bits [4:0] are used to specify the destination ring where the CCE matched + * packet needs to be routed. + */ + A_UINT32 dest_ring; + /** 16 bits [15:0] meta data can be passed to CCE. When the superrule matches, + * CCE copies this back in RX_MSDU_END_TLV. + */ + A_UINT32 meta_data; +} wmi_pdev_update_pkt_routing_cmd_fixed_param; + +typedef enum { + WMI_CALIBRATION_NO_FEATURE = 0, /* The board was calibrated with a meta which did not have this feature */ + WMI_CALIBRATION_OK, /* The calibration status is OK */ + WMI_CALIBRATION_NOT_OK, /* The calibration status is NOT OK */ +} WMI_CALIBRATION_STATUS; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_event_fixed_param */ + A_UINT32 software_cal_version; /* Current software level calibration data version */ + A_UINT32 board_cal_version; /* Calibration data version programmed on chip */ + A_UINT32 cal_status; /* filled with WMI_CALIBRATION_STATUS enum value */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; +} wmi_pdev_check_cal_version_event_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_check_cal_version_cmd_fixed_param */ + /** pdev_id for identifying the MAC + * See macros starting with WMI_PDEV_ID_ for values. + */ + A_UINT32 pdev_id; +} wmi_pdev_check_cal_version_cmd_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_pdev_set_diversity_gain_cmd_fixed_param */ + /** Identifies pdev on which diversity gain to be applied */ + A_UINT32 pdev_id; + /** The number of spatial stream */ + A_UINT32 nss; + /** The number of gains */ + A_UINT32 num_gains; + /* + * This fixed_param TLV is followed by other TLVs: + * A_UINT8 diversity_gains[num_gains]; (gain is in dB units) + */ +} wmi_pdev_set_diversity_gain_cmd_fixed_param; + /* ADD NEW DEFS HERE */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index f5c0943b8d54..ed0b02405c47 100755 --- 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_ 347 +#define __WMI_REVISION_ 351 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work |