samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: dp: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF

Browse Source 
Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF.

CRs-Fixed: 2760938
Change-Id: Ib7999b69f79a65a67e1d9f7e24a04b7a7da0aebf
This commit is contained in:
Srinivas Girigowda
2020-08-10 16:29:10 -07:00
committed by snandini
parent ffc5af7bbf
commit b100ced3c7
8 changed files with 106 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
dp/wifi3.0/dp_peer.c
View File

@@ -247,8 +247,8 @@ void dp_peer_find_hash_add(struct dp_soc *soc, struct dp_peer *peer)
if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM",
peer ? peer->mac_addr.raw : NULL);
"unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT,
peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL);
qdf_spin_unlock_bh(&soc->peer_hash_lock);
return;
}
@@ -280,8 +280,8 @@ void dp_peer_vdev_list_add(struct dp_soc *soc, struct dp_vdev *vdev,
if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM",
peer ? peer->mac_addr.raw : NULL);
"unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT,
peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL);
qdf_spin_unlock_bh(&vdev->peer_list_lock);
return;
}
@@ -351,8 +351,8 @@ void dp_peer_find_id_to_obj_add(struct dp_soc *soc,
if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM peer_id %u",
peer ? peer->mac_addr.raw : NULL, peer_id);
"unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT" peer_id %u",
peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL, peer_id);
qdf_spin_unlock_bh(&soc->peer_map_lock);
return;
@@ -723,8 +723,9 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc,
}
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %pM",
__func__, peer, hw_peer_id, vdev_id, mac_addr);
"%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
__func__, peer, hw_peer_id, vdev_id,
QDF_MAC_ADDR_REF(mac_addr));
qdf_spin_lock_bh(&soc->ast_lock);
@@ -766,9 +767,10 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc,
}
} else {
qdf_spin_unlock_bh(&soc->ast_lock);
dp_alert("AST entry not found with peer %pK peer_id %u peer_mac %pM mac_addr %pM vdev_id %u next_hop %u",
dp_alert("AST entry not found with peer %pK peer_id %u peer_mac "QDF_MAC_ADDR_FMT" mac_addr "QDF_MAC_ADDR_FMT" vdev_id %u next_hop %u",
peer, peer->peer_id,
peer->mac_addr.raw, mac_addr,
QDF_MAC_ADDR_REF(peer->mac_addr.raw),
QDF_MAC_ADDR_REF(mac_addr),
vdev_id, is_wds);
}
err = QDF_STATUS_E_INVAL;
@@ -897,9 +899,10 @@ QDF_STATUS dp_peer_add_ast(struct dp_soc *soc,
}
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: %pM peer: %pK mac %pM",
"%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: "QDF_MAC_ADDR_FMT" peer: %pK mac "QDF_MAC_ADDR_FMT,
__func__, pdev->pdev_id, vdev->vdev_id, type, flags,
peer->mac_addr.raw, peer, mac_addr);
QDF_MAC_ADDR_REF(peer->mac_addr.raw), peer,
QDF_MAC_ADDR_REF(mac_addr));
/* fw supports only 2 times the max_peers ast entries */
@@ -1292,10 +1295,11 @@ int dp_peer_update_ast(struct dp_soc *soc, struct dp_peer *peer,
struct dp_peer *old_peer;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"%s: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: %pM peer_mac: %pM\n",
"%s: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: "QDF_MAC_ADDR_FMT" peer_mac: "QDF_MAC_ADDR_FMT"\n",
__func__, ast_entry->type, peer->vdev->pdev->pdev_id,
peer->vdev->vdev_id, flags, ast_entry->mac_addr.raw,
peer->mac_addr.raw);
peer->vdev->vdev_id, flags,
QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw),
QDF_MAC_ADDR_REF(peer->mac_addr.raw));
/* Do not send AST update in below cases
* 1) Ast entry delete has already triggered
@@ -1480,9 +1484,10 @@ void dp_peer_ast_send_wds_del(struct dp_soc *soc,
bool delete_in_fw = false;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_TRACE,
"%s: ast_entry->type: %d pdevid: %u vdev: %u mac_addr: %pM next_hop: %u peer_id: %uM\n",
"%s: ast_entry->type: %d pdevid: %u vdev: %u mac_addr: "QDF_MAC_ADDR_FMT" next_hop: %u peer_id: %uM\n",
__func__, ast_entry->type, ast_entry->pdev_id,
ast_entry->vdev_id, ast_entry->mac_addr.raw,
ast_entry->vdev_id,
QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw),
ast_entry->next_hop, ast_entry->peer_id);
/*
@@ -1575,7 +1580,7 @@ dp_peer_clean_wds_entries(struct dp_soc *soc, struct dp_peer *peer,
if ((DP_PEER_WDS_COUNT_INVALID != free_wds_count) &&
(free_wds_count != wds_deleted)) {
DP_STATS_INC(soc, ast.ast_mismatch, 1);
dp_alert("For peer %pK (mac: %pM)number of wds entries deleted by fw = %d during peer delete is not same as the numbers deleted by host = %d",
dp_alert("For peer %pK (mac: "QDF_MAC_ADDR_FMT")number of wds entries deleted by fw = %d during peer delete is not same as the numbers deleted by host = %d",
peer, peer->mac_addr.raw, free_wds_count,
wds_deleted);
}
@@ -1935,8 +1940,9 @@ static inline struct dp_peer *dp_peer_find_add_id(struct dp_soc *soc,
peer = dp_peer_find_hash_find(soc, peer_mac_addr,
0 /* is aligned */, vdev_id, DP_MOD_ID_CONFIG);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %pM",
__func__, peer, peer_id, vdev_id, peer_mac_addr);
"%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
__func__, peer, peer_id, vdev_id,
QDF_MAC_ADDR_REF(peer_mac_addr));
if (peer) {
/* peer's ref count was already incremented by
@@ -1952,8 +1958,9 @@ static inline struct dp_peer *dp_peer_find_add_id(struct dp_soc *soc,
*/
if (peer->peer_state == DP_PEER_STATE_LOGICAL_DELETE) {
dp_peer_unref_delete(peer, DP_MOD_ID_CONFIG);
dp_alert("Peer %pK[%pM] logical delete state vid %d",
peer, peer_mac_addr, vdev_id);
dp_alert("Peer %pK["QDF_MAC_ADDR_FMT"] logical delete state vid %d",
peer, QDF_MAC_ADDR_REF(peer_mac_addr),
vdev_id);
return NULL;
}
dp_peer_find_id_to_obj_add(soc, peer, peer_id);
@@ -1997,9 +2004,9 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC;
QDF_STATUS err = QDF_STATUS_SUCCESS;
dp_info("peer_map_event (soc:%pK): peer_id %d, hw_peer_id %d, peer_mac %pM, vdev_id %d",
dp_info("peer_map_event (soc:%pK): peer_id %d, hw_peer_id %d, peer_mac "QDF_MAC_ADDR_FMT", vdev_id %d",
soc, peer_id, hw_peer_id,
peer_mac_addr, vdev_id);
QDF_MAC_ADDR_REF(peer_mac_addr), vdev_id);
/* Peer map event for WDS ast entry get the peer from
* obj map
@@ -2053,8 +2060,8 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
* referring it
*/
if (!peer->self_ast_entry) {
dp_info("Add self ast from map %pM",
peer_mac_addr);
dp_info("Add self ast from map "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac_addr));
dp_peer_add_ast(soc, peer,
peer_mac_addr,
type, 0);
@@ -2108,9 +2115,10 @@ dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
return;
}
dp_alert("AST entry not found with peer %pK peer_id %u peer_mac %pM mac_addr %pM vdev_id %u next_hop %u",
dp_alert("AST entry not found with peer %pK peer_id %u peer_mac "QDF_MAC_ADDR_FMT" mac_addr "QDF_MAC_ADDR_FMT" vdev_id %u next_hop %u",
peer, peer->peer_id,
peer->mac_addr.raw, mac_addr, vdev_id,
QDF_MAC_ADDR_REF(peer->mac_addr.raw),
QDF_MAC_ADDR_REF(mac_addr), vdev_id,
is_wds);
dp_peer_unref_delete(peer, DP_MOD_ID_HTT);
@@ -2200,8 +2208,8 @@ static bool dp_get_peer_vdev_roaming_in_progress(struct dp_peer *peer)
is_roaming = ol_ops->is_roam_inprogress(vdev_id);
}
dp_info("peer: %pM, vdev_id: %d, is_roaming: %d",
peer->mac_addr.raw, vdev_id, is_roaming);
dp_info("peer: "QDF_MAC_ADDR_FMT", vdev_id: %d, is_roaming: %d",
QDF_MAC_ADDR_REF(peer->mac_addr.raw), vdev_id, is_roaming);
return is_roaming;
}
@@ -3094,8 +3102,8 @@ int dp_addba_resp_tx_completion_wifi3(struct cdp_soc_t *cdp_soc,
if (!qdf_atomic_read(&peer->is_default_route_set)) {
qdf_spin_unlock_bh(&rx_tid->tid_lock);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"%s: default route is not set for peer: %pM",
__func__, peer->mac_addr.raw);
"%s: default route is not set for peer: "QDF_MAC_ADDR_FMT,
__func__, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
goto fail;
}
@@ -3638,9 +3646,9 @@ dp_set_key_sec_type_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id,
}
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"key sec spec for peer %pK %pM: %s key of type %d",
"key sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d",
peer,
peer->mac_addr.raw,
QDF_MAC_ADDR_REF(peer->mac_addr.raw),
is_unicast ? "ucast" : "mcast",
sec_type);
@@ -3669,9 +3677,9 @@ dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
return;
}
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"sec spec for peer %pK %pM: %s key of type %d",
"sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d",
peer,
peer->mac_addr.raw,
QDF_MAC_ADDR_REF(peer->mac_addr.raw),
is_unicast ? "ucast" : "mcast",
sec_type);
sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast;
@@ -3907,7 +3915,8 @@ QDF_STATUS dp_peer_state_update(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac,
DP_MOD_ID_CDP);
if (!peer) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"Failed to find peer for: [%pM]", peer_mac);
"Failed to find peer for: ["QDF_MAC_ADDR_FMT"]",
QDF_MAC_ADDR_REF(peer_mac));
return QDF_STATUS_E_FAILURE;
}
peer->state = state;
@@ -3953,8 +3962,8 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,
if (!pdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr: %pM",
peer_addr.bytes);
"PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_addr.bytes));
return NULL;
}
@@ -3962,8 +3971,8 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,
DP_VDEV_ALL, DP_MOD_ID_CDP);
if (!peer) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr: %pM",
peer_addr.bytes);
"PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_addr.bytes));
return NULL;
}
@@ -4141,8 +4150,8 @@ bool dp_find_peer_exist_on_other_vdev(struct cdp_soc_t *soc_hdl,
peer = dp_peer_find_hash_find(soc, peer_addr, 0, i,
DP_MOD_ID_CDP);
if (peer) {
dp_err("%s: Duplicate peer %pM already exist on vdev %d",
__func__, peer_addr, i);
dp_err("%s: Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d",
__func__, QDF_MAC_ADDR_REF(peer_addr), i);
dp_peer_unref_delete(peer, DP_MOD_ID_CDP);
return true;
}