Module Name: src
Committed By: rin
Date: Sat Jun 17 11:22:20 UTC 2023
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_machdep.c
Log Message:
Catch up with new pmap_devmap implementation.
Now, hardcoded VA's should be aligned to L1 section (1M) boundaries.
Rather, just disable ones if there's no need for statically mapping.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/nslu2/nslu2_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/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.37 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.38
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.37 Wed Jun 14 10:30:34 2023
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Sat Jun 17 11:22:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.37 2023/06/14 10:30:34 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.38 2023/06/17 11:22:20 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -351,6 +351,19 @@ static const struct pmap_devmap nslu2_de
IXP425_IO_SIZE
),
+ /* SDRAM Controller */
+ DEVMAP_ENTRY(
+ IXP425_MCU_VBASE,
+ IXP425_MCU_HWBASE,
+ IXP425_MCU_SIZE
+ ),
+
+ /*
+ * No need to map the following entries statically.
+ * If you revive these, align VBASE's to L1 section
+ * boundaries (see pmap_devmap.c).
+ */
+#if 0
/* Expansion Bus */
DEVMAP_ENTRY(
IXP425_EXP_VBASE,
@@ -365,13 +378,6 @@ static const struct pmap_devmap nslu2_de
IXP425_PCI_SIZE
),
- /* SDRAM Controller */
- DEVMAP_ENTRY(
- IXP425_MCU_VBASE,
- IXP425_MCU_HWBASE,
- IXP425_MCU_SIZE
- ),
-
/* PCI Memory Space */
DEVMAP_ENTRY(
IXP425_PCI_MEM_VBASE,
