diff options
| author | jiad <jiad@codeaurora.org> | 2018-06-12 10:32:58 +0800 |
|---|---|---|
| committer | nshrivas <nshrivas@codeaurora.org> | 2018-06-13 16:04:31 -0700 |
| commit | b9157a16d9ff066e4c5cda4ed6be0ef7bb41bce7 (patch) | |
| tree | ace9cd382ff4cdcb8acf2d6eacf900b7e9e38ea8 | |
| parent | 6c3cd5b7fd75b28dba774aba90dc1113308b25b5 (diff) | |
qcacld-3.0: Fix HDD IPA clk scaling enablement
With IPA WDI unified API, IPA PM is used instad of IPA RM
for power/resource management. When checking if IPA clk
scaling is enabled or not, HDD_IPA_RM_ENABLE_MASK is thus
not applicable for WDI unified API.
Change-Id: Ie18c2ba6168a06a3bf03f6a5754ffef98113ce30
CRs-Fixed: 2256015
| -rw-r--r-- | core/hdd/src/wlan_hdd_ipa.c | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index ed6b489b3b24..f68512982901 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -865,19 +865,6 @@ static inline bool hdd_ipa_is_rt_debugging_enabled(hdd_context_t *hdd_ctx) } /** - * hdd_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled? - * @hdd_ipa: Global HDD IPA context - * - * Return: true if clock scaling is enabled, otherwise false - */ -static inline bool hdd_ipa_is_clk_scaling_enabled(hdd_context_t *hdd_ctx) -{ - return HDD_IPA_IS_CONFIG_ENABLED(hdd_ctx, - HDD_IPA_CLK_SCALING_ENABLE_MASK | - HDD_IPA_RM_ENABLE_MASK); -} - -/** * hdd_ipa_is_fw_wdi_actived() - Are FW WDI pipes activated? * @hdd_ipa: Global HDD IPA context * @@ -1040,6 +1027,19 @@ static void hdd_ipa_wdi_init_metering(struct hdd_ipa_priv *ipa_ctxt, void *in) #endif /* FEATURE_METERING */ #ifdef CONFIG_IPA_WDI_UNIFIED_API + +/** + * hdd_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled? + * @hdd_ipa: Global HDD IPA context + * + * Return: true if clock scaling is enabled, otherwise false + */ +static inline bool hdd_ipa_is_clk_scaling_enabled(hdd_context_t *hdd_ctx) +{ + return HDD_IPA_IS_CONFIG_ENABLED(hdd_ctx, + HDD_IPA_CLK_SCALING_ENABLE_MASK); +} + /* * TODO: Get WDI version through FW capabilities */ @@ -1550,6 +1550,20 @@ int hdd_ipa_uc_smmu_map(bool map, uint32_t num_buf, qdf_mem_info_t *buf_arr) (struct ipa_wdi_buffer_info *)buf_arr); } #else /* CONFIG_IPA_WDI_UNIFIED_API */ + +/** + * hdd_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled? + * @hdd_ipa: Global HDD IPA context + * + * Return: true if clock scaling is enabled, otherwise false + */ +static inline bool hdd_ipa_is_clk_scaling_enabled(hdd_context_t *hdd_ctx) +{ + return HDD_IPA_IS_CONFIG_ENABLED(hdd_ctx, + HDD_IPA_CLK_SCALING_ENABLE_MASK | + HDD_IPA_RM_ENABLE_MASK); +} + static inline void hdd_ipa_wdi_get_wdi_version(struct hdd_ipa_priv *hdd_ipa) { } |