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)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
