From owner-svn-src-head@freebsd.org Sun Sep 17 19:40:18 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7939FE26E40; Sun, 17 Sep 2017 19:40:18 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4795E6AEDB; Sun, 17 Sep 2017 19:40:18 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8HJeHSh018021; Sun, 17 Sep 2017 19:40:17 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8HJeHmQ018020; Sun, 17 Sep 2017 19:40:17 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201709171940.v8HJeHmQ018020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Sun, 17 Sep 2017 19:40:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323684 - head/sys/powerpc/powerpc X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/powerpc/powerpc X-SVN-Commit-Revision: 323684 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Sep 2017 19:40:18 -0000 Author: jhibbits Date: Sun Sep 17 19:40:17 2017 New Revision: 323684 URL: https://svnweb.freebsd.org/changeset/base/323684 Log: Print the correct bitmask for the running Book-E CPU All the Book-E world is no longer e500v{1,2}. e500mc the 64-bit derivatives do not use the DOZE/NAP bits with MSR[WE], instead using the `wait' instruction to wait for interrupts, and SoC plane controls (via CCSR) for power management. MFC after: 1 week Modified: head/sys/powerpc/powerpc/cpu.c Modified: head/sys/powerpc/powerpc/cpu.c ============================================================================== --- head/sys/powerpc/powerpc/cpu.c Sun Sep 17 19:14:38 2017 (r323683) +++ head/sys/powerpc/powerpc/cpu.c Sun Sep 17 19:40:17 2017 (r323684) @@ -530,16 +530,32 @@ cpu_booke_setup(int cpuid, uint16_t vers) { #ifdef BOOKE_E500 register_t hid0; + const char *bitmask; hid0 = mfspr(SPR_HID0); - /* Programe power-management mode. */ - hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); - hid0 |= HID0_DOZE; + switch (vers) { + case FSL_E500mc: + bitmask = HID0_E500MC_BITMASK; + break; + case FSL_E5500: + case FSL_E6500: + bitmask = HID0_E5500_BITMASK; + break; + case FSL_E500v1: + case FSL_E500v2: + /* Only e500v1/v2 support HID0 power management setup. */ - mtspr(SPR_HID0, hid0); + /* Programe power-management mode. */ + hid0 &= ~(HID0_DOZE | HID0_NAP | HID0_SLEEP); + hid0 |= HID0_DOZE; - printf("cpu%d: HID0 %b\n", cpuid, (int)hid0, HID0_E500_BITMASK); + mtspr(SPR_HID0, hid0); + default: + bitmask = HID0_E500_BITMASK; + break; + } + printf("cpu%d: HID0 %b\n", cpuid, (int)hid0, bitmask); #endif if (cpu_idle_hook == NULL)