Skip to content

L
linux
Commit 36946d73 authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 89650870
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
arch/mips/sni/rm200.c
View file @ 36946d73
...@@ -132,7 +132,7 @@ device_initcall(snirm_setup_devinit); ...@@ -132,7 +132,7 @@ device_initcall(snirm_setup_devinit);
* readb/writeb to access them * readb/writeb to access them
*/ */
static DEFINE_SPINLOCK(sni_rm200_i8259A_lock); static DEFINE_RAW_SPINLOCK(sni_rm200_i8259A_lock);
#define PIC_CMD 0x00 #define PIC_CMD 0x00
#define PIC_IMR 0x01 #define PIC_IMR 0x01
#define PIC_ISR PIC_CMD #define PIC_ISR PIC_CMD
...@@ -161,13 +161,13 @@ static void sni_rm200_disable_8259A_irq(unsigned int irq) ...@@ -161,13 +161,13 @@ static void sni_rm200_disable_8259A_irq(unsigned int irq)
irq -= RM200_I8259A_IRQ_BASE; irq -= RM200_I8259A_IRQ_BASE;
mask = 1 << irq; mask = 1 << irq;
spin_lock_irqsave(&sni_rm200_i8259A_lock, flags); raw_spin_lock_irqsave(&sni_rm200_i8259A_lock, flags);
rm200_cached_irq_mask |= mask; rm200_cached_irq_mask |= mask;
if (irq & 8) if (irq & 8)
writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR); writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR);
else else
writeb(cached_master_mask, rm200_pic_master + PIC_IMR); writeb(cached_master_mask, rm200_pic_master + PIC_IMR);
spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags); raw_spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags);
} }
static void sni_rm200_enable_8259A_irq(unsigned int irq) static void sni_rm200_enable_8259A_irq(unsigned int irq)
...@@ -177,13 +177,13 @@ static void sni_rm200_enable_8259A_irq(unsigned int irq) ...@@ -177,13 +177,13 @@ static void sni_rm200_enable_8259A_irq(unsigned int irq)
irq -= RM200_I8259A_IRQ_BASE; irq -= RM200_I8259A_IRQ_BASE;
mask = ~(1 << irq); mask = ~(1 << irq);
spin_lock_irqsave(&sni_rm200_i8259A_lock, flags); raw_spin_lock_irqsave(&sni_rm200_i8259A_lock, flags);
rm200_cached_irq_mask &= mask; rm200_cached_irq_mask &= mask;
if (irq & 8) if (irq & 8)
writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR); writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR);
else else
writeb(cached_master_mask, rm200_pic_master + PIC_IMR); writeb(cached_master_mask, rm200_pic_master + PIC_IMR);
spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags); raw_spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags);
} }
static inline int sni_rm200_i8259A_irq_real(unsigned int irq) static inline int sni_rm200_i8259A_irq_real(unsigned int irq)
...@@ -216,7 +216,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq) ...@@ -216,7 +216,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq)
irq -= RM200_I8259A_IRQ_BASE; irq -= RM200_I8259A_IRQ_BASE;
irqmask = 1 << irq; irqmask = 1 << irq;
spin_lock_irqsave(&sni_rm200_i8259A_lock, flags); raw_spin_lock_irqsave(&sni_rm200_i8259A_lock, flags);
/* /*
* Lightweight spurious IRQ detection. We do not want * Lightweight spurious IRQ detection. We do not want
* to overdo spurious IRQ handling - it's usually a sign * to overdo spurious IRQ handling - it's usually a sign
...@@ -247,7 +247,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq) ...@@ -247,7 +247,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq)
writeb(cached_master_mask, rm200_pic_master + PIC_IMR); writeb(cached_master_mask, rm200_pic_master + PIC_IMR);
writeb(0x60+irq, rm200_pic_master + PIC_CMD); writeb(0x60+irq, rm200_pic_master + PIC_CMD);
} }
spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags); raw_spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags);
return; return;
spurious_8259A_irq: spurious_8259A_irq:
...@@ -298,7 +298,7 @@ static inline int sni_rm200_i8259_irq(void) ...@@ -298,7 +298,7 @@ static inline int sni_rm200_i8259_irq(void)
{ {
int irq; int irq;
spin_lock(&sni_rm200_i8259A_lock); raw_spin_lock(&sni_rm200_i8259A_lock);
/* Perform an interrupt acknowledge cycle on controller 1. */ /* Perform an interrupt acknowledge cycle on controller 1. */
writeb(0x0C, rm200_pic_master + PIC_CMD); /* prepare for poll */ writeb(0x0C, rm200_pic_master + PIC_CMD); /* prepare for poll */
...@@ -325,7 +325,7 @@ static inline int sni_rm200_i8259_irq(void) ...@@ -325,7 +325,7 @@ static inline int sni_rm200_i8259_irq(void)
irq = -1; irq = -1;
} }
spin_unlock(&sni_rm200_i8259A_lock); raw_spin_unlock(&sni_rm200_i8259A_lock);
return likely(irq >= 0) ? irq + RM200_I8259A_IRQ_BASE : irq; return likely(irq >= 0) ? irq + RM200_I8259A_IRQ_BASE : irq;
} }
...@@ -334,7 +334,7 @@ void sni_rm200_init_8259A(void) ...@@ -334,7 +334,7 @@ void sni_rm200_init_8259A(void)
{ {
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&sni_rm200_i8259A_lock, flags); raw_spin_lock_irqsave(&sni_rm200_i8259A_lock, flags);
writeb(0xff, rm200_pic_master + PIC_IMR); writeb(0xff, rm200_pic_master + PIC_IMR);
writeb(0xff, rm200_pic_slave + PIC_IMR); writeb(0xff, rm200_pic_slave + PIC_IMR);
...@@ -352,7 +352,7 @@ void sni_rm200_init_8259A(void) ...@@ -352,7 +352,7 @@ void sni_rm200_init_8259A(void)
writeb(cached_master_mask, rm200_pic_master + PIC_IMR); writeb(cached_master_mask, rm200_pic_master + PIC_IMR);
writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR); writeb(cached_slave_mask, rm200_pic_slave + PIC_IMR);
spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags); raw_spin_unlock_irqrestore(&sni_rm200_i8259A_lock, flags);
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7