UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor
authorJungseung Lee <js07.lee@samsung.com>
Mon, 28 Dec 2015 20:47:00 +0000 (04:47 +0800)
committerAmit Pundir <amit.pundir@linaro.org>
Wed, 14 Sep 2016 09:47:01 +0000 (15:17 +0530)
commit15023395079accf4c345412f2b972ad5825f76bf
tree6e78a15ec912c033ae926e7f20d0c586ff8e14e6
parent41e58098703b24e33f8372f82a65bb0f82ecf14a
UPSTREAM: ARM: 8494/1: mm: Enable PXN when running non-LPAE kernel on LPAE processor

The VMSA field of MMFR0 (bottom 4 bits) is incremented for each
added feature.  PXN is supported if the value is >= 4 and LPAE
is supported if it is >= 5.

In case a kernel with CONFIG_ARM_LPAE disabled is used on a
processor that supports LPAE, we can still use PXN in short
descriptors.  So check for >= 4 not == 4.

Signed-off-by: Jungseung Lee <js07.lee@samsung.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/mmu.c