From owner-svn-src-all@freebsd.org Tue May 22 13:21:45 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08A31EF57F0; Tue, 22 May 2018 13:21:45 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA70A73CC5; Tue, 22 May 2018 13:21:44 +0000 (UTC) (envelope-from andrew@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B94114932; Tue, 22 May 2018 13:21:44 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4MDLiEd002007; Tue, 22 May 2018 13:21:44 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4MDLiXe002006; Tue, 22 May 2018 13:21:44 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201805221321.w4MDLiXe002006@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Tue, 22 May 2018 13:21:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334037 - head/sys/arm/arm X-SVN-Group: head X-SVN-Commit-Author: andrew X-SVN-Commit-Paths: head/sys/arm/arm X-SVN-Commit-Revision: 334037 X-SVN-Commit-Repository: base 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.26 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: Tue, 22 May 2018 13:21:45 -0000 Author: andrew Date: Tue May 22 13:21:44 2018 New Revision: 334037 URL: https://svnweb.freebsd.org/changeset/base/334037 Log: Only set realmem based on memory where the EXFLAG_NOALLOC is unset. This will allow us to query the maps at any time without disturbing this value. Obtained from: ABT Systems Ltd Sponsored by: Turing Robotic Industries Modified: head/sys/arm/arm/physmem.c Modified: head/sys/arm/arm/physmem.c ============================================================================== --- head/sys/arm/arm/physmem.c Tue May 22 11:57:10 2018 (r334036) +++ head/sys/arm/arm/physmem.c Tue May 22 13:21:44 2018 (r334037) @@ -168,20 +168,21 @@ arm_physmem_print_tables(void) * Returns the number of pages of non-excluded memory added to the avail list. */ static size_t -regions_to_avail(vm_paddr_t *avail, uint32_t exflags, long *pavail) +regions_to_avail(vm_paddr_t *avail, uint32_t exflags, long *pavail, + long *prealmem) { size_t acnt, exi, hwi; uint64_t end, start, xend, xstart; - long availmem; + long availmem, totalmem; const struct region *exp, *hwp; - realmem = 0; + totalmem = 0; availmem = 0; acnt = 0; for (hwi = 0, hwp = hwregions; hwi < hwcnt; ++hwi, ++hwp) { start = hwp->addr; end = hwp->size + start; - realmem += pm_btop((vm_offset_t)(end - start)); + totalmem += pm_btop((vm_offset_t)(end - start)); for (exi = 0, exp = exregions; exi < excnt; ++exi, ++exp) { /* * If the excluded region does not match given flags, @@ -261,8 +262,10 @@ regions_to_avail(vm_paddr_t *avail, uint32_t exflags, panic("Not enough space in the dump/phys_avail arrays"); } - if (pavail) + if (pavail != NULL) *pavail = availmem; + if (prealmem != NULL) + *prealmem = realmem; return (acnt); } @@ -386,8 +389,9 @@ arm_physmem_init_kernel_globals(void) { size_t nextidx; - regions_to_avail(dump_avail, EXFLAG_NODUMP, NULL); - nextidx = regions_to_avail(phys_avail, EXFLAG_NOALLOC, &physmem); + regions_to_avail(dump_avail, EXFLAG_NODUMP, NULL, NULL); + nextidx = regions_to_avail(phys_avail, EXFLAG_NOALLOC, &physmem, + &realmem); if (nextidx == 0) panic("No memory entries in phys_avail"); Maxmem = atop(phys_avail[nextidx - 1]);