lkml.org 
[lkml]   [2018]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 16/26] arm64: daifflags: Include PMR in daifflags restore operations
    Date
    The addition of PMR should not bypass the semantics of daifflags.

    When DA_F are set, I bit is also set as no interrupts (even of higher
    priority) is allowed.

    When DA_F are cleared, I bit is cleared and interrupt enabling/disabling
    goes through ICC_PMR_EL1.

    Signed-off-by: Julien Thierry <julien.thierry@arm.com>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Will Deacon <will.deacon@arm.com>
    Cc: James Morse <james.morse@arm.com>
    ---
    arch/arm64/include/asm/daifflags.h | 17 +++++++++++++++--
    1 file changed, 15 insertions(+), 2 deletions(-)

    diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
    index 8d91f22..3ae8139 100644
    --- a/arch/arm64/include/asm/daifflags.h
    +++ b/arch/arm64/include/asm/daifflags.h
    @@ -18,8 +18,17 @@

    #include <linux/irqflags.h>

    -#define DAIF_PROCCTX 0
    -#define DAIF_PROCCTX_NOIRQ PSR_I_BIT
    +#include <asm/arch_gicv3.h>
    +
    +#define DAIF_PROCCTX \
    + (gic_prio_masking_enabled() ? \
    + MAKE_ARCH_FLAGS(0, ICC_PMR_EL1_UNMASKED) : \
    + 0)
    +
    +#define DAIF_PROCCTX_NOIRQ \
    + (gic_prio_masking_enabled() ? \
    + MAKE_ARCH_FLAGS(0, ICC_PMR_EL1_MASKED) : \
    + PSR_I_BIT)

    /* mask/save/unmask/restore all exceptions, including interrupts. */
    static inline void local_daif_mask(void)
    @@ -51,6 +60,10 @@ static inline void local_daif_unmask(void)
    :
    :
    : "memory");
    +
    + /* Unmask IRQs in PMR if needed */
    + if (gic_prio_masking_enabled())
    + arch_local_irq_enable();
    }

    static inline void local_daif_restore(unsigned long flags)
    --
    1.9.1
    \
     
     \ /
      Last update: 2018-05-25 11:54    [W:4.758 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site