mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 20:38:08 +01:00
91 lines
3.8 KiB
Text
91 lines
3.8 KiB
Text
|
From: Catalin Marinas <catalin.marinas@arm.com>
|
||
|
|
Subject: Re: [PATCH] ARM: vfp: Always save VFP state in vfp_pm_suspend
|
||
|
|
Date: Mon, 14 Feb 2011 11:42:22 +0000
|
||
|
|
Organization: ARM Limited
|
||
|
|
Lines: 43
|
||
|
|
Message-ID: <1297683742.30092.11.camel@e102109-lin.cambridge.arm.com>
|
||
|
|
References: <1297638813-1315-1-git-send-email-ccross@android.com>
|
||
|
|
Mime-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8BIT
|
||
|
|
Cc: linux-arm-kernel@lists.infradead.org,
|
||
|
|
Russell King <linux@arm.linux.org.uk>,
|
||
|
|
linux-kernel@vger.kernel.org
|
||
|
|
To: Colin Cross <ccross@android.com>
|
||
|
|
X-From: linux-kernel-owner@vger.kernel.org Mon Feb 14 12:42:45 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 1PowpJ-00069R-8c
|
||
|
|
for glk-linux-kernel-3@lo.gmane.org; Mon, 14 Feb 2011 12:42:45 +0100
|
||
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||
|
|
id S1753535Ab1BNLmi (ORCPT <rfc822;glk-linux-kernel-3@m.gmane.org>);
|
||
|
|
Mon, 14 Feb 2011 06:42:38 -0500
|
||
|
|
Received: from service87.mimecast.com ([94.185.240.25]:56758 "HELO
|
||
|
|
service87.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||
|
|
with SMTP id S1752997Ab1BNLmg convert rfc822-to-8bit (ORCPT
|
||
|
|
<rfc822;linux-kernel@vger.kernel.org>);
|
||
|
|
Mon, 14 Feb 2011 06:42:36 -0500
|
||
|
|
Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21])
|
||
|
|
by service87.mimecast.com;
|
||
|
|
Mon, 14 Feb 2011 11:42:31 +0000
|
||
|
|
Received: from [10.1.77.95] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959);
|
||
|
|
Mon, 14 Feb 2011 11:42:28 +0000
|
||
|
|
In-Reply-To: <1297638813-1315-1-git-send-email-ccross@android.com>
|
||
|
|
X-Mailer: Evolution 2.28.1
|
||
|
|
X-OriginalArrivalTime: 14 Feb 2011 11:42:28.0658 (UTC) FILETIME=[41F09120:01CBCC3C]
|
||
|
|
X-MC-Unique: 111021411423105201
|
||
|
|
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/1099685>
|
||
|
|
|
||
|
|
On Sun, 2011-02-13 at 23:13 +0000, Colin Cross wrote:
|
||
|
|
> 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.
|
||
|
|
|
||
|
|
At this point is it guaranteed that the thread won't migrate to another
|
||
|
|
CPU? If not, we should use get/put_cpu.
|
||
|
|
|
||
|
|
> --- 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);
|
||
|
|
> }
|
||
|
|
|
||
|
|
We may want to set the last_VFP_context to NULL so that after resuming
|
||
|
|
(to the same thread) we force the VFP reload from the vfpstate
|
||
|
|
structure. The vfp_support_entry code ignores the reloading if the
|
||
|
|
last_VFP_context is the same as vfpstate.
|
||
|
|
|
||
|
|
--
|
||
|
|
Catalin
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
|