samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "icnss2: Enable dms get mac address for wpss supported target" into wlan-platform.lnx.1.0

Browse Source
This commit is contained in:
CNSS_WLAN Service
2022-04-19 22:16:30 -07:00
committed by Gerrit - the friendly Code Review server
parent 0cba3b1723 e4e94ffa0d
commit 9daa172011
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
icnss2/main.c
View File

@@ -1050,7 +1050,7 @@ static int icnss_driver_event_fw_ready_ind(struct icnss_priv *priv, void *data)
if (test_bit(ICNSS_PD_RESTART, &priv->state)) { if (test_bit(ICNSS_PD_RESTART, &priv->state)) {
ret = icnss_pd_restart_complete(priv); ret = icnss_pd_restart_complete(priv);
} else { } else {
if (priv->device_id == WCN6750_DEVICE_ID) if (priv->wpss_supported)
icnss_setup_dms_mac(priv); icnss_setup_dms_mac(priv);
ret = icnss_call_driver_probe(priv); ret = icnss_call_driver_probe(priv);
} }
@@ -3175,7 +3175,7 @@ int icnss_wlan_enable(struct device *dev, struct icnss_wlan_enable_cfg *config,
return -EINVAL; return -EINVAL;
} }
if (priv->device_id == WCN6750_DEVICE_ID && if (priv->wpss_supported &&
!priv->dms.nv_mac_not_prov && !priv->dms.mac_valid) !priv->dms.nv_mac_not_prov && !priv->dms.mac_valid)
icnss_setup_dms_mac(priv); icnss_setup_dms_mac(priv);
@@ -4248,9 +4248,6 @@ static int icnss_probe(struct platform_device *pdev)
init_completion(&priv->unblock_shutdown); init_completion(&priv->unblock_shutdown);
if (priv->device_id == WCN6750_DEVICE_ID) { if (priv->device_id == WCN6750_DEVICE_ID) {
ret = icnss_dms_init(priv);
if (ret)
icnss_pr_err("ICNSS DMS init failed %d\n", ret);
ret = icnss_genl_init(); ret = icnss_genl_init();
if (ret < 0) if (ret < 0)
icnss_pr_err("ICNSS genl init failed %d\n", ret); icnss_pr_err("ICNSS genl init failed %d\n", ret);
@@ -4260,14 +4257,18 @@ static int icnss_probe(struct platform_device *pdev)
icnss_aop_mbox_init(priv); icnss_aop_mbox_init(priv);
set_bit(ICNSS_COLD_BOOT_CAL, &priv->state); set_bit(ICNSS_COLD_BOOT_CAL, &priv->state);
priv->bdf_download_support = true; priv->bdf_download_support = true;
priv->use_nv_mac = icnss_use_nv_mac(priv);
icnss_pr_dbg("NV MAC feature is %s\n",
priv->use_nv_mac ? "Mandatory":"Not Mandatory");
register_trace_android_vh_rproc_recovery_set(rproc_restart_level_notifier, NULL); register_trace_android_vh_rproc_recovery_set(rproc_restart_level_notifier, NULL);
} }
if (priv->wpss_supported) if (priv->wpss_supported) {
ret = icnss_dms_init(priv);
if (ret)
icnss_pr_err("ICNSS DMS init failed %d\n", ret);
priv->use_nv_mac = icnss_use_nv_mac(priv);
icnss_pr_dbg("NV MAC feature is %s\n",
priv->use_nv_mac ? "Mandatory":"Not Mandatory");
INIT_WORK(&wpss_loader, icnss_wpss_load); INIT_WORK(&wpss_loader, icnss_wpss_load);
}
INIT_LIST_HEAD(&priv->icnss_tcdev_list); INIT_LIST_HEAD(&priv->icnss_tcdev_list);
@@ -4307,16 +4308,6 @@ static int icnss_remove(struct platform_device *pdev)
icnss_pr_info("Removing driver: state: 0x%lx\n", priv->state); icnss_pr_info("Removing driver: state: 0x%lx\n", priv->state);
if (priv->device_id == WCN6750_DEVICE_ID) {
icnss_dms_deinit(priv);
icnss_genl_exit();
icnss_runtime_pm_deinit(priv);
if (!IS_ERR_OR_NULL(priv->mbox_chan))
mbox_free_channel(priv->mbox_chan);
unregister_trace_android_vh_rproc_recovery_set(rproc_restart_level_notifier, NULL);
complete_all(&priv->smp2p_soc_wake_wait);
}
device_init_wakeup(&priv->pdev->dev, false); device_init_wakeup(&priv->pdev->dev, false);
icnss_debugfs_destroy(priv); icnss_debugfs_destroy(priv);
@@ -4327,7 +4318,16 @@ static int icnss_remove(struct platform_device *pdev)
icnss_destroy_ramdump_device(priv->msa0_dump_dev); icnss_destroy_ramdump_device(priv->msa0_dump_dev);
if (priv->wpss_supported)
icnss_dms_deinit(priv);
if (priv->device_id == WCN6750_DEVICE_ID) { if (priv->device_id == WCN6750_DEVICE_ID) {
icnss_genl_exit();
icnss_runtime_pm_deinit(priv);
if (!IS_ERR_OR_NULL(priv->mbox_chan))
mbox_free_channel(priv->mbox_chan);
unregister_trace_android_vh_rproc_recovery_set(rproc_restart_level_notifier, NULL);
complete_all(&priv->smp2p_soc_wake_wait);
icnss_wpss_early_ssr_unregister_notifier(priv); icnss_wpss_early_ssr_unregister_notifier(priv);
icnss_wpss_ssr_unregister_notifier(priv); icnss_wpss_ssr_unregister_notifier(priv);
rproc_put(priv->rproc); rproc_put(priv->rproc);