From aa7e8919450582c0ebfee942bb418b58677594e6 Mon Sep 17 00:00:00 2001 From: spuligil Date: Fri, 15 Dec 2017 13:01:21 -0800 Subject: [PATCH] fw-api: CL 3904028 - update fw common interface files WMI changes to support direct DMA interface (for DFS) Change-Id: Idc115ab454ee310c5e4e73839bf4a8d37e93e5c8 CRs-Fixed: 1107600 --- fw/wmi_services.h | 3 ++ fw/wmi_tlv_defs.h | 25 +++++++++- fw/wmi_unified.h | 118 ++++++++++++++++++++++++++++++++++++++++++++++ fw/wmi_version.h | 2 +- 4 files changed, 146 insertions(+), 2 deletions(-) diff --git a/fw/wmi_services.h b/fw/wmi_services.h index 1d61d21c1483..3692dbdf2d2b 100644 --- a/fw/wmi_services.h +++ b/fw/wmi_services.h @@ -238,6 +238,9 @@ typedef enum { WMI_SERVICE_PEER_MAP_UNMAP_V2_SUPPORT=143, /* Support for HTT peer map/unmap V2 */ WMI_SERVICE_OFFCHAN_DATA_TID_SUPPORT=144, /* Support new tid for offchan data/mgmt tx over wmi */ WMI_SERVICE_RX_PROMISC_ENABLE_SUPPORT=145, /* Support enabling/disabling rx promiscuous mode as directed by a WMI message from the host */ + WMI_SERVICE_SUPPORT_DIRECT_DMA=146, /* indicates target supports direct DMA, + * host will rely on WMI_DMA_RING_CAPABILITIES to get supported modules */ + /******* ADD NEW SERVICES HERE *******/ diff --git a/fw/wmi_tlv_defs.h b/fw/wmi_tlv_defs.h index 8eb4ebbec5c6..d4e291a28575 100644 --- a/fw/wmi_tlv_defs.h +++ b/fw/wmi_tlv_defs.h @@ -875,6 +875,11 @@ typedef enum { WMITLV_TAG_STRUC_WMI_SAR_CAPABILITIES, WMITLV_TAG_STRUC_wmi_sap_obss_detection_cfg_cmd_fixed_param, WMITLV_TAG_STRUC_wmi_sap_obss_detection_info_evt_fixed_param, + WMITLV_TAG_STRUC_WMI_DMA_RING_CAPABILITIES, + WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param, + WMITLV_TAG_STRUC_wmi_dma_ring_cfg_rsp_fixed_param, + WMITLV_TAG_STRUC_wmi_dma_buf_release_fixed_param, + WMITLV_TAG_STRUC_wmi_dma_buf_release_entry, } WMITLV_TAG_ID; /* @@ -1227,6 +1232,7 @@ typedef enum { OP(WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID) \ OP(WMI_PDEV_SET_RX_FILTER_PROMISCUOUS_CMDID) \ OP(WMI_SAP_OBSS_DETECTION_CFG_CMDID) \ + OP(WMI_PDEV_DMA_RING_CFG_REQ_CMDID) \ /* add new CMD_LIST elements above this line */ @@ -1420,6 +1426,8 @@ typedef enum { OP(WMI_HOST_SWFDA_EVENTID) \ OP(WMI_NDL_SCHEDULE_UPDATE_EVENTID) \ OP(WMI_SAP_OBSS_DETECTION_REPORT_EVENTID) \ + OP(WMI_PDEV_DMA_RING_CFG_RSP_EVENTID) \ + OP(WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID) \ /* add new EVT_LIST elements above this line */ @@ -2081,6 +2089,10 @@ WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_QVIT_CMDID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_WMI_PDEV_SET_WAKEUP_CONFIG_CMDID_fixed_param, WMI_PDEV_SET_WAKEUP_CONFIG_CMDID_fixed_param, fixed_param, WMITLV_SIZE_FIX) WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_SET_WAKEUP_CONFIG_CMDID); +#define WMITLV_TABLE_WMI_PDEV_DMA_RING_CFG_REQ_CMDID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param, wmi_dma_ring_cfg_req_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DMA_RING_CFG_REQ_CMDID); + /* Vdev Set keep alive Cmd */ #define WMITLV_TABLE_WMI_VDEV_SET_KEEPALIVE_CMDID(id,op,buf,len) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_vdev_set_keepalive_cmd_fixed_param, wmi_vdev_set_keepalive_cmd_fixed_param, fixed_param, WMITLV_SIZE_FIX) @@ -3554,7 +3566,8 @@ WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_AVAILABLE_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_MAC_PHY_CHAINMASK_COMBO, mac_phy_chainmask_combo, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_MAC_PHY_CHAINMASK_CAPABILITY, mac_phy_chainmask_caps, WMITLV_SIZE_VAR) \ WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_OEM_DMA_RING_CAPABILITIES, oem_dma_ring_caps, WMITLV_SIZE_VAR) \ - WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_WMI_SAR_CAPABILITIES, WMI_SAR_CAPABILITIES, sar_caps, WMITLV_SIZE_FIX) + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_WMI_SAR_CAPABILITIES, WMI_SAR_CAPABILITIES, sar_caps, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, WMI_DMA_RING_CAPABILITIES, dma_ring_caps, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_SERVICE_READY_EXT_EVENTID); /* Ready event */ @@ -4708,6 +4721,16 @@ WMITLV_CREATE_PARAM_STRUC(WMI_WLAN_COEX_BT_ACTIVITY_EVENTID); WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_therm_throt_level_stats_info, therm_throt_level_stats_info, WMITLV_SIZE_VAR) WMITLV_CREATE_PARAM_STRUC(WMI_THERM_THROT_STATS_EVENTID); +#define WMITLV_TABLE_WMI_PDEV_DMA_RING_CFG_RSP_EVENTID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_dma_ring_cfg_rsp_fixed_param, wmi_dma_ring_cfg_rsp_fixed_param, fixed_param, WMITLV_SIZE_FIX) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DMA_RING_CFG_RSP_EVENTID); + +/* dma buffer release event */ +#define WMITLV_TABLE_WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID(id,op,buf,len) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_STRUC_wmi_dma_buf_release_fixed_param, wmi_dma_buf_release_fixed_param, fixed_param, WMITLV_SIZE_FIX) \ + WMITLV_ELEM(id,op,buf,len, WMITLV_TAG_ARRAY_STRUC, wmi_dma_buf_release_entry, entries, WMITLV_SIZE_VAR) +WMITLV_CREATE_PARAM_STRUC(WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID); + /* UNIT-TEST Event */ #define WMITLV_TABLE_WMI_UNIT_TEST_EVENTID(id,op,buf,len) \ diff --git a/fw/wmi_unified.h b/fw/wmi_unified.h index 2e50a827e38a..fbfbcc89b227 100644 --- a/fw/wmi_unified.h +++ b/fw/wmi_unified.h @@ -383,6 +383,8 @@ typedef enum { WMI_PDEV_SET_AC_TX_QUEUE_OPTIMIZED_CMDID, /** enable/disable rx promiscuous mode */ WMI_PDEV_SET_RX_FILTER_PROMISCUOUS_CMDID, + /* set a generic direct DMA ring config */ + WMI_PDEV_DMA_RING_CFG_REQ_CMDID, /* VDEV (virtual device) specific commands */ /** vdev create */ @@ -1173,6 +1175,11 @@ typedef enum { /** Response received the ctl table to host */ WMI_PDEV_UPDATE_CTLTABLE_EVENTID, + WMI_PDEV_DMA_RING_CFG_RSP_EVENTID, + + WMI_PDEV_DMA_RING_BUF_RELEASE_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), @@ -20953,6 +20960,7 @@ static INLINE A_UINT8 *wmi_id_to_name(A_UINT32 wmi_command) WMI_RETURN_STRING(WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID); 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); } return "Invalid WMI cmd"; @@ -21498,6 +21506,116 @@ typedef struct { A_UINT32 flags; } wmi_wlm_config_cmd_fixed_param; +typedef enum { + WMI_DMA_RING_CONFIG_MODULE_SPECTRAL, +} WMI_DMA_RING_SUPPORTED_MODULE; + +typedef struct { + A_UINT32 tlv_header; /* TLV tag and len; tag equals WMITLV_TAG_STRUC_WMI_DMA_RING_CAPABILITIES */ + A_UINT32 pdev_id; + A_UINT32 mod_id; /* see WMI_DMA_RING_SUPPORTED_MODULE */ + A_UINT32 ring_elems_min; /* minimum spaces in the DMA ring for this pdev */ + A_UINT32 min_buf_size; /* minimum size in bytes of each buffer in the DMA ring */ + A_UINT32 min_buf_align; /* minimum alignment in bytes of each buffer in the DMA ring */ +} WMI_DMA_RING_CAPABILITIES; + +#define WMI_DMA_RING_PADDR_LO_S 0 +#define WMI_DMA_RING_PADDR_LO 0xffffffff + +#define WMI_DMA_RING_BASE_PADDR_LO_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_LO) +#define WMI_DMA_RING_BASE_PADDR_LO_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_LO) + +#define WMI_DMA_RING_HEAD_IDX_PADDR_LO_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_LO) +#define WMI_DMA_RING_HEAD_IDX_PADDR_LO_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_LO) + +#define WMI_DMA_RING_TAIL_IDX_PADDR_LO_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_LO) +#define WMI_DMA_RING_TAIL_IDX_PADDR_LO_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_LO) + +#define WMI_DMA_RING_PADDR_HI_S 0 +#define WMI_DMA_RING_PADDR_HI 0xffff + +#define WMI_DMA_RING_BASE_PADDR_HI_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_HI) +#define WMI_DMA_RING_BASE_PADDR_HI_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_HI) + +#define WMI_DMA_RING_HEAD_IDX_PADDR_HI_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_HI) +#define WMI_DMA_RING_HEAD_IDX_PADDR_HI_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_HI) + +#define WMI_DMA_RING_TAIL_IDX_PADDR_HI_GET(dword) WMI_F_MS(dword, WMI_DMA_RING_PADDR_HI) +#define WMI_DMA_RING_TAIL_IDX_PADDR_HI_SET(dword, val) WMI_F_RMW(dword, val, WMI_DMA_RING_PADDR_HI) + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param */ + A_UINT32 pdev_id; + A_UINT32 mod_id; /* see WMI_DMA_RING_SUPPORTED_MODULE */ + /** + * Bits 31:0: base address of ring [31:0] + */ + A_UINT32 base_paddr_lo; + /** + * Bits 15:0: base address of ring [47:32] + * Bits 31:16: reserved (set to 0x0) + */ + A_UINT32 base_paddr_hi; + /** + * Bits 31:0: address of head index [31:0] + */ + A_UINT32 head_idx_paddr_lo; + /** + * Bits 15:0: address of head index [47:32] + * Bits 31:16: reserved (set to 0x0) + */ + A_UINT32 head_idx_paddr_hi; + /** + * Bits 31:0: address of tail index [31:0] + */ + A_UINT32 tail_idx_paddr_lo; + /** + * Bits 15:0: address of tail index [47:32] + * Bits 31:16: reserved (set to 0x0) + */ + A_UINT32 tail_idx_paddr_hi; + A_UINT32 num_elems; /** Number of elems in the ring */ + A_UINT32 buf_size; /** size of allocated buffer in bytes */ + + A_UINT32 num_resp_per_event; /** Number of wmi_dma_buf_release_entry packed together */ + + /** + * This parameter specifies the timeout in milliseconds. + * Target should timeout and send whatever resp it has if this time expires. + */ + A_UINT32 event_timeout_ms; +} wmi_dma_ring_cfg_req_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_dma_ring_cfg_rsp_fixed_param */ + A_UINT32 pdev_id; + A_UINT32 mod_id; /* see WMI_DMA_RING_SUPPORTED_MODULE */ + A_UINT32 cfg_status; /** Configuration status; see A_STATUS */ +} wmi_dma_ring_cfg_rsp_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_dma_buf_release_fixed_param */ + A_UINT32 pdev_id; /** ID of pdev whose DMA ring produced the data */ + A_UINT32 mod_id; /* see WMI_DMA_RING_SUPPORTED_MODULE */ + A_UINT32 num_buf_release_entry; + /* This TLV is followed by another TLV of array of structs. + * wmi_dma_buf_release_entry entries; + */ +} wmi_dma_buf_release_fixed_param; + +typedef struct { + A_UINT32 tlv_header; /** TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_dma_buf_release_entry */ + /** + * Bits 31:0: address of data [31:0] + */ + A_UINT32 paddr_lo; + /** + * Bits 15:0: address of data [47:32] + * Bits 31:16: reserved + */ + A_UINT32 paddr_hi; +} wmi_dma_buf_release_entry; + /* ADD NEW DEFS HERE */ diff --git a/fw/wmi_version.h b/fw/wmi_version.h index 2479fcc69fed..46ac88ab9795 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_ 480 +#define __WMI_REVISION_ 481 /** The Version Namespace should not be normally changed. Only * host and firmware of the same WMI namespace will work