1 files changed, 44 insertions, 48 deletions
diff --git a/arch/sparc64/kernel/ktlb.S b/arch/sparc64/kernel/ktlb.S
index 7796b37f478c..d9244d3c9f73 100644
--- a/arch/sparc64/kernel/ktlb.S
+++ b/arch/sparc64/kernel/ktlb.S
@@ -58,9 +58,6 @@ vpte_noent:
        done
 vpte_insn_obp:
-        sethi           %hi(prom_pmd_phys), %g5
-        ldx             [%g5 + %lo(prom_pmd_phys)], %g5
        /* Behave as if we are at TL0.  */
        wrpr            %g0, 1, %tl
        rdpr            %tpc, %g4       /* Find original faulting iaddr */
@@ -71,58 +68,57 @@ vpte_insn_obp:
        mov             TLB_SFSR, %g1
        stxa            %g4, [%g1 + %g1] ASI_IMMU
-        /* Get PMD offset.  */
+        sethi           %hi(prom_trans), %g5
-        srlx            %g4, 23, %g6
+        or              %g5, %lo(prom_trans), %g5
-        and             %g6, 0x7ff, %g6
-        sllx            %g6, 2, %g6
+1:      ldx             [%g5 + 0x00], %g6       ! base
+        brz,a,pn        %g6, longpath           ! no more entries, fail
-        /* Load PMD, is it valid?  */
+         mov            TLB_SFSR, %g1           ! and restore %g1
-        lduwa           [%g5 + %g6] ASI_PHYS_USE_EC, %g5
+        ldx             [%g5 + 0x08], %g1       ! len
-        brz,pn          %g5, longpath
+        add             %g6, %g1, %g1           ! end
-         sllx           %g5, 11, %g5
+        cmp             %g6, %g4
+        bgu,pt          %xcc, 2f
-        /* Get PTE offset.  */
+         cmp            %g4, %g1
-        srlx            %g4, 13, %g6
+        bgeu,pt         %xcc, 2f
-        and             %g6, 0x3ff, %g6
+         ldx            [%g5 + 0x10], %g1       ! PTE
-        sllx            %g6, 3, %g6
+        /* TLB load, restore %g1, and return from trap.  */
-        /* Load PTE.  */
+        sub             %g4, %g6, %g6
-        ldxa            [%g5 + %g6] ASI_PHYS_USE_EC, %g5
+        add             %g1, %g6, %g5
-        brgez,pn        %g5, longpath
+        mov             TLB_SFSR, %g1
-         nop
-        /* TLB load and return from trap.  */
        stxa            %g5, [%g0] ASI_ITLB_DATA_IN
        retry
-kvmap_do_obp:
+2:      ba,pt           %xcc, 1b
-        sethi           %hi(prom_pmd_phys), %g5
+         add            %g5, (3 * 8), %g5       ! next entry
-        ldx             [%g5 + %lo(prom_pmd_phys)], %g5
-        /* Get PMD offset.  */
-        srlx            %g4, 23, %g6
-        and             %g6, 0x7ff, %g6
-        sllx            %g6, 2, %g6
-        /* Load PMD, is it valid?  */
-        lduwa           [%g5 + %g6] ASI_PHYS_USE_EC, %g5
-        brz,pn          %g5, longpath
-         sllx           %g5, 11, %g5
-        /* Get PTE offset.  */
-        srlx            %g4, 13, %g6
-        and             %g6, 0x3ff, %g6
-        sllx            %g6, 3, %g6
-        /* Load PTE.  */
-        ldxa            [%g5 + %g6] ASI_PHYS_USE_EC, %g5
-        brgez,pn        %g5, longpath
-         nop
-        /* TLB load and return from trap.  */
+kvmap_do_obp:
+        sethi           %hi(prom_trans), %g5
+        or              %g5, %lo(prom_trans), %g5
+        srlx            %g4, 13, %g4
+        sllx            %g4, 13, %g4
+1:      ldx             [%g5 + 0x00], %g6       ! base
+        brz,a,pn        %g6, longpath           ! no more entries, fail
+         mov            TLB_SFSR, %g1           ! and restore %g1
+        ldx             [%g5 + 0x08], %g1       ! len
+        add             %g6, %g1, %g1           ! end
+        cmp             %g6, %g4
+        bgu,pt          %xcc, 2f
+         cmp            %g4, %g1
+        bgeu,pt         %xcc, 2f
+         ldx            [%g5 + 0x10], %g1       ! PTE
+        /* TLB load, restore %g1, and return from trap.  */
+        sub             %g4, %g6, %g6
+        add             %g1, %g6, %g5
+        mov             TLB_SFSR, %g1
        stxa            %g5, [%g0] ASI_DTLB_DATA_IN
        retry
+2:      ba,pt           %xcc, 1b
+         add            %g5, (3 * 8), %g5       ! next entry
 /*
 * On a first level data miss, check whether this is to the OBP range (note
 * that such accesses can be made by prom, as well as by kernel using

diff --git a/arch/sparc64/kernel/ktlb.S b/arch/sparc64/kernel/ktlb.S index 7796b37f478c..d9244d3c9f73 100644 --- a/arch/sparc64/kernel/ktlb.S +++ b/arch/sparc64/kernel/ktlb.S
@@ -58,9 +58,6 @@ vpte_noent:
58	done	58	done
59		59
60	vpte_insn_obp:	60	vpte_insn_obp:
61	sethi %hi(prom_pmd_phys), %g5
62	ldx [%g5 + %lo(prom_pmd_phys)], %g5
63
64	/* Behave as if we are at TL0. */	61	/* Behave as if we are at TL0. */
65	wrpr %g0, 1, %tl	62	wrpr %g0, 1, %tl
66	rdpr %tpc, %g4 /* Find original faulting iaddr */	63	rdpr %tpc, %g4 /* Find original faulting iaddr */
@@ -71,58 +68,57 @@ vpte_insn_obp:
71	mov TLB_SFSR, %g1	68	mov TLB_SFSR, %g1
72	stxa %g4, [%g1 + %g1] ASI_IMMU	69	stxa %g4, [%g1 + %g1] ASI_IMMU
73		70
74	/* Get PMD offset. */	71	sethi %hi(prom_trans), %g5
75	srlx %g4, 23, %g6	72	or %g5, %lo(prom_trans), %g5
76	and %g6, 0x7ff, %g6	73
77	sllx %g6, 2, %g6	74	1: ldx [%g5 + 0x00], %g6 ! base
78		75	brz,a,pn %g6, longpath ! no more entries, fail
79	/* Load PMD, is it valid? */	76	mov TLB_SFSR, %g1 ! and restore %g1
80	lduwa [%g5 + %g6] ASI_PHYS_USE_EC, %g5	77	ldx [%g5 + 0x08], %g1 ! len
81	brz,pn %g5, longpath	78	add %g6, %g1, %g1 ! end
82	sllx %g5, 11, %g5	79	cmp %g6, %g4
83		80	bgu,pt %xcc, 2f
84	/* Get PTE offset. */	81	cmp %g4, %g1
85	srlx %g4, 13, %g6	82	bgeu,pt %xcc, 2f
86	and %g6, 0x3ff, %g6	83	ldx [%g5 + 0x10], %g1 ! PTE
87	sllx %g6, 3, %g6	84
88		85	/* TLB load, restore %g1, and return from trap. */
89	/* Load PTE. */	86	sub %g4, %g6, %g6
90	ldxa [%g5 + %g6] ASI_PHYS_USE_EC, %g5	87	add %g1, %g6, %g5
91	brgez,pn %g5, longpath	88	mov TLB_SFSR, %g1
92	nop
93
94	/* TLB load and return from trap. */
95	stxa %g5, [%g0] ASI_ITLB_DATA_IN	89	stxa %g5, [%g0] ASI_ITLB_DATA_IN
96	retry	90	retry
97		91
98	kvmap_do_obp:	92	2: ba,pt %xcc, 1b
99	sethi %hi(prom_pmd_phys), %g5	93	add %g5, (3 * 8), %g5 ! next entry
100	ldx [%g5 + %lo(prom_pmd_phys)], %g5
101
102	/* Get PMD offset. */
103	srlx %g4, 23, %g6
104	and %g6, 0x7ff, %g6
105	sllx %g6, 2, %g6
106
107	/* Load PMD, is it valid? */
108	lduwa [%g5 + %g6] ASI_PHYS_USE_EC, %g5
109	brz,pn %g5, longpath
110	sllx %g5, 11, %g5
111
112	/* Get PTE offset. */
113	srlx %g4, 13, %g6
114	and %g6, 0x3ff, %g6
115	sllx %g6, 3, %g6
116
117	/* Load PTE. */
118	ldxa [%g5 + %g6] ASI_PHYS_USE_EC, %g5
119	brgez,pn %g5, longpath
120	nop
121		94
122	/* TLB load and return from trap. */	95	kvmap_do_obp:
		96	sethi %hi(prom_trans), %g5
		97	or %g5, %lo(prom_trans), %g5
		98	srlx %g4, 13, %g4
		99	sllx %g4, 13, %g4
		100
		101	1: ldx [%g5 + 0x00], %g6 ! base
		102	brz,a,pn %g6, longpath ! no more entries, fail
		103	mov TLB_SFSR, %g1 ! and restore %g1
		104	ldx [%g5 + 0x08], %g1 ! len
		105	add %g6, %g1, %g1 ! end
		106	cmp %g6, %g4
		107	bgu,pt %xcc, 2f
		108	cmp %g4, %g1
		109	bgeu,pt %xcc, 2f
		110	ldx [%g5 + 0x10], %g1 ! PTE
		111
		112	/* TLB load, restore %g1, and return from trap. */
		113	sub %g4, %g6, %g6
		114	add %g1, %g6, %g5
		115	mov TLB_SFSR, %g1
123	stxa %g5, [%g0] ASI_DTLB_DATA_IN	116	stxa %g5, [%g0] ASI_DTLB_DATA_IN
124	retry	117	retry
125		118
		119	2: ba,pt %xcc, 1b
		120	add %g5, (3 * 8), %g5 ! next entry
		121
126	/*	122	/*
127	* On a first level data miss, check whether this is to the OBP range (note	123	* On a first level data miss, check whether this is to the OBP range (note
128	* that such accesses can be made by prom, as well as by kernel using	124	* that such accesses can be made by prom, as well as by kernel using