diff --git a/components/ipa/core/src/wlan_ipa_core.c b/components/ipa/core/src/wlan_ipa_core.c index 40aa042d1303..a41a980dd0f5 100644 --- a/components/ipa/core/src/wlan_ipa_core.c +++ b/components/ipa/core/src/wlan_ipa_core.c @@ -370,11 +370,11 @@ static inline QDF_STATUS wlan_ipa_wdi_init(struct wlan_ipa_priv *ipa_ctx) } if (QDF_IPA_WDI_INIT_OUT_PARAMS_IS_UC_READY(&out)) { - ipa_info("IPA uC READY"); + ipa_debug("IPA uC READY"); ipa_ctx->uc_loaded = true; ipa_ctx->is_smmu_enabled = QDF_IPA_WDI_INIT_OUT_PARAMS_IS_SMMU_ENABLED(&out); - ipa_info("is_smmu_enabled=%d", ipa_ctx->is_smmu_enabled); + ipa_debug("is_smmu_enabled=%d", ipa_ctx->is_smmu_enabled); } else { return QDF_STATUS_E_BUSY; } diff --git a/components/ipa/dispatcher/src/wlan_ipa_obj_mgmt_api.c b/components/ipa/dispatcher/src/wlan_ipa_obj_mgmt_api.c index ab85ea0fad9a..aab026cde34d 100644 --- a/components/ipa/dispatcher/src/wlan_ipa_obj_mgmt_api.c +++ b/components/ipa/dispatcher/src/wlan_ipa_obj_mgmt_api.c @@ -71,7 +71,7 @@ ipa_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev, QDF_STATUS status; struct wlan_ipa_priv *ipa_obj; - ipa_info("ipa pdev created"); + ipa_debug("ipa pdev created"); if (!ipa_config_is_enabled()) { ipa_info("IPA is disabled"); @@ -110,7 +110,7 @@ ipa_pdev_obj_create_notification(struct wlan_objmgr_pdev *pdev, target_if_ipa_register_tx_ops(&ipa_obj->ipa_tx_op); - ipa_info("ipa pdev attached"); + ipa_debug("ipa pdev attached"); return status; } diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 92c4a6523c61..4e7e94eeb9a8 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -2674,7 +2674,7 @@ static inline void hdd_set_tso_flags(struct hdd_context *hdd_ctx, * We want to enable TSO only if IP/UDP/TCP TX checksum flag is * enabled. */ - hdd_info("TSO Enabled"); + hdd_debug("TSO Enabled"); wlan_dev->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_SG; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 1d5d5343199d..268be546affc 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -7227,12 +7227,15 @@ QDF_STATUS hdd_update_mac_config(struct hdd_context *hdd_ctx) memset(macTable, 0, sizeof(macTable)); status = request_firmware(&fw, WLAN_MAC_FILE, hdd_ctx->parent_dev); - if (status) { - hdd_err("request_firmware failed %d", status); - qdf_status = QDF_STATUS_E_FAILURE; - return qdf_status; + /* + * request_firmware "fails" if the file is not found, which is a + * valid setup for us, so log using debug instead of error + */ + hdd_debug("request_firmware failed; status:%d", status); + return QDF_STATUS_E_FAILURE; } + if (!fw || !fw->data || !fw->size) { hdd_alert("invalid firmware"); qdf_status = QDF_STATUS_E_INVAL; @@ -7286,6 +7289,7 @@ QDF_STATUS hdd_update_mac_config(struct hdd_context *hdd_ctx) } buffer = line; } + if (i <= QDF_MAX_CONCURRENCY_PERSONA) { hdd_debug("%d Mac addresses provided", i); } else { diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index a0c1e8a639eb..cb1e07bab9f1 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -1300,8 +1300,8 @@ static void hdd_update_wiphy_vhtcap(struct hdd_context *hdd_ctx) band_5g->vht_cap.cap |= (val << IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_SHIFT); - hdd_info("Updated wiphy vhtcap:0x%x, CSNAntSupp:%d, NumSoundDim:%d", - band_5g->vht_cap.cap, hdd_ctx->config->txBFCsnValue, val); + hdd_debug("Updated wiphy vhtcap:0x%x, CSNAntSupp:%d, NumSoundDim:%d", + band_5g->vht_cap.cap, hdd_ctx->config->txBFCsnValue, val); } /** @@ -4765,8 +4765,8 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio case QDF_STA_MODE: /* Reset locally administered bit if the device mode is STA */ WLAN_HDD_RESET_LOCALLY_ADMINISTERED_BIT(macAddr); - hdd_info("locally administered bit reset in sta mode: " - MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr)); + hdd_debug("locally administered bit reset in sta mode: " + MAC_ADDRESS_STR, MAC_ADDR_ARRAY(macAddr)); /* fall through */ case QDF_P2P_CLIENT_MODE: case QDF_P2P_DEVICE_MODE: @@ -9854,10 +9854,8 @@ static int hdd_platform_wlan_mac(struct hdd_context *hdd_ctx) addr = hdd_get_platform_wlan_mac_buff(dev, &no_of_mac_addr); - if (no_of_mac_addr == 0 || !addr) { - hdd_warn("Platform Driver Doesn't have wlan mac addresses"); + if (no_of_mac_addr == 0 || !addr) return -EINVAL; - } if (no_of_mac_addr > max_mac_addr) no_of_mac_addr = max_mac_addr; @@ -9921,26 +9919,23 @@ static void hdd_initialize_mac_address(struct hdd_context *hdd_ctx) int ret; ret = hdd_platform_wlan_mac(hdd_ctx); - if (ret == 0) + if (!ret) { + hdd_info("using MAC address from platform driver"); return; - - hdd_info("MAC is not programmed in platform driver ret: %d, use wlan_mac.bin", - ret); + } status = hdd_update_mac_config(hdd_ctx); - - if (QDF_IS_STATUS_SUCCESS(status)) + if (QDF_IS_STATUS_SUCCESS(status)) { + hdd_info("using MAC address from wlan_mac.bin"); return; + } - hdd_info("MAC is not programmed in wlan_mac.bin ret %d, use default MAC", - status); + hdd_info("using default MAC address"); if (hdd_ctx->update_mac_addr_to_fw) { ret = hdd_update_mac_addr_to_fw(hdd_ctx); - if (ret != 0) { + if (ret) hdd_err("MAC address out-of-sync, ret:%d", ret); - QDF_ASSERT(ret); - } } } @@ -14013,7 +14008,7 @@ void hdd_check_and_restart_sap_with_non_dfs_acs(void) if (policy_mgr_get_concurrency_mode(hdd_ctx->hdd_psoc) != (QDF_STA_MASK | QDF_SAP_MASK)) { - hdd_info("Concurrency mode is not SAP"); + hdd_debug("Concurrency mode is not SAP"); return; } diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c index c15d54b742ef..7b892bd104da 100644 --- a/core/hdd/src/wlan_hdd_nan_datapath.c +++ b/core/hdd/src/wlan_hdd_nan_datapath.c @@ -67,10 +67,10 @@ void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx, hdd_ctx->nan_datapath_enabled = hdd_ctx->config->enable_nan_datapath && cfg->nan_datapath_enabled; - hdd_info("enable_nan_datapath: final: %d, host: %d, fw: %d", - hdd_ctx->nan_datapath_enabled, - hdd_ctx->config->enable_nan_datapath, - cfg->nan_datapath_enabled); + hdd_debug("final: %d, host: %d, fw: %d", + hdd_ctx->nan_datapath_enabled, + hdd_ctx->config->enable_nan_datapath, + cfg->nan_datapath_enabled); } /**