diff v7→v6 (patch 4) | series

Inter-revision diff: patch 4

Comparing v7 (message) to v6 (message)
--- v7
+++ v6
@@ -179,7 +179,7 @@
  #define pte_iterate_hashed_end() } while(0); } } while(0)
  
 diff --git a/arch/powerpc/kvm/book3s_32_mmu_host.c b/arch/powerpc/kvm/book3s_32_mmu_host.c
-index 837f13e..45db3b9 100644
+index f922c29..bf5dfb3 100644
 --- a/arch/powerpc/kvm/book3s_32_mmu_host.c
 +++ b/arch/powerpc/kvm/book3s_32_mmu_host.c
 @@ -173,7 +173,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
@@ -192,7 +192,7 @@
  next_pteg:
  	if (rr == 16) {
 diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c
-index 0688b6b..d97c65c 100644
+index 10fc8ec..9d184f1 100644
 --- a/arch/powerpc/kvm/book3s_64_mmu_host.c
 +++ b/arch/powerpc/kvm/book3s_64_mmu_host.c
 @@ -117,7 +117,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
@@ -205,10 +205,10 @@
  	if (!orig_pte->may_write)
  		rflags |= HPTE_R_PP;
 diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
-index 602aeb0..5658508 100644
+index a242b5d..534cc26 100644
 --- a/arch/powerpc/mm/hash_low_64.S
 +++ b/arch/powerpc/mm/hash_low_64.S
-@@ -63,7 +63,7 @@ _GLOBAL(__hash_page_4K)
+@@ -71,7 +71,7 @@ _GLOBAL(__hash_page_4K)
  	/* Save non-volatile registers.
  	 * r31 will hold "old PTE"
  	 * r30 is "new PTE"
@@ -217,7 +217,7 @@
  	 * r28 is a hash value
  	 * r27 is hashtab mask (maybe dynamic patched instead ?)
  	 */
-@@ -111,10 +111,10 @@ BEGIN_FTR_SECTION
+@@ -119,10 +119,10 @@ BEGIN_FTR_SECTION
  	cmpdi	r9,0			/* check segment size */
  	bne	3f
  END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
@@ -232,7 +232,7 @@
  
  	/* Calculate hash value for primary slot and store it in r28 */
  	rldicl	r5,r5,0,25		/* vsid & 0x0000007fffffffff */
-@@ -122,14 +122,19 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
+@@ -130,14 +130,19 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
  	xor	r28,r5,r0
  	b	4f
  
@@ -256,34 +256,34 @@
  	xor	r28,r28,r0		/* hash */
  
  	/* Convert linux PTE bits into HW equivalents */
-@@ -185,7 +190,7 @@ htab_insert_pte:
+@@ -193,7 +198,7 @@ htab_insert_pte:
  
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,0			/* !bolted, !secondary */
  	li	r8,MMU_PAGE_4K		/* page size */
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -208,7 +213,7 @@ _GLOBAL(htab_call_hpte_insert1)
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -216,7 +221,7 @@ _GLOBAL(htab_call_hpte_insert1)
  	
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,HPTE_V_SECONDARY	/* !bolted, secondary */
  	li	r8,MMU_PAGE_4K		/* page size */
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -278,7 +283,7 @@ htab_modify_pte:
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -286,7 +291,7 @@ htab_modify_pte:
  	add	r3,r0,r3	/* add slot idx */
  
  	/* Call ppc_md.hpte_updatepp */
 -	mr	r5,r29			/* va */
 +	mr	r5,r29			/* vpn */
  	li	r6,MMU_PAGE_4K		/* page size */
- 	ld	r7,STK_PARAM(R9)(r1)	/* segment size */
- 	ld	r8,STK_PARAM(R8)(r1)	/* get "local" param */
-@@ -339,7 +344,7 @@ _GLOBAL(__hash_page_4K)
+ 	ld	r7,STK_PARM(r9)(r1)	/* segment size */
+ 	ld	r8,STK_PARM(r8)(r1)	/* get "local" param */
+@@ -347,7 +352,7 @@ _GLOBAL(__hash_page_4K)
  	/* Save non-volatile registers.
  	 * r31 will hold "old PTE"
  	 * r30 is "new PTE"
@@ -292,7 +292,7 @@
  	 * r28 is a hash value
  	 * r27 is hashtab mask (maybe dynamic patched instead ?)
  	 * r26 is the hidx mask
-@@ -394,10 +399,14 @@ BEGIN_FTR_SECTION
+@@ -402,10 +407,14 @@ BEGIN_FTR_SECTION
  	cmpdi	r9,0			/* check segment size */
  	bne	3f
  END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
@@ -311,7 +311,7 @@
  
  	/* Calculate hash value for primary slot and store it in r28 */
  	rldicl	r5,r5,0,25		/* vsid & 0x0000007fffffffff */
-@@ -405,14 +414,23 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
+@@ -413,14 +422,23 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
  	xor	r28,r5,r0
  	b	4f
  
@@ -339,25 +339,25 @@
  	xor	r28,r28,r0		/* hash */
  
  	/* Convert linux PTE bits into HW equivalents */
-@@ -488,7 +506,7 @@ htab_special_pfn:
+@@ -496,7 +514,7 @@ htab_special_pfn:
  
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,0			/* !bolted, !secondary */
  	li	r8,MMU_PAGE_4K		/* page size */
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -515,7 +533,7 @@ _GLOBAL(htab_call_hpte_insert1)
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -523,7 +541,7 @@ _GLOBAL(htab_call_hpte_insert1)
  
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,HPTE_V_SECONDARY	/* !bolted, secondary */
  	li	r8,MMU_PAGE_4K		/* page size */
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -547,7 +565,7 @@ _GLOBAL(htab_call_hpte_remove)
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -555,7 +573,7 @@ _GLOBAL(htab_call_hpte_remove)
  	 * useless now that the segment has been switched to 4k pages.
  	 */
  htab_inval_old_hpte:
@@ -366,16 +366,16 @@
  	mr	r4,r31			/* PTE.pte */
  	li	r5,0			/* PTE.hidx */
  	li	r6,MMU_PAGE_64K		/* psize */
-@@ -620,7 +638,7 @@ htab_modify_pte:
+@@ -628,7 +646,7 @@ htab_modify_pte:
  	add	r3,r0,r3	/* add slot idx */
  
  	/* Call ppc_md.hpte_updatepp */
 -	mr	r5,r29			/* va */
 +	mr	r5,r29			/* vpn */
  	li	r6,MMU_PAGE_4K		/* page size */
- 	ld	r7,STK_PARAM(R9)(r1)	/* segment size */
- 	ld	r8,STK_PARAM(R8)(r1)	/* get "local" param */
-@@ -676,7 +694,7 @@ _GLOBAL(__hash_page_64K)
+ 	ld	r7,STK_PARM(r9)(r1)	/* segment size */
+ 	ld	r8,STK_PARM(r8)(r1)	/* get "local" param */
+@@ -684,7 +702,7 @@ _GLOBAL(__hash_page_64K)
  	/* Save non-volatile registers.
  	 * r31 will hold "old PTE"
  	 * r30 is "new PTE"
@@ -384,7 +384,7 @@
  	 * r28 is a hash value
  	 * r27 is hashtab mask (maybe dynamic patched instead ?)
  	 */
-@@ -729,10 +747,10 @@ BEGIN_FTR_SECTION
+@@ -737,10 +755,10 @@ BEGIN_FTR_SECTION
  	cmpdi	r9,0			/* check segment size */
  	bne	3f
  END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
@@ -399,7 +399,7 @@
  
  	/* Calculate hash value for primary slot and store it in r28 */
  	rldicl	r5,r5,0,25		/* vsid & 0x0000007fffffffff */
-@@ -740,14 +758,19 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
+@@ -748,14 +766,19 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
  	xor	r28,r5,r0
  	b	4f
  
@@ -423,33 +423,33 @@
  	xor	r28,r28,r0		/* hash */
  
  	/* Convert linux PTE bits into HW equivalents */
-@@ -806,7 +829,7 @@ ht64_insert_pte:
+@@ -814,7 +837,7 @@ ht64_insert_pte:
  
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,0			/* !bolted, !secondary */
  	li	r8,MMU_PAGE_64K
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -829,7 +852,7 @@ _GLOBAL(ht64_call_hpte_insert1)
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -837,7 +860,7 @@ _GLOBAL(ht64_call_hpte_insert1)
  
  	/* Call ppc_md.hpte_insert */
- 	ld	r6,STK_PARAM(R4)(r1)	/* Retrieve new pp bits */
+ 	ld	r6,STK_PARM(r4)(r1)	/* Retrieve new pp bits */
 -	mr	r4,r29			/* Retrieve va */
 +	mr	r4,r29			/* Retrieve vpn */
  	li	r7,HPTE_V_SECONDARY	/* !bolted, secondary */
  	li	r8,MMU_PAGE_64K
- 	ld	r9,STK_PARAM(R9)(r1)	/* segment size */
-@@ -899,7 +922,7 @@ ht64_modify_pte:
+ 	ld	r9,STK_PARM(r9)(r1)	/* segment size */
+@@ -907,7 +930,7 @@ ht64_modify_pte:
  	add	r3,r0,r3	/* add slot idx */
  
  	/* Call ppc_md.hpte_updatepp */
 -	mr	r5,r29			/* va */
 +	mr	r5,r29			/* vpn */
  	li	r6,MMU_PAGE_64K
- 	ld	r7,STK_PARAM(R9)(r1)	/* segment size */
- 	ld	r8,STK_PARAM(R8)(r1)	/* get "local" param */
+ 	ld	r7,STK_PARM(r9)(r1)	/* segment size */
+ 	ld	r8,STK_PARM(r8)(r1)	/* get "local" param */
 diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
 index 660b8bb..a5c08c3 100644
 --- a/arch/powerpc/mm/hash_native_64.c
`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help