Module Name: src
Committed By: jmcneill
Date: Tue Nov 13 22:25:29 UTC 2018
Modified Files:
src/sys/arch/arm/cortex: gic_reg.h gicv3.c
Log Message:
Update GICD_CTLR reg bit definitions to reflect the layout of the register
when either in non-secure state or for a system that only supports a single
state.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/cortex/gic_reg.h \
src/sys/arch/arm/cortex/gicv3.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/cortex/gic_reg.h
diff -u src/sys/arch/arm/cortex/gic_reg.h:1.8 src/sys/arch/arm/cortex/gic_reg.h:1.9
--- src/sys/arch/arm/cortex/gic_reg.h:1.8 Fri Nov 9 23:36:24 2018
+++ src/sys/arch/arm/cortex/gic_reg.h Tue Nov 13 22:25:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_reg.h,v 1.8 2018/11/09 23:36:24 jmcneill Exp $ */
+/* $NetBSD: gic_reg.h,v 1.9 2018/11/13 22:25:28 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -143,10 +143,8 @@
#define GICD_CTRL_RWP __BIT(31) // GICv3
#define GICD_CTRL_E1NWF __BIT(7) // GICv3
#define GICD_CTRL_DS __BIT(6) // GICv3
-#define GICD_CTRL_ARE_NS __BIT(5) // GICv3
-#define GICD_CTRL_ARE_S __BIT(4) // GICv3
-#define GICD_CTRL_EnableGrp1S __BIT(2) // GICv3
-#define GICD_CTRL_EnableGrp1NS __BIT(1) // GICv3
+#define GICD_CTRL_ARE_NS __BIT(4) // GICv3
+#define GICD_CTRL_EnableGrp1A __BIT(1) // GICv3
#define GICD_CTRL_Enable __BIT(0)
#define GICD_TYPER_No1N __BIT(25) // GICv3
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.8 src/sys/arch/arm/cortex/gicv3.c:1.9
--- src/sys/arch/arm/cortex/gicv3.c:1.8 Tue Nov 13 10:33:03 2018
+++ src/sys/arch/arm/cortex/gicv3.c Tue Nov 13 22:25:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.8 2018/11/13 10:33:03 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.9 2018/11/13 22:25:28 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.8 2018/11/13 10:33:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.9 2018/11/13 22:25:28 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -245,7 +245,7 @@ gicv3_dist_enable(struct gicv3_softc *sc
;
/* Enable Affinity routing and G1NS interrupts */
- gicd_ctrl = GICD_CTRL_EnableGrp1NS | GICD_CTRL_Enable | GICD_CTRL_ARE_NS;
+ gicd_ctrl = GICD_CTRL_EnableGrp1A | GICD_CTRL_Enable | GICD_CTRL_ARE_NS;
gicd_write_4(sc, GICD_CTRL, gicd_ctrl);
}
