lkml.org 
[lkml]   [2018]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/9] RISC-V: simplify software interrupt / IPI code
    Date
    Rename handle_ipi to riscv_software_interrupt, drop the unused return
    value and move the prototype to irq.h together with riscv_timer_interupt.
    This allows simplifying the upcoming interrupt handling support.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/riscv/include/asm/irq.h | 1 +
    arch/riscv/include/asm/smp.h | 3 ---
    arch/riscv/kernel/smp.c | 6 ++----
    3 files changed, 3 insertions(+), 7 deletions(-)

    diff --git a/arch/riscv/include/asm/irq.h b/arch/riscv/include/asm/irq.h
    index 4dee9d4c13c0..c871661c9df4 100644
    --- a/arch/riscv/include/asm/irq.h
    +++ b/arch/riscv/include/asm/irq.h
    @@ -22,6 +22,7 @@
    #define INTERRUPT_CAUSE_EXTERNAL 9

    void riscv_timer_interrupt(void);
    +void riscv_software_interrupt(void);

    #include <asm-generic/irq.h>

    diff --git a/arch/riscv/include/asm/smp.h b/arch/riscv/include/asm/smp.h
    index 85e4220839b0..c9395fff246f 100644
    --- a/arch/riscv/include/asm/smp.h
    +++ b/arch/riscv/include/asm/smp.h
    @@ -44,9 +44,6 @@ void arch_send_call_function_single_ipi(int cpu);
    */
    #define raw_smp_processor_id() (*((int*)((char*)get_current() + TASK_TI_CPU)))

    -/* Interprocessor interrupt handler */
    -irqreturn_t handle_ipi(void);
    -
    #endif /* CONFIG_SMP */

    #endif /* _ASM_RISCV_SMP_H */
    diff --git a/arch/riscv/kernel/smp.c b/arch/riscv/kernel/smp.c
    index 6d3962435720..906fe21ea21b 100644
    --- a/arch/riscv/kernel/smp.c
    +++ b/arch/riscv/kernel/smp.c
    @@ -45,7 +45,7 @@ int setup_profiling_timer(unsigned int multiplier)
    return -EINVAL;
    }

    -irqreturn_t handle_ipi(void)
    +void riscv_software_interrupt(void)
    {
    unsigned long *pending_ipis = &ipi_data[smp_processor_id()].bits;

    @@ -60,7 +60,7 @@ irqreturn_t handle_ipi(void)

    ops = xchg(pending_ipis, 0);
    if (ops == 0)
    - return IRQ_HANDLED;
    + return;

    if (ops & (1 << IPI_RESCHEDULE))
    scheduler_ipi();
    @@ -73,8 +73,6 @@ irqreturn_t handle_ipi(void)
    /* Order data access and bit testing. */
    mb();
    }
    -
    - return IRQ_HANDLED;
    }

    static void
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-07-26 16:38    [W:4.064 / U:0.220 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site