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

4
dp/wifi3.0/dp_internal.h
View File

@@ -367,8 +367,8 @@ static inline void dp_set_peer_isolation(struct dp_peer *peer, bool val)
{ {
peer->isolation = val; peer->isolation = val;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"peer:%pM isolation:%d", "peer:"QDF_MAC_ADDR_FMT" isolation:%d",
peer->mac_addr.raw, peer->isolation); QDF_MAC_ADDR_REF(peer->mac_addr.raw), peer->isolation);
} }
#else #else

7
dp/wifi3.0/dp_ipa.c
View File

@@ -1315,7 +1315,8 @@ QDF_STATUS dp_ipa_setup_iface(char *ifname, uint8_t *mac_addr,
struct dp_ipa_uc_tx_hdr uc_tx_hdr_v6; struct dp_ipa_uc_tx_hdr uc_tx_hdr_v6;
int ret = -EINVAL; int ret = -EINVAL;
dp_debug("Add Partial hdr: %s, %pM", ifname, mac_addr); dp_debug("Add Partial hdr: %s, "QDF_MAC_ADDR_FMT, ifname,
QDF_MAC_ADDR_REF(mac_addr));
qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t)); qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));
qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr); qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);
@@ -1570,8 +1571,8 @@ QDF_STATUS dp_ipa_setup_iface(char *ifname, uint8_t *mac_addr,
int ret = -EINVAL; int ret = -EINVAL;
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
"%s: Add Partial hdr: %s, %pM", "%s: Add Partial hdr: %s, "QDF_MAC_ADDR_FMT,
__func__, ifname, mac_addr); __func__, ifname, QDF_MAC_ADDR_REF(mac_addr));
qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t)); qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));
qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr); qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);

45
dp/wifi3.0/dp_main.c
View File

@@ -1235,8 +1235,8 @@ dp_print_peer_ast_entries(struct dp_soc *soc, struct dp_peer *peer, void *arg)
"DA", "HMWDS_SEC"}; "DA", "HMWDS_SEC"};
DP_PEER_ITERATE_ASE_LIST(peer, ase, tmp_ase) { DP_PEER_ITERATE_ASE_LIST(peer, ase, tmp_ase) {
DP_PRINT_STATS("%6d mac_addr = %pM" DP_PRINT_STATS("%6d mac_addr = "QDF_MAC_ADDR_FMT
" peer_mac_addr = %pM" " peer_mac_addr = "QDF_MAC_ADDR_FMT
" peer_id = %u" " peer_id = %u"
" type = %s" " type = %s"
" next_hop = %d" " next_hop = %d"
@@ -1247,8 +1247,8 @@ dp_print_peer_ast_entries(struct dp_soc *soc, struct dp_peer *peer, void *arg)
" pdev_id = %d" " pdev_id = %d"
" vdev_id = %d", " vdev_id = %d",
++num_entries, ++num_entries,
ase->mac_addr.raw, QDF_MAC_ADDR_REF(ase->mac_addr.raw),
peer->mac_addr.raw, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
ase->peer_id, ase->peer_id,
type[ase->type], type[ase->type],
ase->next_hop, ase->next_hop,
@@ -1305,14 +1305,14 @@ void dp_print_ast_stats(struct dp_soc *soc)
static void static void
dp_print_peer_info(struct dp_soc *soc, struct dp_peer *peer, void *arg) dp_print_peer_info(struct dp_soc *soc, struct dp_peer *peer, void *arg)
{ {
DP_PRINT_STATS(" peer_mac_addr = %pM" DP_PRINT_STATS(" peer_mac_addr = "QDF_MAC_ADDR_FMT
" nawds_enabled = %d" " nawds_enabled = %d"
" bss_peer = %d" " bss_peer = %d"
" wds_enabled = %d" " wds_enabled = %d"
" tx_cap_enabled = %d" " tx_cap_enabled = %d"
" rx_cap_enabled = %d" " rx_cap_enabled = %d"
" peer id = %d", " peer id = %d",
peer->mac_addr.raw, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
peer->nawds_enabled, peer->nawds_enabled,
peer->bss_peer, peer->bss_peer,
peer->wds_enabled, peer->wds_enabled,
@@ -5210,7 +5210,8 @@ static QDF_STATUS dp_vdev_attach_wifi3(struct cdp_soc_t *cdp_soc,
if (pdev->vdev_count == 1) if (pdev->vdev_count == 1)
dp_lro_hash_setup(soc, pdev); dp_lro_hash_setup(soc, pdev);
dp_info("Created vdev %pK (%pM)", vdev, vdev->mac_addr.raw); dp_info("Created vdev %pK ("QDF_MAC_ADDR_FMT")", vdev,
QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
DP_STATS_INIT(vdev); DP_STATS_INIT(vdev);
if (wlan_op_mode_sta == vdev->opmode) if (wlan_op_mode_sta == vdev->opmode)
@@ -5334,8 +5335,8 @@ static void dp_vdev_flush_peers(struct cdp_vdev *vdev_handle, bool unmap_only)
continue; continue;
} }
dp_info("peer: %pM is getting unmap", dp_info("peer: "QDF_MAC_ADDR_FMT" is getting unmap",
peer->mac_addr.raw); QDF_MAC_ADDR_REF(peer->mac_addr.raw));
dp_rx_peer_unmap_handler(soc, i, dp_rx_peer_unmap_handler(soc, i,
vdev->vdev_id, vdev->vdev_id,
@@ -5693,8 +5694,8 @@ dp_peer_create_wifi3(struct cdp_soc_t *soc_hdl, uint8_t vdev_id,
/* Initialize the peer state */ /* Initialize the peer state */
peer->state = OL_TXRX_PEER_STATE_DISC; peer->state = OL_TXRX_PEER_STATE_DISC;
dp_info("vdev %pK created peer %pK (%pM) ref_cnt: %d", dp_info("vdev %pK created peer %pK ("QDF_MAC_ADDR_FMT") ref_cnt: %d",
vdev, peer, peer->mac_addr.raw, vdev, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
qdf_atomic_read(&peer->ref_cnt)); qdf_atomic_read(&peer->ref_cnt));
/* /*
* For every peer MAp message search and set if bss_peer * For every peer MAp message search and set if bss_peer
@@ -6277,10 +6278,10 @@ dp_record_mscs_params(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac,
peer->mscs_ipv6_parameter.classifier_mask = peer->mscs_ipv6_parameter.classifier_mask =
mscs_params->classifier_mask; mscs_params->classifier_mask;
peer->mscs_active = 1; peer->mscs_active = 1;
dp_info("\n\tMSCS Procedure request based parameters for %pM\n" dp_info("\n\tMSCS Procedure request based parameters for "QDF_MAC_ADDR_FMT"\n"
"\tClassifier_type = %d\tUser priority bitmap = %x\n" "\tClassifier_type = %d\tUser priority bitmap = %x\n"
"\tUser priority limit = %x\tClassifier mask = %x", "\tUser priority limit = %x\tClassifier mask = %x",
peer_mac, QDF_MAC_ADDR_REF(peer_mac),
mscs_params->classifier_type, mscs_params->classifier_type,
peer->mscs_ipv4_parameter.user_priority_bitmap, peer->mscs_ipv4_parameter.user_priority_bitmap,
peer->mscs_ipv4_parameter.user_priority_limit, peer->mscs_ipv4_parameter.user_priority_limit,
@@ -6388,8 +6389,8 @@ void dp_vdev_unref_delete(struct dp_soc *soc, struct dp_vdev *vdev,
vdev_delete_cb = vdev->delete.callback; vdev_delete_cb = vdev->delete.callback;
vdev_delete_context = vdev->delete.context; vdev_delete_context = vdev->delete.context;
dp_info("deleting vdev object %pK (%pM)- its last peer is done", dp_info("deleting vdev object %pK ("QDF_MAC_ADDR_FMT")- its last peer is done",
vdev, vdev->mac_addr.raw); vdev, QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
if (wlan_op_mode_monitor == vdev->opmode) { if (wlan_op_mode_monitor == vdev->opmode) {
if (soc->intr_mode == DP_INTR_POLL) if (soc->intr_mode == DP_INTR_POLL)
@@ -6421,6 +6422,8 @@ free_vdev:
dp_info("deleting vdev object %pK (%pM)", dp_info("deleting vdev object %pK (%pM)",
vdev, vdev->mac_addr.raw); vdev, vdev->mac_addr.raw);
dp_info("deleting vdev object %pK ("QDF_MAC_ADDR_FMT")",
vdev, QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
wlan_minidump_remove(vdev); wlan_minidump_remove(vdev);
qdf_mem_free(vdev); qdf_mem_free(vdev);
vdev = NULL; vdev = NULL;
@@ -6468,7 +6471,8 @@ void dp_peer_unref_delete(struct dp_peer *peer, enum dp_mod_id mod_id)
QDF_ASSERT(peer_id == HTT_INVALID_PEER); QDF_ASSERT(peer_id == HTT_INVALID_PEER);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"Deleting peer %pK (%pM)", peer, peer->mac_addr.raw); "Deleting peer %pK ("QDF_MAC_ADDR_FMT")", peer,
QDF_MAC_ADDR_REF(peer->mac_addr.raw));
/* /*
* Deallocate the extended stats contenxt * Deallocate the extended stats contenxt
@@ -6556,7 +6560,8 @@ static QDF_STATUS dp_peer_delete_wifi3(struct cdp_soc_t *soc_hdl,
if (!peer->valid) { if (!peer->valid) {
dp_peer_unref_delete(peer, DP_MOD_ID_CDP); dp_peer_unref_delete(peer, DP_MOD_ID_CDP);
dp_err("Invalid peer: %pM", peer_mac); dp_err("Invalid peer: "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac));
return QDF_STATUS_E_ALREADY; return QDF_STATUS_E_ALREADY;
} }
@@ -6567,7 +6572,8 @@ static QDF_STATUS dp_peer_delete_wifi3(struct cdp_soc_t *soc_hdl,
peer->valid = 0; peer->valid = 0;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
FL("peer %pK (%pM)"), peer, peer->mac_addr.raw); FL("peer %pK ("QDF_MAC_ADDR_FMT")"), peer,
QDF_MAC_ADDR_REF(peer->mac_addr.raw));
dp_local_peer_id_free(peer->vdev->pdev, peer); dp_local_peer_id_free(peer->vdev->pdev, peer);
@@ -8915,7 +8921,8 @@ dp_txrx_get_peer_stats_param(struct cdp_soc_t *soc, uint8_t vdev_id,
if (!peer) { if (!peer) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"Invalid Peer for Mac %pM", peer_mac); "Invalid Peer for Mac "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(peer_mac));
return QDF_STATUS_E_FAILURE; return QDF_STATUS_E_FAILURE;
} else if (type < cdp_peer_stats_max) { } else if (type < cdp_peer_stats_max) {
switch (type) { switch (type) {

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) != if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) { QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM", "unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT,
peer ? peer->mac_addr.raw : NULL); peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL);
qdf_spin_unlock_bh(&soc->peer_hash_lock); qdf_spin_unlock_bh(&soc->peer_hash_lock);
return; 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) != if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) { QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM", "unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT,
peer ? peer->mac_addr.raw : NULL); peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL);
qdf_spin_unlock_bh(&vdev->peer_list_lock); qdf_spin_unlock_bh(&vdev->peer_list_lock);
return; 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) != if (dp_peer_get_ref(soc, peer, DP_MOD_ID_CONFIG) !=
QDF_STATUS_SUCCESS) { QDF_STATUS_SUCCESS) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO,
"unable to get peer reference at MAP mac %pM peer_id %u", "unable to get peer reference at MAP mac "QDF_MAC_ADDR_FMT" peer_id %u",
peer ? peer->mac_addr.raw : NULL, peer_id); peer ? QDF_MAC_ADDR_REF(peer->mac_addr.raw) : NULL, peer_id);
qdf_spin_unlock_bh(&soc->peer_map_lock); qdf_spin_unlock_bh(&soc->peer_map_lock);
return; 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, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %pM", "%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
__func__, peer, hw_peer_id, vdev_id, mac_addr); __func__, peer, hw_peer_id, vdev_id,
QDF_MAC_ADDR_REF(mac_addr));
qdf_spin_lock_bh(&soc->ast_lock); qdf_spin_lock_bh(&soc->ast_lock);
@@ -766,9 +767,10 @@ static inline QDF_STATUS dp_peer_map_ast(struct dp_soc *soc,
} }
} else { } else {
qdf_spin_unlock_bh(&soc->ast_lock); 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, 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); vdev_id, is_wds);
} }
err = QDF_STATUS_E_INVAL; 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, 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, __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 */ /* 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; struct dp_peer *old_peer;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, 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, __func__, ast_entry->type, peer->vdev->pdev->pdev_id,
peer->vdev->vdev_id, flags, ast_entry->mac_addr.raw, peer->vdev->vdev_id, flags,
peer->mac_addr.raw); 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 /* Do not send AST update in below cases
* 1) Ast entry delete has already triggered * 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; bool delete_in_fw = false;
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_TRACE, 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, __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); 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) && if ((DP_PEER_WDS_COUNT_INVALID != free_wds_count) &&
(free_wds_count != wds_deleted)) { (free_wds_count != wds_deleted)) {
DP_STATS_INC(soc, ast.ast_mismatch, 1); 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, peer, peer->mac_addr.raw, free_wds_count,
wds_deleted); 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, peer = dp_peer_find_hash_find(soc, peer_mac_addr,
0 /* is aligned */, vdev_id, DP_MOD_ID_CONFIG); 0 /* is aligned */, vdev_id, DP_MOD_ID_CONFIG);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %pM", "%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
__func__, peer, peer_id, vdev_id, peer_mac_addr); __func__, peer, peer_id, vdev_id,
QDF_MAC_ADDR_REF(peer_mac_addr));
if (peer) { if (peer) {
/* peer's ref count was already incremented by /* 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) { if (peer->peer_state == DP_PEER_STATE_LOGICAL_DELETE) {
dp_peer_unref_delete(peer, DP_MOD_ID_CONFIG); dp_peer_unref_delete(peer, DP_MOD_ID_CONFIG);
dp_alert("Peer %pK[%pM] logical delete state vid %d", dp_alert("Peer %pK["QDF_MAC_ADDR_FMT"] logical delete state vid %d",
peer, peer_mac_addr, vdev_id); peer, QDF_MAC_ADDR_REF(peer_mac_addr),
vdev_id);
return NULL; return NULL;
} }
dp_peer_find_id_to_obj_add(soc, peer, peer_id); 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; enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC;
QDF_STATUS err = QDF_STATUS_SUCCESS; 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, 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 /* Peer map event for WDS ast entry get the peer from
* obj map * obj map
@@ -2053,8 +2060,8 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
* referring it * referring it
*/ */
if (!peer->self_ast_entry) { if (!peer->self_ast_entry) {
dp_info("Add self ast from map %pM", dp_info("Add self ast from map "QDF_MAC_ADDR_FMT,
peer_mac_addr); QDF_MAC_ADDR_REF(peer_mac_addr));
dp_peer_add_ast(soc, peer, dp_peer_add_ast(soc, peer,
peer_mac_addr, peer_mac_addr,
type, 0); type, 0);
@@ -2108,9 +2115,10 @@ dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
return; 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, 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); is_wds);
dp_peer_unref_delete(peer, DP_MOD_ID_HTT); 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); is_roaming = ol_ops->is_roam_inprogress(vdev_id);
} }
dp_info("peer: %pM, vdev_id: %d, is_roaming: %d", dp_info("peer: "QDF_MAC_ADDR_FMT", vdev_id: %d, is_roaming: %d",
peer->mac_addr.raw, vdev_id, is_roaming); QDF_MAC_ADDR_REF(peer->mac_addr.raw), vdev_id, is_roaming);
return 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)) { if (!qdf_atomic_read(&peer->is_default_route_set)) {
qdf_spin_unlock_bh(&rx_tid->tid_lock); qdf_spin_unlock_bh(&rx_tid->tid_lock);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
"%s: default route is not set for peer: %pM", "%s: default route is not set for peer: "QDF_MAC_ADDR_FMT,
__func__, peer->mac_addr.raw); __func__, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
goto fail; 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, 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,
peer->mac_addr.raw, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
is_unicast ? "ucast" : "mcast", is_unicast ? "ucast" : "mcast",
sec_type); sec_type);
@@ -3669,9 +3677,9 @@ dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
return; return;
} }
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, 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,
peer->mac_addr.raw, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
is_unicast ? "ucast" : "mcast", is_unicast ? "ucast" : "mcast",
sec_type); sec_type);
sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast; 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); DP_MOD_ID_CDP);
if (!peer) { if (!peer) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, 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; return QDF_STATUS_E_FAILURE;
} }
peer->state = state; peer->state = state;
@@ -3953,8 +3962,8 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,
if (!pdev) { if (!pdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr: %pM", "PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
peer_addr.bytes); QDF_MAC_ADDR_REF(peer_addr.bytes));
return NULL; return NULL;
} }
@@ -3962,8 +3971,8 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,
DP_VDEV_ALL, DP_MOD_ID_CDP); DP_VDEV_ALL, DP_MOD_ID_CDP);
if (!peer) { if (!peer) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr: %pM", "PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
peer_addr.bytes); QDF_MAC_ADDR_REF(peer_addr.bytes));
return NULL; 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, peer = dp_peer_find_hash_find(soc, peer_addr, 0, i,
DP_MOD_ID_CDP); DP_MOD_ID_CDP);
if (peer) { if (peer) {
dp_err("%s: Duplicate peer %pM already exist on vdev %d", dp_err("%s: Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d",
__func__, peer_addr, i); __func__, QDF_MAC_ADDR_REF(peer_addr), i);
dp_peer_unref_delete(peer, DP_MOD_ID_CDP); dp_peer_unref_delete(peer, DP_MOD_ID_CDP);
return true; return true;
} }

5
dp/wifi3.0/dp_peer.h
View File

@@ -461,8 +461,9 @@ dp_peer_update_state(struct dp_soc *soc,
QDF_ASSERT(0); QDF_ASSERT(0);
break; break;
} }
qdf_info("Updating peer state from %u to %u mac %pM\n", qdf_info("Updating peer state from %u to %u mac "QDF_MAC_ADDR_FMT"\n",
peer_state, state, peer->mac_addr.raw); peer_state, state,
QDF_MAC_ADDR_REF(peer->mac_addr.raw));
peer->peer_state = state; peer->peer_state = state;
} }

16
dp/wifi3.0/dp_rx_defrag.c
View File

@@ -240,8 +240,8 @@ static void dp_rx_defrag_waitlist_add(struct dp_peer *peer, unsigned tid)
struct dp_soc *psoc = peer->vdev->pdev->soc; struct dp_soc *psoc = peer->vdev->pdev->soc;
struct dp_rx_tid *rx_reorder = &peer->rx_tid[tid]; struct dp_rx_tid *rx_reorder = &peer->rx_tid[tid];
dp_debug("Adding TID %u to waitlist for peer %pK at MAC address %pM", dp_debug("Adding TID %u to waitlist for peer %pK at MAC address "QDF_MAC_ADDR_FMT,
tid, peer, peer->mac_addr.raw); tid, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
/* TODO: use LIST macros instead of TAIL macros */ /* TODO: use LIST macros instead of TAIL macros */
qdf_spin_lock_bh(&psoc->rx.defrag.defrag_lock); qdf_spin_lock_bh(&psoc->rx.defrag.defrag_lock);
@@ -269,8 +269,8 @@ void dp_rx_defrag_waitlist_remove(struct dp_peer *peer, unsigned tid)
struct dp_rx_tid *rx_reorder; struct dp_rx_tid *rx_reorder;
struct dp_rx_tid *tmp; struct dp_rx_tid *tmp;
dp_debug("Removing TID %u to waitlist for peer %pK at MAC address %pM", dp_debug("Removing TID %u to waitlist for peer %pK at MAC address "QDF_MAC_ADDR_FMT,
tid, peer, peer->mac_addr.raw); tid, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
if (tid >= DP_MAX_TIDS) { if (tid >= DP_MAX_TIDS) {
dp_err("TID out of bounds: %d", tid); dp_err("TID out of bounds: %d", tid);
@@ -1544,8 +1544,8 @@ void dp_rx_defrag_cleanup(struct dp_peer *peer, unsigned tid)
rx_reorder_array_elem->head = NULL; rx_reorder_array_elem->head = NULL;
rx_reorder_array_elem->tail = NULL; rx_reorder_array_elem->tail = NULL;
} else { } else {
dp_info("Cleanup self peer %pK and TID %u at MAC address %pM", dp_info("Cleanup self peer %pK and TID %u at MAC address "QDF_MAC_ADDR_FMT,
peer, tid, peer->mac_addr.raw); peer, tid, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
} }
/* Free up saved ring descriptors */ /* Free up saved ring descriptors */
@@ -1991,9 +1991,9 @@ QDF_STATUS dp_rx_defrag_add_last_frag(struct dp_soc *soc,
*/ */
if (!rx_reorder_array_elem) { if (!rx_reorder_array_elem) {
dp_verbose_debug( dp_verbose_debug(
"peer id:%d mac: %pM drop rx frame!", "peer id:%d mac: "QDF_MAC_ADDR_FMT" drop rx frame!",
peer->peer_id, peer->peer_id,
peer->mac_addr.raw); QDF_MAC_ADDR_REF(peer->mac_addr.raw));
DP_STATS_INC(soc, rx.err.defrag_peer_uninit, 1); DP_STATS_INC(soc, rx.err.defrag_peer_uninit, 1);
qdf_nbuf_free(nbuf); qdf_nbuf_free(nbuf);
goto fail; goto fail;

13
dp/wifi3.0/dp_rx_err.c
View File

@@ -136,8 +136,9 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc,
qdf_spin_unlock_bh(&soc->ast_lock); qdf_spin_unlock_bh(&soc->ast_lock);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE(QDF_MODULE_ID_DP,
QDF_TRACE_LEVEL_INFO, QDF_TRACE_LEVEL_INFO,
"Detected DBDC Root AP %pM, %d %d", "Detected DBDC Root AP "QDF_MAC_ADDR_FMT", %d %d",
&data[QDF_MAC_ADDR_SIZE], vdev->pdev->pdev_id, QDF_MAC_ADDR_REF(&data[QDF_MAC_ADDR_SIZE]),
vdev->pdev->pdev_id,
ase->pdev_id); ase->pdev_id);
return false; return false;
} }
@@ -147,8 +148,8 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc,
qdf_spin_unlock_bh(&soc->ast_lock); qdf_spin_unlock_bh(&soc->ast_lock);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE(QDF_MODULE_ID_DP,
QDF_TRACE_LEVEL_INFO, QDF_TRACE_LEVEL_INFO,
"received pkt with same src mac %pM", "received pkt with same src mac "QDF_MAC_ADDR_FMT,
&data[QDF_MAC_ADDR_SIZE]); QDF_MAC_ADDR_REF(&data[QDF_MAC_ADDR_SIZE]));
return true; return true;
} }
@@ -403,8 +404,8 @@ dp_rx_pn_error_handle(struct dp_soc *soc, hal_ring_desc_t ring_desc,
* TODO: Check for peer specific policies & set peer_pn_policy * TODO: Check for peer specific policies & set peer_pn_policy
*/ */
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
"discard rx due to PN error for peer %pK %pM", "discard rx due to PN error for peer %pK "QDF_MAC_ADDR_FMT,
peer, peer->mac_addr.raw); peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
dp_peer_unref_delete(peer, DP_MOD_ID_RX_ERR); dp_peer_unref_delete(peer, DP_MOD_ID_RX_ERR);
} }

6
dp/wifi3.0/dp_tx.c
View File

@@ -2262,7 +2262,8 @@ dp_tx_send_exception(struct cdp_soc_t *soc_hdl, uint8_t vdev_id,
msdu_info.tid = tx_exc_metadata->tid; msdu_info.tid = tx_exc_metadata->tid;
eh = (qdf_ether_header_t *)qdf_nbuf_data(nbuf); eh = (qdf_ether_header_t *)qdf_nbuf_data(nbuf);
dp_verbose_debug("skb %pM", nbuf->data); dp_verbose_debug("skb "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(nbuf->data));
DP_STATS_INC_PKT(vdev, tx_i.rcvd, 1, qdf_nbuf_len(nbuf)); DP_STATS_INC_PKT(vdev, tx_i.rcvd, 1, qdf_nbuf_len(nbuf));
@@ -2562,7 +2563,8 @@ qdf_nbuf_t dp_tx_send(struct cdp_soc_t *soc_hdl, uint8_t vdev_id,
if (qdf_unlikely(!vdev)) if (qdf_unlikely(!vdev))
return nbuf; return nbuf;
dp_verbose_debug("skb %pM", nbuf->data); dp_verbose_debug("skb "QDF_MAC_ADDR_FMT,
QDF_MAC_ADDR_REF(nbuf->data));
/* /*
* Set Default Host TID value to invalid TID * Set Default Host TID value to invalid TID