Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src/sys/arch/arm/arm32 Pull up the following revisions, reque...
details: https://anonhg.NetBSD.org/src/rev/e1341324dfe4
branches: netbsd-7
changeset: 798565:e1341324dfe4
user: martin <martin%NetBSD.org@localhost>
date: Fri Nov 14 07:29:13 2014 +0000
description:
Pull up the following revisions, requested by skrll in ticket #222:
src/sys/arch/arm/arm32/locore.S 1.37
src/sys/arch/arm/arm32/bus_dma.c 1.87
Make the initial svcstack is doubleword aligned if EABI.
With PMAP_NEED_ALLOC_POOLPAGE, before using pmap_map_poolpage make sure
the page comes from the same freelist that pmap_map_poolpage uses.
diffstat:
sys/arch/arm/arm32/bus_dma.c | 17 +++++++++++++++--
sys/arch/arm/arm32/locore.S | 7 +++++--
2 files changed, 20 insertions(+), 4 deletions(-)
diffs (66 lines):
diff -r ae4c9376f828 -r e1341324dfe4 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c Thu Nov 13 09:55:45 2014 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c Fri Nov 14 07:29:13 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.86.2.1 2014/11/10 19:57:26 martin Exp $ */
+/* $NetBSD: bus_dma.c,v 1.86.2.2 2014/11/14 07:29:13 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_arm_bus_space.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.86.2.1 2014/11/10 19:57:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.86.2.2 2014/11/14 07:29:13 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1307,6 +1307,19 @@
}
}
+#ifdef PMAP_NEED_ALLOC_POOLPAGE
+ /*
+ * The page can only be direct mapped if was allocated out
+ * of the arm poolpage vm freelist.
+ */
+ int lcv = vm_physseg_find(atop(pa), NULL);
+ KASSERT(lcv != -1);
+ if (direct_mapable) {
+ direct_mapable =
+ (arm_poolpage_vmfreelist == VM_PHYSMEM_PTR(lcv)->free_list);
+ }
+#endif
+
if (direct_mapable) {
*kvap = (void *)PMAP_MAP_POOLPAGE(pa);
#ifdef DEBUG_DMA
diff -r ae4c9376f828 -r e1341324dfe4 sys/arch/arm/arm32/locore.S
--- a/sys/arch/arm/arm32/locore.S Thu Nov 13 09:55:45 2014 +0000
+++ b/sys/arch/arm/arm32/locore.S Fri Nov 14 07:29:13 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $ */
+/* $NetBSD: locore.S,v 1.36.2.1 2014/11/14 07:29:13 martin Exp $ */
/*
* Copyright (C) 1994-1997 Mark Brinicombe
@@ -40,7 +40,7 @@
/* What size should this really be ? It is only used by init_arm() */
#define INIT_ARM_STACK_SIZE 2048
- RCSID("$NetBSD: locore.S,v 1.36 2014/04/11 16:34:29 matt Exp $")
+ RCSID("$NetBSD: locore.S,v 1.36.2.1 2014/11/14 07:29:13 martin Exp $")
/*
* This is for kvm_mkdb, and should be the address of the beginning
@@ -115,6 +115,9 @@
ASEND(start)
.bss
+#ifdef __ARM_EABI__
+ .align 3
+#endif
svcstk:
.space INIT_ARM_STACK_SIZE
Home |
Main Index |
Thread Index |
Old Index