From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [PATCH] KVM: arm/arm64: vITS: Drop its_ite->lpi field Date: Mon, 4 Sep 2017 10:55:51 +0200 Message-ID: <20170904085551.GJ13572@cbox> References: <20170901165156.30775-1-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Christoffer Dall , Eric Auger , Andre Przywara , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org To: Marc Zyngier Return-path: Received: from mail-wm0-f41.google.com ([74.125.82.41]:34827 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753318AbdIDIz4 (ORCPT ); Mon, 4 Sep 2017 04:55:56 -0400 Received: by mail-wm0-f41.google.com with SMTP id v2so767639wmf.0 for ; Mon, 04 Sep 2017 01:55:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20170901165156.30775-1-marc.zyngier@arm.com> Sender: kvm-owner@vger.kernel.org List-ID: On Fri, Sep 01, 2017 at 05:51:56PM +0100, Marc Zyngier wrote: > For unknown reasons, the its_ite data structure carries an "lpi" field > which contains the intid of the LPI. This is an obvious duplication > of the vgic_irq->intid field, so let's fix the only user and remove > the now useless field. > > Signed-off-by: Marc Zyngier Applied, thanks. -Christoffer > --- > virt/kvm/arm/vgic/vgic-its.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c > index dd85817a9b29..01aa4d9d405e 100644 > --- a/virt/kvm/arm/vgic/vgic-its.c > +++ b/virt/kvm/arm/vgic/vgic-its.c > @@ -142,7 +142,6 @@ struct its_ite { > > struct vgic_irq *irq; > struct its_collection *collection; > - u32 lpi; > u32 event_id; > }; > > @@ -851,7 +850,7 @@ static void vgic_its_free_collection(struct vgic_its *its, u32 coll_id) > /* Must be called with its_lock mutex held */ > static struct its_ite *vgic_its_alloc_ite(struct its_device *device, > struct its_collection *collection, > - u32 lpi_id, u32 event_id) > + u32 event_id) > { > struct its_ite *ite; > > @@ -861,7 +860,6 @@ static struct its_ite *vgic_its_alloc_ite(struct its_device *device, > > ite->event_id = event_id; > ite->collection = collection; > - ite->lpi = lpi_id; > > list_add_tail(&ite->ite_list, &device->itt_head); > return ite; > @@ -911,7 +909,7 @@ static int vgic_its_cmd_handle_mapi(struct kvm *kvm, struct vgic_its *its, > new_coll = collection; > } > > - ite = vgic_its_alloc_ite(device, collection, lpi_nr, event_id); > + ite = vgic_its_alloc_ite(device, collection, event_id); > if (IS_ERR(ite)) { > if (new_coll) > vgic_its_free_collection(its, coll_id); > @@ -1902,7 +1900,7 @@ static int vgic_its_save_ite(struct vgic_its *its, struct its_device *dev, > > next_offset = compute_next_eventid_offset(&dev->itt_head, ite); > val = ((u64)next_offset << KVM_ITS_ITE_NEXT_SHIFT) | > - ((u64)ite->lpi << KVM_ITS_ITE_PINTID_SHIFT) | > + ((u64)ite->irq->intid << KVM_ITS_ITE_PINTID_SHIFT) | > ite->collection->collection_id; > val = cpu_to_le64(val); > return kvm_write_guest(kvm, gpa, &val, ite_esz); > @@ -1949,7 +1947,7 @@ static int vgic_its_restore_ite(struct vgic_its *its, u32 event_id, > if (!collection) > return -EINVAL; > > - ite = vgic_its_alloc_ite(dev, collection, lpi_id, event_id); > + ite = vgic_its_alloc_ite(dev, collection, event_id); > if (IS_ERR(ite)) > return PTR_ERR(ite); > > -- > 2.11.0 >