diff options
Diffstat (limited to 'arch/mips/include/asm/processor.h')
-rw-r--r-- | arch/mips/include/asm/processor.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index bd98b503f04c..2a5fa7abb346 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h | |||
@@ -112,8 +112,8 @@ struct mips_fpu_struct { | |||
112 | typedef __u32 dspreg_t; | 112 | typedef __u32 dspreg_t; |
113 | 113 | ||
114 | struct mips_dsp_state { | 114 | struct mips_dsp_state { |
115 | dspreg_t dspr[NUM_DSP_REGS]; | 115 | dspreg_t dspr[NUM_DSP_REGS]; |
116 | unsigned int dspcontrol; | 116 | unsigned int dspcontrol; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | #define INIT_CPUMASK { \ | 119 | #define INIT_CPUMASK { \ |
@@ -137,46 +137,46 @@ union mips_watch_reg_state { | |||
137 | 137 | ||
138 | struct octeon_cop2_state { | 138 | struct octeon_cop2_state { |
139 | /* DMFC2 rt, 0x0201 */ | 139 | /* DMFC2 rt, 0x0201 */ |
140 | unsigned long cop2_crc_iv; | 140 | unsigned long cop2_crc_iv; |
141 | /* DMFC2 rt, 0x0202 (Set with DMTC2 rt, 0x1202) */ | 141 | /* DMFC2 rt, 0x0202 (Set with DMTC2 rt, 0x1202) */ |
142 | unsigned long cop2_crc_length; | 142 | unsigned long cop2_crc_length; |
143 | /* DMFC2 rt, 0x0200 (set with DMTC2 rt, 0x4200) */ | 143 | /* DMFC2 rt, 0x0200 (set with DMTC2 rt, 0x4200) */ |
144 | unsigned long cop2_crc_poly; | 144 | unsigned long cop2_crc_poly; |
145 | /* DMFC2 rt, 0x0402; DMFC2 rt, 0x040A */ | 145 | /* DMFC2 rt, 0x0402; DMFC2 rt, 0x040A */ |
146 | unsigned long cop2_llm_dat[2]; | 146 | unsigned long cop2_llm_dat[2]; |
147 | /* DMFC2 rt, 0x0084 */ | 147 | /* DMFC2 rt, 0x0084 */ |
148 | unsigned long cop2_3des_iv; | 148 | unsigned long cop2_3des_iv; |
149 | /* DMFC2 rt, 0x0080; DMFC2 rt, 0x0081; DMFC2 rt, 0x0082 */ | 149 | /* DMFC2 rt, 0x0080; DMFC2 rt, 0x0081; DMFC2 rt, 0x0082 */ |
150 | unsigned long cop2_3des_key[3]; | 150 | unsigned long cop2_3des_key[3]; |
151 | /* DMFC2 rt, 0x0088 (Set with DMTC2 rt, 0x0098) */ | 151 | /* DMFC2 rt, 0x0088 (Set with DMTC2 rt, 0x0098) */ |
152 | unsigned long cop2_3des_result; | 152 | unsigned long cop2_3des_result; |
153 | /* DMFC2 rt, 0x0111 (FIXME: Read Pass1 Errata) */ | 153 | /* DMFC2 rt, 0x0111 (FIXME: Read Pass1 Errata) */ |
154 | unsigned long cop2_aes_inp0; | 154 | unsigned long cop2_aes_inp0; |
155 | /* DMFC2 rt, 0x0102; DMFC2 rt, 0x0103 */ | 155 | /* DMFC2 rt, 0x0102; DMFC2 rt, 0x0103 */ |
156 | unsigned long cop2_aes_iv[2]; | 156 | unsigned long cop2_aes_iv[2]; |
157 | /* DMFC2 rt, 0x0104; DMFC2 rt, 0x0105; DMFC2 rt, 0x0106; DMFC2 | 157 | /* DMFC2 rt, 0x0104; DMFC2 rt, 0x0105; DMFC2 rt, 0x0106; DMFC2 |
158 | * rt, 0x0107 */ | 158 | * rt, 0x0107 */ |
159 | unsigned long cop2_aes_key[4]; | 159 | unsigned long cop2_aes_key[4]; |
160 | /* DMFC2 rt, 0x0110 */ | 160 | /* DMFC2 rt, 0x0110 */ |
161 | unsigned long cop2_aes_keylen; | 161 | unsigned long cop2_aes_keylen; |
162 | /* DMFC2 rt, 0x0100; DMFC2 rt, 0x0101 */ | 162 | /* DMFC2 rt, 0x0100; DMFC2 rt, 0x0101 */ |
163 | unsigned long cop2_aes_result[2]; | 163 | unsigned long cop2_aes_result[2]; |
164 | /* DMFC2 rt, 0x0240; DMFC2 rt, 0x0241; DMFC2 rt, 0x0242; DMFC2 | 164 | /* DMFC2 rt, 0x0240; DMFC2 rt, 0x0241; DMFC2 rt, 0x0242; DMFC2 |
165 | * rt, 0x0243; DMFC2 rt, 0x0244; DMFC2 rt, 0x0245; DMFC2 rt, | 165 | * rt, 0x0243; DMFC2 rt, 0x0244; DMFC2 rt, 0x0245; DMFC2 rt, |
166 | * 0x0246; DMFC2 rt, 0x0247; DMFC2 rt, 0x0248; DMFC2 rt, | 166 | * 0x0246; DMFC2 rt, 0x0247; DMFC2 rt, 0x0248; DMFC2 rt, |
167 | * 0x0249; DMFC2 rt, 0x024A; DMFC2 rt, 0x024B; DMFC2 rt, | 167 | * 0x0249; DMFC2 rt, 0x024A; DMFC2 rt, 0x024B; DMFC2 rt, |
168 | * 0x024C; DMFC2 rt, 0x024D; DMFC2 rt, 0x024E - Pass2 */ | 168 | * 0x024C; DMFC2 rt, 0x024D; DMFC2 rt, 0x024E - Pass2 */ |
169 | unsigned long cop2_hsh_datw[15]; | 169 | unsigned long cop2_hsh_datw[15]; |
170 | /* DMFC2 rt, 0x0250; DMFC2 rt, 0x0251; DMFC2 rt, 0x0252; DMFC2 | 170 | /* DMFC2 rt, 0x0250; DMFC2 rt, 0x0251; DMFC2 rt, 0x0252; DMFC2 |
171 | * rt, 0x0253; DMFC2 rt, 0x0254; DMFC2 rt, 0x0255; DMFC2 rt, | 171 | * rt, 0x0253; DMFC2 rt, 0x0254; DMFC2 rt, 0x0255; DMFC2 rt, |
172 | * 0x0256; DMFC2 rt, 0x0257 - Pass2 */ | 172 | * 0x0256; DMFC2 rt, 0x0257 - Pass2 */ |
173 | unsigned long cop2_hsh_ivw[8]; | 173 | unsigned long cop2_hsh_ivw[8]; |
174 | /* DMFC2 rt, 0x0258; DMFC2 rt, 0x0259 - Pass2 */ | 174 | /* DMFC2 rt, 0x0258; DMFC2 rt, 0x0259 - Pass2 */ |
175 | unsigned long cop2_gfm_mult[2]; | 175 | unsigned long cop2_gfm_mult[2]; |
176 | /* DMFC2 rt, 0x025E - Pass2 */ | 176 | /* DMFC2 rt, 0x025E - Pass2 */ |
177 | unsigned long cop2_gfm_poly; | 177 | unsigned long cop2_gfm_poly; |
178 | /* DMFC2 rt, 0x025A; DMFC2 rt, 0x025B - Pass2 */ | 178 | /* DMFC2 rt, 0x025A; DMFC2 rt, 0x025B - Pass2 */ |
179 | unsigned long cop2_gfm_result[2]; | 179 | unsigned long cop2_gfm_result[2]; |
180 | }; | 180 | }; |
181 | #define INIT_OCTEON_COP2 {0,} | 181 | #define INIT_OCTEON_COP2 {0,} |
182 | 182 | ||
@@ -249,9 +249,9 @@ struct thread_struct { | |||
249 | #endif /* CONFIG_CPU_CAVIUM_OCTEON */ | 249 | #endif /* CONFIG_CPU_CAVIUM_OCTEON */ |
250 | 250 | ||
251 | #define INIT_THREAD { \ | 251 | #define INIT_THREAD { \ |
252 | /* \ | 252 | /* \ |
253 | * Saved main processor registers \ | 253 | * Saved main processor registers \ |
254 | */ \ | 254 | */ \ |
255 | .reg16 = 0, \ | 255 | .reg16 = 0, \ |
256 | .reg17 = 0, \ | 256 | .reg17 = 0, \ |
257 | .reg18 = 0, \ | 257 | .reg18 = 0, \ |
@@ -332,7 +332,7 @@ unsigned long get_wchan(struct task_struct *p); | |||
332 | * aborts compilation on some CPUs. It's simply not possible to unwind | 332 | * aborts compilation on some CPUs. It's simply not possible to unwind |
333 | * some CPU's stackframes. | 333 | * some CPU's stackframes. |
334 | * | 334 | * |
335 | * __builtin_return_address works only for non-leaf functions. We avoid the | 335 | * __builtin_return_address works only for non-leaf functions. We avoid the |
336 | * overhead of a function call by forcing the compiler to save the return | 336 | * overhead of a function call by forcing the compiler to save the return |
337 | * address register on the stack. | 337 | * address register on the stack. |
338 | */ | 338 | */ |