Module Name: src
Committed By: matt
Date: Sun Apr 27 16:22:13 UTC 2014
Modified Files:
src/sys/arch/arm/cortex: gic.c gic_reg.h
Log Message:
When dealing with the PMR register, only use non-secure priority values.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/cortex/gic.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gic_reg.h
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/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.8 src/sys/arch/arm/cortex/gic.c:1.9
--- src/sys/arch/arm/cortex/gic.c:1.8 Sun Apr 13 02:21:47 2014
+++ src/sys/arch/arm/cortex/gic.c Sun Apr 27 16:22:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.8 2014/04/13 02:21:47 matt Exp $ */
+/* $NetBSD: gic.c,v 1.9 2014/04/27 16:22:13 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.8 2014/04/13 02:21:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.9 2014/04/27 16:22:13 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -139,18 +139,21 @@ gicd_write(struct armgic_softc *sc, bus_
/*
* In the GIC prioritization scheme, lower numbers have higher priority.
+ * Only write priorities that could be non-secure.
*/
static inline uint32_t
armgic_ipl_to_priority(int ipl)
{
- return (IPL_HIGH - ipl) * GICC_PMR_PRIORITIES / NIPL;
+ return GICC_PMR_NONSECURE
+ | ((IPL_HIGH - ipl) * GICC_PMR_NS_PRIORITIES / NIPL);
}
#if 0
static inline int
armgic_priority_to_ipl(uint32_t priority)
{
- return IPL_HIGH - priority * NIPL / GICC_PMR_PRIORITIES;
+ return IPL_HIGH
+ - (priority & ~GICC_PMR_NONSECURE) * NIPL / GICC_PMR_NS_PRIORITIES;
}
#endif
Index: src/sys/arch/arm/cortex/gic_reg.h
diff -u src/sys/arch/arm/cortex/gic_reg.h:1.2 src/sys/arch/arm/cortex/gic_reg.h:1.3
--- src/sys/arch/arm/cortex/gic_reg.h:1.2 Fri Mar 28 21:39:09 2014
+++ src/sys/arch/arm/cortex/gic_reg.h Sun Apr 27 16:22:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_reg.h,v 1.2 2014/03/28 21:39:09 matt Exp $ */
+/* $NetBSD: gic_reg.h,v 1.3 2014/04/27 16:22:13 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -90,6 +90,8 @@
#define GICC_PMR_PRIORITY __BITS(7,0)
#define GICC_PMR_PRIORITIES 256
+#define GICC_PMR_NS_PRIORITIES 128
+#define GICC_PMR_NONSECURE 0x80
#define GICC_PMR_8_LEVELS 0x1f
#define GICC_PMR_16_LEVELS 0x0f
#define GICC_PMR_32_LEVELS 0x07
