On 12/7/18 12:39 PM, Kristina Martsenko wrote: > From: Mark Rutland <[email protected]> > > In KVM we define the configuration of HCR_EL2 for a VHE HOST in > HCR_HOST_VHE_FLAGS, but we don't have a similar definition for the > non-VHE host flags, and open-code HCR_RW. Further, in head.S we > open-code the flags for VHE and non-VHE configurations. > > In future, we're going to want to configure more flags for the host, so > lets add a HCR_HOST_NVHE_FLAGS defintion, and consistently use both > HCR_HOST_VHE_FLAGS and HCR_HOST_NVHE_FLAGS in the kvm code and head.S. > > We now use mov_q to generate the HCR_EL2 value, as we use when > configuring other registers in head.S. > > Signed-off-by: Mark Rutland <[email protected]> > Signed-off-by: Kristina Martsenko <[email protected]> > Reviewed-by: Christoffer Dall <[email protected]> > Cc: Catalin Marinas <[email protected]> > Cc: Marc Zyngier <[email protected]> > Cc: Will Deacon <[email protected]> > Cc: [email protected] > --- > arch/arm64/include/asm/kvm_arm.h | 1 + > arch/arm64/kernel/head.S | 5 ++--- > arch/arm64/kvm/hyp/switch.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by: Richard Henderson <[email protected]> r~
