lkml.org 
[lkml]   [2018]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 04/27] arm64: daifflags: Use irqflags functions for daifflags
    Date
    Some of the work done in daifflags save/restore is already provided
    by irqflags functions. Daifflags should always be a superset of irqflags
    (it handles irq status + status of other flags). Modifying behaviour of
    irqflags should alter the behaviour of daifflags.

    Use irqflags_save/restore functions for the corresponding daifflags
    operation.

    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 | 15 +++++----------
    1 file changed, 5 insertions(+), 10 deletions(-)

    diff --git a/arch/arm64/include/asm/daifflags.h b/arch/arm64/include/asm/daifflags.h
    index 22e4c83..8d91f22 100644
    --- a/arch/arm64/include/asm/daifflags.h
    +++ b/arch/arm64/include/asm/daifflags.h
    @@ -36,11 +36,8 @@ static inline unsigned long local_daif_save(void)
    {
    unsigned long flags;

    - asm volatile(
    - "mrs %0, daif // local_daif_save\n"
    - : "=r" (flags)
    - :
    - : "memory");
    + flags = arch_local_save_flags();
    +
    local_daif_mask();

    return flags;
    @@ -60,11 +57,9 @@ static inline void local_daif_restore(unsigned long flags)
    {
    if (!arch_irqs_disabled_flags(flags))
    trace_hardirqs_on();
    - asm volatile(
    - "msr daif, %0 // local_daif_restore"
    - :
    - : "r" (flags)
    - : "memory");
    +
    + arch_local_irq_restore(flags);
    +
    if (arch_irqs_disabled_flags(flags))
    trace_hardirqs_off();
    }
    --
    1.9.1
    \
     
     \ /
      Last update: 2018-08-28 17:55    [W:4.057 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site