Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8a13c4f972e6c107d8cff54de647544c00e25b41 Commit: 8a13c4f972e6c107d8cff54de647544c00e25b41 Parent: f5d7d13cd96313a90f8d13fa5d6e0704f6d534ba Author: Kumar Gala <[EMAIL PROTECTED]> AuthorDate: Thu Oct 11 13:36:52 2007 -0500 Committer: Kumar Gala <[EMAIL PROTECTED]> CommitDate: Thu Oct 11 13:36:52 2007 -0500
[POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers Move to using PAGE_OFFSET instead of TASK_SIZE or KERNELBASE value on 6xx/40x/44x/fsl-booke to determine if the faulting address is a kernel or user space address. This mimics how the macro is_kernel_addr() works. Signed-off-by: Kumar Gala <[EMAIL PROTECTED]> --- arch/powerpc/kernel/head_32.S | 18 +++++++++--------- arch/powerpc/kernel/head_40x.S | 6 +++--- arch/powerpc/kernel/head_44x.S | 6 +++--- arch/powerpc/kernel/head_fsl_booke.S | 11 ++++------- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index d83f04e..a5b13ae 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -469,12 +469,12 @@ InstructionTLBMiss: mfctr r0 /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_IMISS - lis r1,[EMAIL PROTECTED] /* check if kernel address */ - cmplw 0,r3,r1 + lis r1,[EMAIL PROTECTED] /* check if kernel address */ + cmplw 0,r1,r3 mfspr r2,SPRN_SPRG3 li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) - blt+ 112f + bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ lis r2,[EMAIL PROTECTED] /* if kernel address, use */ @@ -543,12 +543,12 @@ DataLoadTLBMiss: mfctr r0 /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_DMISS - lis r1,[EMAIL PROTECTED] /* check if kernel address */ - cmplw 0,r3,r1 + lis r1,[EMAIL PROTECTED] /* check if kernel address */ + cmplw 0,r1,r3 mfspr r2,SPRN_SPRG3 li r1,_PAGE_USER|_PAGE_PRESENT /* low addresses tested as user */ lwz r2,PGDIR(r2) - blt+ 112f + bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ lis r2,[EMAIL PROTECTED] /* if kernel address, use */ @@ -615,12 +615,12 @@ DataStoreTLBMiss: mfctr r0 /* Get PTE (linux-style) and check access */ mfspr r3,SPRN_DMISS - lis r1,[EMAIL PROTECTED] /* check if kernel address */ - cmplw 0,r3,r1 + lis r1,[EMAIL PROTECTED] /* check if kernel address */ + cmplw 0,r1,r3 mfspr r2,SPRN_SPRG3 li r1,_PAGE_RW|_PAGE_USER|_PAGE_PRESENT /* access flags */ lwz r2,PGDIR(r2) - blt+ 112f + bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ lis r2,[EMAIL PROTECTED] /* if kernel address, use */ diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S index e312824..cfefc2d 100644 --- a/arch/powerpc/kernel/head_40x.S +++ b/arch/powerpc/kernel/head_40x.S @@ -289,7 +289,7 @@ label: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] @@ -481,7 +481,7 @@ label: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] @@ -581,7 +581,7 @@ label: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S index 864d63f..409db61 100644 --- a/arch/powerpc/kernel/head_44x.S +++ b/arch/powerpc/kernel/head_44x.S @@ -319,7 +319,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] @@ -458,7 +458,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] @@ -528,7 +528,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw r10, r11 blt+ 3f lis r11, [EMAIL PROTECTED] diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S index ee33ddd..4b98227 100644 --- a/arch/powerpc/kernel/head_fsl_booke.S +++ b/arch/powerpc/kernel/head_fsl_booke.S @@ -461,8 +461,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] - ori r11, r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw 0, r10, r11 bge 2f @@ -584,8 +583,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] - ori r11, r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw 5, r10, r11 blt 5, 3f lis r11, [EMAIL PROTECTED] @@ -645,8 +643,7 @@ interrupt_base: /* If we are faulting a kernel address, we have to use the * kernel page tables. */ - lis r11, [EMAIL PROTECTED] - ori r11, r11, [EMAIL PROTECTED] + lis r11, [EMAIL PROTECTED] cmplw 5, r10, r11 blt 5, 3f lis r11, [EMAIL PROTECTED] @@ -744,7 +741,7 @@ data_access: * r10 - EA of fault * r11 - TLB (info from Linux PTE) * r12, r13 - available to use - * CR5 - results of addr < TASK_SIZE + * CR5 - results of addr >= PAGE_OFFSET * MAS0, MAS1 - loaded with proper value when we get here * MAS2, MAS3 - will need additional info from Linux PTE * Upon exit, we reload everything and RFI. - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html