Advertisement
jintack

Temp commit L2 work with VHE-guest

Oct 30th, 2016
95
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.40 KB | None | 0 0
  1. diff --git a/arch/arm64/kvm/emulate.c b/arch/arm64/kvm/emulate.c
  2. index df04dd1..c9b7b99 100644
  3. --- a/arch/arm64/kvm/emulate.c
  4. +++ b/arch/arm64/kvm/emulate.c
  5. @@ -169,19 +169,19 @@ struct el1_el2_map {
  6. * registers in EL2 with E2H bit set.
  7. */
  8. static const struct el1_el2_map vhe_map[] = {
  9. - { SCTLR_EL1, SCTLR_EL2 },
  10. +// { SCTLR_EL1, SCTLR_EL2 },
  11. { CPACR_EL1, CPTR_EL2 },
  12. { TTBR0_EL1, TTBR0_EL2 },
  13. { TTBR1_EL1, TTBR1_EL2 },
  14. { TCR_EL1, TCR_EL2},
  15. - { AFSR0_EL1, AFSR0_EL2 },
  16. - { AFSR1_EL1, AFSR1_EL2 },
  17. +// { AFSR0_EL1, AFSR0_EL2 },
  18. +// { AFSR1_EL1, AFSR1_EL2 },
  19. { ESR_EL1, ESR_EL2},
  20. - { FAR_EL1, FAR_EL2},
  21. - { MAIR_EL1, MAIR_EL2 },
  22. - { AMAIR_EL1, AMAIR_EL2 },
  23. +// { FAR_EL1, FAR_EL2},
  24. +// { MAIR_EL1, MAIR_EL2 },
  25. +// { AMAIR_EL1, AMAIR_EL2 },
  26. { VBAR_EL1, VBAR_EL2 },
  27. - { CONTEXTIDR_EL1, CONTEXTIDR_EL2 },
  28. +// { CONTEXTIDR_EL1, CONTEXTIDR_EL2 },
  29. /*
  30. * Do not sync between CNTKCTL_EL1 and CNTHCTL_EL2.
  31. * Since CNTKCTL_EL1 does not have fields which CNTHCTL_EL2 has,
  32. @@ -198,8 +198,8 @@ static const struct el1_el2_map vhe_map[] = {
  33. { CNTV_CTL_EL0, CNTHV_CTL_EL2},
  34. { CNTV_CVAL_EL0, CNTHV_CVAL_EL2},
  35. */
  36. - { SPSR_EL1, SPSR_EL2 },
  37. - { ELR_EL1, ELR_EL2 },
  38. +// { SPSR_EL1, SPSR_EL2 },
  39. +// { ELR_EL1, ELR_EL2 },
  40. };
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement