mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-27 03:41:41 +01:00
90 lines
3.5 KiB
Text
90 lines
3.5 KiB
Text
|
From: Colin Cross <ccross@android.com>
|
||
|
|
Subject: [PATCH] ARM: vfp: Always save VFP state in vfp_pm_suspend
|
||
|
|
Date: Sun, 13 Feb 2011 15:13:33 -0800
|
||
|
|
Lines: 45
|
||
|
|
Message-ID: <1297638813-1315-1-git-send-email-ccross@android.com>
|
||
|
|
Cc: Colin Cross <ccross@android.com>,
|
||
|
|
Catalin Marinas <catalin.marinas@arm.com>,
|
||
|
|
Russell King <linux@arm.linux.org.uk>,
|
||
|
|
linux-kernel@vger.kernel.org
|
||
|
|
To: linux-arm-kernel@lists.infradead.org
|
||
|
|
X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 00:14:16 2011
|
||
|
|
Return-path: <linux-kernel-owner@vger.kernel.org>
|
||
|
|
Envelope-to: glk-linux-kernel-3@lo.gmane.org
|
||
|
|
Received: from vger.kernel.org ([209.132.180.67])
|
||
|
|
by lo.gmane.org with esmtp (Exim 4.69)
|
||
|
|
(envelope-from <linux-kernel-owner@vger.kernel.org>)
|
||
|
|
id 1Pol8x-0007RZ-Hw
|
||
|
|
for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 00:14:15 +0100
|
||
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||
|
|
id S1755242Ab1BMXOA (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||
|
|
Sun, 13 Feb 2011 18:14:00 -0500
|
||
|
|
Received: from smtp-out.google.com ([74.125.121.67]:10204 "EHLO
|
||
|
|
smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||
|
|
with ESMTP id S1753669Ab1BMXN5 (ORCPT
|
||
|
|
<rfc822;linux-kernel@vger.kernel.org>);
|
||
|
|
Sun, 13 Feb 2011 18:13:57 -0500
|
||
|
|
Received: from hpaq1.eem.corp.google.com (hpaq1.eem.corp.google.com [172.25.149.1])
|
||
|
|
by smtp-out.google.com with ESMTP id p1DNDjFc030645;
|
||
|
|
Sun, 13 Feb 2011 15:13:45 -0800
|
||
|
|
Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.102.62])
|
||
|
|
by hpaq1.eem.corp.google.com with ESMTP id p1DNDdKg016468;
|
||
|
|
Sun, 13 Feb 2011 15:13:39 -0800
|
||
|
|
Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897)
|
||
|
|
id 1F65025772D; Sun, 13 Feb 2011 15:13:39 -0800 (PST)
|
||
|
|
X-Mailer: git-send-email 1.7.3.1
|
||
|
|
X-System-Of-Record: true
|
||
|
|
Sender: linux-kernel-owner@vger.kernel.org
|
||
|
|
Precedence: bulk
|
||
|
|
List-ID: <linux-kernel.vger.kernel.org>
|
||
|
|
X-Mailing-List: linux-kernel@vger.kernel.org
|
||
|
|
Archived-At: <http://permalink.gmane.org/gmane.linux.kernel/1099558>
|
||
|
|
|
||
|
|
vfp_pm_suspend should save the VFP state any time there is
|
||
|
|
a last_VFP_context. If it only saves when the VFP is enabled,
|
||
|
|
the state can get lost when, on a UP system:
|
||
|
|
Thread 1 uses the VFP
|
||
|
|
Context switch occurs to thread 2, VFP is disabled but the
|
||
|
|
VFP context is not saved to allow lazy save and restore
|
||
|
|
Thread 2 initiates suspend
|
||
|
|
vfp_pm_suspend is called with the VFP disabled, but the
|
||
|
|
context has not been saved.
|
||
|
|
|
||
|
|
Modify vfp_pm_suspend to save the VFP context whenever
|
||
|
|
last_VFP_context is set.
|
||
|
|
|
||
|
|
Cc: Catalin Marinas <catalin.marinas@arm.com>
|
||
|
|
Signed-off-by: Colin Cross <ccross@android.com>
|
||
|
|
---
|
||
|
|
arch/arm/vfp/vfpmodule.c | 11 +++++------
|
||
|
|
1 files changed, 5 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
|
||
|
|
index 66bf8d1..7aea616 100644
|
||
|
|
--- a/arch/arm/vfp/vfpmodule.c
|
||
|
|
+++ b/arch/arm/vfp/vfpmodule.c
|
||
|
|
@@ -415,13 +415,12 @@ static int vfp_pm_suspend(struct sys_device *dev, pm_message_t state)
|
||
|
|
struct thread_info *ti = current_thread_info();
|
||
|
|
u32 fpexc = fmrx(FPEXC);
|
||
|
|
|
||
|
|
- /* if vfp is on, then save state for resumption */
|
||
|
|
- if (fpexc & FPEXC_EN) {
|
||
|
|
+ /* save state for resume */
|
||
|
|
+ if (last_VFP_context[ti->cpu]) {
|
||
|
|
printk(KERN_DEBUG "%s: saving vfp state\n", __func__);
|
||
|
|
- vfp_save_state(&ti->vfpstate, fpexc);
|
||
|
|
-
|
||
|
|
- /* disable, just in case */
|
||
|
|
- fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
|
||
|
|
+ fmxr(FPEXC, fpexc | FPEXC_EN);
|
||
|
|
+ vfp_save_state(last_VFP_context[ti->cpu], fpexc);
|
||
|
|
+ fmxr(FPEXC, fpexc & ~FPEXC_EN);
|
||
|
|
}
|
||
|
|
|
||
|
|
/* clear any information we had about last context state */
|
||
|
|
--
|
||
|
|
1.7.3.1
|
||
|
|
|
||
|
|
|
||
|
|
|