From owner-svn-src-projects@FreeBSD.ORG Thu Dec 5 05:59:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D12F8DE6; Thu, 5 Dec 2013 05:59:09 +0000 (UTC) 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 AF3E91F4F; Thu, 5 Dec 2013 05:59:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB55x9Sa074318; Thu, 5 Dec 2013 05:59:09 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB55x9FU074317; Thu, 5 Dec 2013 05:59:09 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201312050559.rB55x9FU074317@svn.freebsd.org> From: Justin Hibbits Date: Thu, 5 Dec 2013 05:59:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258958 - 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.17 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: Thu, 05 Dec 2013 05:59:09 -0000 Author: jhibbits Date: Thu Dec 5 05:59:09 2013 New Revision: 258958 URL: http://svnweb.freebsd.org/changeset/base/258958 Log: Clean up the low level PMU sleep code. This could actually be moved elsewhere, since it's not precisely related to the PMU. 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 Thu Dec 5 05:58:17 2013 (r258957) +++ projects/pmac_pmu/sys/powerpc/powermac/pmu.c Thu Dec 5 05:59:09 2013 (r258958) @@ -1129,10 +1129,10 @@ extern void *ap_pcpu; void pmu_sleep_int(void) { + static u_quad_t timebase = 0; jmp_buf resetjb; - u_quad_t timebase; - struct thread *fputd = NULL; - struct thread *vectd = NULL; + struct thread *fputd; + struct thread *vectd; register_t hid0; register_t msr; register_t saved_msr; @@ -1143,14 +1143,12 @@ void pmu_sleep_int(void) *(unsigned long *)0x80 = 0x100; saved_msr = mfmsr(); - timebase = mftb(); - flush_disable_caches(); fputd = PCPU_GET(fputhread); vectd = PCPU_GET(vecthread); if (fputd != NULL) - save_fpu(PCPU_GET(fputhread)); + save_fpu(fputd); if (vectd != NULL) - save_vec(PCPU_GET(vecthread)); + save_vec(vectd); if (setjmp(resetjb) == 0) { sprgs[0] = mfspr(SPR_SPRG0); sprgs[1] = mfspr(SPR_SPRG1); @@ -1158,14 +1156,17 @@ void pmu_sleep_int(void) sprgs[3] = mfspr(SPR_SPRG3); srrs[0] = mfspr(SPR_SRR0); srrs[1] = mfspr(SPR_SRR1); + timebase = mftb(); + powerpc_sync(); + flush_disable_caches(); hid0 = mfspr(SPR_HID0); hid0 = (hid0 & ~(HID0_DOZE | HID0_NAP)) | HID0_SLEEP; powerpc_sync(); isync(); + msr = mfmsr() | PSL_POW; mtspr(SPR_HID0, hid0); powerpc_sync(); - msr = mfmsr() | PSL_POW; while (1) mtmsr(msr); }