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
4837a661
Commit
4837a661
authored
Feb 27, 2010
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
f1d39e6e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
arch/mips/cavium-octeon/octeon-irq.c
arch/mips/cavium-octeon/octeon-irq.c
+5
-5
No files found.
arch/mips/cavium-octeon/octeon-irq.c
View file @
4837a661
...
@@ -544,7 +544,7 @@ static struct irq_chip octeon_irq_chip_ciu1 = {
...
@@ -544,7 +544,7 @@ static struct irq_chip octeon_irq_chip_ciu1 = {
#ifdef CONFIG_PCI_MSI
#ifdef CONFIG_PCI_MSI
static
DEFINE_SPINLOCK
(
octeon_irq_msi_lock
);
static
DEFINE_
RAW_
SPINLOCK
(
octeon_irq_msi_lock
);
static
void
octeon_irq_msi_ack
(
unsigned
int
irq
)
static
void
octeon_irq_msi_ack
(
unsigned
int
irq
)
{
{
...
@@ -586,12 +586,12 @@ static void octeon_irq_msi_enable(unsigned int irq)
...
@@ -586,12 +586,12 @@ static void octeon_irq_msi_enable(unsigned int irq)
*/
*/
uint64_t
en
;
uint64_t
en
;
unsigned
long
flags
;
unsigned
long
flags
;
spin_lock_irqsave
(
&
octeon_irq_msi_lock
,
flags
);
raw_
spin_lock_irqsave
(
&
octeon_irq_msi_lock
,
flags
);
en
=
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
en
=
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
en
|=
1ull
<<
(
irq
-
OCTEON_IRQ_MSI_BIT0
);
en
|=
1ull
<<
(
irq
-
OCTEON_IRQ_MSI_BIT0
);
cvmx_write_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
,
en
);
cvmx_write_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
,
en
);
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
spin_unlock_irqrestore
(
&
octeon_irq_msi_lock
,
flags
);
raw_
spin_unlock_irqrestore
(
&
octeon_irq_msi_lock
,
flags
);
}
}
}
}
...
@@ -608,12 +608,12 @@ static void octeon_irq_msi_disable(unsigned int irq)
...
@@ -608,12 +608,12 @@ static void octeon_irq_msi_disable(unsigned int irq)
*/
*/
uint64_t
en
;
uint64_t
en
;
unsigned
long
flags
;
unsigned
long
flags
;
spin_lock_irqsave
(
&
octeon_irq_msi_lock
,
flags
);
raw_
spin_lock_irqsave
(
&
octeon_irq_msi_lock
,
flags
);
en
=
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
en
=
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
en
&=
~
(
1ull
<<
(
irq
-
OCTEON_IRQ_MSI_BIT0
));
en
&=
~
(
1ull
<<
(
irq
-
OCTEON_IRQ_MSI_BIT0
));
cvmx_write_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
,
en
);
cvmx_write_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
,
en
);
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
cvmx_read_csr
(
CVMX_PEXP_NPEI_MSI_ENB0
);
spin_unlock_irqrestore
(
&
octeon_irq_msi_lock
,
flags
);
raw_
spin_unlock_irqrestore
(
&
octeon_irq_msi_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