| /branches/sparc/kernel/arch/sparc64/src/sun4v/start.S |
|---|
| 273,9 → 273,3 |
| .global mmu_fsas |
| mmu_fsas: |
| .space (MMU_FSA_SIZE * MAX_NUM_STRANDS) |
| /* area containing kernel stack and uspace window buffer pointers of all CPUs */ |
| .align KSTACK_WBUF_PTR_SIZE |
| .global kstack_wbuf_ptrs |
| kstack_wbuf_ptrs: |
| .space (KSTACK_WBUF_PTR_SIZE * MAX_NUM_STRANDS) |
| /branches/sparc/kernel/arch/sparc64/src/proc/sun4v/scheduler.c |
|---|
| 58,10 → 58,9 |
| if ((THREAD->flags & THREAD_FLAG_USPACE)) { |
| uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE - |
| (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)); |
| int cpuid = asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_CPUID); |
| kstack_wbuf_ptrs[cpuid].kstack = sp; |
| kstack_wbuf_ptrs[cpuid].wbuf = |
| (uintptr_t) THREAD->arch.uspace_window_buffer; |
| asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_KSTACK, sp); |
| asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_WBUF, |
| (uintptr_t) THREAD->arch.uspace_window_buffer); |
| } |
| } |
| 70,9 → 69,9 |
| { |
| if ((THREAD->flags & THREAD_FLAG_USPACE)) { |
| /* sample the state of the userspace window buffer */ |
| int cpuid = asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_CPUID); |
| THREAD->arch.uspace_window_buffer = |
| (uint8_t *) kstack_wbuf_ptrs[cpuid].wbuf; |
| (uint8_t *) asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_WBUF); |
| } |
| } |
| /branches/sparc/kernel/arch/sparc64/src/trap/sun4v/trap_table.S |
|---|
| 771,8 → 771,8 |
| INLINE_SPILL_TO_WBUF %g3, %g4, %g7 |
| 2: |
| get_kstack_wbuf_ptr %g3, %g4 |
| ldx [%g4], %g6 |
| set SCRATCHPAD_KSTACK, %g4 |
| ldxa [%g4] ASI_SCRATCHPAD, %g6 |
| save %g6, -PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE, %sp |
| .if \is_syscall |
| 823,8 → 823,8 |
| /* Restoring userspace windows: */ |
| /* Save address of the userspace window buffer to the %g7 register. */ |
| get_kstack_wbuf_ptr %g1, %g5 |
| ldx [%g5 + 8], %g7 |
| set SCRATCHPAD_WBUF, %g5 |
| ldxa [%g5] ASI_SCRATCHPAD, %g7 |
| rdpr %cwp, %g1 |
| rdpr %otherwin, %g2 |
| 874,7 → 874,7 |
| 6: |
| /* Save changes of the address of the userspace window buffer. */ |
| stx %g7, [%g5 + 8] |
| stxa %g7, [%g5] ASI_SCRATCHPAD |
| /* |
| * Switch back to the proper current window and adjust |