From 00302dd31ae245d718631711155d6f949340b8ac Mon Sep 17 00:00:00 2001
From: jiad <jiad@codeaurora.org>
Date: Fri, 9 Nov 2018 13:45:54 +0800
Subject: [PATCH] qcacld-3.0: Fix WLAN IPA RM enablement

With IPA WDI unified API, IPA PM is used instad of IPA RM
for power/resource management. When checking if IPA RM is
enabled or not, HDD_IPA_RM_ENABLE_MASK is thus not applicable
for WDI unified API.

Fix is to always return true for IPA WDI unified API for power
efficiency.

Change-Id: I047b3156cf00002142dd3acb021cfb6ce64489ee
CRs-Fixed: 2283088
---
 ipa/core/inc/wlan_ipa_core.h | 37 +++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/ipa/core/inc/wlan_ipa_core.h b/ipa/core/inc/wlan_ipa_core.h
index 7d8510a132..985cdc454b 100644
--- a/ipa/core/inc/wlan_ipa_core.h
+++ b/ipa/core/inc/wlan_ipa_core.h
@@ -46,17 +46,6 @@ static inline bool wlan_ipa_uc_is_enabled(struct wlan_ipa_config *ipa_cfg)
 	return WLAN_IPA_IS_CONFIG_ENABLED(ipa_cfg, WLAN_IPA_UC_ENABLE_MASK);
 }
 
-/**
- * wlan_ipa_is_rm_enabled() - Is IPA RM enabled?
- * @ipa_cfg: IPA config
- *
- * Return: true if IPA RM is enabled, false otherwise
- */
-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_rt_debugging_enabled() - Is IPA RT debugging enabled?
  * @ipa_cfg: IPA config
@@ -145,6 +134,17 @@ struct wlan_ipa_iface_context
 
 #ifndef CONFIG_IPA_WDI_UNIFIED_API
 
+/**
+ * wlan_ipa_is_rm_enabled() - Is IPA RM enabled?
+ * @ipa_cfg: IPA config
+ *
+ * Return: true if IPA RM is enabled, false otherwise
+ */
+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
@@ -239,6 +239,21 @@ bool wlan_ipa_is_rm_released(struct wlan_ipa_priv *ipa_ctx);
 
 #else /* CONFIG_IPA_WDI_UNIFIED_API */
 
+/**
+ * wlan_ipa_is_rm_enabled() - Is IPA RM enabled?
+ * @ipa_cfg: IPA config
+ *
+ * IPA RM is deprecated and IPA PM is involved. WLAN driver
+ * has no control over IPA PM and thus we could regard IPA
+ * RM as always enabled for power efficiency.
+ *
+ * Return: true
+ */
+static inline bool wlan_ipa_is_rm_enabled(struct wlan_ipa_config *ipa_cfg)
+{
+	return true;
+}
+
 /**
  * wlan_ipa_is_clk_scaling_enabled() - Is IPA clock scaling enabled?
  * @ipa_cfg: IPA config