From: dwalker@codeaurora•org (Daniel Walker)
To: linux-arm-kernel@lists•infradead.org
Subject: [RFC 15/18] arm: vfp: Add additional vfp interfaces
Date: Mon, 11 Jan 2010 14:47:34 -0800 [thread overview]
Message-ID: <1263250057-26692-16-git-send-email-dwalker@codeaurora.org> (raw)
In-Reply-To: <1263250057-26692-1-git-send-email-dwalker@codeaurora.org>
From: Dave Estes <cestes@quicinc•com>
Refactor common code to vfp_flush_context() and vfp_reinit(). Allow
use by other client beside suspend/resume. Currently intended for
idle power collapse.
Signed-off-by: Dave Estes <cestes@quicinc•com>
Signed-off-by: Daniel Walker <dwalker@codeaurora•org>
---
arch/arm/include/asm/vfp.h | 6 ++++++
arch/arm/vfp/vfpmodule.c | 37 ++++++++++++++++++++++++++++---------
2 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/vfp.h b/arch/arm/include/asm/vfp.h
index f4ab34f..ea2e3ac 100644
--- a/arch/arm/include/asm/vfp.h
+++ b/arch/arm/include/asm/vfp.h
@@ -82,3 +82,9 @@
#define VFPOPDESC_UNUSED_BIT (24)
#define VFPOPDESC_UNUSED_MASK (0xFF << VFPOPDESC_UNUSED_BIT)
#define VFPOPDESC_OPDESC_MASK (~(VFPOPDESC_LENGTH_MASK | VFPOPDESC_UNUSED_MASK))
+
+#ifndef __ASSEMBLY__
+int vfp_flush_context(void);
+void vfp_reinit(void);
+#endif
+
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index f60a540..c3a088c 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -370,13 +370,12 @@ static void vfp_enable(void *unused)
set_copro_access(access | CPACC_FULL(10) | CPACC_FULL(11));
}
-#ifdef CONFIG_PM
-#include <linux/sysdev.h>
-
-static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
+int vfp_flush_context(void)
{
struct thread_info *ti = current_thread_info();
u32 fpexc = fmrx(FPEXC);
+ u32 cpu = ti->cpu;
+ int saved = 0;
/* if vfp is on, then save state for resumption */
if (fpexc & FPEXC_EN) {
@@ -385,7 +384,31 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
/* disable, just in case */
fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+
+ last_VFP_context[cpu] = NULL;
+ saved = 1;
}
+ return saved;
+}
+
+void vfp_reinit(void)
+{
+ /* ensure we have access to the vfp */
+ vfp_enable(NULL);
+
+ /* and disable it to ensure the next usage restores the state */
+ fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+}
+
+#ifdef CONFIG_PM
+#include <linux/sysdev.h>
+
+static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
+{
+ int saved = vfp_flush_context();
+
+ if (saved)
+ printk(KERN_DEBUG "%s: saved vfp state\n", __func__);
/* clear any information we had about last context state */
memset(last_VFP_context, 0, sizeof(last_VFP_context));
@@ -395,11 +418,7 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
static int vfp_pm_resume(struct sys_device *dev)
{
- /* ensure we have access to the vfp */
- vfp_enable(NULL);
-
- /* and disable it to ensure the next usage restores the state */
- fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+ vfp_reinit();
return 0;
}
--
1.6.3.3
next prev parent reply other threads:[~2010-01-11 22:47 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-11 22:47 [RFC 00/18] generic arm needed for msm Daniel Walker
2010-01-11 22:47 ` [RFC 01/18] arm: msm: allow ARCH_MSM to have v7 cpus Daniel Walker
2010-01-11 22:47 ` [RFC 02/18] arm: msm: add oprofile pmu support Daniel Walker
2010-01-11 22:47 ` [RFC 03/18] arm: boot: remove old ARM ID for QSD Daniel Walker
2010-01-15 21:26 ` Russell King - ARM Linux
2010-01-11 22:47 ` [RFC 04/18] arm: cache-l2x0: add l2x0 suspend and resume functions Daniel Walker
2010-01-11 23:44 ` Russell King - ARM Linux
2010-01-12 0:52 ` Ruan, Willie
2010-01-11 22:47 ` [RFC 05/18] arm: msm: implement ioremap_strongly_ordered Daniel Walker
2010-01-11 23:37 ` Russell King - ARM Linux
2010-01-28 23:04 ` Larry Bassel
2010-02-03 14:59 ` Russell King - ARM Linux
2010-01-11 22:47 ` [RFC 06/18] arm: msm: implement proper dmb() for 7x27 Daniel Walker
2010-01-11 23:39 ` Russell King - ARM Linux
2010-01-11 23:45 ` Daniel Walker
2010-01-12 0:01 ` Russell King - ARM Linux
2010-01-19 17:28 ` Jamie Lokier
2010-01-19 18:04 ` Russell King - ARM Linux
2010-01-19 21:12 ` Jamie Lokier
2010-01-19 23:11 ` Russell King - ARM Linux
2010-01-19 17:16 ` Jamie Lokier
2010-01-11 22:47 ` [RFC 07/18] arm: mm: retry on QSD icache parity errors Daniel Walker
2010-01-18 18:42 ` Ashwin Chaugule
2010-01-19 16:16 ` Ashwin Chaugule
2010-01-11 22:47 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch and burst on Scorpion Daniel Walker
2010-01-11 23:45 ` Russell King - ARM Linux
2010-01-12 10:51 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch and burston Scorpion Catalin Marinas
2010-01-12 11:23 ` Shilimkar, Santosh
2010-01-12 11:44 ` Russell King - ARM Linux
2010-01-12 13:32 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch and burstonScorpion Catalin Marinas
2010-01-12 13:58 ` Russell King - ARM Linux
2010-01-12 14:41 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch andburstonScorpion Catalin Marinas
2010-01-12 18:23 ` Daniel Walker
2010-01-13 10:36 ` Catalin Marinas
2010-01-19 17:38 ` Jamie Lokier
2010-01-13 6:14 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch and burstonScorpion Shilimkar, Santosh
2010-01-12 20:21 ` [RFC 08/18] arm: msm: set L2CR1 to enable prefetch and burston Scorpion Nicolas Pitre
2010-01-11 22:47 ` [RFC 09/18] arm: mm: support error reporting in L1/L2 caches on QSD Daniel Walker
2010-01-11 22:47 ` [RFC 10/18] arm: mm: enable L2X0 to use L2 cache on MSM7X27 Daniel Walker
2010-01-11 22:47 ` [RFC 11/18] arm: msm: add ARCH_MSM_SCORPION to CPU_V7 Daniel Walker
2010-01-11 23:13 ` Russell King - ARM Linux
2010-01-11 23:17 ` Daniel Walker
2010-01-11 22:47 ` [RFC 12/18] arm: msm: Enable frequency scaling Daniel Walker
2010-01-11 22:47 ` [RFC 13/18] arm: msm: define HAVE_CLK for ARCH_MSM Daniel Walker
2010-01-11 22:47 ` [RFC 14/18] arm: msm: add v7 support for compiler version-4.1.1 Daniel Walker
2010-01-11 23:07 ` Russell King - ARM Linux
2010-01-11 22:47 ` Daniel Walker [this message]
2010-01-11 22:47 ` [RFC 16/18] arm: msm: add arch_has_speculative_dfetch() Daniel Walker
2010-01-11 23:33 ` Russell King - ARM Linux
2010-01-12 0:28 ` Daniel Walker
2010-01-12 8:59 ` Russell King - ARM Linux
2010-01-11 22:47 ` [RFC 17/18] arm: mm: Add SW emulation for ARM domain manager feature Daniel Walker
2010-01-25 16:40 ` Catalin Marinas
2010-01-25 17:04 ` Nicolas Pitre
2010-01-25 18:25 ` Daniel Walker
2010-03-22 18:11 ` Daniel Walker
2010-03-22 18:58 ` Nicolas Pitre
2010-03-22 20:01 ` Daniel Walker
2010-03-22 20:32 ` Nicolas Pitre
2010-03-23 10:04 ` Catalin Marinas
2010-01-11 22:47 ` [RFC 18/18] arm: mm: qsd8x50: Fix incorrect permission faults Daniel Walker
2010-01-11 23:11 ` Russell King - ARM Linux
2010-01-19 17:10 ` Jamie Lokier
2010-01-19 17:33 ` Daniel Walker
2010-01-19 17:43 ` Jamie Lokier
2010-01-19 17:49 ` Daniel Walker
2010-01-19 18:09 ` Russell King - ARM Linux
2010-02-04 0:09 ` David Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1263250057-26692-16-git-send-email-dwalker@codeaurora.org \
--to=dwalker@codeaurora$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox