[src/trunk]: src/sys/arch/arm/arm32 Mirror changes to passing pages to UVM in...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3346c5fcf81c
branches:  trunk
changeset: 379493:3346c5fcf81c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Jun 03 07:06:22 2021 +0000

description:
Mirror changes to passing pages to UVM into aarch64_machdep.c

Two fixes for loading free pages into UVM

- Only consider a boot_physmem (inner loop) range that has its end
  (bp_end) after the bootconfig.dram (outer loop) range start (start).
  This was harmless as a later condition correctly checks there is only
  something to do if start < bp_end.

- Stop processing boot_physmem ranges if all the bootconfig.dram range has
  been passed to UVM.  This fixes a boot problem for simon@

Copy a comment over and do the VPRINTF before the uvm_page_physload in
the same way as aarch64_machdep.c as well.

diffstat:

 sys/arch/arm/arm32/arm32_boot.c |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 2c4e7e50476e -r 3346c5fcf81c sys/arch/arm/arm32/arm32_boot.c
--- a/sys/arch/arm/arm32/arm32_boot.c   Thu Jun 03 07:02:59 2021 +0000
+++ b/sys/arch/arm/arm32/arm32_boot.c   Thu Jun 03 07:06:22 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_boot.c,v 1.42 2021/06/01 16:55:07 skrll Exp $    */
+/*     $NetBSD: arm32_boot.c,v 1.43 2021/06/03 07:06:22 skrll Exp $    */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -122,7 +122,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.42 2021/06/01 16:55:07 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.43 2021/06/03 07:06:22 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_cputypes.h"
@@ -261,15 +261,21 @@ initarm_common(vaddr_t kvm_base, vsize_t
                        continue;
                }
                VPRINTF("\n");
+
+               /*
+                * This assumes the bp list is sorted in ascending
+                * order.
+                */
                paddr_t segend = end;
-               for (size_t j = 0; j < nbp; j++) {
+               for (size_t j = 0; j < nbp && start < end; j++) {
                        paddr_t bp_start = bp[j].bp_start;
                        paddr_t bp_end = bp_start + bp[j].bp_pages;
 
                        VPRINTF("   bp %2zu start %08lx  end %08lx\n",
                            j, ptoa(bp_start), ptoa(bp_end));
+
                        KASSERT(bp_start < bp_end);
-                       if (start > bp_end || segend < bp_start)
+                       if (start >= bp_end || segend < bp_start)
                                continue;
 
                        if (start < bp_start)
@@ -281,11 +287,13 @@ initarm_common(vaddr_t kvm_base, vsize_t
                                }
                                vm_freelist = bp[j].bp_freelist;
 
-                               uvm_page_physload(start, segend, start, segend,
-                                   vm_freelist);
                                VPRINTF("         start %08lx  end %08lx"
                                    "... loading in freelist %d\n", ptoa(start),
                                    ptoa(segend), vm_freelist);
+
+                               uvm_page_physload(start, segend, start, segend,
+                                   vm_freelist);
+
                                start = segend;
                                segend = end;
                        }