[...] > > > el1_sync: > > > - mrs x1, esr_el2 > > > - lsr x1, x1, #26 > > > - cmp x1, #0x16 > > > - b.ne 2f // Not an HVC trap > > > - cbz x0, 1f > > > - msr vbar_el2, x0 // Set vbar_el2 > > > + mrs x18, esr_el2 > > > + lsr x17, x18, #26 // x17=EC > > > > The first patch enabled kvm_arm.h macros to be used from asm. Can't we > > use them here? If we don't include kvm_arm.h in the hyp stub, maybe we > > should (ideally we'd factor common stuff out, but I can see that getting > > messy fast). > > I didn't want to tackle the cleanup of the headers in this patch > series, and I thought it odd to include a kvm header in this core > arm64 file, but maybe it is better to include kvm_arm.h and use the > ESR_EL2_ macros so the values are at least easier to understand and > keep track of. I'd rather we used the mnemonics. If that involves pulling in the kvm header I'd rather we do that for the moment. [...] > > > diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S > > > index b72aa9f..9607f15 100644 > > > --- a/arch/arm64/kvm/hyp.S > > > +++ b/arch/arm64/kvm/hyp.S > > > @@ -26,6 +26,7 @@ > > > #include <asm/kvm_asm.h> > > > #include <asm/kvm_arm.h> > > > #include <asm/kvm_mmu.h> > > > +#include <asm/virt.h> > > > > As far as I can see, virt.h only defines BOOT_CPU_MODE_EL{1,2}, which we > > don't use below. So I don't think we need this include. > > We need asm/virt.h for the new HVC_ macros added to it by this > patch (above)... Sorry, my comment was bogus. I'd evidently confused myself when reading this. Mark.