qcacld-3.0: Fix WLAN 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
This commit is contained in:
jiad 2018-06-12 10:48:07 +08:00 • committed by nshrivas
commit ad913c784e

View file

@ -57,20 +57,6 @@ static inline bool wlan_ipa_is_rm_enabled(struct wlan_ipa_config *ipa_cfg)
return WLAN_IPA_IS_CONFIG_ENABLED(ipa_cfg, WLAN_IPA_RM_ENABLE_MASK);
}
/**
* wlan_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled?
* @ipa_cfg: IPA config
*
* Return: true if IPA RM is enabled, false otherwise
*/
static inline
bool wlan_ipa_is_clk_scaling_enabled(struct wlan_ipa_config *ipa_cfg)
{
return WLAN_IPA_IS_CONFIG_ENABLED(ipa_cfg,
WLAN_IPA_CLK_SCALING_ENABLE_MASK |
WLAN_IPA_RM_ENABLE_MASK);
}
/**
* wlan_ipa_is_rt_debugging_enabled() - Is IPA RT debugging enabled?
* @ipa_cfg: IPA config
@ -158,6 +144,21 @@ struct wlan_ipa_iface_context
*wlan_ipa_get_iface(struct wlan_ipa_priv *ipa_ctx, uint8_t mode);
#ifndef CONFIG_IPA_WDI_UNIFIED_API
/**
* wlan_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled?
* @ipa_cfg: IPA config
*
* Return: true if IPA clock scaling is enabled, false otherwise
*/
static inline
bool wlan_ipa_is_clk_scaling_enabled(struct wlan_ipa_config *ipa_cfg)
{
return WLAN_IPA_IS_CONFIG_ENABLED(ipa_cfg,
WLAN_IPA_CLK_SCALING_ENABLE_MASK |
WLAN_IPA_RM_ENABLE_MASK);
}
/**
* wlan_ipa_wdi_rm_request_resource() - IPA WDI request resource
* @ipa_ctx: IPA context
@ -238,6 +239,19 @@ bool wlan_ipa_is_rm_released(struct wlan_ipa_priv *ipa_ctx);
#else /* CONFIG_IPA_WDI_UNIFIED_API */
/**
* wlan_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled?
* @ipa_cfg: IPA config
*
* Return: true if IPA clock scaling is enabled, false otherwise
*/
static inline
bool wlan_ipa_is_clk_scaling_enabled(struct wlan_ipa_config *ipa_cfg)
{
return WLAN_IPA_IS_CONFIG_ENABLED(ipa_cfg,
WLAN_IPA_CLK_SCALING_ENABLE_MASK);
}
static inline int wlan_ipa_wdi_rm_request_resource(
struct wlan_ipa_priv *ipa_ctx,
qdf_ipa_rm_resource_name_t res_name)