diff options
Diffstat (limited to 'arch/arm/kvm/mmio.c')
| -rw-r--r-- | arch/arm/kvm/mmio.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/arch/arm/kvm/mmio.c b/arch/arm/kvm/mmio.c index 6495c1ca7bfa..0b8f49985b70 100644 --- a/arch/arm/kvm/mmio.c +++ b/arch/arm/kvm/mmio.c | |||
| @@ -77,20 +77,9 @@ static int decode_hsr(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, | |||
| 77 | return 1; | 77 | return 1; |
| 78 | } | 78 | } |
| 79 | 79 | ||
| 80 | switch ((kvm_vcpu_get_hsr(vcpu) >> 22) & 0x3) { | 80 | len = kvm_vcpu_dabt_get_as(vcpu); |
| 81 | case 0: | 81 | if (unlikely(len < 0)) |
| 82 | len = 1; | 82 | return len; |
| 83 | break; | ||
| 84 | case 1: | ||
| 85 | len = 2; | ||
| 86 | break; | ||
| 87 | case 2: | ||
| 88 | len = 4; | ||
| 89 | break; | ||
| 90 | default: | ||
| 91 | kvm_err("Hardware is weird: SAS 0b11 is reserved\n"); | ||
| 92 | return -EFAULT; | ||
| 93 | } | ||
| 94 | 83 | ||
| 95 | is_write = kvm_vcpu_dabt_iswrite(vcpu); | 84 | is_write = kvm_vcpu_dabt_iswrite(vcpu); |
| 96 | sign_extend = kvm_vcpu_dabt_issext(vcpu); | 85 | sign_extend = kvm_vcpu_dabt_issext(vcpu); |