diff --git a/umac/cmn_services/serialization/src/wlan_serialization_api.c b/umac/cmn_services/serialization/src/wlan_serialization_api.c index f0cc99396914..387aeee9a64f 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_api.c +++ b/umac/cmn_services/serialization/src/wlan_serialization_api.c @@ -294,6 +294,7 @@ void wlan_serialization_remove_cmd( struct wlan_serialization_queued_cmd_info *cmd_info) { QDF_STATUS status; + enum wlan_serialization_cmd_status ser_status; struct wlan_serialization_command cmd = {0}; ser_enter(); @@ -316,8 +317,11 @@ void wlan_serialization_remove_cmd( cmd.source = cmd_info->requestor; cmd.vdev = cmd_info->vdev; - if (wlan_serialization_dequeue_cmd(&cmd, SER_REMOVE, true) != - WLAN_SER_CMD_IN_ACTIVE_LIST) { + ser_status = wlan_serialization_dequeue_cmd( + &cmd, SER_REMOVE, true); + + if (ser_status != WLAN_SER_CMD_IN_ACTIVE_LIST) { + if (ser_status != WLAN_SER_CMD_MARKED_FOR_ACTIVATION) ser_err("Can't dequeue requested cmd_id[%d] type[%d]", cmd.cmd_id, cmd.cmd_type); } diff --git a/umac/cmn_services/serialization/src/wlan_serialization_non_scan.c b/umac/cmn_services/serialization/src/wlan_serialization_non_scan.c index 1ea51bebf0b0..ceb6e93bf1aa 100644 --- a/umac/cmn_services/serialization/src/wlan_serialization_non_scan.c +++ b/umac/cmn_services/serialization/src/wlan_serialization_non_scan.c @@ -410,8 +410,19 @@ QDF_STATUS wlan_ser_remove_non_scan_cmd( cmd, is_active_cmd); + /* Here command removal can fail for 2 reasons + * 1. The cmd is not present + * 2. The command had not returned from activation + * and will not be removed now. + * + * In the second case, we should not flag it as error + * since it will removed after the activation completes. + */ + if (vdev_status != QDF_STATUS_SUCCESS) { - ser_err("Failed to remove cmd from vdev active/pending queue"); + status = vdev_status; + if (vdev_status != QDF_STATUS_E_PENDING) + ser_err("Failed to remove cmd from vdev queue"); goto error; } diff --git a/umac/cmn_services/utils/src/wlan_utility.c b/umac/cmn_services/utils/src/wlan_utility.c index 4a0590776f59..9b604f3c5fe3 100644 --- a/umac/cmn_services/utils/src/wlan_utility.c +++ b/umac/cmn_services/utils/src/wlan_utility.c @@ -439,31 +439,24 @@ static void wlan_pdev_chan_match(struct wlan_objmgr_pdev *pdev, void *object, iter_vdev_chan->ch_phymode))) ch_filter->flag = 1; - qdf_err("Chan match failed"); - qdf_err("==> iter vdev id: %d: ieee %d, freq %d", - wlan_vdev_get_id(comp_vdev), vdev_chan->ch_ieee, - vdev_chan->ch_freq); - qdf_err("flags %016llx, flags ext: %08x, max pwr %d", - vdev_chan->ch_flags, vdev_chan->ch_flagext, - vdev_chan->ch_maxpower); - qdf_err(" seg1 %d seg2 %d chwidth %d, ch_phymode %d", - vdev_chan->ch_freq_seg1, - vdev_chan->ch_freq_seg2, - vdev_chan->ch_width, vdev_chan->ch_phymode); + qdf_nofl_err("==> iter vdev id: %d: ieee %d, mode %d", + wlan_vdev_get_id(comp_vdev), + vdev_chan->ch_ieee, + vdev_chan->ch_phymode); + qdf_nofl_err("fl %016llx, fl-ext %08x, s1 %d, s2 %d ", + vdev_chan->ch_flags, vdev_chan->ch_flagext, + vdev_chan->ch_freq_seg1, + vdev_chan->ch_freq_seg2); - qdf_err("==> base vdev id: %d: ieee %d, freq %d", - wlan_vdev_get_id(ch_filter->vdev), - iter_vdev_chan->ch_ieee, - iter_vdev_chan->ch_freq); - qdf_err("flags %016llx, flags ext: %08x, max pwr %d", - iter_vdev_chan->ch_flags, - iter_vdev_chan->ch_flagext, - iter_vdev_chan->ch_maxpower); - qdf_err(" seg1 %d seg2 %d chwidth %d, ch_phymode %d", - iter_vdev_chan->ch_freq_seg1, - iter_vdev_chan->ch_freq_seg2, - iter_vdev_chan->ch_width, - iter_vdev_chan->ch_phymode); + qdf_nofl_err("==> base vdev id: %d: ieee %d mode %d", + wlan_vdev_get_id(ch_filter->vdev), + iter_vdev_chan->ch_ieee, + iter_vdev_chan->ch_phymode); + qdf_nofl_err("fl %016llx, fl-ext %08x s1 %d, s2 %d", + iter_vdev_chan->ch_flags, + iter_vdev_chan->ch_flagext, + iter_vdev_chan->ch_freq_seg1, + iter_vdev_chan->ch_freq_seg2); } } diff --git a/umac/mlme/mlme_utils/wlan_vdev_mlme_ser_if.c b/umac/mlme/mlme_utils/wlan_vdev_mlme_ser_if.c index 9db8250a7d42..3e9a4435114b 100644 --- a/umac/mlme/mlme_utils/wlan_vdev_mlme_ser_if.c +++ b/umac/mlme/mlme_utils/wlan_vdev_mlme_ser_if.c @@ -93,7 +93,7 @@ wlan_vdev_mlme_ser_stop_bss(struct wlan_serialization_command *cmd) WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD); if (wlan_serialization_is_cmd_present_in_active_queue(NULL, cmd)) { - mlme_err("Cmd already exist in the active queue"); + mlme_debug("Cmd already exist in the active queue"); return WLAN_SER_CMD_DENIED_UNSPECIFIED; } @@ -177,7 +177,7 @@ wlan_vdev_mlme_ser_disconnect(struct wlan_serialization_command *cmd) WLAN_SER_CANCEL_VDEV_NON_SCAN_CMD); if (wlan_serialization_is_cmd_present_in_active_queue(NULL, cmd)) { - mlme_err("Cmd already exist in the active queue"); + mlme_debug("Cmd already exist in the active queue"); return WLAN_SER_CMD_DENIED_UNSPECIFIED; }