|
@@ -294,17 +294,17 @@ static bool lock_all_vcpus(struct kvm *kvm)
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
-/** vgic_attr_regs_access: allows user space to read/write VGIC registers
|
|
|
- *
|
|
|
- * @dev: kvm device handle
|
|
|
- * @attr: kvm device attribute
|
|
|
- * @reg: address the value is read or written
|
|
|
- * @is_write: write flag
|
|
|
+/**
|
|
|
+ * vgic_attr_regs_access_v2 - allows user space to access VGIC v2 state
|
|
|
*
|
|
|
+ * @dev: kvm device handle
|
|
|
+ * @attr: kvm device attribute
|
|
|
+ * @reg: address the value is read or written
|
|
|
+ * @is_write: true if userspace is writing a register
|
|
|
*/
|
|
|
-static int vgic_attr_regs_access(struct kvm_device *dev,
|
|
|
- struct kvm_device_attr *attr,
|
|
|
- u32 *reg, bool is_write)
|
|
|
+static int vgic_attr_regs_access_v2(struct kvm_device *dev,
|
|
|
+ struct kvm_device_attr *attr,
|
|
|
+ u32 *reg, bool is_write)
|
|
|
{
|
|
|
struct vgic_reg_attr reg_attr;
|
|
|
gpa_t addr;
|
|
@@ -347,8 +347,6 @@ out:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-/* V2 ops */
|
|
|
-
|
|
|
static int vgic_v2_set_attr(struct kvm_device *dev,
|
|
|
struct kvm_device_attr *attr)
|
|
|
{
|
|
@@ -367,7 +365,7 @@ static int vgic_v2_set_attr(struct kvm_device *dev,
|
|
|
if (get_user(reg, uaddr))
|
|
|
return -EFAULT;
|
|
|
|
|
|
- return vgic_attr_regs_access(dev, attr, ®, true);
|
|
|
+ return vgic_attr_regs_access_v2(dev, attr, ®, true);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -389,7 +387,7 @@ static int vgic_v2_get_attr(struct kvm_device *dev,
|
|
|
u32 __user *uaddr = (u32 __user *)(long)attr->addr;
|
|
|
u32 reg = 0;
|
|
|
|
|
|
- ret = vgic_attr_regs_access(dev, attr, ®, false);
|
|
|
+ ret = vgic_attr_regs_access_v2(dev, attr, ®, false);
|
|
|
if (ret)
|
|
|
return ret;
|
|
|
return put_user(reg, uaddr);
|
|
@@ -433,8 +431,6 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = {
|
|
|
.has_attr = vgic_v2_has_attr,
|
|
|
};
|
|
|
|
|
|
-/* V3 ops */
|
|
|
-
|
|
|
#ifdef CONFIG_KVM_ARM_VGIC_V3
|
|
|
|
|
|
static int vgic_v3_set_attr(struct kvm_device *dev,
|