From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4sHk-0002Wk-5G for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:56:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4sHh-0005yy-DV for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:56:20 -0400 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:57372) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4sHh-0005yj-55 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 10:56:17 -0400 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 16 Jun 2015 15:56:14 +0100 Date: Tue, 16 Jun 2015 16:56:05 +0200 From: Greg Kurz Message-ID: <20150616165605.296e139c@bahia.local> In-Reply-To: <20150616100933.17550.8245.stgit@bahia.huguette.org> References: <20150616100933.17550.8245.stgit@bahia.huguette.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] spapr_iommu: drop erroneous check in h_put_tce_indirect() and useless enum List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, qemu-devel@nongnu.org On Tue, 16 Jun 2015 12:09:33 +0200 Greg Kurz wrote: > The tce_list variable is not a TCE but the address to a TCE: we shouldn't > clear permission bits as we do now. And this is dead code anyway since we > check tce_list is 4K aligned a few lines above. > > While we're here, since we drop its last user, let's kill the sPAPRTCEAccess > enum as well. > According to Alexey's feedback (see link below), we should convert SPAPR_TCE_xxx to IOMMU_xxx instead of dropping sPAPRTCEAccess. https://lists.gnu.org/archive/html/qemu-devel/2015-06/msg04249.html Please ignore this patch, I'll send another one. -- Greg > This patch doesn't fix any bug, it is only code cleanup. > > Signed-off-by: Greg Kurz > --- > hw/ppc/spapr_iommu.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index 8cd9dba9ac4d..2ae8684ca5bc 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -29,13 +29,6 @@ > > #include > > -enum sPAPRTCEAccess { > - SPAPR_TCE_FAULT = 0, > - SPAPR_TCE_RO = 1, > - SPAPR_TCE_WO = 2, > - SPAPR_TCE_RW = 3, > -}; > - > #define IOMMU_PAGE_SIZE(shift) (1ULL << (shift)) > #define IOMMU_PAGE_MASK(shift) (~(IOMMU_PAGE_SIZE(shift) - 1)) > > @@ -267,9 +260,7 @@ static target_ulong h_put_tce_indirect(PowerPCCPU *cpu, > ioba &= page_mask; > > for (i = 0; i < npages; ++i, ioba += page_size) { > - target_ulong off = (tce_list & ~SPAPR_TCE_RW) + > - i * sizeof(target_ulong); > - tce = ldq_be_phys(cs->as, off); > + tce = ldq_be_phys(cs->as, tce_list + i * sizeof(target_ulong)); > > ret = put_tce_emu(tcet, ioba, tce); > if (ret) { > >