diff options
| author | Yuanyuan Liu <yuanliu@codeaurora.org> | 2018-01-08 10:50:28 -0800 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2018-01-09 17:38:57 -0800 |
| commit | 67a25ee1a8caae98ee2b2b48c56e53bc35aff5ad (patch) | |
| tree | 7e758b07d7e078c081d67480021bd2369bf00007 | |
| parent | 862943a96381b02d9fe5cf60ae31490ecf553b81 (diff) | |
qcacld-3.0: Set target ready only after hif_enable
Target register is safe to access only after FW ack the wlan
enable request, which is done in hif_enable. Hence set FW ready
state after that.
Change-Id: Ieeb7dd3e1a2400c7b2568869ac27cf7f745c20d5
CRs-Fixed: 2167736
| -rw-r--r-- | core/hdd/src/wlan_hdd_driver_ops.c | 8 | ||||
| -rw-r--r-- | core/pld/inc/pld_common.h | 3 | ||||
| -rw-r--r-- | core/pld/src/pld_snoc.c | 6 |
3 files changed, 4 insertions, 13 deletions
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c index 133a25ef605b..31284c07aa9d 100644 --- a/core/hdd/src/wlan_hdd_driver_ops.c +++ b/core/hdd/src/wlan_hdd_driver_ops.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -252,6 +252,7 @@ int hdd_hif_open(struct device *dev, void *bdev, const struct hif_bus_id *bid, ret = qdf_status_to_os_return(status); goto err_hif_close; } else { + cds_set_target_ready(true); ret = hdd_napi_create(); hdd_debug("hdd_napi_create returned: %d", ret); if (ret == 0) @@ -1355,9 +1356,6 @@ static void wlan_hdd_set_the_pld_uevent(struct pld_uevent_data *uevent) case PLD_RECOVERY: cds_set_recovery_in_progress(true); break; - case PLD_FW_READY: - cds_set_target_ready(true); - break; default: return; } @@ -1399,8 +1397,6 @@ static void wlan_hdd_pld_uevent(struct device *dev, case PLD_FW_DOWN: hdd_cleanup_on_fw_down(); break; - case PLD_FW_READY: - break; } uevent_not_allowed: mutex_unlock(&hdd_init_deinit_lock); diff --git a/core/pld/inc/pld_common.h b/core/pld/inc/pld_common.h index 0a2032cdb361..240427278b92 100644 --- a/core/pld/inc/pld_common.h +++ b/core/pld/inc/pld_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -159,7 +159,6 @@ enum pld_driver_status { enum pld_uevent { PLD_RECOVERY, PLD_FW_DOWN, - PLD_FW_READY, }; /** diff --git a/core/pld/src/pld_snoc.c b/core/pld/src/pld_snoc.c index dfe843418822..2f6b84fa123a 100644 --- a/core/pld/src/pld_snoc.c +++ b/core/pld/src/pld_snoc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -263,10 +263,6 @@ static int pld_snoc_uevent(struct device *dev, data.uevent = PLD_FW_DOWN; data.fw_down.crashed = uevent_data->crashed; break; - case ICNSS_UEVENT_FW_READY: - data.uevent = PLD_FW_READY; - break; - default: return 0; } |