From owner-svn-src-all@freebsd.org Wed Jun 29 14:40:45 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 5A8E3B85805; Wed, 29 Jun 2016 14:40:45 +0000 (UTC) (envelope-from nwhitehorn@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 112122AF7; Wed, 29 Jun 2016 14:40:44 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5TEeinw047889; Wed, 29 Jun 2016 14:40:44 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5TEeieA047887; Wed, 29 Jun 2016 14:40:44 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201606291440.u5TEeieA047887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Wed, 29 Jun 2016 14:40:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302279 - in head/sys/powerpc: aim powerpc 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.22 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: Wed, 29 Jun 2016 14:40:45 -0000 Author: nwhitehorn Date: Wed Jun 29 14:40:43 2016 New Revision: 302279 URL: https://svnweb.freebsd.org/changeset/base/302279 Log: Do not rely on firmware having pre-enabled the MMU in a reasonable way for late boot: enable it explicitly after installing the page tables. If booting from an FDT, also make sure to escape the firmware's MMU context early before overwriting firmware page tables. Approved by: re (gjb) Modified: head/sys/powerpc/aim/mmu_oea.c head/sys/powerpc/powerpc/machdep.c Modified: head/sys/powerpc/aim/mmu_oea.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea.c Wed Jun 29 11:48:42 2016 (r302278) +++ head/sys/powerpc/aim/mmu_oea.c Wed Jun 29 14:40:43 2016 (r302279) @@ -921,7 +921,7 @@ moea_bootstrap(mmu_t mmup, vm_offset_t k Maxmem = powerpc_btop(phys_avail[i + 1]); moea_cpu_bootstrap(mmup,0); - + mtmsr(mfmsr() | PSL_DR | PSL_IR); pmap_bootstrapped++; /* Modified: head/sys/powerpc/powerpc/machdep.c ============================================================================== --- head/sys/powerpc/powerpc/machdep.c Wed Jun 29 11:48:42 2016 (r302278) +++ head/sys/powerpc/powerpc/machdep.c Wed Jun 29 14:40:43 2016 (r302279) @@ -251,6 +251,18 @@ powerpc_init(vm_offset_t fdt, vm_offset_ if (mdp == (void *)0x65504150) mdp = NULL; +#if AIM + /* + * If running from an FDT, make sure we are in real mode to avoid + * tromping on firmware page tables. Everything in the kernel assumes + * 1:1 mappings out of firmware, so this won't break anything not + * already broken. This doesn't work if there is live OF, since OF + * may internally use non-1:1 mappings. + */ + if (ofentry == 0) + mtmsr(mfmsr() & ~(PSL_IR | PSL_DR)); +#endif + /* * Parse metadata if present and fetch parameters. Must be done * before console is inited so cninit gets the right value of