On Tue, Sep 15, 2015 at 04:41:19PM +0100, Suzuki K. Poulose wrote:
> From: "Suzuki K. Poulose" <suzuki.poul...@arm.com>
> 
> {V}TCR_EL2_TG0 is a 2bit wide field, where:
> 
>  00 - 4K
>  01 - 64K
>  10 - 16K
> 
> But we use only 1 bit, which has worked well so far since
> we never cared about 16K. Fix it for 16K support.
> 
> Cc: Catalin Marinas <catalin.mari...@arm.com>
> Cc: Will Deacon <will.dea...@arm.com>
> Cc: Marc Zyngier <marc.zyng...@arm.com>
> Cc: Christoffer Dall <christoffer.d...@linaro.org>
> Cc: kvm...@lists.cs.columbia.edu
> Acked-by: Mark Rutland <mark.rutl...@arm.com>
> Signed-off-by: Suzuki K. Poulose <suzuki.poul...@arm.com>
> ---
>  arch/arm64/include/asm/kvm_arm.h |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/kvm_arm.h 
> b/arch/arm64/include/asm/kvm_arm.h
> index 7605e09..bdf139e 100644
> --- a/arch/arm64/include/asm/kvm_arm.h
> +++ b/arch/arm64/include/asm/kvm_arm.h
> @@ -98,7 +98,7 @@
>  #define TCR_EL2_TBI  (1 << 20)
>  #define TCR_EL2_PS   (7 << 16)
>  #define TCR_EL2_PS_40B       (2 << 16)
> -#define TCR_EL2_TG0  (1 << 14)
> +#define TCR_EL2_TG0  (3 << 14)
>  #define TCR_EL2_SH0  (3 << 12)
>  #define TCR_EL2_ORGN0        (3 << 10)
>  #define TCR_EL2_IRGN0        (3 << 8)
> @@ -110,7 +110,7 @@
>  
>  /* VTCR_EL2 Registers bits */
>  #define VTCR_EL2_PS_MASK     (7 << 16)
> -#define VTCR_EL2_TG0_MASK    (1 << 14)
> +#define VTCR_EL2_TG0_MASK    (3 << 14)
>  #define VTCR_EL2_TG0_4K              (0 << 14)
>  #define VTCR_EL2_TG0_64K     (1 << 14)
>  #define VTCR_EL2_SH0_MASK    (3 << 12)
> -- 
> 1.7.9.5
> 

Reviewed-by: Christoffer Dall <christoffer.d...@linaro.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to