From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcITs-0002x1-DQ for qemu-devel@nongnu.org; Tue, 14 May 2013 12:53:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UcITq-0007Gm-II for qemu-devel@nongnu.org; Tue, 14 May 2013 12:53:40 -0400 Message-ID: <1368550415.5520.117.camel@ul30vt.home> From: Alex Williamson Date: Tue, 14 May 2013 10:53:35 -0600 In-Reply-To: <1368522837-20747-10-git-send-email-david@gibson.dropbear.id.au> References: <1368522837-20747-1-git-send-email-david@gibson.dropbear.id.au> <1368522837-20747-10-git-send-email-david@gibson.dropbear.id.au> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/11] memory: Add iova to IOMMUTLBEntry List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: aik@ozlabs.ru, pbonzini@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, mst@redhat.com On Tue, 2013-05-14 at 19:13 +1000, David Gibson wrote: > Currently, the IOMMUTLBEntry structure contains the translated address, > but not the IOVA (original untranslated address). We're going to need it > for upcoming changes, so add it in here, and populate it correctly in our > one existing iommu implementation. > > Signed-off-by: David Gibson > --- > hw/ppc/spapr_iommu.c | 2 ++ > include/exec/memory.h | 2 +- > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index 90469b3..07a6307 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -80,6 +80,7 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) > > if (tcet->bypass) { > return (IOMMUTLBEntry) { > + .iova = 0, > .translated_addr = 0, > .addr_mask = ~(hwaddr)0, > .perm = { true, true }, > @@ -102,6 +103,7 @@ static IOMMUTLBEntry spapr_tce_translate_iommu(MemoryRegion *iommu, hwaddr addr) > #endif > > return (IOMMUTLBEntry) { > + .iova = addr & ~SPAPR_TCE_PAGE_MASK, > .translated_addr = tce & ~SPAPR_TCE_PAGE_MASK, > .addr_mask = SPAPR_TCE_PAGE_MASK, > .perm = { [0] = tce & SPAPR_TCE_RO, [1] = tce & SPAPR_TCE_WO }, > diff --git a/include/exec/memory.h b/include/exec/memory.h > index b97ace7..cd33439 100644 > --- a/include/exec/memory.h > +++ b/include/exec/memory.h > @@ -116,7 +116,7 @@ typedef struct IOMMUTLBEntry IOMMUTLBEntry; > typedef struct MemoryRegionIOMMUOps MemoryRegionIOMMUOps; > > struct IOMMUTLBEntry { > - hwaddr translated_addr; > + hwaddr iova, translated_addr; Being a struct definition, I assume we'd want to keep these on separate lines for clarity (and preferably comments). > hwaddr addr_mask; /* 0xfff = 4k translation */ > bool perm[2]; /* permissions, [0] for read, [1] for write */ > };