Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7333cefe authored by Eric Auger's avatar Eric Auger Committed by Christoffer Dall
Browse files

KVM: arm64: vgic-its: Interpret MAPD ITT_addr field 



Up to now the MAPD ITT_addr had been ignored. We will need it
for save/restore. Let's record it in the its_device struct.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 0d44cdb6

virt/kvm/arm/vgic/vgic-its.c

+4 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct its_device { 
	/* the head for the list of ITTEs */

	struct list_head itt_head;

	u32 num_eventid_bits;

	gpa_t itt_addr;

	u32 device_id;

};
@@ -602,6 +603,7 @@ static u64 its_cmd_mask_field(u64 *its_cmd, int word, int shift, int size) 
#define its_cmd_get_id(cmd)		its_cmd_mask_field(cmd, 1,  0, 32)

#define its_cmd_get_physical_id(cmd)	its_cmd_mask_field(cmd, 1, 32, 32)

#define its_cmd_get_collection(cmd)	its_cmd_mask_field(cmd, 2,  0, 16)

#define its_cmd_get_ittaddr(cmd)	(its_cmd_mask_field(cmd, 2,  8, 44) << 8)

#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)
@@ -873,6 +875,7 @@ 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);

	u8 num_eventid_bits = 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))
@@ -904,6 +907,7 @@ static int vgic_its_cmd_handle_mapd(struct kvm *kvm, struct vgic_its *its, 


	device->device_id = device_id;

	device->num_eventid_bits = num_eventid_bits;

	device->itt_addr = itt_addr;



	INIT_LIST_HEAD(&device->itt_head);