From owner-svn-src-all@freebsd.org Mon Jan 4 01:33:08 2016 Return-Path: Delivered-To: svn-src-all@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 EEFD4A61E38; Mon, 4 Jan 2016 01:33:08 +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 BCDC51551; Mon, 4 Jan 2016 01:33:08 +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 u041X7Rd027570; Mon, 4 Jan 2016 01:33:07 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u041X7eM027569; Mon, 4 Jan 2016 01:33:07 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201601040133.u041X7eM027569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 4 Jan 2016 01:33:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r293128 - head/sys/powerpc/booke X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2016 01:33:09 -0000 Author: jhibbits Date: Mon Jan 4 01:33:07 2016 New Revision: 293128 URL: https://svnweb.freebsd.org/changeset/base/293128 Log: Set the cacheline size before calling powerpc_init() powerpc_init() initializes the mmu. Since this may clear pages via pmap_zero_page(), set the cacheline size before calling into it, so pmap_zero_page() has the right cacheline size. This isn't completely necessary now, but will be when 64-bit book-e is completed. Modified: head/sys/powerpc/booke/booke_machdep.c Modified: head/sys/powerpc/booke/booke_machdep.c ============================================================================== --- head/sys/powerpc/booke/booke_machdep.c Mon Jan 4 01:16:32 2016 (r293127) +++ head/sys/powerpc/booke/booke_machdep.c Mon Jan 4 01:33:07 2016 (r293128) @@ -316,8 +316,6 @@ booke_init(uint32_t arg1, uint32_t arg2) else /* U-Boot */ mdp = NULL; - ret = powerpc_init(dtbp, 0, 0, mdp); - /* Default to 32 byte cache line size. */ switch ((mfpvr()) >> 16) { case FSL_E500mc: @@ -327,6 +325,8 @@ booke_init(uint32_t arg1, uint32_t arg2) break; } + ret = powerpc_init(dtbp, 0, 0, mdp); + /* Enable caches */ booke_enable_l1_cache(); booke_enable_l2_cache();