mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
MIPS: BCM63xx: Add cpu argument to dispatch internal
Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: John Crispin <blogic@openwrt.org> Cc: Maxime Bizon <mbizon@freebox.fr> Cc: Florian Fainelli <florian@openwrt.org> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Gregory Fong <gregory.0xf0@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/7320/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
3534b5ce05
commit
7a9fd14d4c
1 changed files with 10 additions and 8 deletions
|
@ -19,9 +19,10 @@
|
||||||
#include <bcm63xx_io.h>
|
#include <bcm63xx_io.h>
|
||||||
#include <bcm63xx_irq.h>
|
#include <bcm63xx_irq.h>
|
||||||
|
|
||||||
|
|
||||||
static u32 irq_stat_addr[2];
|
static u32 irq_stat_addr[2];
|
||||||
static u32 irq_mask_addr[2];
|
static u32 irq_mask_addr[2];
|
||||||
static void (*dispatch_internal)(void);
|
static void (*dispatch_internal)(int cpu);
|
||||||
static int is_ext_irq_cascaded;
|
static int is_ext_irq_cascaded;
|
||||||
static unsigned int ext_irq_count;
|
static unsigned int ext_irq_count;
|
||||||
static unsigned int ext_irq_start, ext_irq_end;
|
static unsigned int ext_irq_start, ext_irq_end;
|
||||||
|
@ -54,19 +55,20 @@ static inline void handle_internal(int intbit)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define BUILD_IPIC_INTERNAL(width) \
|
#define BUILD_IPIC_INTERNAL(width) \
|
||||||
void __dispatch_internal_##width(void) \
|
void __dispatch_internal_##width(int cpu) \
|
||||||
{ \
|
{ \
|
||||||
u32 pending[width / 32]; \
|
u32 pending[width / 32]; \
|
||||||
unsigned int src, tgt; \
|
unsigned int src, tgt; \
|
||||||
bool irqs_pending = false; \
|
bool irqs_pending = false; \
|
||||||
static unsigned int i; \
|
static unsigned int i[2]; \
|
||||||
|
unsigned int *next = &i[cpu]; \
|
||||||
\
|
\
|
||||||
/* read registers in reverse order */ \
|
/* read registers in reverse order */ \
|
||||||
for (src = 0, tgt = (width / 32); src < (width / 32); src++) { \
|
for (src = 0, tgt = (width / 32); src < (width / 32); src++) { \
|
||||||
u32 val; \
|
u32 val; \
|
||||||
\
|
\
|
||||||
val = bcm_readl(irq_stat_addr[0] + src * sizeof(u32)); \
|
val = bcm_readl(irq_stat_addr[cpu] + src * sizeof(u32)); \
|
||||||
val &= bcm_readl(irq_mask_addr[0] + src * sizeof(u32)); \
|
val &= bcm_readl(irq_mask_addr[cpu] + src * sizeof(u32)); \
|
||||||
pending[--tgt] = val; \
|
pending[--tgt] = val; \
|
||||||
\
|
\
|
||||||
if (val) \
|
if (val) \
|
||||||
|
@ -77,9 +79,9 @@ void __dispatch_internal_##width(void) \
|
||||||
return; \
|
return; \
|
||||||
\
|
\
|
||||||
while (1) { \
|
while (1) { \
|
||||||
unsigned int to_call = i; \
|
unsigned int to_call = *next; \
|
||||||
\
|
\
|
||||||
i = (i + 1) & (width - 1); \
|
*next = (*next + 1) & (width - 1); \
|
||||||
if (pending[to_call / 32] & (1 << (to_call & 0x1f))) { \
|
if (pending[to_call / 32] & (1 << (to_call & 0x1f))) { \
|
||||||
handle_internal(to_call); \
|
handle_internal(to_call); \
|
||||||
break; \
|
break; \
|
||||||
|
@ -129,7 +131,7 @@ asmlinkage void plat_irq_dispatch(void)
|
||||||
if (cause & CAUSEF_IP1)
|
if (cause & CAUSEF_IP1)
|
||||||
do_IRQ(1);
|
do_IRQ(1);
|
||||||
if (cause & CAUSEF_IP2)
|
if (cause & CAUSEF_IP2)
|
||||||
dispatch_internal();
|
dispatch_internal(0);
|
||||||
if (!is_ext_irq_cascaded) {
|
if (!is_ext_irq_cascaded) {
|
||||||
if (cause & CAUSEF_IP3)
|
if (cause & CAUSEF_IP3)
|
||||||
do_IRQ(IRQ_EXT_0);
|
do_IRQ(IRQ_EXT_0);
|
||||||
|
|
Loading…
Reference in a new issue