Up to now the ITT_addr and size fields of the MAPD command were ignored. We will need them to handle save/restore. Let's record the reconstructed number of eventid bits, the ITT base gpa and the size in bytes in the its device struct.
Signed-off-by: Eric Auger <[email protected]> --- virt/kvm/arm/vgic/vgic-its.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index 358ae38..32429fd 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -103,6 +103,9 @@ struct its_device { /* the head for the list of ITTEs */ struct list_head itt_head; + gpa_t itt_addr; + size_t itt_size; + u32 nb_eventid_bits; u32 device_id; }; @@ -562,6 +565,8 @@ static u64 its_cmd_mask_field(u64 *its_cmd, int word, int shift, int size) #define its_cmd_get_collection(cmd) its_cmd_mask_field(cmd, 2, 0, 16) #define its_cmd_get_target_addr(cmd) its_cmd_mask_field(cmd, 2, 16, 32) #define its_cmd_get_validbit(cmd) its_cmd_mask_field(cmd, 2, 63, 1) +#define its_cmd_get_ittaddr(cmd) its_cmd_mask_field(cmd, 2, 8, 44) +#define its_cmd_get_size(cmd) its_cmd_mask_field(cmd, 1, 0, 5) /* * The DISCARD command frees an Interrupt Translation Table Entry (ITTE). @@ -827,6 +832,8 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, { u32 device_id = its_cmd_get_deviceid(its_cmd); bool valid = its_cmd_get_validbit(its_cmd); + size_t size = its_cmd_get_size(its_cmd); + gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); struct its_device *device; if (!vgic_its_check_id(its, its->baser_device_table, device_id)) @@ -854,6 +861,9 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, return -ENOMEM; device->device_id = device_id; + device->itt_addr = itt_addr << 8; + device->nb_eventid_bits = size + 1; + device->itt_size = ((2 << (size + 1)) - 1) * 16; INIT_LIST_HEAD(&device->itt_head); list_add_tail(&device->dev_list, &its->device_list); -- 2.5.5 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
