Changeset cade9c1 in mainline for kernel/arch/sparc64/src/mm/sun4v/tlb.c

Timestamp:

2014-10-30T12:48:50Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3579629

Parents:

aef669b

Message:

sparc64/sun4v trap overhaul.

• Handle interrupt, MMU and other essential traps via exc_dispatch()
• Handle data_access_exception on TL>1
• Switch the sun4v code to the previously modified istate_t structure

File:

• kernel/arch/sparc64/src/mm/sun4v/tlb.c (modified) (3 diffs)

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -208 +208 @@
 
 /** ITLB miss handler. */
-void fast_instruction_access_mmu_miss(sysarg_t unused, istate_t *istate)
+void fast_instruction_access_mmu_miss(unsigned int tt, istate_t *istate)
 {
         uintptr_t va = ALIGN_DOWN(istate->tpc, PAGE_SIZE);
@@ -239 +239 @@
  * low-level, assembly language part of the fast_data_access_mmu_miss handler.
  *
- * @param page_and_ctx  A 64-bit value describing the fault. The most
- *                      significant 51 bits of the value contain the virtual
- *                      address which caused the fault truncated to the page
- *                      boundary. The least significant 13 bits of the value
- *                      contain the number of the context in which the fault
- *                      occurred.
+ * @param tt            Trap type.
  * @param istate        Interrupted state saved on the stack.
  */
-void fast_data_access_mmu_miss(uint64_t page_and_ctx, istate_t *istate)
+void fast_data_access_mmu_miss(unsigned int tt, istate_t *istate)
 {
         pte_t *t;
-        uintptr_t va = DMISS_ADDRESS(page_and_ctx);
-        uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
+        uintptr_t va = DMISS_ADDRESS(istate->tlb_tag_access);
+        uint16_t ctx = DMISS_CONTEXT(istate->tlb_tag_access);
         as_t *as = AS;
 
@@ -288 +283 @@
 /** DTLB protection fault handler.
  *
- * @param page_and_ctx  A 64-bit value describing the fault. The most
- *                      significant 51 bits of the value contain the virtual
- *                      address which caused the fault truncated to the page
- *                      boundary. The least significant 13 bits of the value
- *                      contain the number of the context in which the fault
- *                      occurred.
+ * @param tt            Trap type.
  * @param istate        Interrupted state saved on the stack.
  */
-void fast_data_access_protection(uint64_t page_and_ctx, istate_t *istate)
+void fast_data_access_protection(unsigned int tt, istate_t *istate)
 {
         pte_t *t;
-        uintptr_t va = DMISS_ADDRESS(page_and_ctx);
-        uint16_t ctx = DMISS_CONTEXT(page_and_ctx);
+        uintptr_t va = DMISS_ADDRESS(istate->tlb_tag_access);
+        uint16_t ctx = DMISS_CONTEXT(istate->tlb_tag_access);
         as_t *as = AS;