msm: AVS: Refactor and clean up avs_hw.S to avs.c
Refactor AVS API to a cleaner C implementation. The new implementation
uses C assembly functions and provides a cleaner way for future targets
to add new AVS functionality.
Also fixed a possible issue with the earlier AVS_ENABLE and AVS_DISABLE
implementations. The earlier implementation did a get_cpu() and compared
it against the cpu for which AVS was to to be disabled, if the cpu's did
not match then it did not return an error and avs could have been left
enabled during the voltage change. In this new implementation, enable
and disable use smp_call_function_single() to ensure that the enable and
disable indeed happen on the core requested.
If acpuclock_set_rate() was called on the right core correctly during
cpufreq frequency change, there would have been no issue, but newer
implementation of mach-msm/cpufreq.c does not gaurantee that.
Change-Id: I94db3fc70341ceb79d747d54c7f525056b377755
Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
diff --git a/arch/arm/mach-msm/pm-8x60.c b/arch/arm/mach-msm/pm-8x60.c
index 550bb56..b42ad94 100644
--- a/arch/arm/mach-msm/pm-8x60.c
+++ b/arch/arm/mach-msm/pm-8x60.c
@@ -558,15 +558,18 @@
static bool msm_pm_power_collapse_standalone(bool from_idle)
{
unsigned int cpu = smp_processor_id();
- unsigned int avsdscr_setting;
- unsigned int avscsr_enable;
+ unsigned int avsdscr;
+ unsigned int avscsr;
bool collapsed;
- avsdscr_setting = avs_get_avsdscr();
- avscsr_enable = avs_disable();
+ avsdscr = avs_get_avsdscr();
+ avscsr = avs_get_avscsr();
+ avs_set_avscsr(0); /* Disable AVS */
+
collapsed = msm_pm_spm_power_collapse(cpu, from_idle, false);
- avs_enable(avscsr_enable);
- avs_reset_delays(avsdscr_setting);
+
+ avs_set_avsdscr(avsdscr);
+ avs_set_avscsr(avscsr);
return collapsed;
}
@@ -574,8 +577,8 @@
{
unsigned int cpu = smp_processor_id();
unsigned long saved_acpuclk_rate;
- unsigned int avsdscr_setting;
- unsigned int avscsr_enable;
+ unsigned int avsdscr;
+ unsigned int avscsr;
bool collapsed;
if (MSM_PM_DEBUG_POWER_COLLAPSE & msm_pm_debug_mask)
@@ -586,8 +589,9 @@
if (MSM_PM_DEBUG_POWER_COLLAPSE & msm_pm_debug_mask)
pr_info("CPU%u: %s: pre power down\n", cpu, __func__);
- avsdscr_setting = avs_get_avsdscr();
- avscsr_enable = avs_disable();
+ avsdscr = avs_get_avsdscr();
+ avscsr = avs_get_avscsr();
+ avs_set_avscsr(0); /* Disable AVS */
if (cpu_online(cpu))
saved_acpuclk_rate = acpuclk_power_collapse();
@@ -629,8 +633,8 @@
}
- avs_enable(avscsr_enable);
- avs_reset_delays(avsdscr_setting);
+ avs_set_avsdscr(avsdscr);
+ avs_set_avscsr(avscsr);
msm_pm_config_hw_after_power_up();
if (MSM_PM_DEBUG_POWER_COLLAPSE & msm_pm_debug_mask)
pr_info("CPU%u: %s: post power up\n", cpu, __func__);