Mon Dec 30 15:42:40 2019 UTC ()

Remove unnecessary brackets and unwrap a conditional.  Same code before
and after.


(skrll)

diff -r1.58 -r1.59 src/sys/arch/aarch64/aarch64/pmap.c

--- src/sys/arch/aarch64/aarch64/pmap.c 2019/12/28 17:19:43	1.58
+++ src/sys/arch/aarch64/aarch64/pmap.c 2019/12/30 15:42:39	1.59

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.58 2019/12/28 17:19:43 jmcneill Exp $	*/
+/*	$NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $	*/
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.58 2019/12/28 17:19:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.59 2019/12/30 15:42:39 skrll Exp $");
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "opt_pmap.h"
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <sys/vmem.h>
 #include <sys/atomic.h>
 #include <sys/asan.h>
 @@ -313,28 +313,27 @@ pmap_devmap_bootstrap(vaddr_t l0pt, cons
 	VPRINTF("%s:\n", __func__);
 	for (i = 0; table[i].pd_size != 0; i++) {
 		VPRINTF(" devmap: pa %08lx-%08lx = va %016lx\n",
 		    table[i].pd_pa,
 		    table[i].pd_pa + table[i].pd_size - 1,
 		    table[i].pd_va);
 		va = table[i].pd_va;
 		KASSERT((VM_KERNEL_IO_ADDRESS <= va) &&
 		    (va < (VM_KERNEL_IO_ADDRESS + VM_KERNEL_IO_SIZE)));
 		/* update and check virtual_devmap_addr */
-		if ((virtual_devmap_addr == 0) ||
+		if (virtual_devmap_addr == 0 || virtual_devmap_addr > va) {
 		    (virtual_devmap_addr > va)) {
 			virtual_devmap_addr = va;
+		}
 		pmap_map_chunk(
 		    table[i].pd_va,
 		    table[i].pd_pa,
 		    table[i].pd_size,
 		    table[i].pd_prot,
 		    table[i].pd_flags);
+	}
 	pmap_devmap_bootstrap_done = true;
+}
 @@ -413,27 +412,27 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v
 	paddr_t l0pa;
 	PMAP_HIST_INIT();	/* init once */
 	UVMHIST_FUNC(__func__);
 	UVMHIST_CALLED(pmaphist);
 #if 0
 	/* uvmexp.ncolors = icachesize / icacheways / PAGE_SIZE; */
 	uvmexp.ncolors = aarch64_cache_vindexsize / PAGE_SIZE;
 #endif
 	/* devmap already uses last of va? */
-	if ((virtual_devmap_addr != 0) && (virtual_devmap_addr < vend))
+	if (virtual_devmap_addr != 0 && virtual_devmap_addr < vend)
 		vend = virtual_devmap_addr;
 	virtual_avail = vstart;
 	virtual_end = vend;
 	pmap_maxkvaddr = vstart;
 	aarch64_tlbi_all();
 	l0pa = reg_ttbr1_el1_read();
 	l0 = (void *)AARCH64_PA_TO_KVA(l0pa);
 	memset(&kernel_pmap, 0, sizeof(kernel_pmap));
 	kpm = pmap_kernel();