Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c08a0d authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Benjamin Herrenschmidt
Browse files

powerpc/mm: Use HPTE constants when updating hpte bits 



Even though we have same value for linux PTE bits and hash PTE pits
use the hash pte bits wen updating hash pte

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6f4441ef

arch/powerpc/platforms/cell/beat_htab.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group, 
		DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);



	if (rflags & _PAGE_NO_CACHE)

		hpte_r &= ~_PAGE_COHERENT;

		hpte_r &= ~HPTE_R_M;



	raw_spin_lock(&beat_htab_lock);

	lpar_rc = beat_read_mask(hpte_group);
@@ -337,7 +337,7 @@ static long beat_lpar_hpte_insert_v3(unsigned long hpte_group, 
		DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);



	if (rflags & _PAGE_NO_CACHE)

		hpte_r &= ~_PAGE_COHERENT;

		hpte_r &= ~HPTE_R_M;



	/* insert into not-volted entry */

	lpar_rc = beat_insert_htab_entry3(0, hpte_group, hpte_v, hpte_r,

arch/powerpc/platforms/pseries/lpar.c

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group, 


	/* Make pHyp happy */

	if ((rflags & _PAGE_NO_CACHE) && !(rflags & _PAGE_WRITETHRU))

		hpte_r &= ~_PAGE_COHERENT;

		hpte_r &= ~HPTE_R_M;



	if (firmware_has_feature(FW_FEATURE_XCMO) && !(hpte_r & HPTE_R_N))

		flags |= H_COALESCE_CAND;