Module Name: src
Committed By: skrll
Date: Sun Oct 22 20:35:32 UTC 2017
Modified Files:
src/sys/arch/arm/include/arm32: pmap.h
src/sys/arch/arm/nvidia: tegra_platform.c
src/sys/arch/arm/samsung: exynos_platform.c
src/sys/arch/arm/sunxi: sunxi_platform.c
src/sys/arch/arm/vexpress: vexpress_platform.c
Log Message:
Centralise defines for DEVMAP_{ALIGN,SIZE,ENTRY,ENTRY_END}
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/vexpress/vexpress_platform.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/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.152 src/sys/arch/arm/include/arm32/pmap.h:1.153
--- src/sys/arch/arm/include/arm32/pmap.h:1.152 Tue Aug 29 06:28:26 2017
+++ src/sys/arch/arm/include/arm32/pmap.h Sun Oct 22 20:35:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.152 2017/08/29 06:28:26 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.153 2017/10/22 20:35:32 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -213,6 +213,18 @@ struct pmap_devmap {
int pd_cache; /* cache attributes */
};
+#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
+#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
+#define DEVMAP_ENTRY(va, pa, sz) \
+ { \
+ .pd_va = DEVMAP_ALIGN(va), \
+ .pd_pa = DEVMAP_ALIGN(pa), \
+ .pd_size = DEVMAP_SIZE(sz), \
+ .pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
+ .pd_cache = PTE_NOCACHE \
+ }
+#define DEVMAP_ENTRY_END { 0 }
+
/*
* The pmap structure itself
*/
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.7 src/sys/arch/arm/nvidia/tegra_platform.c:1.8
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.7 Thu Jul 20 01:46:15 2017
+++ src/sys/arch/arm/nvidia/tegra_platform.c Sun Oct 22 20:35:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.7 2017/07/20 01:46:15 jmcneill Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.8 2017/10/22 20:35:32 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.7 2017/07/20 01:46:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.8 2017/10/22 20:35:32 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -62,18 +62,6 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_platfo
#define PLLP_OUT0_FREQ 408000000
-#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
-#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
-#define DEVMAP_ENTRY(va, pa, sz) \
- { \
- .pd_va = DEVMAP_ALIGN(va), \
- .pd_pa = DEVMAP_ALIGN(pa), \
- .pd_size = DEVMAP_SIZE(sz), \
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_cache = PTE_NOCACHE \
- }
-#define DEVMAP_ENTRY_END { 0 }
-
static const struct pmap_devmap *
tegra_platform_devmap(void)
{
Index: src/sys/arch/arm/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.6 src/sys/arch/arm/samsung/exynos_platform.c:1.7
--- src/sys/arch/arm/samsung/exynos_platform.c:1.6 Tue Jun 20 19:13:34 2017
+++ src/sys/arch/arm/samsung/exynos_platform.c Sun Oct 22 20:35:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.6 2017/06/20 19:13:34 jmcneill Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.7 2017/10/22 20:35:32 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.6 2017/06/20 19:13:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.7 2017/10/22 20:35:32 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -59,18 +59,6 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_platf
#define EXYNOS5_SWRESET_REG 0x10040400
-#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
-#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
-#define DEVMAP_ENTRY(va, pa, sz) \
- { \
- .pd_va = DEVMAP_ALIGN(va), \
- .pd_pa = DEVMAP_ALIGN(pa), \
- .pd_size = DEVMAP_SIZE(sz), \
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_cache = PTE_NOCACHE \
- }
-#define DEVMAP_ENTRY_END { 0 }
-
static const struct pmap_devmap *
exynos_platform_devmap(void)
{
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.12 src/sys/arch/arm/sunxi/sunxi_platform.c:1.13
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.12 Sat Oct 21 02:21:30 2017
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Sun Oct 22 20:35:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.12 2017/10/21 02:21:30 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.13 2017/10/22 20:35:32 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.12 2017/10/21 02:21:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.13 2017/10/22 20:35:32 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -89,19 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_platfo
#define SUN9I_WDT_MODE 0x18
#define SUN9I_WDT_MODE_EN __BIT(0)
-
-#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
-#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
-#define DEVMAP_ENTRY(va, pa, sz) \
- { \
- .pd_va = DEVMAP_ALIGN(va), \
- .pd_pa = DEVMAP_ALIGN(pa), \
- .pd_size = DEVMAP_SIZE(sz), \
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_cache = PTE_NOCACHE \
- }
-#define DEVMAP_ENTRY_END { 0 }
-
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.3 src/sys/arch/arm/vexpress/vexpress_platform.c:1.4
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.3 Tue Jun 6 09:56:57 2017
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Sun Oct 22 20:35:32 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.3 2017/06/06 09:56:57 jmcneill Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.4 2017/10/22 20:35:32 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.3 2017/06/06 09:56:57 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.4 2017/10/22 20:35:32 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -61,18 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: vexpress_pla
"/smb@08000000/motherboard/iofpga@3,00000000/clcd@1f0000"
#define VEXPRESS_REF_FREQ 24000000
-#define DEVMAP_ALIGN(a) ((a) & ~L1_S_OFFSET)
-#define DEVMAP_SIZE(s) roundup2((s), L1_S_SIZE)
-#define DEVMAP_ENTRY(va, pa, sz) \
- { \
- .pd_va = DEVMAP_ALIGN(va), \
- .pd_pa = DEVMAP_ALIGN(pa), \
- .pd_size = DEVMAP_SIZE(sz), \
- .pd_prot = VM_PROT_READ|VM_PROT_WRITE, \
- .pd_cache = PTE_NOCACHE \
- }
-#define DEVMAP_ENTRY_END { 0 }
-
extern struct bus_space armv7_generic_bs_tag;
extern struct bus_space armv7_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag armv7_generic_dma_tag;
