Many sysregs are shared across arm and arm64. Introduce a common header for shared definitions.
Signed-off-by: Ralf Ramsauer <[email protected]> --- inmates/lib/arm-common/gic-v3.c | 8 ---- .../arm-common/include/asm/sysregs_common.h | 45 +++++++++++++++++++ inmates/lib/arm/include/asm/sysregs.h | 2 + inmates/lib/arm64/include/asm/sysregs.h | 2 + 4 files changed, 49 insertions(+), 8 deletions(-) create mode 100644 inmates/lib/arm-common/include/asm/sysregs_common.h diff --git a/inmates/lib/arm-common/gic-v3.c b/inmates/lib/arm-common/gic-v3.c index f9278f71..f98f5257 100644 --- a/inmates/lib/arm-common/gic-v3.c +++ b/inmates/lib/arm-common/gic-v3.c @@ -48,14 +48,6 @@ #define GICR_SGI_BASE 0x10000 #define GICR_ISENABLER GICD_ISENABLER -#define ICC_IAR1_EL1 SYSREG_32(0, c12, c12, 0) -#define ICC_EOIR1_EL1 SYSREG_32(0, c12, c12, 1) -#define ICC_PMR_EL1 SYSREG_32(0, c4, c6, 0) -#define ICC_CTLR_EL1 SYSREG_32(0, c12, c12, 4) -#define ICC_IGRPEN1_EL1 SYSREG_32(0, c12, c12, 7) - -#define ICC_IGRPEN1_EN 0x1 - static void gic_v3_enable(unsigned int irqn) { if (is_sgi_ppi(irqn)) diff --git a/inmates/lib/arm-common/include/asm/sysregs_common.h b/inmates/lib/arm-common/include/asm/sysregs_common.h new file mode 100644 index 00000000..09e91f8a --- /dev/null +++ b/inmates/lib/arm-common/include/asm/sysregs_common.h @@ -0,0 +1,45 @@ +/* + * Jailhouse, a Linux-based partitioning hypervisor + * + * Copyright (c) OTH Regensburg, 2018 + * + * Authors: + * Ralf Ramsauer <[email protected]> + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Alternatively, you can use or redistribute this file under the following + * BSD license: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + * THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define ICC_IAR1_EL1 SYSREG_32(0, c12, c12, 0) +#define ICC_EOIR1_EL1 SYSREG_32(0, c12, c12, 1) +#define ICC_PMR_EL1 SYSREG_32(0, c4, c6, 0) +#define ICC_CTLR_EL1 SYSREG_32(0, c12, c12, 4) +#define ICC_IGRPEN1_EL1 SYSREG_32(0, c12, c12, 7) + +#define ICC_IGRPEN1_EN 0x1 diff --git a/inmates/lib/arm/include/asm/sysregs.h b/inmates/lib/arm/include/asm/sysregs.h index 7c285923..d04e6866 100644 --- a/inmates/lib/arm/include/asm/sysregs.h +++ b/inmates/lib/arm/include/asm/sysregs.h @@ -54,6 +54,8 @@ #define _arm_read_sysreg(size, ...) arm_read_sysreg_ ## size(__VA_ARGS__) #define arm_read_sysreg(...) _arm_read_sysreg(__VA_ARGS__) +#include <asm/sysregs_common.h> + #ifndef __ASSEMBLY__ asm(".arch_extension virt\n"); diff --git a/inmates/lib/arm64/include/asm/sysregs.h b/inmates/lib/arm64/include/asm/sysregs.h index 0caea891..b2adde7d 100644 --- a/inmates/lib/arm64/include/asm/sysregs.h +++ b/inmates/lib/arm64/include/asm/sysregs.h @@ -52,4 +52,6 @@ #define arm_read_sysreg(sysreg, val) \ asm volatile ("mrs %0, "__stringify(sysreg)"\n" : "=r"((val))) +#include <asm/sysregs_common.h> + #endif /* __ASSEMBLY__ */ -- 2.17.0 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
