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
33b75e5c
Commit
33b75e5c
authored
Nov 06, 2007
by
Ralf Baechle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[MIPS] Sibyte: Replace use of removed IO_SPACE_BASE with IOADDR.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
bb856c5b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
arch/mips/mm/cerr-sb1.c
arch/mips/mm/cerr-sb1.c
+3
-3
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/bcm1480/irq.c
+3
-3
No files found.
arch/mips/mm/cerr-sb1.c
View file @
33b75e5c
...
@@ -154,7 +154,7 @@ static void check_bus_watcher(void)
...
@@ -154,7 +154,7 @@ static void check_bus_watcher(void)
if
(
status
&
~
(
1UL
<<
31
))
{
if
(
status
&
~
(
1UL
<<
31
))
{
l2_err
=
csr_in32
(
IOADDR
(
A_BUS_L2_ERRORS
));
l2_err
=
csr_in32
(
IOADDR
(
A_BUS_L2_ERRORS
));
#ifdef DUMP_L2_ECC_TAG_ON_ERROR
#ifdef DUMP_L2_ECC_TAG_ON_ERROR
l2_tag
=
in64
(
IO
_SPACE_BASE
|
A_L2_ECC_TAG
);
l2_tag
=
in64
(
IO
ADDR
(
A_L2_ECC_TAG
)
);
#endif
#endif
memio_err
=
csr_in32
(
IOADDR
(
A_BUS_MEM_IO_ERRORS
));
memio_err
=
csr_in32
(
IOADDR
(
A_BUS_MEM_IO_ERRORS
));
printk
(
"Bus watcher error counters: %08x %08x
\n
"
,
l2_err
,
memio_err
);
printk
(
"Bus watcher error counters: %08x %08x
\n
"
,
l2_err
,
memio_err
);
...
@@ -183,9 +183,9 @@ asmlinkage void sb1_cache_error(void)
...
@@ -183,9 +183,9 @@ asmlinkage void sb1_cache_error(void)
#ifdef CONFIG_SIBYTE_BW_TRACE
#ifdef CONFIG_SIBYTE_BW_TRACE
/* Freeze the trace buffer now */
/* Freeze the trace buffer now */
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
#if defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
csr_out32
(
M_BCM1480_SCD_TRACE_CFG_FREEZE
,
IO
_SPACE_BASE
|
A_SCD_TRACE_CFG
);
csr_out32
(
M_BCM1480_SCD_TRACE_CFG_FREEZE
,
IO
ADDR
(
A_SCD_TRACE_CFG
)
);
#else
#else
csr_out32
(
M_SCD_TRACE_CFG_FREEZE
,
IO
_SPACE_BASE
|
A_SCD_TRACE_CFG
);
csr_out32
(
M_SCD_TRACE_CFG_FREEZE
,
IO
ADDR
(
A_SCD_TRACE_CFG
)
);
#endif
#endif
printk
(
"Trace buffer frozen
\n
"
);
printk
(
"Trace buffer frozen
\n
"
);
#endif
#endif
...
...
arch/mips/sibyte/bcm1480/irq.c
View file @
33b75e5c
...
@@ -370,11 +370,11 @@ void __init arch_init_irq(void)
...
@@ -370,11 +370,11 @@ void __init arch_init_irq(void)
#endif
#endif
/* Setup uart 1 settings, mapper */
/* Setup uart 1 settings, mapper */
/* QQQ FIXME */
/* QQQ FIXME */
__raw_writeq
(
M_DUART_IMR_BRK
,
IO
_SPACE_BASE
+
A_DUART_IMRREG
(
kgdb_port
));
__raw_writeq
(
M_DUART_IMR_BRK
,
IO
ADDR
(
A_DUART_IMRREG
(
kgdb_port
)
));
__raw_writeq
(
IMR_IP6_VAL
,
__raw_writeq
(
IMR_IP6_VAL
,
IO
_SPACE_BASE
+
A_BCM1480_IMR_REGISTER
(
0
,
R_BCM1480_IMR_INTERRUPT_MAP_BASE_H
)
+
IO
ADDR
(
A_BCM1480_IMR_REGISTER
(
0
,
R_BCM1480_IMR_INTERRUPT_MAP_BASE_H
)
+
(
kgdb_irq
<<
3
));
(
kgdb_irq
<<
3
)
));
bcm1480_unmask_irq
(
0
,
kgdb_irq
);
bcm1480_unmask_irq
(
0
,
kgdb_irq
);
#ifdef CONFIG_GDB_CONSOLE
#ifdef CONFIG_GDB_CONSOLE
...
...
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