diff options
Diffstat (limited to 'arch/mips/mm/cerr-sb1.c')
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 13d96d62764e..7166ffe63502 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include <asm/sibyte/sb1250_regs.h> | 25 | #include <asm/sibyte/sb1250_regs.h> |
26 | #include <asm/sibyte/sb1250_scd.h> | 26 | #include <asm/sibyte/sb1250_scd.h> |
27 | #endif | 27 | #endif |
28 | 28 | ||
29 | /* SB1 definitions */ | 29 | /* SB1 definitions */ |
30 | 30 | ||
31 | /* XXX should come from config1 XXX */ | 31 | /* XXX should come from config1 XXX */ |
@@ -136,14 +136,14 @@ static inline void breakout_cerrd(unsigned int val) | |||
136 | 136 | ||
137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER | 137 | #ifndef CONFIG_SIBYTE_BUS_WATCHER |
138 | 138 | ||
139 | static void check_bus_watcher(void) | 139 | static void check_bus_watcher(void) |
140 | { | 140 | { |
141 | uint32_t status, l2_err, memio_err; | 141 | uint32_t status, l2_err, memio_err; |
142 | 142 | ||
143 | /* Destructive read, clears register and interrupt */ | 143 | /* Destructive read, clears register and interrupt */ |
144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); | 144 | status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS)); |
145 | /* Bit 31 is always on, but there's no #define for that */ | 145 | /* Bit 31 is always on, but there's no #define for that */ |
146 | if (status & ~(1UL << 31)) { | 146 | if (status & ~(1UL << 31)) { |
147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); | 147 | l2_err = csr_in32(IOADDR(A_BUS_L2_ERRORS)); |
148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); | 148 | memio_err = csr_in32(IOADDR(A_BUS_MEM_IO_ERRORS)); |
149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); | 149 | prom_printf("Bus watcher error counters: %08x %08x\n", l2_err, memio_err); |
@@ -153,14 +153,14 @@ static void check_bus_watcher(void) | |||
153 | (int)(G_SCD_BERR_TID(status) >> 6), | 153 | (int)(G_SCD_BERR_TID(status) >> 6), |
154 | (int)G_SCD_BERR_RID(status), | 154 | (int)G_SCD_BERR_RID(status), |
155 | (int)G_SCD_BERR_DCODE(status)); | 155 | (int)G_SCD_BERR_DCODE(status)); |
156 | } else { | 156 | } else { |
157 | prom_printf("Bus watcher indicates no error\n"); | 157 | prom_printf("Bus watcher indicates no error\n"); |
158 | } | 158 | } |
159 | } | 159 | } |
160 | #else | 160 | #else |
161 | extern void check_bus_watcher(void); | 161 | extern void check_bus_watcher(void); |
162 | #endif | 162 | #endif |
163 | 163 | ||
164 | asmlinkage void sb1_cache_error(void) | 164 | asmlinkage void sb1_cache_error(void) |
165 | { | 165 | { |
166 | uint64_t cerr_dpa; | 166 | uint64_t cerr_dpa; |