Module Name: src
Committed By: skrll
Date: Sat Aug 4 21:59:28 UTC 2018
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
Log Message:
Fix KERN_{VTOPHYS,PHYSTOV) fallout differently
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.12 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.13
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.12 Sat Aug 4 13:27:03 2018
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Sat Aug 4 21:59:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.12 2018/08/04 13:27:03 kre Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.13 2018/08/04 21:59:28 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define IDM_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.12 2018/08/04 13:27:03 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.13 2018/08/04 21:59:28 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_evbarm_boardtype.h"
@@ -93,15 +93,7 @@ static void bcm53xx_system_reset(void);
* Macros to translate between physical and virtual for a subset of the
* kernel address space. *Not* for general use.
*/
-#if !defined(KERN_VTOPHYS) || !defined(KERN_PHYSTOV)
#define KERN_VTOPDIFF ((vaddr_t)KERNEL_BASE_phys - (vaddr_t)KERNEL_BASE_virt)
-#endif
-#ifndef KERN_VTOPHYS
-#define KERN_VTOPHYS(va) ((paddr_t)((vaddr_t)va + KERN_VTOPDIFF))
-#endif
-#ifndef KERN_PHYSTOV
-#define KERN_PHYSTOV(pa) ((vaddr_t)((paddr_t)pa - KERN_VTOPDIFF))
-#endif
#ifndef CONADDR
#define CONADDR (BCM53XX_IOREG_PBASE + CCA_UART0_BASE)
@@ -202,6 +194,8 @@ static const struct boot_physmem bp_firs
u_int
initarm(void *arg)
{
+ kern_vtopdiff = KERN_VTOPDIFF;
+
pmap_devmap_register(devmap);
bcm53xx_bootstrap(KERNEL_IO_IOREG_VBASE);
