Merge "qca-wifi: Reduce log level for dumping lut"
diff --git a/dp/wifi3.0/dp_rx_tag.c b/dp/wifi3.0/dp_rx_tag.c
index fb439d2..fbf2518 100644
--- a/dp/wifi3.0/dp_rx_tag.c
+++ b/dp/wifi3.0/dp_rx_tag.c
@@ -135,7 +135,7 @@
cce_match = true;
/* Get the cce_metadata from RX MSDU TLV */
- cce_metadata = (hal_rx_msdu_cce_metadata_get(rx_tlv_hdr) &
+ cce_metadata = (hal_rx_msdu_cce_metadata_get(soc->hal_soc, rx_tlv_hdr) &
RX_MSDU_END_16_CCE_METADATA_MASK);
/*
* Received CCE metadata should be within the
@@ -160,7 +160,7 @@
qdf_nbuf_set_rx_protocol_tag(nbuf, protocol_tag);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW,
"Seq:%u dcap:%u CCE Match:%u ProtoID:%u Tag:%u stats:%u",
- hal_rx_get_rx_sequence(rx_tlv_hdr),
+ hal_rx_get_rx_sequence(soc->hal_soc, rx_tlv_hdr),
vdev->rx_decap_type, cce_match, cce_metadata,
protocol_tag, is_update_stats);
@@ -207,12 +207,12 @@
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW,
"Seq:%u dcap:%u invalid:%u timeout:%u flow:%u tag:%u stat:%u",
- hal_rx_get_rx_sequence(rx_tlv_hdr),
+ hal_rx_get_rx_sequence(soc->hal_soc, rx_tlv_hdr),
vdev->rx_decap_type,
- hal_rx_msdu_flow_idx_invalid(rx_tlv_hdr),
- hal_rx_msdu_flow_idx_timeout(rx_tlv_hdr),
- hal_rx_msdu_flow_idx_get(rx_tlv_hdr),
- hal_rx_msdu_fse_metadata_get(rx_tlv_hdr),
+ hal_rx_msdu_flow_idx_invalid(soc->hal_soc, rx_tlv_hdr),
+ hal_rx_msdu_flow_idx_timeout(soc->hal_soc, rx_tlv_hdr),
+ hal_rx_msdu_flow_idx_get(soc->hal_soc, rx_tlv_hdr),
+ hal_rx_msdu_fse_metadata_get(soc->hal_soc, rx_tlv_hdr),
update_stats);
/**
@@ -225,8 +225,8 @@
if (qdf_likely((vdev->rx_decap_type != htt_cmn_pkt_type_ethernet)))
return;
- flow_idx_invalid = hal_rx_msdu_flow_idx_invalid(rx_tlv_hdr);
- hal_rx_msdu_get_flow_params(rx_tlv_hdr, &flow_idx_invalid,
+ flow_idx_invalid = hal_rx_msdu_flow_idx_invalid(soc->hal_soc, rx_tlv_hdr);
+ hal_rx_msdu_get_flow_params(soc->hal_soc, rx_tlv_hdr, &flow_idx_invalid,
&flow_idx_timeout, &flow_idx);
if (qdf_unlikely(flow_idx_invalid))
return;
@@ -238,14 +238,14 @@
* Limit FSE metadata to 16 bit as we have allocated only
* 16 bits for flow_tag field in skb->cb
*/
- fse_metadata = hal_rx_msdu_fse_metadata_get(rx_tlv_hdr) & 0xFFFF;
+ fse_metadata = hal_rx_msdu_fse_metadata_get(soc->hal_soc, rx_tlv_hdr) & 0xFFFF;
/* update the skb->cb with the user-specified tag/metadata */
qdf_nbuf_set_rx_flow_tag(nbuf, fse_metadata);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW,
"Seq:%u dcap:%u invalid:%u timeout:%u flow:%u tag:%u stat:%u",
- hal_rx_get_rx_sequence(rx_tlv_hdr),
+ hal_rx_get_rx_sequence(soc->hal_soc, rx_tlv_hdr),
vdev->rx_decap_type, flow_idx_invalid, flow_idx_timeout,
flow_idx, fse_metadata, update_stats);
@@ -284,7 +284,7 @@
if (qdf_likely(1 != dp_pdev->ppdu_info.rx_status.rxpcu_filter_pass))
return;
- msdu_ppdu_id = HAL_RX_HW_DESC_GET_PPDUID_GET(rx_desc);
+ msdu_ppdu_id = hal_rx_hw_desc_get_ppduid_get(soc->hal_soc, rx_desc);
if (msdu_ppdu_id != dp_pdev->ppdu_info.com_info.ppdu_id) {
QDF_TRACE(QDF_MODULE_ID_DP,
diff --git a/dp/wifi3.0/dp_txrx_wds.h b/dp/wifi3.0/dp_txrx_wds.h
index f307b22..c8084fb 100644
--- a/dp/wifi3.0/dp_txrx_wds.h
+++ b/dp/wifi3.0/dp_txrx_wds.h
@@ -274,8 +274,8 @@
struct dp_peer *ta_peer,
qdf_nbuf_t nbuf)
{
- uint16_t sa_sw_peer_id = hal_rx_msdu_end_sa_sw_peer_id_get(rx_tlv_hdr);
- uint8_t sa_is_valid = hal_rx_msdu_end_sa_is_valid_get(rx_tlv_hdr);
+ uint16_t sa_sw_peer_id = hal_rx_msdu_end_sa_sw_peer_id_get(soc->hal_soc, rx_tlv_hdr);
+ uint8_t sa_is_valid = hal_rx_msdu_end_sa_is_valid_get(soc->hal_soc, rx_tlv_hdr);
uint16_t sa_idx;
uint8_t is_chfrag_start = 0;
uint8_t is_ad4_valid = 0;
@@ -285,13 +285,13 @@
is_chfrag_start = qdf_nbuf_is_rx_chfrag_start(nbuf);
if (is_chfrag_start)
- is_ad4_valid = hal_rx_get_mpdu_mac_ad4_valid(rx_tlv_hdr);
+ is_ad4_valid = hal_rx_get_mpdu_mac_ad4_valid(soc->hal_soc, rx_tlv_hdr);
/*
* Get the AST entry from HW SA index and mark it as active
*/
- sa_idx = hal_rx_msdu_end_sa_idx_get(rx_tlv_hdr);
+ sa_idx = hal_rx_msdu_end_sa_idx_get(soc->hal_soc, rx_tlv_hdr);
dp_rx_wds_add_or_update_ast(soc, ta_peer, nbuf, is_ad4_valid,
sa_is_valid, is_chfrag_start,
diff --git a/target_if/cfr/src/target_if_cfr_8074v2.c b/target_if/cfr/src/target_if_cfr_8074v2.c
index 05f4317..b6a2e1b 100644
--- a/target_if/cfr/src/target_if_cfr_8074v2.c
+++ b/target_if/cfr/src/target_if_cfr_8074v2.c
@@ -234,7 +234,8 @@
data = payload->vaddr;
cookie = payload->cookie;
- cfr_debug("bufferaddr: 0x%pK cookie: %u", payload->paddr, cookie);
+ cfr_debug("bufferaddr: 0x%pK cookie: %u",
+ (void *)((uintptr_t)payload->paddr), cookie);
qdf_mem_copy(&dma_hdr, &data[0], sizeof(struct whal_cfir_dma_hdr));
dump_dma_hdr(&dma_hdr, 0);
@@ -447,14 +448,15 @@
if (target_if_dbr_cookie_lookup(pdev, DBR_MODULE_CFR, buf_addr,
&cookie, 0)) {
cfr_debug("Cookie lookup failure for addr: 0x%pK status: 0x%x",
- buf_addr, tx_evt_param.status);
+ (void *)((uintptr_t)buf_addr), tx_evt_param.status);
wlan_objmgr_psoc_release_ref(psoc, WLAN_CFR_ID);
wlan_objmgr_vdev_release_ref(vdev, WLAN_CFR_ID);
wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
return -EINVAL;
}
- cfr_debug("buffer address: 0x%pK cookie: %u", buf_addr, cookie);
+ cfr_debug("buffer address: 0x%pK cookie: %u",
+ (void *)((uintptr_t)buf_addr), cookie);
lut = &pdev_cfrobj->lut[cookie];
lut->tx_ppdu_id = (tx_evt_param.correlation_info_2 >> 16);
@@ -507,7 +509,7 @@
cfr_debug("Data sent to upper layers, releasing look up table");
} else if (status == STATUS_HOLD) {
cfr_debug("HOLD for buffer address: 0x%pK cookie: %u",
- buf_addr, cookie);
+ (void *)((uintptr_t)buf_addr), cookie);
} else {
cfr_err("Correlation returned invalid status!!");
wlan_objmgr_psoc_release_ref(psoc, WLAN_CFR_ID);
diff --git a/target_if/cfr/src/target_if_cfr_wifi2_0.c b/target_if/cfr/src/target_if_cfr_wifi2_0.c
index 8d3b5a8..b90aa3c 100644
--- a/target_if/cfr/src/target_if_cfr_wifi2_0.c
+++ b/target_if/cfr/src/target_if_cfr_wifi2_0.c
@@ -96,7 +96,7 @@
status = wlan_objmgr_pdev_try_get_ref(pdev, WLAN_CFR_ID);
if (QDF_IS_STATUS_ERROR(status)) {
- cfr_err("%s,%d unable to get reference", __func__, __LINE__);
+ cfr_err("unable to get reference");
return status;
}
@@ -213,8 +213,8 @@
prindex, cfr_dump_len, &end_magic, 4);
}
- cfr_debug("CFR:%s status=%d rindex=%x dump_len=%d\n", __func__,
- cfr_cap_status, prindex, cfr_dump_len);
+ cfr_debug("CFR: status=%d rindex=0x%pK dump_len=%d\n",
+ cfr_cap_status, prindex, cfr_dump_len);
wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);
@@ -264,7 +264,7 @@
read_offset = pa->cfr_mem_chunk.vaddr;
(*read_offset) =
CFR_CAPTURE_HOST_MEM_DEFAULT_READ_OFFSET;
- cfr_debug("CFR:%s reqid=%d len=%d\n", __func__,
+ cfr_debug("CFR: reqid=%d len=%d\n",
pa->cfr_mem_chunk.req_id,
pa->cfr_mem_chunk.len);
}
diff --git a/wmi/src/wmi_unified_ap_tlv.c b/wmi/src/wmi_unified_ap_tlv.c
index d05e57d..7754518 100644
--- a/wmi/src/wmi_unified_ap_tlv.c
+++ b/wmi/src/wmi_unified_ap_tlv.c
@@ -242,6 +242,7 @@
wmi_pdev_set_ctl_table_cmd_fixed_param));
cmd->ctl_len = param->ctl_cmd_len;
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
buf_ptr += sizeof(*cmd);
@@ -316,6 +317,7 @@
wmi_pdev_set_mimogain_table_cmd_fixed_param));
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
WMI_MIMOGAIN_ARRAY_GAIN_LEN_SET(cmd->mimogain_info, param->tbl_len);
WMI_MIMOGAIN_MULTI_CHAIN_BYPASS_SET(cmd->mimogain_info,
@@ -472,6 +474,7 @@
WMITLV_GET_STRUCT_TLVLEN(
wmi_pdev_get_tpc_cmd_fixed_param));
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
cmd->rate_flags = convert_to_power_info_rate_flags(param);
cmd->nss = param->nss;
@@ -518,7 +521,9 @@
WMITLV_TAG_STRUC_wmi_pdev_get_nfcal_power_fixed_param,
WMITLV_GET_STRUCT_TLVLEN
(wmi_pdev_get_nfcal_power_fixed_param));
- cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(mac_id);
+ cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
+ mac_id);
wmi_mtrace(WMI_PDEV_GET_NFCAL_POWER_CMDID, NO_SESSION, 0);
ret = wmi_unified_cmd_send(wmi_handle, buf, len,
@@ -677,6 +682,7 @@
quiet_cmd->duration = param->duration;
quiet_cmd->next_start = param->offset;
quiet_cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
WMI_HOST_PDEV_ID_SOC);
wmi_mtrace(WMI_PDEV_SET_QUIET_MODE_CMDID, NO_SESSION, 0);
@@ -987,6 +993,7 @@
cmpl_params = param_buf->fixed_param;
param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
cmpl_params->pdev_id);
param->desc_id = cmpl_params->desc_id;
param->status = cmpl_params->status;
@@ -1021,6 +1028,7 @@
csa_status = param_buf->fixed_param;
param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
csa_status->pdev_id);
param->current_switch_count = csa_status->current_switch_count;
param->num_vdevs = csa_status->num_vdevs;
@@ -1148,6 +1156,7 @@
WMITLV_GET_STRUCT_TLVLEN
(wmi_pdev_multiple_vdev_restart_request_cmd_fixed_param));
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
cmd->requestor_id = param->requestor_id;
cmd->disable_hw_ack = param->disable_hw_ack;
@@ -1249,6 +1258,7 @@
param->interference_type = param_buf->fixed_param->interference_type;
param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
param_buf->fixed_param->pdev_id);
return QDF_STATUS_SUCCESS;
@@ -1368,6 +1378,7 @@
event = (wmi_pdev_tpc_event_fixed_param *)param_buf->fixed_param;
param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
event->pdev_id);
qdf_mem_copy(param->tpc, param_buf->tpc, sizeof(param->tpc));
@@ -1436,7 +1447,8 @@
}
param->pdev_id = wmi_handle->ops->
- convert_pdev_id_target_to_host(event->pdev_id);
+ convert_pdev_id_target_to_host(wmi_handle,
+ event->pdev_id);
return QDF_STATUS_SUCCESS;
}
@@ -2204,6 +2216,7 @@
cmpl_params = param_buf->fixed_param;
param->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
cmpl_params->pdev_id);
param->desc_id = cmpl_params->desc_id;
param->status = cmpl_params->status;
@@ -2280,6 +2293,7 @@
ch_hopping->noise_floor_report_iter = event->noise_floor_report_iter;
ch_hopping->noise_floor_total_iter = event->noise_floor_total_iter;
ch_hopping->pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(
+ wmi_handle,
event->pdev_id);
return QDF_STATUS_SUCCESS;
diff --git a/wmi/src/wmi_unified_atf_tlv.c b/wmi/src/wmi_unified_atf_tlv.c
index dce5e7e..339907a 100644
--- a/wmi/src/wmi_unified_atf_tlv.c
+++ b/wmi/src/wmi_unified_atf_tlv.c
@@ -76,6 +76,7 @@
peer_info->vdev_id = param->peer_info[i].vdev_id;
peer_info->pdev_id =
wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->peer_info[i].pdev_id);
/*
* TLV definition for peer atf request fixed param combines
@@ -162,6 +163,7 @@
param->peer_info[i].vdev_id;
peer_info->pdev_id =
wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->peer_info[i].pdev_id);
peer_info++;
}
diff --git a/wmi/src/wmi_unified_non_tlv.c b/wmi/src/wmi_unified_non_tlv.c
index af55446..1dc1e0c 100644
--- a/wmi/src/wmi_unified_non_tlv.c
+++ b/wmi/src/wmi_unified_non_tlv.c
@@ -9867,7 +9867,8 @@
*
* Return None.
*/
-void wmi_non_tlv_pdev_id_conversion_enable(wmi_unified_t wmi_handle)
+void wmi_non_tlv_pdev_id_conversion_enable(wmi_unified_t wmi_handle,
+ uint32_t *pdev_id_map, uint8_t size)
{
WMI_LOGD("PDEV conversion Not Available");
}
diff --git a/wmi/src/wmi_unified_smart_ant_tlv.c b/wmi/src/wmi_unified_smart_ant_tlv.c
index f9d9e57..7987caf 100644
--- a/wmi/src/wmi_unified_smart_ant_tlv.c
+++ b/wmi/src/wmi_unified_smart_ant_tlv.c
@@ -64,6 +64,7 @@
wmi_pdev_smart_ant_enable_cmd_fixed_param));
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
cmd->enable = param->enable;
cmd->mode = param->mode;
@@ -99,6 +100,7 @@
/* Setting it to 0 for now */
gpio_param->pdev_id =
wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
gpio_param++;
}
@@ -158,6 +160,7 @@
wmi_pdev_smart_ant_set_rx_antenna_cmd_fixed_param));
cmd->rx_antenna = param->antenna;
cmd->pdev_id = wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
param->pdev_id);
wmi_mtrace(WMI_PDEV_SMART_ANT_SET_RX_ANTENNA_CMDID, NO_SESSION, 0);
@@ -288,7 +291,9 @@
cmd->antCtrlCommon1 = param->ant_ctrl_common1;
cmd->antCtrlCommon2 = param->ant_ctrl_common2;
cmd->mac_id =
- wmi_handle->ops->convert_pdev_id_host_to_target(param->pdev_id);
+ wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
+ param->pdev_id);
/* TLV indicating array of structures to follow */
buf_ptr += sizeof(wmi_pdev_set_ant_switch_tbl_cmd_fixed_param);
@@ -301,7 +306,9 @@
WMITLV_TAG_STRUC_wmi_pdev_set_ant_ctrl_chain,
WMITLV_GET_STRUCT_TLVLEN(wmi_pdev_set_ant_ctrl_chain));
ctrl_chain->pdev_id =
- wmi_handle->ops->convert_pdev_id_host_to_target(param->pdev_id);
+ wmi_handle->ops->convert_pdev_id_host_to_target(
+ wmi_handle,
+ param->pdev_id);
ctrl_chain->antCtrlChain = param->antCtrlChain;
wmi_mtrace(WMI_PDEV_SET_ANTENNA_SWITCH_TABLE_CMDID, NO_SESSION, 0);
@@ -508,7 +515,8 @@
param_buf = (WMI_PEER_RATECODE_LIST_EVENTID_param_tlvs *)evt_buf;
ev = (wmi_peer_ratecode_list_event_fixed_param *)param_buf->fixed_param;
WMI_MAC_ADDR_TO_CHAR_ARRAY(&ev->peer_macaddr, peer_mac);
- *pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(ev->pdev_id);
+ *pdev_id = wmi_handle->ops->convert_pdev_id_target_to_host(wmi_handle,
+ ev->pdev_id);
for (i = 0; i < SA_BYTES_IN_DWORD; i++) {
rate_cap->ratecount[i] = ((ev->ratecount >> (i*8)) &