Attachment 728076 Details for Bug 1043231

[patch] 0018-ARM-gic-v3-Work-around-definition-of-gic_write_bpr1.patch

0018-ARM-gic-v3-Work-around-definition-of-gic_write_bpr1.patch (text/plain), 1.32 KB, created by Matwey Kornilov on 2017-06-07 19:37:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matwey Kornilov

Created: 2017-06-07 19:37:58 UTC

Size: 1.32 KB

patch

obsolete

>From 94ab00aaac973fa8c4e27bbf2529387e713ad8f3 Mon Sep 17 00:00:00 2001
>From: Marc Zyngier <marc.zyngier@arm.com>
>Date: Fri, 23 Sep 2016 14:23:43 +0100
>Subject: [PATCH 18/19] ARM: gic-v3: Work around definition of gic_write_bpr1
>
>A new accessor for gic_write_bpr1 is added to arch_gicv3.h in 4.9,
>whilst the CP15 accessors are redifined in a separate branch.
>This leads to a horrible clash, where the new accessor ends up with
>a crap "asm volatile" definition.
>
>Work around this by carrying our own definition of gic_write_bpr1,
>creating a small conflict which will be obvious to resolve.
>
>Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
>Git-commit: 3d9cd95f90b2987ef95182a4340a9150e06c4253
>Patch-mainline: v4.9-rc1
>Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com>
>---
> arch/arm/include/asm/arch_gicv3.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/arch/arm/include/asm/arch_gicv3.h b/arch/arm/include/asm/arch_gicv3.h
>index fb4f1a4dc4fc..4e0d709947bd 100644
>--- a/arch/arm/include/asm/arch_gicv3.h
>+++ b/arch/arm/include/asm/arch_gicv3.h
>@@ -155,7 +155,11 @@ static inline void gic_write_sre(u32 val)
> 
> static inline void gic_write_bpr1(u32 val)
> {
>+#if defined(__write_sysreg) && defined(ICC_BPR1)
>+	write_sysreg(val, ICC_BPR1);
>+#else
> 	asm volatile("mcr " __stringify(ICC_BPR1) : : "r" (val));
>+#endif
> }
> 
> /*
>-- 
>2.12.0
>

Actions: View | Diff

Attachments on bug 1043231: 728059 | 728060 | 728061 | 728062 | 728063 | 728064 | 728065 | 728066 | 728067 | 728068 | 728069 | 728070 | 728071 | 728072 | 728073 | 728074 | 728075 | 728076 | 728077 | 728521 | 728695 | 728770