Module Name: src
Committed By: skrll
Date: Fri Apr 21 15:04:47 UTC 2023
Modified Files:
src/sys/arch/arm/at91: at91rm9200bus.c at91sam9261bus.c
src/sys/arch/evbarm/armadaxp: armadaxp_machdep.c
src/sys/arch/evbarm/bcm53xx: bcm53xx_machdep.c
Log Message:
More devmap updates
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91rm9200bus.c \
src/sys/arch/arm/at91/at91sam9261bus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
cvs rdiff -u -r1.27 -r1.28 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/arm/at91/at91rm9200bus.c
diff -u src/sys/arch/arm/at91/at91rm9200bus.c:1.3 src/sys/arch/arm/at91/at91rm9200bus.c:1.4
--- src/sys/arch/arm/at91/at91rm9200bus.c:1.3 Fri Apr 21 15:00:48 2023
+++ src/sys/arch/arm/at91/at91rm9200bus.c Fri Apr 21 15:04:47 2023
@@ -1,7 +1,7 @@
-/* $Id: at91rm9200bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $ */
+/* $Id: at91rm9200bus.c,v 1.4 2023/04/21 15:04:47 skrll Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91rm9200bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91rm9200bus.c,v 1.4 2023/04/21 15:04:47 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -46,21 +46,12 @@ void at91rm9200bus_init(struct at91bus_c
const struct pmap_devmap *at91rm9200bus_devmap(void)
{
static const struct pmap_devmap devmap[] = {
- {
+ DEVMAP_ENTRY(
AT91RM9200_APB_VBASE,
AT91RM9200_APB_HWBASE,
- AT91RM9200_APB_SIZE,
- VM_PROT_READ | VM_PROT_WRITE,
- PTE_NOCACHE
- },
-
- {
- 0,
- 0,
- 0,
- 0,
- 0
- }
+ AT91RM9200_APB_SIZE
+ ),
+ DEVMAP_ENTRY_END
};
return devmap;
Index: src/sys/arch/arm/at91/at91sam9261bus.c
diff -u src/sys/arch/arm/at91/at91sam9261bus.c:1.3 src/sys/arch/arm/at91/at91sam9261bus.c:1.4
--- src/sys/arch/arm/at91/at91sam9261bus.c:1.3 Fri Apr 21 15:00:48 2023
+++ src/sys/arch/arm/at91/at91sam9261bus.c Fri Apr 21 15:04:47 2023
@@ -1,7 +1,7 @@
-/* $Id: at91sam9261bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $ */
+/* $Id: at91sam9261bus.c,v 1.4 2023/04/21 15:04:47 skrll Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91sam9261bus.c,v 1.3 2023/04/21 15:00:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91sam9261bus.c,v 1.4 2023/04/21 15:04:47 skrll Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -46,21 +46,12 @@ void at91sam9261bus_init(struct at91bus_
const struct pmap_devmap *at91sam9261bus_devmap(void)
{
static const struct pmap_devmap devmap[] = {
- {
+ DEVMAP_ENTRY(
AT91SAM9261_APB_VBASE,
AT91SAM9261_APB_HWBASE,
- AT91SAM9261_APB_SIZE,
- VM_PROT_READ | VM_PROT_WRITE,
- PTE_NOCACHE
- },
-
- {
- 0,
- 0,
- 0,
- 0,
- 0
- }
+ AT91SAM9261_APB_SIZE
+ ),
+ DEVMAP_ENTRY_END
};
return devmap;
Index: src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c
diff -u src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.18 src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.19
--- src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c:1.18 Thu Apr 20 08:28:03 2023
+++ src/sys/arch/evbarm/armadaxp/armadaxp_machdep.c Fri Apr 21 15:04:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: armadaxp_machdep.c,v 1.18 2023/04/20 08:28:03 skrll Exp $ */
+/* $NetBSD: armadaxp_machdep.c,v 1.19 2023/04/21 15:04:47 skrll Exp $ */
/*******************************************************************************
Copyright (C) Marvell International Ltd. and its affiliates
@@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
*******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.18 2023/04/20 08:28:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadaxp_machdep.c,v 1.19 2023/04/21 15:04:47 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -188,11 +188,9 @@ axp_system_reset(void)
*/
static const struct pmap_devmap devmap[] = {
- DEVMAP_ENTRY_FLAGS(MARVELL_INTERREGS_VBASE,
- MARVELL_INTERREGS_PBASE,
- MVSOC_INTERREGS_SIZE,
- VM_PROT_READ | VM_PROT_WRITE,
- PMAP_NOCACHE),
+ DEVMAP_ENTRY(MARVELL_INTERREGS_VBASE,
+ MARVELL_INTERREGS_PBASE,
+ MVSOC_INTERREGS_SIZE),
DEVMAP_ENTRY_END
};
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.27 src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.28
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c:1.27 Sat Mar 20 05:58:22 2021
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_machdep.c Fri Apr 21 15:04:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_machdep.c,v 1.27 2021/03/20 05:58:22 skrll Exp $ */
+/* $NetBSD: bcm53xx_machdep.c,v 1.28 2023/04/21 15:04:47 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.27 2021/03/20 05:58:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm53xx_machdep.c,v 1.28 2023/04/21 15:04:47 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -148,51 +148,39 @@ static struct consdev earlycons = {
*/
static const struct pmap_devmap devmap[] = {
- {
+ DEVMAP_ENTRY(
KERNEL_IO_IOREG_VBASE,
BCM53XX_IOREG_PBASE, /* 0x18000000 */
- BCM53XX_IOREG_SIZE, /* 2MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
- {
+ BCM53XX_IOREG_SIZE /* 2MB */
+ ),
+ DEVMAP_ENTRY(
KERNEL_IO_ARMCORE_VBASE,
BCM53XX_ARMCORE_PBASE, /* 0x19000000 */
- BCM53XX_ARMCORE_SIZE, /* 1MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
- {
+ BCM53XX_ARMCORE_SIZE /* 1MB */
+ ),
+ DEVMAP_ENTRY(
KERNEL_IO_ROM_REGION_VBASE,
BCM53XX_ROM_REGION_PBASE, /* 0xfff00000 */
- BCM53XX_ROM_REGION_SIZE, /* 1MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
+ BCM53XX_ROM_REGION_SIZE /* 1MB */
+ ),
#if NPCI > 0
- {
+ DEVMAP_ENTRY(
KERNEL_IO_PCIE0_OWIN_VBASE,
BCM53XX_PCIE0_OWIN_PBASE, /* 0x08000000 */
- BCM53XX_PCIE0_OWIN_SIZE, /* 4MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
- {
+ BCM53XX_PCIE0_OWIN_SIZE /* 4MB */
+ ),
+ DEVMAP_ENTRY(
KERNEL_IO_PCIE1_OWIN_VBASE,
BCM53XX_PCIE1_OWIN_PBASE, /* 0x40000000 */
- BCM53XX_PCIE1_OWIN_SIZE, /* 4MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
- {
+ BCM53XX_PCIE1_OWIN_SIZE /* 4MB */
+ ),
+ DEVMAP_ENTRY(
KERNEL_IO_PCIE2_OWIN_VBASE,
BCM53XX_PCIE2_OWIN_PBASE, /* 0x48000000 */
- BCM53XX_PCIE2_OWIN_SIZE, /* 4MB */
- VM_PROT_READ|VM_PROT_WRITE,
- PTE_NOCACHE,
- },
+ BCM53XX_PCIE2_OWIN_SIZE /* 4MB */
+ ),
#endif /* NPCI > 0 */
- { 0, 0, 0, 0, 0 }
+ DEVMAP_ENTRY_END
};
static const struct boot_physmem bp_first256 = {
