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

Commit ad92c615 authored by Denis Kirjanov's avatar Denis Kirjanov Committed by Benjamin Herrenschmidt
Browse files

powerpc/pseries: Fix a typo in pSeries_lpar_hpte_insert() 



Commit 801eb73f introduced
a bug while checking PTE flags. We have to drop the _PAGE_COHERENT flag
when __PAGE_NO_CACHE is set and the cache update policy is not write-through
(i.e. _PAGE_WRITETHRU is not set)

Signed-off-by: default avatarDenis Kirjanov <kda@linux-powerpc.org>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
CC:  Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent ab55d218

arch/powerpc/platforms/pseries/lpar.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group, 
	flags = 0;



	/* Make pHyp happy */

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

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

		hpte_r &= ~_PAGE_COHERENT;

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

		flags |= H_COALESCE_CAND;