From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 00:56:39 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1619999E; Mon, 14 Oct 2013 00:56:39 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04CD82059; Mon, 14 Oct 2013 00:56:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9E0ucEq026912; Mon, 14 Oct 2013 00:56:38 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9E0ucDW026911; Mon, 14 Oct 2013 00:56:38 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201310140056.r9E0ucDW026911@svn.freebsd.org> From: Justin Hibbits Date: Mon, 14 Oct 2013 00:56:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256434 - projects/pmac_pmu/sys/powerpc/powermac X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 00:56:39 -0000 Author: jhibbits Date: Mon Oct 14 00:56:38 2013 New Revision: 256434 URL: http://svnweb.freebsd.org/changeset/base/256434 Log: PCPU fputhread and vecthread get reset to NULL when save_fpu()/save_vec() is called. Cache these. Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c Modified: projects/pmac_pmu/sys/powerpc/powermac/pmu.c ============================================================================== --- projects/pmac_pmu/sys/powerpc/powermac/pmu.c Sun Oct 13 21:46:08 2013 (r256433) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Mon Oct 14 00:56:38 2013 (r256434) @@ -1129,11 +1129,13 @@ extern void *ap_pcpu; void pmu_sleep_int(void) { + jmp_buf resetjb; u_quad_t timebase; + struct thread *fputd = NULL; + struct thread *vectd = NULL; register_t hid0; register_t msr; register_t saved_msr; - jmp_buf resetjb; ap_pcpu = pcpup; @@ -1143,9 +1145,11 @@ void pmu_sleep_int(void) saved_msr = mfmsr(); timebase = mftb(); flush_disable_caches(); - if (PCPU_GET(fputhread) != NULL) + fputd = PCPU_GET(fputhread); + vectd = PCPU_GET(vecthread); + if (fputd != NULL) save_fpu(PCPU_GET(fputhread)); - if (PCPU_GET(vecthread) != NULL) + if (vectd != NULL) save_vec(PCPU_GET(vecthread)); if (setjmp(resetjb) == 0) { sprgs[0] = mfspr(SPR_SPRG0); @@ -1177,9 +1181,9 @@ void pmu_sleep_int(void) mtspr(SPR_SRR0, srrs[0]); mtspr(SPR_SRR1, srrs[1]); mtmsr(saved_msr); - if (PCPU_GET(fputhread) == curthread) + if (fputd == curthread) enable_fpu(curthread); - if (PCPU_GET(vecthread) == curthread) + if (vectd == curthread) enable_vec(curthread); powerpc_sync(); }