diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-03-18 11:56:10 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-03-19 14:15:35 -0400 |
| commit | 63c2b6812f1dc0beda4d6adad0365e048aa693e2 (patch) | |
| tree | bfcb619a1130e1b2a6153d45fa46f61af8e08e53 /arch/mips/include | |
| parent | a4285b99e0087361c61f51c819633382fa659ea6 (diff) | |
MIPS: Fix code generation for non-DSP capable CPUs
Commit 32a7ede (MIPS: dsp: Add assembler support for DSP ASEs) has
enabled the use of DSP ASE specific instructions such as rddsp and wrdsp
under the idea that all code path that will make use of these two
instructions are properly checking for cpu_has_dsp to ensure that the
particular CPU we are running on *actually* supports DSP ASE.
This commit actually causes the following oops on QEMU Malta emulating a
MIPS 24Kc without the DSP ASE implemented:
[ 7.960000] Reserved instruction in kernel
[ 7.960000] Cpu 0
[ 7.960000] $ 0 : 00000000 00000000 00000014 00000005
[ 7.960000] $ 4 : 8fc2de48 00000001 00000000 8f59ddb0
[ 7.960000] $ 8 : 8f5ceec4 00000018 00000c00 00800000
[ 7.960000] $12 : 00000100 00000200 00000000 00457b84
[ 7.960000] $16 : 00000000 8fc2ba78 8f4ec980 00000001
[ 7.960000] $20 : 80418f90 00000000 00000000 000002dd
[ 7.960000] $24 : 0000009c 7730d7b8
[ 7.960000] $28 : 8f59c000 8f59dd38 00000001 80104248
[ 7.960000] Hi : 0000001d
[ 7.960000] Lo : 0000000b
[ 7.960000] epc : 801041ec thread_saved_pc+0x2c/0x38
[ 7.960000] Not tainted
[ 7.960000] ra : 80104248 get_wchan+0x48/0xac
[ 7.960000] Status: 1000b703 KERNEL EXL IE
[ 7.960000] Cause : 10800028
[ 7.960000] PrId : 00019300 (MIPS 24Kc)
[ 7.960000] Modules linked in:
[ 7.960000] Process killall (pid: 1574, threadinfo=8f59c000,
task=8fd14558, tls=773aa440)
[ 7.960000] Stack : 8fc2ba78 8012b008 0000000c 0000001d 00000000
00000000 8f58a380
8f58a380 8fc2ba78 80202668 8f59de78 8f468600 8f59de28
801b2a3c 8f59df00 8f98ba20 74696e69
8f468600 8f59de28 801b7308 0081c007 00000000 00000000
00000000 00000000 00000000 00000000
00000000 8fc2bbb4 00000001 0000001d 0000000b 77f038cc
7fe80648 ffffffff ffffffff 00000000
00000001 0016e000 00000000 ...
[ 7.960000] Call Trace:
[ 7.960000] [<801041ec>] thread_saved_pc+0x2c/0x38
[ 7.960000] [<80104248>] get_wchan+0x48/0xac
The disassembly of thread_saved_pc points to the following:
000006d0 <thread_saved_pc>:
6d0: 8c820208 lw v0,520(a0)
6d4: 3c030000 lui v1,0x0
6d8: 24630000 addiu v1,v1,0
6dc: 10430008 beq v0,v1,700 <thread_saved_pc+0x30>
6e0: 00000000 nop
6e4: 3c020000 lui v0,0x0
6e8: 8c43000c lw v1,12(v0)
6ec: 04620004 bltzl v1,700 <thread_saved_pc+0x30>
6f0: 00001021 move v0,zero
6f4: 8c840200 lw a0,512(a0)
6f8: 00031080 sll v0,v1,0x2
6fc: 7c44100a lwx v0,a0(v0) <------------
700: 03e00008 jr ra
704: 00000000 nop
If we specifically disable -mdsp/-mdspr2 for arch/mips/kernel/process.o,
we get the following (non-crashing) assembly:
00000708 <thread_saved_pc>:
708: 8c820208 lw v0,520(a0)
70c: 3c030000 lui v1,0x0
710: 24630000 addiu v1,v1,0
714: 10430009 beq v0,v1,73c <thread_saved_pc+0x34>
718: 00000000 nop
71c: 3c020000 lui v0,0x0
720: 8c42000c lw v0,12(v0)
724: 04420005 bltzl v0,73c <thread_saved_pc+0x34>
728: 00001021 move v0,zero
72c: 8c830200 lw v1,512(a0)
730: 00021080 sll v0,v0,0x2
734: 00431021 addu v0,v0,v1
738: 8c420000 lw v0,0(v0)
73c: 03e00008 jr ra
740: 00000000 nop
The specific line that leads a different assembly being produced is:
unsigned long thread_saved_pc(struct task_struct *tsk)
...
return ((unsigned long *)t->reg29)[schedule_mfi.pc_offset]; <---
The problem here is that the compiler was given the right to use DSP
instructions with the -mdsp / -mdspr2 command-line switches and
performed some optimization for us and used DSP ASE instructions where
we are not checking that the running CPU actually supports DSP ASE.
This patch fixes the issue by partially reverting commit 32a7ede for
arch/mips/kernel/Makefile in order to remove the -mdsp / -mdspr2
compiler command-line switches such that we are now guaranteed that the
compiler will not optimize using DSP ASE reserved instructions. We also
need to fixup the rddsp/wrdsp and m{t,h}{hi,lo}{0,1,2,3} macros in
arch/mips/include/asm/mipsregs.h to tell the assembler that we are going
to explicitely use DSP ASE reserved instructions. The comment in
arch/mips/kernel/Makefile is also updated to reflect that.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: blogic@openwrt.org
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 209 |
1 files changed, 190 insertions, 19 deletions
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h index 12b70c25906a..0da44d422f5b 100644 --- a/arch/mips/include/asm/mipsregs.h +++ b/arch/mips/include/asm/mipsregs.h | |||
| @@ -1166,7 +1166,10 @@ do { \ | |||
| 1166 | unsigned int __dspctl; \ | 1166 | unsigned int __dspctl; \ |
| 1167 | \ | 1167 | \ |
| 1168 | __asm__ __volatile__( \ | 1168 | __asm__ __volatile__( \ |
| 1169 | " .set push \n" \ | ||
| 1170 | " .set dsp \n" \ | ||
| 1169 | " rddsp %0, %x1 \n" \ | 1171 | " rddsp %0, %x1 \n" \ |
| 1172 | " .set pop \n" \ | ||
| 1170 | : "=r" (__dspctl) \ | 1173 | : "=r" (__dspctl) \ |
| 1171 | : "i" (mask)); \ | 1174 | : "i" (mask)); \ |
| 1172 | __dspctl; \ | 1175 | __dspctl; \ |
| @@ -1175,30 +1178,198 @@ do { \ | |||
| 1175 | #define wrdsp(val, mask) \ | 1178 | #define wrdsp(val, mask) \ |
| 1176 | do { \ | 1179 | do { \ |
| 1177 | __asm__ __volatile__( \ | 1180 | __asm__ __volatile__( \ |
| 1181 | " .set push \n" \ | ||
| 1182 | " .set dsp \n" \ | ||
| 1178 | " wrdsp %0, %x1 \n" \ | 1183 | " wrdsp %0, %x1 \n" \ |
| 1184 | " .set pop \n" \ | ||
| 1179 | : \ | 1185 | : \ |
| 1180 | : "r" (val), "i" (mask)); \ | 1186 | : "r" (val), "i" (mask)); \ |
| 1181 | } while (0) | 1187 | } while (0) |
| 1182 | 1188 | ||
| 1183 | #define mflo0() ({ long mflo0; __asm__("mflo %0, $ac0" : "=r" (mflo0)); mflo0;}) | 1189 | #define mflo0() \ |
| 1184 | #define mflo1() ({ long mflo1; __asm__("mflo %0, $ac1" : "=r" (mflo1)); mflo1;}) | 1190 | ({ \ |
| 1185 | #define mflo2() ({ long mflo2; __asm__("mflo %0, $ac2" : "=r" (mflo2)); mflo2;}) | 1191 | long mflo0; \ |
| 1186 | #define mflo3() ({ long mflo3; __asm__("mflo %0, $ac3" : "=r" (mflo3)); mflo3;}) | 1192 | __asm__( \ |
| 1187 | 1193 | " .set push \n" \ | |
| 1188 | #define mfhi0() ({ long mfhi0; __asm__("mfhi %0, $ac0" : "=r" (mfhi0)); mfhi0;}) | 1194 | " .set dsp \n" \ |
| 1189 | #define mfhi1() ({ long mfhi1; __asm__("mfhi %0, $ac1" : "=r" (mfhi1)); mfhi1;}) | 1195 | " mflo %0, $ac0 \n" \ |
| 1190 | #define mfhi2() ({ long mfhi2; __asm__("mfhi %0, $ac2" : "=r" (mfhi2)); mfhi2;}) | 1196 | " .set pop \n" \ |
| 1191 | #define mfhi3() ({ long mfhi3; __asm__("mfhi %0, $ac3" : "=r" (mfhi3)); mfhi3;}) | 1197 | : "=r" (mflo0)); \ |
| 1192 | 1198 | mflo0; \ | |
| 1193 | #define mtlo0(x) __asm__("mtlo %0, $ac0" ::"r" (x)) | 1199 | }) |
| 1194 | #define mtlo1(x) __asm__("mtlo %0, $ac1" ::"r" (x)) | 1200 | |
| 1195 | #define mtlo2(x) __asm__("mtlo %0, $ac2" ::"r" (x)) | 1201 | #define mflo1() \ |
| 1196 | #define mtlo3(x) __asm__("mtlo %0, $ac3" ::"r" (x)) | 1202 | ({ \ |
| 1197 | 1203 | long mflo1; \ | |
| 1198 | #define mthi0(x) __asm__("mthi %0, $ac0" ::"r" (x)) | 1204 | __asm__( \ |
| 1199 | #define mthi1(x) __asm__("mthi %0, $ac1" ::"r" (x)) | 1205 | " .set push \n" \ |
| 1200 | #define mthi2(x) __asm__("mthi %0, $ac2" ::"r" (x)) | 1206 | " .set dsp \n" \ |
| 1201 | #define mthi3(x) __asm__("mthi %0, $ac3" ::"r" (x)) | 1207 | " mflo %0, $ac1 \n" \ |
| 1208 | " .set pop \n" \ | ||
| 1209 | : "=r" (mflo1)); \ | ||
| 1210 | mflo1; \ | ||
| 1211 | }) | ||
| 1212 | |||
| 1213 | #define mflo2() \ | ||
| 1214 | ({ \ | ||
| 1215 | long mflo2; \ | ||
| 1216 | __asm__( \ | ||
| 1217 | " .set push \n" \ | ||
| 1218 | " .set dsp \n" \ | ||
| 1219 | " mflo %0, $ac2 \n" \ | ||
| 1220 | " .set pop \n" \ | ||
| 1221 | : "=r" (mflo2)); \ | ||
| 1222 | mflo2; \ | ||
| 1223 | }) | ||
| 1224 | |||
| 1225 | #define mflo3() \ | ||
| 1226 | ({ \ | ||
| 1227 | long mflo3; \ | ||
| 1228 | __asm__( \ | ||
| 1229 | " .set push \n" \ | ||
| 1230 | " .set dsp \n" \ | ||
| 1231 | " mflo %0, $ac3 \n" \ | ||
| 1232 | " .set pop \n" \ | ||
| 1233 | : "=r" (mflo3)); \ | ||
| 1234 | mflo3; \ | ||
| 1235 | }) | ||
| 1236 | |||
| 1237 | #define mfhi0() \ | ||
| 1238 | ({ \ | ||
| 1239 | long mfhi0; \ | ||
| 1240 | __asm__( \ | ||
| 1241 | " .set push \n" \ | ||
| 1242 | " .set dsp \n" \ | ||
| 1243 | " mfhi %0, $ac0 \n" \ | ||
| 1244 | " .set pop \n" \ | ||
| 1245 | : "=r" (mfhi0)); \ | ||
| 1246 | mfhi0; \ | ||
| 1247 | }) | ||
| 1248 | |||
| 1249 | #define mfhi1() \ | ||
| 1250 | ({ \ | ||
| 1251 | long mfhi1; \ | ||
| 1252 | __asm__( \ | ||
| 1253 | " .set push \n" \ | ||
| 1254 | " .set dsp \n" \ | ||
| 1255 | " mfhi %0, $ac1 \n" \ | ||
| 1256 | " .set pop \n" \ | ||
| 1257 | : "=r" (mfhi1)); \ | ||
| 1258 | mfhi1; \ | ||
| 1259 | }) | ||
| 1260 | |||
| 1261 | #define mfhi2() \ | ||
| 1262 | ({ \ | ||
| 1263 | long mfhi2; \ | ||
| 1264 | __asm__( \ | ||
| 1265 | " .set push \n" \ | ||
| 1266 | " .set dsp \n" \ | ||
| 1267 | " mfhi %0, $ac2 \n" \ | ||
| 1268 | " .set pop \n" \ | ||
| 1269 | : "=r" (mfhi2)); \ | ||
| 1270 | mfhi2; \ | ||
| 1271 | }) | ||
| 1272 | |||
| 1273 | #define mfhi3() \ | ||
| 1274 | ({ \ | ||
| 1275 | long mfhi3; \ | ||
| 1276 | __asm__( \ | ||
| 1277 | " .set push \n" \ | ||
| 1278 | " .set dsp \n" \ | ||
| 1279 | " mfhi %0, $ac3 \n" \ | ||
| 1280 | " .set pop \n" \ | ||
| 1281 | : "=r" (mfhi3)); \ | ||
| 1282 | mfhi3; \ | ||
| 1283 | }) | ||
| 1284 | |||
| 1285 | |||
| 1286 | #define mtlo0(x) \ | ||
| 1287 | ({ \ | ||
| 1288 | __asm__( \ | ||
| 1289 | " .set push \n" \ | ||
| 1290 | " .set dsp \n" \ | ||
| 1291 | " mtlo %0, $ac0 \n" \ | ||
| 1292 | " .set pop \n" \ | ||
| 1293 | : \ | ||
| 1294 | : "r" (x)); \ | ||
| 1295 | }) | ||
| 1296 | |||
| 1297 | #define mtlo1(x) \ | ||
| 1298 | ({ \ | ||
| 1299 | __asm__( \ | ||
| 1300 | " .set push \n" \ | ||
| 1301 | " .set dsp \n" \ | ||
| 1302 | " mtlo %0, $ac1 \n" \ | ||
| 1303 | " .set pop \n" \ | ||
| 1304 | : \ | ||
| 1305 | : "r" (x)); \ | ||
| 1306 | }) | ||
| 1307 | |||
| 1308 | #define mtlo2(x) \ | ||
| 1309 | ({ \ | ||
| 1310 | __asm__( \ | ||
| 1311 | " .set push \n" \ | ||
| 1312 | " .set dsp \n" \ | ||
| 1313 | " mtlo %0, $ac2 \n" \ | ||
| 1314 | " .set pop \n" \ | ||
| 1315 | : \ | ||
| 1316 | : "r" (x)); \ | ||
| 1317 | }) | ||
| 1318 | |||
| 1319 | #define mtlo3(x) \ | ||
| 1320 | ({ \ | ||
| 1321 | __asm__( \ | ||
| 1322 | " .set push \n" \ | ||
| 1323 | " .set dsp \n" \ | ||
| 1324 | " mtlo %0, $ac3 \n" \ | ||
| 1325 | " .set pop \n" \ | ||
| 1326 | : \ | ||
| 1327 | : "r" (x)); \ | ||
| 1328 | }) | ||
| 1329 | |||
| 1330 | #define mthi0(x) \ | ||
| 1331 | ({ \ | ||
| 1332 | __asm__( \ | ||
| 1333 | " .set push \n" \ | ||
| 1334 | " .set dsp \n" \ | ||
| 1335 | " mthi %0, $ac0 \n" \ | ||
| 1336 | " .set pop \n" \ | ||
| 1337 | : \ | ||
| 1338 | : "r" (x)); \ | ||
| 1339 | }) | ||
| 1340 | |||
| 1341 | #define mthi1(x) \ | ||
| 1342 | ({ \ | ||
| 1343 | __asm__( \ | ||
| 1344 | " .set push \n" \ | ||
| 1345 | " .set dsp \n" \ | ||
| 1346 | " mthi %0, $ac1 \n" \ | ||
| 1347 | " .set pop \n" \ | ||
| 1348 | : \ | ||
| 1349 | : "r" (x)); \ | ||
| 1350 | }) | ||
| 1351 | |||
| 1352 | #define mthi2(x) \ | ||
| 1353 | ({ \ | ||
| 1354 | __asm__( \ | ||
| 1355 | " .set push \n" \ | ||
| 1356 | " .set dsp \n" \ | ||
| 1357 | " mthi %0, $ac2 \n" \ | ||
| 1358 | " .set pop \n" \ | ||
| 1359 | : \ | ||
| 1360 | : "r" (x)); \ | ||
| 1361 | }) | ||
| 1362 | |||
| 1363 | #define mthi3(x) \ | ||
| 1364 | ({ \ | ||
| 1365 | __asm__( \ | ||
| 1366 | " .set push \n" \ | ||
| 1367 | " .set dsp \n" \ | ||
| 1368 | " mthi %0, $ac3 \n" \ | ||
| 1369 | " .set pop \n" \ | ||
| 1370 | : \ | ||
| 1371 | : "r" (x)); \ | ||
| 1372 | }) | ||
| 1202 | 1373 | ||
| 1203 | #else | 1374 | #else |
| 1204 | 1375 | ||