Commit d925c262 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle

Fill R3k load delay slots properly.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9678e28b
...@@ -1486,6 +1486,7 @@ static void __init build_r3000_tlb_load_handler(void) ...@@ -1486,6 +1486,7 @@ static void __init build_r3000_tlb_load_handler(void)
build_r3000_tlbchange_handler_head(&p, K0, K1); build_r3000_tlbchange_handler_head(&p, K0, K1);
build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl); build_pte_present(&p, &l, &r, K0, K1, label_nopage_tlbl);
i_nop(&p); /* load delay */
build_make_valid(&p, &r, K0, K1); build_make_valid(&p, &r, K0, K1);
build_r3000_pte_reload(&p, K1); build_r3000_pte_reload(&p, K1);
build_r3000_tlb_write(&p, &l, &r, K0); build_r3000_tlb_write(&p, &l, &r, K0);
...@@ -1527,6 +1528,7 @@ static void __init build_r3000_tlb_store_handler(void) ...@@ -1527,6 +1528,7 @@ static void __init build_r3000_tlb_store_handler(void)
build_r3000_tlbchange_handler_head(&p, K0, K1); build_r3000_tlbchange_handler_head(&p, K0, K1);
build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs); build_pte_writable(&p, &l, &r, K0, K1, label_nopage_tlbs);
i_nop(&p); /* load delay */
build_make_write(&p, &r, K0, K1); build_make_write(&p, &r, K0, K1);
build_r3000_pte_reload(&p, K1); build_r3000_pte_reload(&p, K1);
build_r3000_tlb_write(&p, &l, &r, K0); build_r3000_tlb_write(&p, &l, &r, K0);
...@@ -1568,6 +1570,7 @@ static void __init build_r3000_tlb_modify_handler(void) ...@@ -1568,6 +1570,7 @@ static void __init build_r3000_tlb_modify_handler(void)
build_r3000_tlbchange_handler_head(&p, K0, K1); build_r3000_tlbchange_handler_head(&p, K0, K1);
build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm); build_pte_modifiable(&p, &l, &r, K0, K1, label_nopage_tlbm);
i_nop(&p); /* load delay */
build_make_write(&p, &r, K0, K1); build_make_write(&p, &r, K0, K1);
build_r3000_pte_reload(&p, K1); build_r3000_pte_reload(&p, K1);
i_tlbwi(&p); i_tlbwi(&p);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment