From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andre Przywara Subject: Re: [PATCH v3 09/19] KVM: arm64: ITS: Interpret MAPD ITT_addr field Date: Fri, 17 Mar 2017 15:19:49 +0000 Message-ID: <4ba972ac-1287-b898-74e7-de74106c49fd@arm.com> References: <1488800074-21991-1-git-send-email-eric.auger@redhat.com> <1488800074-21991-10-git-send-email-eric.auger@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: Prasun.Kapoor@cavium.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com To: Eric Auger , eric.auger.pro@gmail.com, marc.zyngier@arm.com, christoffer.dall@linaro.org, vijayak@caviumnetworks.com, Vijaya.Kumar@cavium.com, peter.maydell@linaro.org, linux-arm-kernel@lists.infradead.org, drjones@redhat.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org Return-path: In-Reply-To: <1488800074-21991-10-git-send-email-eric.auger@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu List-Id: kvm.vger.kernel.org On 06/03/17 11:34, Eric Auger wrote: > 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: Eric Auger > --- > virt/kvm/arm/vgic/vgic-its.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index 56bcd92..694023f 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -99,6 +99,7 @@ struct its_device { > > /* the head for the list of ITTEs */ > struct list_head itt_head; > + gpa_t itt_addr; > u32 nb_eventid_bits; > u32 device_id; > }; > @@ -562,6 +563,7 @@ 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) --> here? > #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) Can you please move this up ^ And adjust the spacing to align the commas? (heavily influenced by suppressed OCD today ;-) > #define its_cmd_get_size(cmd) its_cmd_mask_field(cmd, 1, 0, 5) > > /* > @@ -832,6 +834,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); > size_t size = its_cmd_get_size(its_cmd); > + gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); And do the "<< 8" already here? Cheers, Andre. > struct its_device *device; > > if (!vgic_its_check_id(its, its->baser_device_table, device_id)) > @@ -862,6 +865,7 @@ 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; > > INIT_LIST_HEAD(&device->itt_head); > From mboxrd@z Thu Jan 1 00:00:00 1970 From: andre.przywara@arm.com (Andre Przywara) Date: Fri, 17 Mar 2017 15:19:49 +0000 Subject: [PATCH v3 09/19] KVM: arm64: ITS: Interpret MAPD ITT_addr field In-Reply-To: <1488800074-21991-10-git-send-email-eric.auger@redhat.com> References: <1488800074-21991-1-git-send-email-eric.auger@redhat.com> <1488800074-21991-10-git-send-email-eric.auger@redhat.com> Message-ID: <4ba972ac-1287-b898-74e7-de74106c49fd@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 06/03/17 11:34, Eric Auger wrote: > 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: Eric Auger > --- > virt/kvm/arm/vgic/vgic-its.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index 56bcd92..694023f 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -99,6 +99,7 @@ struct its_device { > > /* the head for the list of ITTEs */ > struct list_head itt_head; > + gpa_t itt_addr; > u32 nb_eventid_bits; > u32 device_id; > }; > @@ -562,6 +563,7 @@ 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) --> here? > #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) Can you please move this up ^ And adjust the spacing to align the commas? (heavily influenced by suppressed OCD today ;-) > #define its_cmd_get_size(cmd) its_cmd_mask_field(cmd, 1, 0, 5) > > /* > @@ -832,6 +834,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); > size_t size = its_cmd_get_size(its_cmd); > + gpa_t itt_addr = its_cmd_get_ittaddr(its_cmd); And do the "<< 8" already here? Cheers, Andre. > struct its_device *device; > > if (!vgic_its_check_id(its, its->baser_device_table, device_id)) > @@ -862,6 +865,7 @@ 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; > > INIT_LIST_HEAD(&device->itt_head); >