samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

qcacmn: Define DFS logging APIs

Przeglądaj źródła 
1) Define logging(alert, err, warn, info, debug) on top of
   QDF abstractions for DFS component.
2) Use dfs_info for important prints such as CAC timeout,
   NOL timeout, enable/disable radar etc.
3) For everything else use dfs_debug macro.

Change-Id: Id1efc12dd00e7b3f2b8d5627c65f58e619438c82
CRs-Fixed: 2116421
This commit is contained in:
Abhijit Pradhan
2017-10-05 17:47:57 +05:30
zatwierdzone przez snandini
rodzic 6d2ffaa980
commit 77561584ad
26 zmienionych plików z 903 dodań i 880 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

50
umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c
Wyświetl plik

@@ -32,6 +32,7 @@
#include "../../core/src/dfs.h"
#include "a_types.h"
#include "wlan_serialization_api.h"
#include <qdf_trace.h>
struct dfs_to_mlme global_dfs_to_mlme;
@@ -101,6 +102,8 @@ void register_dfs_callbacks(void)
QDF_STATUS dfs_init(void)
{
QDF_STATUS res;
register_dfs_callbacks();
if (wlan_objmgr_register_pdev_create_handler(WLAN_UMAC_COMP_DFS,
@@ -116,6 +119,13 @@ QDF_STATUS dfs_init(void)
return QDF_STATUS_E_FAILURE;
}
res = qdf_print_set_category_verbose(qdf_get_pidx(),
QDF_MODULE_ID_DFS, QDF_TRACE_LEVEL_INFO, true);
if (res) {
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "Failed to set verbose for category");
return QDF_STATUS_E_FAILURE;
}
return QDF_STATUS_SUCCESS;
}
@@ -143,13 +153,13 @@ QDF_STATUS wlan_dfs_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs = NULL;
struct wlan_objmgr_psoc *psoc;
if (pdev == NULL) {
DFS_PRINTK("%s: null pdev\n", __func__);
if (!pdev) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return QDF_STATUS_E_FAILURE;
}
if (dfs_create_object(&dfs) == 1) {
DFS_PRINTK("%s: failed to create object\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "failed to create object");
return QDF_STATUS_E_FAILURE;
}
@@ -158,16 +168,16 @@ QDF_STATUS wlan_dfs_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev,
dfs->dfs_pdev_obj = pdev;
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
DFS_PRINTK("%s: null psoc\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null psoc");
return QDF_STATUS_E_FAILURE;
}
dfs->dfs_is_offload_enabled =
DFS_OFFLOAD_IS_ENABLED(psoc->service_param.service_bitmap);
DFS_PRINTK("%s: dfs_offload %d\n", __func__,
dfs->dfs_is_offload_enabled);
dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS,
"dfs_offload %d", dfs->dfs_is_offload_enabled);
dfs = wlan_pdev_get_dfs_obj(pdev);
if (dfs_attach(dfs) == 1) {
DFS_PRINTK("%s: dfs_attch failed\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs_attch failed");
dfs_destroy_object(dfs);
return QDF_STATUS_E_FAILURE;
}
@@ -182,8 +192,8 @@ QDF_STATUS wlan_dfs_pdev_obj_destroy_notification(struct wlan_objmgr_pdev *pdev,
{
struct wlan_dfs *dfs;
if (pdev == NULL) {
DFS_PRINTK("%s:PDEV is NULL\n", __func__);
if (!pdev) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "PDEV is NULL");
return QDF_STATUS_E_FAILURE;
}
@@ -212,24 +222,24 @@ static void dfs_scan_serialization_comp_info_cb(
struct wlan_objmgr_pdev *pdev;
if (!comp_info) {
DFS_PRINTK("%s: comp_info is NULL\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "comp_info is NULL");
return;
}
if (!vdev) {
DFS_PRINTK("%s: vdev is NULL\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "vdev is NULL");
return;
}
pdev = wlan_vdev_get_pdev(vdev);
if (!pdev) {
DFS_PRINTK("%s: pdev is NULL\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "pdev is NULL");
return;
}
dfs = wlan_pdev_get_dfs_obj(pdev);
if (dfs == NULL) {
DFS_PRINTK("%s: dfs is NULL\n", __func__);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return;
}
@@ -245,11 +255,11 @@ QDF_STATUS wifi_dfs_psoc_enable(struct wlan_objmgr_psoc *psoc)
bool dfs_offload =
DFS_OFFLOAD_IS_ENABLED(psoc->service_param.service_bitmap);
DFS_PRINTK("%s: dfs_offload %d\n", __func__, dfs_offload);
dfs_info(NULL, WLAN_DEBUG_DFS_ALWAYS, "dfs_offload %d", dfs_offload);
status = tgt_dfs_reg_ev_handler(psoc, dfs_offload);
if (status != QDF_STATUS_SUCCESS) {
DFS_PRINTK("%s: tgt_dfs_reg_ev_handler failed\n", __func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "tgt_dfs_reg_ev_handler failed");
return QDF_STATUS_E_FAILURE;
}
@@ -258,9 +268,7 @@ QDF_STATUS wifi_dfs_psoc_enable(struct wlan_objmgr_psoc *psoc)
WLAN_SER_CMD_SCAN,
dfs_scan_serialization_comp_info_cb);
if (status != QDF_STATUS_SUCCESS) {
DFS_PRINTK(
"%s :Serialize scan cmd register failed\n",
__func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "Serialize scan cmd register failed");
return status;
}
@@ -275,9 +283,7 @@ QDF_STATUS wifi_dfs_psoc_disable(struct wlan_objmgr_psoc *psoc)
WLAN_UMAC_COMP_DFS,
WLAN_SER_CMD_SCAN);
if (status != QDF_STATUS_SUCCESS) {
DFS_PRINTK(
"%s :Serialize scan cmd deregister failed\n",
__func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "Serialize scan cmd deregister failed");
return status;
}

10
umac/dfs/dispatcher/src/wlan_dfs_mlme_api.c
Wyświetl plik

@@ -75,8 +75,8 @@ static void dfs_send_radar_ind(struct wlan_objmgr_pdev *pdev,
sme_msg.bodyptr = NULL;
sme_msg.bodyval = vdev_id;
scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
DFS_PRINTK("%s: eWNI_SME_DFS_RADAR_FOUND pdev%d posted\n",
__func__, vdev_id);
dfs_info(NULL, WLAN_DEBUG_DFS_ALWAYS, "eWNI_SME_DFS_RADAR_FOUND pdev%d posted",
vdev_id);
}
void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
@@ -86,7 +86,7 @@ void dfs_mlme_mark_dfs(struct wlan_objmgr_pdev *pdev,
uint64_t flags)
{
if (!pdev) {
DFS_PRINTK("%s: null pdev\n", __func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return;
}
@@ -119,8 +119,8 @@ void dfs_mlme_proc_cac(struct wlan_objmgr_pdev *pdev, uint32_t vdev_id)
sme_msg.bodyptr = NULL;
sme_msg.bodyval = vdev_id;
scheduler_post_msg(QDF_MODULE_ID_SME, &sme_msg);
DFS_PRINTK("%s: eWNI_SME_DFS_CAC_COMPLETE vdev%d posted\n",
__func__, vdev_id);
dfs_info(NULL, WLAN_DEBUG_DFS_ALWAYS, "eWNI_SME_DFS_CAC_COMPLETE vdev%d posted",
vdev_id);
}
#endif

59
umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c
Wyświetl plik

@@ -46,8 +46,10 @@ QDF_STATUS tgt_dfs_set_current_channel(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_set_current_channel(dfs,
dfs_ch_freq,
@@ -67,8 +69,10 @@ QDF_STATUS tgt_dfs_radar_enable(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
if (!dfs->dfs_is_offload_enabled)
dfs_radar_enable(dfs, no_cac, opmode);
@@ -88,16 +92,18 @@ QDF_STATUS tgt_dfs_process_phyerr(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
if (!dfs->dfs_is_offload_enabled)
dfs_process_phyerr(dfs, buf, datalen, r_rssi,
r_ext_rssi, r_rs_tstamp, r_fulltsf);
else
DFS_PRINTK(
"%s: Received a pulse from firmware even though the DFS is offloaded\n",
__func__);
dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS,
"Received a pulse from firmware even though the DFS is offloaded"
);
return QDF_STATUS_SUCCESS;
}
@@ -109,8 +115,10 @@ QDF_STATUS tgt_dfs_is_precac_timer_running(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
*is_precac_timer_running = dfs_is_precac_timer_running(dfs);
@@ -123,8 +131,10 @@ QDF_STATUS tgt_dfs_get_radars(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
if (!dfs->dfs_is_offload_enabled)
dfs_get_radars(dfs);
@@ -138,8 +148,10 @@ QDF_STATUS tgt_dfs_destroy_object(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_destroy_object(dfs);
dfs = NULL;
@@ -159,8 +171,10 @@ QDF_STATUS tgt_dfs_control(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
*error = dfs_control(dfs, id, indata, insize, outdata, outsize);
@@ -180,8 +194,10 @@ QDF_STATUS tgt_dfs_find_vht80_chan_for_precac(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_find_vht80_chan_for_precac(dfs,
chan_mode,
@@ -202,14 +218,18 @@ QDF_STATUS tgt_dfs_process_radar_ind(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
if (!pdev) {
DFS_PRINTK("%s: null pdev\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return QDF_STATUS_E_FAILURE;
}
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs || !dfs->dfs_curchan) {
DFS_PRINTK("%s: err, dfs=%pK, dfs->dfs_curchan=%pK\n",
__func__, dfs, dfs->dfs_curchan);
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is null");
return QDF_STATUS_E_FAILURE;
}
if (!dfs->dfs_curchan) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs->dfs_curchan is NULL");
return QDF_STATUS_E_FAILURE;
}
@@ -240,7 +260,7 @@ QDF_STATUS tgt_dfs_reg_ev_handler(struct wlan_objmgr_psoc *psoc,
pdev = wlan_objmgr_get_pdev_by_id(psoc, 0, WLAN_DFS_ID);
if (!pdev) {
DFS_PRINTK("%s: null pdev\n", __func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null pdev");
return QDF_STATUS_E_FAILURE;
}
@@ -248,7 +268,8 @@ QDF_STATUS tgt_dfs_reg_ev_handler(struct wlan_objmgr_psoc *psoc,
if (dfs_tx_ops && dfs_tx_ops->dfs_reg_ev_handler)
status = dfs_tx_ops->dfs_reg_ev_handler(pdev, dfs_offload);
else
DFS_PRINTK("%s: err, dfs_tx_ops=%pK\n", __func__, dfs_tx_ops);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS,
"dfs_tx_ops=%p", dfs_tx_ops);
wlan_objmgr_pdev_release_ref(pdev, WLAN_DFS_ID);
@@ -261,8 +282,10 @@ QDF_STATUS tgt_dfs_stop(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs) {
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL");
return QDF_STATUS_E_FAILURE;
}
dfs_stop(dfs);

16
umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c
Wyświetl plik

@@ -32,7 +32,7 @@ QDF_STATUS ucfg_dfs_is_ap_cac_timer_running(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*is_ap_cac_timer_running = dfs_is_ap_cac_timer_running(dfs);
@@ -47,7 +47,7 @@ QDF_STATUS ucfg_dfs_getnol(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_getnol(dfs, dfs_nolinfo);
@@ -63,7 +63,7 @@ QDF_STATUS ucfg_dfs_override_cac_timeout(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*status = dfs_override_cac_timeout(dfs, cac_timeout);
@@ -79,7 +79,7 @@ QDF_STATUS ucfg_dfs_get_override_cac_timeout(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*status = dfs_get_override_cac_timeout(dfs, cac_timeout);
@@ -94,7 +94,7 @@ QDF_STATUS ucfg_dfs_get_override_precac_timeout(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_get_override_precac_timeout(dfs, precac_timeout);
@@ -109,7 +109,7 @@ QDF_STATUS ucfg_dfs_override_precac_timeout(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_override_precac_timeout(dfs, precac_timeout);
@@ -124,7 +124,7 @@ QDF_STATUS ucfg_dfs_set_precac_enable(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_set_precac_enable(dfs, value);
@@ -139,7 +139,7 @@ QDF_STATUS ucfg_dfs_get_precac_enable(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*buff = dfs_get_precac_enable(dfs);

107
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c
Wyświetl plik

@@ -42,7 +42,7 @@ QDF_STATUS utils_dfs_reset(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_reset(dfs);
@@ -59,7 +59,7 @@ QDF_STATUS utils_dfs_cac_valid_reset(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_cac_valid_reset(dfs, prevchan_ieee, prevchan_flags);
@@ -73,7 +73,7 @@ QDF_STATUS utils_dfs_reset_precaclists(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_reset_precaclists(dfs);
@@ -87,7 +87,7 @@ QDF_STATUS utils_dfs_cancel_precac_timer(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_cancel_precac_timer(dfs);
@@ -102,7 +102,7 @@ QDF_STATUS utils_dfs_is_precac_done(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*is_precac_done = dfs_is_precac_done(dfs);
@@ -116,7 +116,7 @@ QDF_STATUS utils_dfs_cancel_cac_timer(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_cancel_cac_timer(dfs);
@@ -130,7 +130,7 @@ QDF_STATUS utils_dfs_start_cac_timer(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_start_cac_timer(dfs);
@@ -144,7 +144,7 @@ QDF_STATUS utils_dfs_cac_stop(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_cac_stop(dfs);
@@ -157,7 +157,7 @@ QDF_STATUS utils_dfs_stacac_stop(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_stacac_stop(dfs);
@@ -174,7 +174,7 @@ QDF_STATUS utils_dfs_random_channel(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*target_channel = dfs_random_channel(dfs,
@@ -190,7 +190,7 @@ QDF_STATUS utils_dfs_get_usenol(struct wlan_objmgr_pdev *pdev, uint16_t *usenol)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*usenol = dfs_get_usenol(dfs);
@@ -204,7 +204,7 @@ QDF_STATUS utils_dfs_radar_disable(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_radar_disable(dfs);
@@ -219,7 +219,7 @@ QDF_STATUS utils_dfs_set_update_nol_flag(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_set_update_nol_flag(dfs, val);
@@ -234,7 +234,7 @@ QDF_STATUS utils_dfs_get_update_nol_flag(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*nol_flag = dfs_get_update_nol_flag(dfs);
@@ -249,7 +249,7 @@ QDF_STATUS utils_dfs_get_rn_use_nol(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*rn_use_nol = dfs_get_rn_use_nol(dfs);
@@ -264,7 +264,7 @@ QDF_STATUS utils_dfs_get_nol_timeout(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*dfs_nol_timeout = dfs_get_nol_timeout(dfs);
@@ -280,7 +280,7 @@ QDF_STATUS utils_dfs_nol_addchan(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_nol_addchan(dfs, freq, dfs_nol_timeout);
@@ -294,7 +294,7 @@ QDF_STATUS utils_dfs_nol_update(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_nol_update(dfs);
@@ -308,7 +308,7 @@ QDF_STATUS utils_dfs_second_segment_radar_disable(struct wlan_objmgr_pdev *pdev)
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_second_segment_radar_disable(dfs);
@@ -322,7 +322,7 @@ QDF_STATUS utils_dfs_is_ignore_dfs(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*ignore_dfs = dfs->dfs_ignore_dfs;
@@ -337,7 +337,7 @@ QDF_STATUS utils_dfs_is_cac_valid(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*is_cac_valid = dfs->dfs_cac_valid;
@@ -352,7 +352,7 @@ QDF_STATUS utils_dfs_is_ignore_cac(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
*ignore_cac = dfs->dfs_ignore_cac;
@@ -367,7 +367,7 @@ QDF_STATUS utils_dfs_set_cac_timer_running(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs->dfs_cac_timer_running = val;
@@ -385,7 +385,7 @@ QDF_STATUS utils_dfs_get_nol_chfreq_and_chwidth(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_get_nol_chfreq_and_chwidth(nollist, nol_chfreq, nol_chwidth, index);
@@ -401,7 +401,7 @@ QDF_STATUS utils_dfs_update_cur_chan_flags(struct wlan_objmgr_pdev *pdev,
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (dfs == NULL)
if (!dfs)
return QDF_STATUS_E_FAILURE;
dfs_update_cur_chan_flags(dfs, flags, flagext);
@@ -428,16 +428,22 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
int i = 0, j = 0;
enum channel_state state;
struct regulatory_channel *cur_chan_list;
struct wlan_dfs *dfs;
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs)
return;
cur_chan_list = qdf_mem_malloc(NUM_CHANNELS *
sizeof(struct regulatory_channel));
if (cur_chan_list == NULL)
DFS_PRINTK("%s: fail to alloc\n", __func__);
dfs_alert(dfs, WLAN_DEBUG_DFS_ALWAYS, "fail to alloc");
if (wlan_reg_get_current_chan_list(
pdev, cur_chan_list) != QDF_STATUS_SUCCESS) {
*num_chan = 0;
DFS_PRINTK("%s: failed to get curr channel list\n", __func__);
dfs_alert(dfs, WLAN_DEBUG_DFS_ALWAYS,
"failed to get curr channel list");
return;
}
@@ -470,7 +476,7 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
*num_chan = 0;
DFS_PRINTK("%s: null psoc\n", __func__);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS, "null psoc");
return;
}
@@ -486,8 +492,9 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
&len, weight_list, weight_len, true);
if (*num_chan < len) {
DFS_PRINTK("%s: Invalid len src=%d, dst=%d\n",
__func__, *num_chan, len);
dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS,
"Invalid len src=%d, dst=%d",
*num_chan, len);
*num_chan = 0;
return;
}
@@ -498,7 +505,7 @@ static void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev,
wlan_reg_chan_to_freq(pdev, pcl_ch[i]);
}
*num_chan = i;
DFS_PRINTK("%s: num channels %d\n", __func__, i);
dfs_info(NULL, WLAN_DEBUG_DFS_ALWAYS, "num channels %d", i);
}
#endif
@@ -521,26 +528,26 @@ QDF_STATUS dfs_get_random_channel(
*target_chan = 0;
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
DFS_PRINTK("%s: null psoc\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null psoc");
goto random_chan_error;
}
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs) {
DFS_PRINTK("%s: null dfs\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
goto random_chan_error;
}
wlan_reg_get_dfs_region(pdev, &dfs_reg);
chan_list = qdf_mem_malloc(num_chan * sizeof(*chan_list));
if (!chan_list) {
DFS_PRINTK("%s: mem alloc failed\n", __func__);
dfs_alert(dfs, WLAN_DEBUG_DFS_ALWAYS, "mem alloc failed");
goto random_chan_error;
}
utils_dfs_get_chan_list(pdev, chan_list, &num_chan);
if (!num_chan) {
DFS_PRINTK("%s: zero channels\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "zero channels");
goto random_chan_error;
}
@@ -557,7 +564,8 @@ QDF_STATUS dfs_get_random_channel(
ch_params->center_freq_seg0 = cur_chan.dfs_ch_vhtop_ch_freq_seg1;
ch_params->center_freq_seg1 = cur_chan.dfs_ch_vhtop_ch_freq_seg2;
DFS_PRINTK("%s: input width=%d\n", __func__, ch_params->ch_width);
dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS,
"input width=%d", ch_params->ch_width);
if (*target_chan) {
wlan_reg_set_channel_params(pdev,
@@ -566,9 +574,11 @@ QDF_STATUS dfs_get_random_channel(
status = QDF_STATUS_SUCCESS;
}
DFS_PRINTK("%s: ch=%d, seg0=%d, seg1=%d, width=%d\n",
__func__, *target_chan, ch_params->center_freq_seg0,
ch_params->center_freq_seg1, ch_params->ch_width);
dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS,
"ch=%d, seg0=%d, seg1=%d, width=%d",
*target_chan, ch_params->center_freq_seg0,
ch_params->center_freq_seg1, ch_params->ch_width);
random_chan_error:
qdf_mem_free(chan_list);
@@ -592,13 +602,14 @@ void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
psoc = wlan_pdev_get_psoc(pdev);
if (!dfs || !psoc) {
DFS_PRINTK("%s: dfs %pK, psoc %pK\n", __func__, dfs, psoc);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,
"dfs %p, psoc %p", dfs, psoc);
return;
}
qdf_dev = psoc->soc_objmgr.qdf_dev;
if (!qdf_dev->dev) {
DFS_PRINTK("%s: null device\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null device");
return;
}
@@ -607,10 +618,10 @@ void dfs_init_nol(struct wlan_objmgr_pdev *pdev)
(uint16_t)sizeof(dfs_nolinfo));
if (len > 0) {
dfs_set_nol(dfs, dfs_nolinfo.dfs_nol, dfs_nolinfo.num_chans);
DFS_PRINTK("%s: nol channels in pld\n", __func__);
dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "nol channels in pld");
dfs_print_nol(dfs);
} else {
DFS_PRINTK("%s: no nol in pld\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "no nol in pld");
}
}
#endif
@@ -631,19 +642,19 @@ void dfs_save_nol(struct wlan_objmgr_pdev *pdev)
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs) {
DFS_PRINTK("%s: null dfs\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
return;
}
psoc = wlan_pdev_get_psoc(pdev);
if (!psoc) {
DFS_PRINTK("%s: null psoc\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null psoc");
return;
}
qdf_dev = psoc->soc_objmgr.qdf_dev;
if (!qdf_dev->dev) {
DFS_PRINTK("%s: null device\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null device");
return;
}
@@ -669,7 +680,7 @@ void dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev)
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs) {
DFS_PRINTK("%s: null dfs\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
return;
}
@@ -683,7 +694,7 @@ void dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev)
dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev);
if (!dfs) {
DFS_PRINTK("%s: null dfs\n", __func__);
dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs");
return;
}