Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
36946d73
Commit
36946d73
authored
Feb 27, 2010
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
89650870
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
arch/mips/sni/rm200.c
arch/mips/sni/rm200.c
+11
-11
No files found.
arch/mips/sni/rm200.c
View file @
36946d73
...
...
@@ -132,7 +132,7 @@ device_initcall(snirm_setup_devinit);
* 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_IMR 0x01
#define PIC_ISR PIC_CMD
...
...
@@ -161,13 +161,13 @@ static void sni_rm200_disable_8259A_irq(unsigned int irq)
irq
-=
RM200_I8259A_IRQ_BASE
;
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
;
if
(
irq
&
8
)
writeb
(
cached_slave_mask
,
rm200_pic_slave
+
PIC_IMR
);
else
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
)
...
...
@@ -177,13 +177,13 @@ static void sni_rm200_enable_8259A_irq(unsigned int irq)
irq
-=
RM200_I8259A_IRQ_BASE
;
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
;
if
(
irq
&
8
)
writeb
(
cached_slave_mask
,
rm200_pic_slave
+
PIC_IMR
);
else
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
)
...
...
@@ -216,7 +216,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq)
irq
-=
RM200_I8259A_IRQ_BASE
;
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
* to overdo spurious IRQ handling - it's usually a sign
...
...
@@ -247,7 +247,7 @@ void sni_rm200_mask_and_ack_8259A(unsigned int irq)
writeb
(
cached_master_mask
,
rm200_pic_master
+
PIC_IMR
);
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
;
spurious_8259A_irq:
...
...
@@ -298,7 +298,7 @@ static inline int sni_rm200_i8259_irq(void)
{
int
irq
;
spin_lock
(
&
sni_rm200_i8259A_lock
);
raw_
spin_lock
(
&
sni_rm200_i8259A_lock
);
/* Perform an interrupt acknowledge cycle on controller 1. */
writeb
(
0x0C
,
rm200_pic_master
+
PIC_CMD
);
/* prepare for poll */
...
...
@@ -325,7 +325,7 @@ static inline int sni_rm200_i8259_irq(void)
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
;
}
...
...
@@ -334,7 +334,7 @@ void sni_rm200_init_8259A(void)
{
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_slave
+
PIC_IMR
);
...
...
@@ -352,7 +352,7 @@ void sni_rm200_init_8259A(void)
writeb
(
cached_master_mask
,
rm200_pic_master
+
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
);
}
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment