From owner-svn-src-head@freebsd.org Sat Dec 30 20:25:34 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 D0FB0EAAC32; Sat, 30 Dec 2017 20:25:34 +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 9BA426B2E3; Sat, 30 Dec 2017 20:25:34 +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 vBUKPXDE016326; Sat, 30 Dec 2017 20:25:33 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBUKPXlc016325; Sat, 30 Dec 2017 20:25:33 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201712302025.vBUKPXlc016325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Sat, 30 Dec 2017 20:25:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327389 - head/sys/powerpc/ps3 X-SVN-Group: head X-SVN-Commit-Author: nwhitehorn X-SVN-Commit-Paths: head/sys/powerpc/ps3 X-SVN-Commit-Revision: 327389 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.25 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: Sat, 30 Dec 2017 20:25:34 -0000 Author: nwhitehorn Date: Sat Dec 30 20:25:33 2017 New Revision: 327389 URL: https://svnweb.freebsd.org/changeset/base/327389 Log: Remove logic for early console with loader.ps3 now that loader.ps3 is dead. Modified: head/sys/powerpc/ps3/mmu_ps3.c Modified: head/sys/powerpc/ps3/mmu_ps3.c ============================================================================== --- head/sys/powerpc/ps3/mmu_ps3.c Sat Dec 30 20:24:33 2017 (r327388) +++ head/sys/powerpc/ps3/mmu_ps3.c Sat Dec 30 20:25:33 2017 (r327389) @@ -100,12 +100,18 @@ mps3_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm moea64_early_bootstrap(mmup, kernelstart, kernelend); + /* In case we had a page table already */ + lv1_destruct_virtual_address_space(0); + + /* Allocate new hardware page table */ lv1_construct_virtual_address_space( 20 /* log_2(moea64_pteg_count) */, 2 /* n page sizes */, (24UL << 56) | (16UL << 48) /* page sizes 16 MB + 64 KB */, &mps3_vas_id, &final_pteg_count ); + lv1_select_virtual_address_space(mps3_vas_id); + moea64_pteg_count = final_pteg_count / sizeof(struct lpteg); moea64_mid_bootstrap(mmup, kernelstart, kernelend); @@ -122,14 +128,9 @@ mps3_cpu_bootstrap(mmu_t mmup, int ap) mtmsr(mfmsr() & ~PSL_DR & ~PSL_IR); /* - * Destroy the loader's address space if we are coming up for - * the first time, and redo the FB mapping so we can continue - * having a console. + * Select the page table we configured above and set up the FB mapping + * so we can have a console. */ - - if (!ap) - lv1_destruct_virtual_address_space(0); - lv1_select_virtual_address_space(mps3_vas_id); if (!ap)