diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-01-22 06:59:30 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-01 04:00:22 -0500 |
commit | 7034228792cc561e79ff8600f02884bd4c80e287 (patch) | |
tree | 89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/mm/cerr-sb1.c | |
parent | 405ab01c70e18058d9c01a1256769a61fc65413e (diff) |
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this
once and for all rather than dealing with this kind of patches trickling
in forever.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mm/cerr-sb1.c')
-rw-r--r-- | arch/mips/mm/cerr-sb1.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/mm/cerr-sb1.c b/arch/mips/mm/cerr-sb1.c index 3571090ba178..576add33bf5b 100644 --- a/arch/mips/mm/cerr-sb1.c +++ b/arch/mips/mm/cerr-sb1.c | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | /* | 28 | /* |
29 | * We'd like to dump the L2_ECC_TAG register on errors, but errata make | 29 | * We'd like to dump the L2_ECC_TAG register on errors, but errata make |
30 | * that unsafe... So for now we don't. (BCM1250/BCM112x erratum SOC-48.) | 30 | * that unsafe... So for now we don't. (BCM1250/BCM112x erratum SOC-48.) |
31 | */ | 31 | */ |
32 | #undef DUMP_L2_ECC_TAG_ON_ERROR | 32 | #undef DUMP_L2_ECC_TAG_ON_ERROR |
33 | 33 | ||
@@ -48,7 +48,7 @@ | |||
48 | #define CP0_CERRI_EXTERNAL (1 << 26) | 48 | #define CP0_CERRI_EXTERNAL (1 << 26) |
49 | 49 | ||
50 | #define CP0_CERRI_IDX_VALID(c) (!((c) & CP0_CERRI_EXTERNAL)) | 50 | #define CP0_CERRI_IDX_VALID(c) (!((c) & CP0_CERRI_EXTERNAL)) |
51 | #define CP0_CERRI_DATA (CP0_CERRI_DATA_PARITY) | 51 | #define CP0_CERRI_DATA (CP0_CERRI_DATA_PARITY) |
52 | 52 | ||
53 | #define CP0_CERRD_MULTIPLE (1 << 31) | 53 | #define CP0_CERRD_MULTIPLE (1 << 31) |
54 | #define CP0_CERRD_TAG_STATE (1 << 30) | 54 | #define CP0_CERRD_TAG_STATE (1 << 30) |
@@ -56,8 +56,8 @@ | |||
56 | #define CP0_CERRD_DATA_SBE (1 << 28) | 56 | #define CP0_CERRD_DATA_SBE (1 << 28) |
57 | #define CP0_CERRD_DATA_DBE (1 << 27) | 57 | #define CP0_CERRD_DATA_DBE (1 << 27) |
58 | #define CP0_CERRD_EXTERNAL (1 << 26) | 58 | #define CP0_CERRD_EXTERNAL (1 << 26) |
59 | #define CP0_CERRD_LOAD (1 << 25) | 59 | #define CP0_CERRD_LOAD (1 << 25) |
60 | #define CP0_CERRD_STORE (1 << 24) | 60 | #define CP0_CERRD_STORE (1 << 24) |
61 | #define CP0_CERRD_FILLWB (1 << 23) | 61 | #define CP0_CERRD_FILLWB (1 << 23) |
62 | #define CP0_CERRD_COHERENCY (1 << 22) | 62 | #define CP0_CERRD_COHERENCY (1 << 22) |
63 | #define CP0_CERRD_DUPTAG (1 << 21) | 63 | #define CP0_CERRD_DUPTAG (1 << 21) |
@@ -69,10 +69,10 @@ | |||
69 | (CP0_CERRD_LOAD | CP0_CERRD_STORE | CP0_CERRD_FILLWB | CP0_CERRD_COHERENCY | CP0_CERRD_DUPTAG) | 69 | (CP0_CERRD_LOAD | CP0_CERRD_STORE | CP0_CERRD_FILLWB | CP0_CERRD_COHERENCY | CP0_CERRD_DUPTAG) |
70 | #define CP0_CERRD_TYPES \ | 70 | #define CP0_CERRD_TYPES \ |
71 | (CP0_CERRD_TAG_STATE | CP0_CERRD_TAG_ADDRESS | CP0_CERRD_DATA_SBE | CP0_CERRD_DATA_DBE | CP0_CERRD_EXTERNAL) | 71 | (CP0_CERRD_TAG_STATE | CP0_CERRD_TAG_ADDRESS | CP0_CERRD_DATA_SBE | CP0_CERRD_DATA_DBE | CP0_CERRD_EXTERNAL) |
72 | #define CP0_CERRD_DATA (CP0_CERRD_DATA_SBE | CP0_CERRD_DATA_DBE) | 72 | #define CP0_CERRD_DATA (CP0_CERRD_DATA_SBE | CP0_CERRD_DATA_DBE) |
73 | 73 | ||
74 | static uint32_t extract_ic(unsigned short addr, int data); | 74 | static uint32_t extract_ic(unsigned short addr, int data); |
75 | static uint32_t extract_dc(unsigned short addr, int data); | 75 | static uint32_t extract_dc(unsigned short addr, int data); |
76 | 76 | ||
77 | static inline void breakout_errctl(unsigned int val) | 77 | static inline void breakout_errctl(unsigned int val) |
78 | { | 78 | { |
@@ -209,11 +209,11 @@ asmlinkage void sb1_cache_error(void) | |||
209 | "=r" (dpahi), "=r" (dpalo), "=r" (eepc)); | 209 | "=r" (dpahi), "=r" (dpalo), "=r" (eepc)); |
210 | 210 | ||
211 | cerr_dpa = (((uint64_t)dpahi) << 32) | dpalo; | 211 | cerr_dpa = (((uint64_t)dpahi) << 32) | dpalo; |
212 | printk(" c0_errorepc == %08x\n", eepc); | 212 | printk(" c0_errorepc == %08x\n", eepc); |
213 | printk(" c0_errctl == %08x", errctl); | 213 | printk(" c0_errctl == %08x", errctl); |
214 | breakout_errctl(errctl); | 214 | breakout_errctl(errctl); |
215 | if (errctl & CP0_ERRCTL_ICACHE) { | 215 | if (errctl & CP0_ERRCTL_ICACHE) { |
216 | printk(" c0_cerr_i == %08x", cerr_i); | 216 | printk(" c0_cerr_i == %08x", cerr_i); |
217 | breakout_cerri(cerr_i); | 217 | breakout_cerri(cerr_i); |
218 | if (CP0_CERRI_IDX_VALID(cerr_i)) { | 218 | if (CP0_CERRI_IDX_VALID(cerr_i)) { |
219 | /* Check index of EPC, allowing for delay slot */ | 219 | /* Check index of EPC, allowing for delay slot */ |
@@ -229,7 +229,7 @@ asmlinkage void sb1_cache_error(void) | |||
229 | } | 229 | } |
230 | } | 230 | } |
231 | if (errctl & CP0_ERRCTL_DCACHE) { | 231 | if (errctl & CP0_ERRCTL_DCACHE) { |
232 | printk(" c0_cerr_d == %08x", cerr_d); | 232 | printk(" c0_cerr_d == %08x", cerr_d); |
233 | breakout_cerrd(cerr_d); | 233 | breakout_cerrd(cerr_d); |
234 | if (CP0_CERRD_DPA_VALID(cerr_d)) { | 234 | if (CP0_CERRD_DPA_VALID(cerr_d)) { |
235 | printk(" c0_cerr_dpa == %010llx\n", cerr_dpa); | 235 | printk(" c0_cerr_dpa == %010llx\n", cerr_dpa); |
@@ -256,7 +256,7 @@ asmlinkage void sb1_cache_error(void) | |||
256 | /* | 256 | /* |
257 | * Calling panic() when a fatal cache error occurs scrambles the | 257 | * Calling panic() when a fatal cache error occurs scrambles the |
258 | * state of the system (and the cache), making it difficult to | 258 | * state of the system (and the cache), making it difficult to |
259 | * investigate after the fact. However, if you just stall the CPU, | 259 | * investigate after the fact. However, if you just stall the CPU, |
260 | * the other CPU may keep on running, which is typically very | 260 | * the other CPU may keep on running, which is typically very |
261 | * undesirable. | 261 | * undesirable. |
262 | */ | 262 | */ |
@@ -411,7 +411,7 @@ static uint32_t extract_ic(unsigned short addr, int data) | |||
411 | " dmfc0 $1, $28, 1\n\t" | 411 | " dmfc0 $1, $28, 1\n\t" |
412 | " dsrl32 %1, $1, 0 \n\t" | 412 | " dsrl32 %1, $1, 0 \n\t" |
413 | " sll %2, $1, 0 \n\t" | 413 | " sll %2, $1, 0 \n\t" |
414 | " .set pop \n" | 414 | " .set pop \n" |
415 | : "=r" (datahi), "=r" (insta), "=r" (instb) | 415 | : "=r" (datahi), "=r" (insta), "=r" (instb) |
416 | : "r" ((way << 13) | addr | (offset << 3))); | 416 | : "r" ((way << 13) | addr | (offset << 3))); |
417 | predecode = (datahi >> 8) & 0xff; | 417 | predecode = (datahi >> 8) & 0xff; |
@@ -441,8 +441,8 @@ static uint8_t dc_ecc(uint64_t dword) | |||
441 | { | 441 | { |
442 | uint64_t t; | 442 | uint64_t t; |
443 | uint32_t w; | 443 | uint32_t w; |
444 | uint8_t p; | 444 | uint8_t p; |
445 | int i; | 445 | int i; |
446 | 446 | ||
447 | p = 0; | 447 | p = 0; |
448 | for (i = 7; i >= 0; i--) | 448 | for (i = 7; i >= 0; i--) |