samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Bifurcation 0
Code Tickets Demandes d'ajout Actions Paquets Projets Publications Wiki Activité

qcacmn: Replace CM_PREFIX_LOG with CM_PREFIX_FMT and CM_PREFIX_REF

Parcourir la source 
Use CM_PREFIX_FMT and CM_PREFIX_REF to print connection mgr logs
instead of CM_PREFIX_LOG to avoid confusion.

Change-Id: I06c0009804d9c49da4916a120b6dc448ea28fdb6
CRs-Fixed: 2791198
Cette révision appartient à :
Abhishek Singh
2020-10-05 19:31:04 +05:30
révisé par snandini
Parent df74860811
révision 7fcea50eab
4 fichiers modifiés avec 78 ajouts et 71 suppressions
Télécharger le Fichier Patch Télécharger le Fichier des Différences Développer tous les fichiers Réduire tous les fichiers

89
umac/mlme/connection_mgr/core/src/wlan_cm_connect.c
Voir le fichier

@@ -146,8 +146,8 @@ cm_ser_connect_cb(struct wlan_serialization_command *cmd,
/* command removed from pending list. */
break;
case WLAN_SER_CB_ACTIVE_CMD_TIMEOUT:
mlme_err(CM_PREFIX_LOG "Active command timeout",
wlan_vdev_get_id(cm_ctx->vdev), cmd->cmd_id);
mlme_err(CM_PREFIX_FMT "Active command timeout",
CM_PREFIX_REF(wlan_vdev_get_id(vdev), cmd->cmd_id));
QDF_ASSERT(0);
cm_connect_cmd_timeout(cm_ctx, cmd->cmd_id);
@@ -174,11 +174,12 @@ static QDF_STATUS cm_ser_connect_req(struct wlan_objmgr_pdev *pdev,
struct wlan_serialization_command cmd = {0, };
enum wlan_serialization_status ser_cmd_status;
QDF_STATUS status;
uint8_t vdev_id = wlan_vdev_get_id(cm_ctx->vdev);
status = wlan_objmgr_vdev_try_get_ref(cm_ctx->vdev, WLAN_MLME_CM_ID);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err(CM_PREFIX_LOG "unable to get reference",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id);
mlme_err(CM_PREFIX_FMT "unable to get reference",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
return status;
}
@@ -200,9 +201,8 @@ static QDF_STATUS cm_ser_connect_req(struct wlan_objmgr_pdev *pdev,
/* command moved to active list. Do nothing */
break;
default:
mlme_err(CM_PREFIX_LOG "ser cmd status %d",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id,
ser_cmd_status);
mlme_err(CM_PREFIX_FMT "ser cmd status %d",
CM_PREFIX_REF(vdev_id, cm_req->cm_id), ser_cmd_status);
wlan_objmgr_vdev_release_ref(cm_ctx->vdev, WLAN_MLME_CM_ID);
return QDF_STATUS_E_FAILURE;
@@ -272,8 +272,9 @@ QDF_STATUS cm_handle_hw_mode_change(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id,
pdev = wlan_vdev_get_pdev(cm_ctx->vdev);
if (!pdev) {
mlme_err(CM_PREFIX_LOG "Failed to find pdev",
wlan_vdev_get_id(cm_ctx->vdev), *cm_id);
mlme_err(CM_PREFIX_FMT "Failed to find pdev",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev),
cm_req->cm_id));
goto send_failure;
}
@@ -301,8 +302,8 @@ void cm_hw_mode_change_resp(struct wlan_objmgr_pdev *pdev, uint8_t vdev_id,
enum wlan_cm_sm_evt event = WLAN_CM_SM_EV_HW_MODE_SUCCESS;
struct cnx_mgr *cm_ctx;
mlme_debug(CM_PREFIX_LOG "Continue connect after HW mode change, status %d",
vdev_id, cm_id, status);
mlme_debug(CM_PREFIX_FMT "Continue connect after HW mode change, status %d",
CM_PREFIX_REF(vdev_id, cm_id), status);
vdev = wlan_objmgr_get_vdev_by_id_from_pdev(pdev, vdev_id,
WLAN_MLME_CM_ID);
@@ -454,6 +455,7 @@ static QDF_STATUS cm_connect_get_candidates(struct wlan_objmgr_pdev *pdev,
uint32_t num_bss = 0;
enum QDF_OPMODE op_mode;
qdf_list_t *candidate_list;
uint8_t vdev_id = wlan_vdev_get_id(cm_ctx->vdev);
filter = qdf_mem_malloc(sizeof(*filter));
if (!filter)
@@ -464,9 +466,8 @@ static QDF_STATUS cm_connect_get_candidates(struct wlan_objmgr_pdev *pdev,
candidate_list = wlan_scan_get_result(pdev, filter);
if (candidate_list) {
num_bss = qdf_list_size(candidate_list);
mlme_debug(CM_PREFIX_LOG "num_entries found %d",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id,
num_bss);
mlme_debug(CM_PREFIX_FMT "num_entries found %d",
CM_PREFIX_REF(vdev_id, cm_req->cm_id), num_bss);
}
op_mode = wlan_vdev_mlme_get_opmode(cm_ctx->vdev);
@@ -477,9 +478,8 @@ static QDF_STATUS cm_connect_get_candidates(struct wlan_objmgr_pdev *pdev,
if (!candidate_list || !qdf_list_size(candidate_list)) {
if (candidate_list)
wlan_scan_purge_results(candidate_list);
mlme_info(CM_PREFIX_LOG "no valid candidate found, num_bss %d",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id,
num_bss);
mlme_info(CM_PREFIX_FMT "no valid candidate found, num_bss %d",
CM_PREFIX_REF(vdev_id, cm_req->cm_id), num_bss);
/*
* Do connect scan only of no candidates were found
* if candidates were found and were removed due to invalid
@@ -572,15 +572,15 @@ QDF_STATUS cm_connect_start(struct cnx_mgr *cm_ctx,
/* Interface event */
pdev = wlan_vdev_get_pdev(cm_ctx->vdev);
if (!pdev) {
mlme_err(CM_PREFIX_LOG "Failed to find pdev", vdev_id,
cm_req->cm_id);
mlme_err(CM_PREFIX_FMT "Failed to find pdev",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
goto connect_err;
}
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
mlme_err(CM_PREFIX_LOG "Failed to find psoc", vdev_id,
cm_req->cm_id);
mlme_err(CM_PREFIX_FMT "Failed to find psoc",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
goto connect_err;
}
@@ -597,12 +597,12 @@ QDF_STATUS cm_connect_start(struct cnx_mgr *cm_ctx,
vdev_id, cm_req->cm_id);
if (QDF_IS_STATUS_ERROR(status) && status != QDF_STATUS_E_ALREADY) {
reason = CM_HW_MODE_FAILURE;
mlme_err(CM_PREFIX_LOG "Failed to set HW mode change",
vdev_id, cm_req->cm_id);
mlme_err(CM_PREFIX_FMT "Failed to set HW mode change",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
goto connect_err;
} else if (QDF_IS_STATUS_SUCCESS(status)) {
mlme_debug(CM_PREFIX_LOG "Connect will continue after HW mode change",
vdev_id, cm_req->cm_id);
mlme_debug(CM_PREFIX_FMT "Connect will continue after HW mode change",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
return QDF_STATUS_SUCCESS;
}
@@ -636,11 +636,12 @@ static QDF_STATUS cm_get_valid_candidate(struct cnx_mgr *cm_ctx,
qdf_list_node_t *cur_node = NULL, *next_node = NULL;
struct scan_cache_node *cur_candidate;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint8_t vdev_id = wlan_vdev_get_id(cm_ctx->vdev);
if (cm_req->connect_req.connect_attempts >=
cm_ctx->max_connect_attempts) {
mlme_info(CM_PREFIX_LOG "%d attempts tried, max %d",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id,
mlme_info(CM_PREFIX_FMT "%d attempts tried, max %d",
CM_PREFIX_REF(vdev_id, cm_req->cm_id),
cm_req->connect_req.connect_attempts,
cm_ctx->max_connect_attempts);
return QDF_STATUS_E_FAILURE;
@@ -678,8 +679,8 @@ static QDF_STATUS cm_get_valid_candidate(struct cnx_mgr *cm_ctx,
* candidates left for connect now.
*/
if (!cur_node) {
mlme_debug(CM_PREFIX_LOG "No more candidates left",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id);
mlme_debug(CM_PREFIX_FMT "No more candidates left",
CM_PREFIX_REF(vdev_id, cm_req->cm_id));
cm_req->connect_req.cur_candidate = NULL;
return QDF_STATUS_E_FAILURE;
}
@@ -700,10 +701,11 @@ static void cm_create_bss_peer(struct cnx_mgr *cm_ctx,
status = mlme_cm_bss_peer_create_req(cm_ctx->vdev, bssid);
if (QDF_IS_STATUS_ERROR(status)) {
struct wlan_cm_connect_rsp *resp;
uint8_t vdev_id = wlan_vdev_get_id(cm_ctx->vdev);
/* In case of failure try with next candidate */
mlme_err(CM_PREFIX_LOG "peer create request failed %d",
wlan_vdev_get_id(cm_ctx->vdev), req->cm_id, status);
mlme_err(CM_PREFIX_FMT "peer create request failed %d",
CM_PREFIX_REF(vdev_id, req->cm_id), status);
resp = qdf_mem_malloc(sizeof(*resp));
if (!resp)
@@ -735,8 +737,8 @@ cm_send_bss_select_ind(struct cnx_mgr *cm_ctx, struct cm_connect_req *req)
return status;
/* In supported and failure try with next candidate */
mlme_err(CM_PREFIX_LOG "mlme candidate select indication failed %d",
wlan_vdev_get_id(cm_ctx->vdev), req->cm_id, status);
mlme_err(CM_PREFIX_FMT "mlme candidate select indication failed %d",
CM_PREFIX_REF(vdev_req.vdev_id, req->cm_id), status);
resp = qdf_mem_malloc(sizeof(*resp));
if (!resp)
return QDF_STATUS_E_FAILURE;
@@ -860,8 +862,8 @@ cm_resume_connect_after_peer_create(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
status = mlme_cm_connect_req(cm_ctx->vdev, &req);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err(CM_PREFIX_LOG "connect request failed",
wlan_vdev_get_id(cm_ctx->vdev), *cm_id);
mlme_err(CM_PREFIX_FMT "connect request failed",
CM_PREFIX_REF(req.vdev_id, req.cm_id));
status = cm_send_connect_start_fail(cm_ctx,
&cm_req->connect_req,
CM_JOIN_FAILED);
@@ -879,8 +881,8 @@ cm_inform_blm_connect_complete(struct wlan_objmgr_vdev *vdev,
pdev = wlan_vdev_get_pdev(vdev);
if (!pdev) {
mlme_err(CM_PREFIX_LOG "Failed to find pdev",
wlan_vdev_get_id(vdev), resp->cm_id);
mlme_err(CM_PREFIX_FMT "Failed to find pdev",
CM_PREFIX_REF(wlan_vdev_get_id(vdev), resp->cm_id));
return QDF_STATUS_E_FAILURE;
}
@@ -976,8 +978,9 @@ QDF_STATUS cm_connect_rsp(struct wlan_objmgr_vdev *vdev,
prefix = CM_ID_GET_PREFIX(cm_id);
if (prefix != CONNECT_REQ_PREFIX || cm_id != resp->cm_id) {
mlme_err(CM_PREFIX_LOG " Active cm_id 0x%x is different",
wlan_vdev_get_id(cm_ctx->vdev), resp->cm_id, cm_id);
mlme_err(CM_PREFIX_FMT " Active cm_id 0x%x is different",
CM_PREFIX_REF(wlan_vdev_get_id(vdev), resp->cm_id),
cm_id);
qdf_status = QDF_STATUS_E_FAILURE;
goto post_err;
}
@@ -1033,8 +1036,8 @@ QDF_STATUS cm_bss_select_ind_rsp(struct wlan_objmgr_vdev *vdev,
prefix = CM_ID_GET_PREFIX(cm_id);
if (prefix != CONNECT_REQ_PREFIX) {
mlme_err("vdev %d active req 0x%x is not connect req",
wlan_vdev_get_id(cm_ctx->vdev), cm_id);
mlme_err(CM_PREFIX_FMT "active req is not connect req",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev), cm_id));
return QDF_STATUS_E_INVAL;
}
@@ -1094,8 +1097,8 @@ QDF_STATUS cm_bss_peer_create_rsp(struct wlan_objmgr_vdev *vdev,
prefix = CM_ID_GET_PREFIX(cm_id);
if (prefix != CONNECT_REQ_PREFIX) {
mlme_err("vdev %d active req 0x%x is not connect req",
wlan_vdev_get_id(cm_ctx->vdev), cm_id);
mlme_err(CM_PREFIX_FMT "active req is not connect req",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev), cm_id));
mlme_cm_bss_peer_delete_req(vdev);
return QDF_STATUS_E_INVAL;
}

44
umac/mlme/connection_mgr/core/src/wlan_cm_disconnect.c
Voir le fichier

@@ -99,8 +99,8 @@ cm_ser_disconnect_cb(struct wlan_serialization_command *cmd,
/* command removed from pending list. */
break;
case WLAN_SER_CB_ACTIVE_CMD_TIMEOUT:
mlme_err(CM_PREFIX_LOG "Active command timeout",
wlan_vdev_get_id(vdev), cmd->cmd_id);
mlme_err(CM_PREFIX_FMT "Active command timeout",
CM_PREFIX_REF(wlan_vdev_get_id(vdev), cmd->cmd_id));
QDF_ASSERT(0);
cm_send_disconnect_resp(cm_ctx, cmd->cmd_id);
break;
@@ -126,11 +126,12 @@ static QDF_STATUS cm_ser_disconnect_req(struct wlan_objmgr_pdev *pdev,
struct wlan_serialization_command cmd = {0, };
enum wlan_serialization_status ser_cmd_status;
QDF_STATUS status;
uint8_t vdev_id = wlan_vdev_get_id(cm_ctx->vdev);
status = wlan_objmgr_vdev_try_get_ref(cm_ctx->vdev, WLAN_MLME_CM_ID);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err(CM_PREFIX_LOG "unable to get reference",
wlan_vdev_get_id(cm_ctx->vdev), req->cm_id);
mlme_err(CM_PREFIX_FMT "unable to get reference",
CM_PREFIX_REF(vdev_id, req->cm_id));
return status;
}
@@ -152,9 +153,8 @@ static QDF_STATUS cm_ser_disconnect_req(struct wlan_objmgr_pdev *pdev,
/* command moved to active list. Do nothing */
break;
default:
mlme_err(CM_PREFIX_LOG "ser cmd status %d",
wlan_vdev_get_id(cm_ctx->vdev), req->cm_id,
ser_cmd_status);
mlme_err(CM_PREFIX_FMT "ser cmd status %d",
CM_PREFIX_REF(vdev_id, req->cm_id), ser_cmd_status);
wlan_objmgr_vdev_release_ref(cm_ctx->vdev, WLAN_MLME_CM_ID);
return QDF_STATUS_E_FAILURE;
@@ -245,15 +245,15 @@ cm_update_scan_mlme_on_disconnect(struct wlan_objmgr_vdev *vdev,
pdev = wlan_vdev_get_pdev(vdev);
if (!pdev) {
mlme_err(CM_PREFIX_LOG "failed to find pdev",
req->req.vdev_id, req->cm_id);
mlme_err(CM_PREFIX_FMT "failed to find pdev",
CM_PREFIX_REF(req->req.vdev_id, req->cm_id));
return;
}
chan = wlan_vdev_get_active_channel(vdev);
if (!chan) {
mlme_err(CM_PREFIX_LOG "failed to get active channel",
req->req.vdev_id, req->cm_id);
mlme_err(CM_PREFIX_FMT "failed to get active channel",
CM_PREFIX_REF(req->req.vdev_id, req->cm_id));
return;
}
@@ -261,8 +261,8 @@ cm_update_scan_mlme_on_disconnect(struct wlan_objmgr_vdev *vdev,
&bss_info.ssid.length);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err(CM_PREFIX_LOG "failed to get ssid",
req->req.vdev_id, req->cm_id);
mlme_err(CM_PREFIX_FMT "failed to get ssid",
CM_PREFIX_REF(req->req.vdev_id, req->cm_id));
return;
}
@@ -302,14 +302,14 @@ QDF_STATUS cm_disconnect_active(struct cnx_mgr *cm_ctx, wlan_cm_id *cm_id)
cm_update_scan_mlme_on_disconnect(cm_ctx->vdev,
&cm_req->discon_req);
mlme_debug(CM_PREFIX_LOG "disconnect " QDF_MAC_ADDR_FMT " source %d reason %d",
req->req.vdev_id, req->cm_id,
mlme_debug(CM_PREFIX_FMT "disconnect " QDF_MAC_ADDR_FMT " source %d reason %d",
CM_PREFIX_REF(req->req.vdev_id, req->cm_id),
QDF_MAC_ADDR_REF(req->req.bssid.bytes),
req->req.source, req->req.reason_code);
status = mlme_cm_disconnect_req(cm_ctx->vdev, req);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err(CM_PREFIX_LOG "disconnect req fail", req->req.vdev_id,
req->cm_id);
mlme_err(CM_PREFIX_FMT "disconnect req fail",
CM_PREFIX_REF(req->req.vdev_id, req->cm_id));
cm_send_disconnect_resp(cm_ctx, req->cm_id);
}
qdf_mem_free(req);
@@ -326,8 +326,9 @@ cm_inform_blm_disconnect_complete(struct wlan_objmgr_vdev *vdev,
pdev = wlan_vdev_get_pdev(vdev);
if (!pdev) {
mlme_err(CM_PREFIX_LOG "failed to find pdev",
wlan_vdev_get_id(vdev), resp->req.cm_id);
mlme_err(CM_PREFIX_FMT "failed to find pdev",
CM_PREFIX_REF(wlan_vdev_get_id(vdev),
resp->req.cm_id));
return;
}
@@ -431,8 +432,9 @@ QDF_STATUS cm_disconnect_rsp(struct wlan_objmgr_vdev *vdev,
prefix = CM_ID_GET_PREFIX(cm_id);
if (prefix != DISCONNECT_REQ_PREFIX || cm_id != resp->req.cm_id) {
mlme_err("prefix %x cm_id %x does not match with active request cm_id %x",
prefix, resp->req.cm_id, cm_id);
mlme_err(CM_PREFIX_FMT "Active cm_id 0x%x is different",
CM_PREFIX_REF(wlan_vdev_get_id(vdev), resp->req.cm_id),
cm_id);
qdf_status = QDF_STATUS_E_FAILURE;
goto disconnect_complete;
}

3
umac/mlme/connection_mgr/core/src/wlan_cm_main_api.h
Voir le fichier

@@ -36,7 +36,8 @@
#define CM_ID_GET_PREFIX(cm_id) cm_id & 0xFFFF0000
#define CM_PREFIX_LOG "vdev %d cm_id 0x%x: "
#define CM_PREFIX_FMT "vdev %d cm_id 0x%x: "
#define CM_PREFIX_REF(vdev_id, cm_id) (vdev_id), (cm_id)
/*************** CONNECT APIs ****************/

13
umac/mlme/connection_mgr/core/src/wlan_cm_util.c
Voir le fichier

@@ -268,8 +268,9 @@ QDF_STATUS cm_add_req_to_list_and_indicate_osif(struct cnx_mgr *cm_ctx,
cm_req_lock_acquire(cm_ctx);
if (qdf_list_size(&cm_ctx->req_list) >= CM_MAX_REQ) {
cm_req_lock_release(cm_ctx);
mlme_err(CM_PREFIX_LOG "List full size %d",
wlan_vdev_get_id(cm_ctx->vdev), cm_req->cm_id,
mlme_err(CM_PREFIX_FMT "List full size %d",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev),
cm_req->cm_id),
qdf_list_size(&cm_ctx->req_list));
return QDF_STATUS_E_FAILURE;
}
@@ -336,8 +337,8 @@ cm_delete_req_from_list(struct cnx_mgr *cm_ctx, wlan_cm_id cm_id)
if (!cm_req) {
cm_req_lock_release(cm_ctx);
mlme_err("vdev %d cm req id %d not found",
wlan_vdev_get_id(cm_ctx->vdev), cm_id);
mlme_err(CM_PREFIX_FMT " req not found",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev), cm_id));
return QDF_STATUS_E_FAILURE;
}
@@ -364,8 +365,8 @@ void cm_remove_cmd(struct cnx_mgr *cm_ctx, wlan_cm_id cm_id)
psoc = wlan_vdev_get_psoc(cm_ctx->vdev);
if (!psoc) {
mlme_err(CM_PREFIX_LOG "Failed to find psoc",
wlan_vdev_get_id(cm_ctx->vdev), cm_id);
mlme_err(CM_PREFIX_FMT "Failed to find psoc",
CM_PREFIX_REF(wlan_vdev_get_id(cm_ctx->vdev), cm_id));
return;
}