diff --git a/wmi/inc/wmi_unified_api.h b/wmi/inc/wmi_unified_api.h index 535e1b22c2..870c210806 100644 --- a/wmi/inc/wmi_unified_api.h +++ b/wmi/inc/wmi_unified_api.h @@ -767,6 +767,16 @@ QDF_STATUS wmi_unified_oem_dma_ring_cfg(void *wmi_hdl, wmi_oem_dma_ring_cfg_req_fixed_param *cfg); #endif +/** + * wmi_unified_dbr_ring_cfg: Configure direct buffer rx rings + * @wmi_hdl: WMI handle + * @cfg: pointer to direct buffer rx config request + * + * Return: QDF status of operation + */ +QDF_STATUS wmi_unified_dbr_ring_cfg(void *wmi_hdl, + struct direct_buf_rx_cfg_req *cfg); + QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl, uint32_t data_len, uint8_t *data); @@ -1543,6 +1553,51 @@ QDF_STATUS wmi_extract_reg_cap_service_ready_ext( void *wmi_hdl, uint8_t *evt_buf, uint8_t phy_idx, struct wlan_psoc_host_hal_reg_capabilities_ext *param); + +/** + * wmi_extract_dbr_ring_cap_service_ready_ext: Extract direct buffer rx + * capability received through + * extended service ready event + * @wmi_hdl: WMI handle + * @evt_buf: Event buffer + * @idx: Index of the module for which capability is received + * @param: Pointer to direct buffer rx ring cap struct + * + * Return: QDF status of operation + */ +QDF_STATUS wmi_extract_dbr_ring_cap_service_ready_ext( + void *wmi_hdl, + uint8_t *evt_buf, uint8_t idx, + struct wlan_psoc_host_dbr_ring_caps *param); + +/** + * wmi_extract_dbr_buf_release_fixed : Extract direct buffer rx fixed param + * from buffer release event + * @wmi_hdl: WMI handle + * @evt_buf: Event buffer + * @param: Pointer to direct buffer rx response struct + * + * Return: QDF status of operation + */ +QDF_STATUS wmi_extract_dbr_buf_release_fixed( + void *wmi_hdl, + uint8_t *evt_buf, + struct direct_buf_rx_rsp *param); + +/** + * wmi_extract_dbr_buf_release_entry: Extract direct buffer rx buffer tlv + * + * @wmi_hdl: WMI handle + * @evt_buf: Event buffer + * @idx: Index of the module for which capability is received + * @param: Pointer to direct buffer rx entry + * + * Return: QDF status of operation + */ +QDF_STATUS wmi_extract_dbr_buf_release_entry( + void *wmi_hdl, + uint8_t *evt_buf, uint8_t idx, + struct direct_buf_rx_entry *param); QDF_STATUS wmi_extract_pdev_utf_event(void *wmi_hdl, uint8_t *evt_buf, struct wmi_host_pdev_utf_event *param); diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index afef74812c..dbfd03d037 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -5614,6 +5614,7 @@ typedef enum { wmi_mgmt_tx_bundle_completion_event_id, wmi_radio_tx_power_level_stats_event_id, wmi_report_stats_event_id, + wmi_dma_buf_release_event_id, wmi_events_max, } wmi_conv_event_id; @@ -6025,6 +6026,7 @@ typedef enum { wmi_service_widebw_scan, wmi_service_bcn_offload_start_stop_support, wmi_service_offchan_data_tid_support, + wmi_service_support_dma, wmi_services_max, } wmi_conv_service_ids; @@ -8168,4 +8170,101 @@ struct wdsentry { A_UINT32 flags; }; +#define WMI_HOST_DBR_RING_ADDR_LO_S 0 +#define WMI_HOST_DBR_RING_ADDR_LO 0xffffffff + +#define WMI_HOST_DBR_RING_ADDR_LO_GET(dword) \ + WMI_HOST_F_MS(dword, WMI_HOST_DBR_RING_ADDR_LO) +#define WMI_HOST_DBR_RING_ADDR_LO_SET(dword, val) \ + WMI_HOST_F_RMW(dword, val, WMI_HOST_DBR_RING_ADDR_LO) + +#define WMI_HOST_DBR_RING_ADDR_HI_S 0 +#define WMI_HOST_DBR_RING_ADDR_HI 0xf + +#define WMI_HOST_DBR_RING_ADDR_HI_GET(dword) \ + WMI_HOST_F_MS(dword, WMI_HOST_DBR_RING_ADDR_HI) +#define WMI_HOST_DBR_RING_ADDR_HI_SET(dword, val) \ + WMI_HOST_F_RMW(dword, val, WMI_HOST_DBR_RING_ADDR_HI) + +#define WMI_HOST_DBR_DATA_ADDR_LO_S 0 +#define WMI_HOST_DBR_DATA_ADDR_LO 0xffffffff + +#define WMI_HOST_DBR_DATA_ADDR_LO_GET(dword) \ + WMI_HOST_F_MS(dword, WMI_HOST_DBR_DATA_ADDR_LO) +#define WMI_HOST_DBR_DATA_ADDR_LO_SET(dword, val) \ + WMI_HOST_F_RMW(dword, val, WMI_HOST_DBR_DATA_ADDR_LO) + +#define WMI_HOST_DBR_DATA_ADDR_HI_S 0 +#define WMI_HOST_DBR_DATA_ADDR_HI 0xf + +#define WMI_HOST_DBR_DATA_ADDR_HI_GET(dword) \ + WMI_HOST_F_MS(dword, WMI_HOST_DBR_DATA_ADDR_HI) +#define WMI_HOST_DBR_DATA_ADDR_HI_SET(dword, val) \ + WMI_HOST_F_RMW(dword, val, WMI_HOST_DBR_DATA_ADDR_HI) + +#define WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA_S 12 +#define WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA 0xfffff + +#define WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA_GET(dword) \ + WMI_HOST_F_MS(dword, WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA) +#define WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA_SET(dword, val) \ + WMI_HOST_F_RMW(dword, val, WMI_HOST_DBR_DATA_ADDR_HI_HOST_DATA) + +/** + * struct direct_buf_rx_entry: direct buffer rx release entry structure + * + * @addr_lo: LSB 32-bits of the buffer + * @addr_hi: MSB 32-bits of the buffer + * @len: Length of the buffer + */ +struct direct_buf_rx_entry { + uint32_t paddr_lo; + uint32_t paddr_hi; + uint32_t len; +}; + +/** + * struct direct_buf_rx_rsp: direct buffer rx response structure + * + * @pdev_id: Index of the pdev for which response is received + * @mod_mod: Index of the module for which respone is received + * @num_buf_release_entry: Number of buffers released through event + * @dbr_entries: Pointer to direct buffer rx entry struct + */ +struct direct_buf_rx_rsp { + uint32_t pdev_id; + uint32_t mod_id; + uint32_t num_buf_release_entry; + struct direct_buf_rx_entry *dbr_entries; +}; + +/** + * struct direct_buf_rx_cfg_req: direct buffer rx config request structure + * + * @pdev_id: Index of the pdev for which response is received + * @mod_id: Index of the module for which respone is received + * @base_paddr_lo: Lower 32bits of ring base address + * @base_paddr_hi: Higher 32bits of ring base address + * @head_idx_paddr_lo: Lower 32bits of head idx register address + * @head_idx_paddr_hi: Higher 32bits of head idx register address + * @tail_idx_paddr_lo: Lower 32bits of tail idx register address + * @tail_idx_paddr_hi: Higher 32bits of tail idx register address + * @buf_size: Size of the buffer for each pointer in the ring + * @num_elems: Number of pointers allocated and part of the source ring + */ +struct direct_buf_rx_cfg_req { + uint32_t pdev_id; + uint32_t mod_id; + uint32_t base_paddr_lo; + uint32_t base_paddr_hi; + uint32_t head_idx_paddr_lo; + uint32_t head_idx_paddr_hi; + uint32_t tail_idx_paddr_hi; + uint32_t tail_idx_paddr_lo; + uint32_t buf_size; + uint32_t num_elems; + uint32_t event_timeout_ms; + uint32_t num_resp_per_event; +}; + #endif /* _WMI_UNIFIED_PARAM_H_ */ diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index ca0e9c6f78..e989919493 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -628,6 +628,9 @@ QDF_STATUS (*send_oem_dma_cfg_cmd)(wmi_unified_t wmi_handle, wmi_oem_dma_ring_cfg_req_fixed_param *cfg); #endif +QDF_STATUS (*send_dbr_cfg_cmd)(wmi_unified_t wmi_handle, + struct direct_buf_rx_cfg_req *cfg); + QDF_STATUS (*send_start_oem_data_cmd)(wmi_unified_t wmi_handle, uint32_t data_len, uint8_t *data); @@ -1354,6 +1357,21 @@ QDF_STATUS (*extract_reg_cap_service_ready_ext)( uint8_t *evt_buf, uint8_t phy_idx, struct wlan_psoc_host_hal_reg_capabilities_ext *param); +QDF_STATUS (*extract_dbr_ring_cap_service_ready_ext)( + wmi_unified_t wmi_handle, + uint8_t *evt_buf, uint8_t idx, + struct wlan_psoc_host_dbr_ring_caps *param); + +QDF_STATUS (*extract_dbr_buf_release_fixed)( + wmi_unified_t wmi_handle, + uint8_t *evt_buf, + struct direct_buf_rx_rsp *param); + +QDF_STATUS (*extract_dbr_buf_release_entry)( + wmi_unified_t wmi_handle, + uint8_t *evt_buf, uint8_t idx, + struct direct_buf_rx_entry *param); + QDF_STATUS (*extract_pdev_utf_event)(wmi_unified_t wmi_hdl, uint8_t *evt_buf, struct wmi_host_pdev_utf_event *param); diff --git a/wmi/src/wmi_unified_api.c b/wmi/src/wmi_unified_api.c index d6d33bce8f..b7dccadf04 100644 --- a/wmi/src/wmi_unified_api.c +++ b/wmi/src/wmi_unified_api.c @@ -2347,6 +2347,17 @@ QDF_STATUS wmi_unified_oem_dma_ring_cfg(void *wmi_hdl, } #endif +QDF_STATUS wmi_unified_dbr_ring_cfg(void *wmi_hdl, + struct direct_buf_rx_cfg_req *cfg) +{ + wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; + + if (wmi_handle->ops->send_dbr_cfg_cmd) + return wmi_handle->ops->send_dbr_cfg_cmd(wmi_handle, cfg); + + return QDF_STATUS_E_FAILURE; +} + /** * wmi_unified_start_oem_data_cmd() - start OEM data request to target * @wmi_handle: wmi handle @@ -6759,6 +6770,51 @@ QDF_STATUS wmi_extract_reg_cap_service_ready_ext( return QDF_STATUS_E_FAILURE; } +QDF_STATUS wmi_extract_dbr_ring_cap_service_ready_ext( + void *wmi_hdl, + uint8_t *evt_buf, uint8_t idx, + struct wlan_psoc_host_dbr_ring_caps *param) +{ + wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; + + if (wmi_handle->ops->extract_dbr_ring_cap_service_ready_ext) + return wmi_handle->ops->extract_dbr_ring_cap_service_ready_ext( + wmi_handle, + evt_buf, idx, param); + + return QDF_STATUS_E_FAILURE; +} + +QDF_STATUS wmi_extract_dbr_buf_release_fixed( + void *wmi_hdl, + uint8_t *evt_buf, + struct direct_buf_rx_rsp *param) +{ + wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; + + if (wmi_handle->ops->extract_dbr_buf_release_fixed) + return wmi_handle->ops->extract_dbr_buf_release_fixed( + wmi_handle, + evt_buf, param); + + return QDF_STATUS_E_FAILURE; +} + +QDF_STATUS wmi_extract_dbr_buf_release_entry( + void *wmi_hdl, + uint8_t *evt_buf, uint8_t idx, + struct direct_buf_rx_entry *param) +{ + wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl; + + if (wmi_handle->ops->extract_dbr_buf_release_entry) + return wmi_handle->ops->extract_dbr_buf_release_entry( + wmi_handle, + evt_buf, idx, param); + + return QDF_STATUS_E_FAILURE; +} + /** * wmi_extract_pdev_utf_event() - * extract UTF data from pdev utf event diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c index f83dcf7c3e..b77785094f 100644 --- a/wmi/src/wmi_unified_non_tlv.c +++ b/wmi/src/wmi_unified_non_tlv.c @@ -8630,6 +8630,8 @@ static void populate_non_tlv_service(uint32_t *wmi_service) wmi_service[wmi_service_chan_load_info] = WMI_SERVICE_UNAVAILABLE; wmi_service[wmi_service_ack_timeout] = WMI_SERVICE_UNAVAILABLE; wmi_service[wmi_service_widebw_scan] = WMI_SERVICE_UNAVAILABLE; + wmi_service[wmi_service_support_dma] = + WMI_SERVICE_UNAVAILABLE; } /** diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c index 12d0420017..cc2a6c7307 100644 --- a/wmi/src/wmi_unified_tlv.c +++ b/wmi/src/wmi_unified_tlv.c @@ -8793,6 +8793,68 @@ static QDF_STATUS send_oem_dma_cfg_cmd_tlv(wmi_unified_t wmi_handle, } #endif +/** + * send_dbr_cfg_cmd_tlv() - configure DMA rings for Direct Buf RX + * @wmi_handle: wmi handle + * @data_len: len of dma cfg req + * @data: dma cfg req + * + * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failure + */ +static QDF_STATUS send_dbr_cfg_cmd_tlv(wmi_unified_t wmi_handle, + struct direct_buf_rx_cfg_req *cfg) +{ + wmi_buf_t buf; + wmi_dma_ring_cfg_req_fixed_param *cmd; + QDF_STATUS ret; + int32_t len = sizeof(*cmd); + + buf = wmi_buf_alloc(wmi_handle, sizeof(*cmd)); + if (!buf) { + WMI_LOGE(FL("wmi_buf_alloc failed")); + return QDF_STATUS_E_FAILURE; + } + + cmd = (wmi_dma_ring_cfg_req_fixed_param *)wmi_buf_data(buf); + + WMITLV_SET_HDR(&cmd->tlv_header, + WMITLV_TAG_STRUC_wmi_dma_ring_cfg_req_fixed_param, + WMITLV_GET_STRUCT_TLVLEN(wmi_dma_ring_cfg_req_fixed_param)); + + cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target( + cfg->pdev_id); + cmd->mod_id = cfg->mod_id; + cmd->base_paddr_lo = cfg->base_paddr_lo; + cmd->base_paddr_hi = cfg->base_paddr_hi; + cmd->head_idx_paddr_lo = cfg->head_idx_paddr_lo; + cmd->head_idx_paddr_hi = cfg->head_idx_paddr_hi; + cmd->tail_idx_paddr_lo = cfg->tail_idx_paddr_lo; + cmd->tail_idx_paddr_hi = cfg->tail_idx_paddr_hi; + cmd->num_elems = cfg->num_elems; + cmd->buf_size = cfg->buf_size; + cmd->num_resp_per_event = cfg->num_resp_per_event; + cmd->event_timeout_ms = cfg->event_timeout_ms; + + WMI_LOGD("%s: wmi_dma_ring_cfg_req_fixed_param pdev id %d mod id %d" + "base paddr lo %x base paddr hi %x head idx paddr lo %x" + "head idx paddr hi %x tail idx paddr lo %x" + "tail idx addr hi %x num elems %d buf size %d num resp %d" + "event timeout %d\n", __func__, cmd->pdev_id, + cmd->mod_id, cmd->base_paddr_lo, cmd->base_paddr_hi, + cmd->head_idx_paddr_lo, cmd->head_idx_paddr_hi, + cmd->tail_idx_paddr_lo, cmd->tail_idx_paddr_hi, + cmd->num_elems, cmd->buf_size, cmd->num_resp_per_event, + cmd->event_timeout_ms); + ret = wmi_unified_cmd_send(wmi_handle, buf, len, + WMI_PDEV_DMA_RING_CFG_REQ_CMDID); + if (QDF_IS_STATUS_ERROR(ret)) { + WMI_LOGE(FL(":wmi cmd send failed")); + wmi_buf_free(buf); + } + + return ret; +} + /** * send_start_11d_scan_cmd_tlv() - start 11d scan request * @wmi_handle: wmi handle @@ -18428,6 +18490,7 @@ static QDF_STATUS extract_service_ready_ext_tlv(wmi_unified_t wmi_handle, param->mpdu_density = ev->mpdu_density; param->max_bssid_rx_filters = ev->max_bssid_rx_filters; param->fw_build_vers_ext = ev->fw_build_vers_ext; + param->num_dbr_ring_caps = param_buf->num_dma_ring_caps; qdf_mem_copy(¶m->ppet, &ev->ppet, sizeof(param->ppet)); hw_caps = param_buf->soc_hw_mode_caps; @@ -18658,6 +18721,79 @@ static QDF_STATUS extract_reg_cap_service_ready_ext_tlv( return QDF_STATUS_SUCCESS; } +static QDF_STATUS extract_dbr_ring_cap_service_ready_ext_tlv( + wmi_unified_t wmi_handle, + uint8_t *event, uint8_t idx, + struct wlan_psoc_host_dbr_ring_caps *param) +{ + WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *param_buf; + WMI_DMA_RING_CAPABILITIES *dbr_ring_caps; + + param_buf = (WMI_SERVICE_READY_EXT_EVENTID_param_tlvs *)event; + if (!param_buf) + return QDF_STATUS_E_INVAL; + + dbr_ring_caps = ¶m_buf->dma_ring_caps[idx]; + + param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host( + dbr_ring_caps->pdev_id); + param->mod_id = dbr_ring_caps->mod_id; + param->ring_elems_min = dbr_ring_caps->ring_elems_min; + param->min_buf_size = dbr_ring_caps->min_buf_size; + param->min_buf_align = dbr_ring_caps->min_buf_align; + + return QDF_STATUS_SUCCESS; +} + +static QDF_STATUS extract_dbr_buf_release_fixed_tlv(wmi_unified_t wmi_handle, + uint8_t *event, struct direct_buf_rx_rsp *param) +{ + WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID_param_tlvs *param_buf; + wmi_dma_buf_release_fixed_param *ev; + + param_buf = (WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID_param_tlvs *)event; + if (!param_buf) + return QDF_STATUS_E_INVAL; + + ev = param_buf->fixed_param; + if (!ev) + return QDF_STATUS_E_INVAL; + + param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host( + ev->pdev_id); + param->mod_id = ev->mod_id; + param->num_buf_release_entry = ev->num_buf_release_entry; + WMI_LOGD("%s:pdev id %d mod id %d num buf release entry %d\n", __func__, + param->pdev_id, param->mod_id, param->num_buf_release_entry); + + return QDF_STATUS_SUCCESS; +} + +static QDF_STATUS extract_dbr_buf_release_entry_tlv(wmi_unified_t wmi_handle, + uint8_t *event, uint8_t idx, struct direct_buf_rx_entry *param) +{ + WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID_param_tlvs *param_buf; + wmi_dma_buf_release_entry *entry; + + param_buf = (WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID_param_tlvs *)event; + if (!param_buf) + return QDF_STATUS_E_INVAL; + + entry = ¶m_buf->entries[idx]; + + if (!entry) { + WMI_LOGE("%s: Entry is NULL\n", __func__); + return QDF_STATUS_E_FAILURE; + } + + WMI_LOGD("%s: paddr_lo[%d] = %x\n", __func__, idx, entry->paddr_lo); + + param->paddr_lo = entry->paddr_lo; + param->paddr_hi = entry->paddr_hi; + + return QDF_STATUS_SUCCESS; +} + /** * extract_dcs_interference_type_tlv() - extract dcs interference type * from event @@ -20229,6 +20365,7 @@ struct wmi_ops tlv_ops = { #ifdef WLAN_FEATURE_CIF_CFR .send_oem_dma_cfg_cmd = send_oem_dma_cfg_cmd_tlv, #endif + .send_dbr_cfg_cmd = send_dbr_cfg_cmd_tlv, .send_dfs_phyerr_filter_offload_en_cmd = send_dfs_phyerr_filter_offload_en_cmd_tlv, .send_wow_delete_pattern_cmd = send_wow_delete_pattern_cmd_tlv, @@ -20408,6 +20545,10 @@ struct wmi_ops tlv_ops = { extract_mac_phy_cap_service_ready_ext_tlv, .extract_reg_cap_service_ready_ext = extract_reg_cap_service_ready_ext_tlv, + .extract_dbr_ring_cap_service_ready_ext = + extract_dbr_ring_cap_service_ready_ext_tlv, + .extract_dbr_buf_release_fixed = extract_dbr_buf_release_fixed_tlv, + .extract_dbr_buf_release_entry = extract_dbr_buf_release_entry_tlv, .extract_pdev_utf_event = extract_pdev_utf_event_tlv, .wmi_set_htc_tx_tag = wmi_set_htc_tx_tag_tlv, .extract_dcs_interference_type = extract_dcs_interference_type_tlv, @@ -20744,6 +20885,8 @@ static void populate_tlv_events_id(uint32_t *event_ids) event_ids[wmi_radio_tx_power_level_stats_event_id] = WMI_RADIO_TX_POWER_LEVEL_STATS_EVENTID; event_ids[wmi_report_stats_event_id] = WMI_REPORT_STATS_EVENTID; + event_ids[wmi_dma_buf_release_event_id] = + WMI_PDEV_DMA_RING_BUF_RELEASE_EVENTID; } #ifndef CONFIG_MCL @@ -20942,6 +21085,8 @@ static void populate_tlv_service(uint32_t *wmi_service) WMI_SERVICE_BCN_OFFLOAD_START_STOP_SUPPORT; wmi_service[wmi_service_offchan_data_tid_support] = WMI_SERVICE_OFFCHAN_DATA_TID_SUPPORT; + wmi_service[wmi_service_support_dma] = + WMI_SERVICE_SUPPORT_DIRECT_DMA; } /**