GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SPARC64]: Fix trap state reading for instruction_access_exception.

Browse source 
1) Read ASI_IMMU SFSR not ASI_DMMU.
2) IMMU has no SFAR, read TPC instead
3) Delete old and incorrect comment about the DTLB protection
   trap having a dependency on the SFSR contents in order to
   function correctly

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2005-08-29 12:44:40 -07:00
parent bf4e70e54c
commit 5ea68e0276
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
arch/sparc64/kernel/entry.S
View file

@ -690,11 +690,6 @@ netbsd_syscall:
retl retl
nop nop
/* These next few routines must be sure to clear the
* SFSR FaultValid bit so that the fast tlb data protection
* handler does not flush the wrong context and lock up the
* box.
*/
.globl __do_data_access_exception .globl __do_data_access_exception
.globl __do_data_access_exception_tl1 .globl __do_data_access_exception_tl1
__do_data_access_exception_tl1: __do_data_access_exception_tl1:
@ -733,9 +728,8 @@ __do_instruction_access_exception_tl1:
rdpr %pstate, %g4 rdpr %pstate, %g4
wrpr %g4, PSTATE_MG|PSTATE_AG, %pstate wrpr %g4, PSTATE_MG|PSTATE_AG, %pstate
mov TLB_SFSR, %g3 mov TLB_SFSR, %g3
mov DMMU_SFAR, %g5 ldxa [%g3] ASI_IMMU, %g4 ! Get SFSR
ldxa [%g3] ASI_DMMU, %g4 ! Get SFSR rdpr %tpc, %g5 ! IMMU has no SFAR, use TPC
ldxa [%g5] ASI_DMMU, %g5 ! Get SFAR
stxa %g0, [%g3] ASI_IMMU ! Clear FaultValid bit stxa %g0, [%g3] ASI_IMMU ! Clear FaultValid bit
membar #Sync membar #Sync
sethi %hi(109f), %g7 sethi %hi(109f), %g7
@ -752,9 +746,8 @@ __do_instruction_access_exception:
rdpr %pstate, %g4 rdpr %pstate, %g4
wrpr %g4, PSTATE_MG|PSTATE_AG, %pstate wrpr %g4, PSTATE_MG|PSTATE_AG, %pstate
mov TLB_SFSR, %g3 mov TLB_SFSR, %g3
mov DMMU_SFAR, %g5 ldxa [%g3] ASI_IMMU, %g4 ! Get SFSR
ldxa [%g3] ASI_DMMU, %g4 ! Get SFSR rdpr %tpc, %g5 ! IMMU has no SFAR, use TPC
ldxa [%g5] ASI_DMMU, %g5 ! Get SFAR
stxa %g0, [%g3] ASI_IMMU ! Clear FaultValid bit stxa %g0, [%g3] ASI_IMMU ! Clear FaultValid bit
membar #Sync membar #Sync
sethi %hi(109f), %g7 sethi %hi(109f), %g7