Message ID | 20150616162647.31380.65074.stgit@bahia.huguette.org |
---|---|
State | New |
Headers | show |
On Tue, 16 Jun 2015 18:26:47 +0200 Greg Kurz <gkurz@linux.vnet.ibm.com> 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. > > This patch doesn't fix any bug, it is only code cleanup. > > Suggested-by: Alexey Kardashevskiy <aik@ozlabs.ru> > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > --- > hw/ppc/spapr_iommu.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > Of course, I did forget the changelog... v2: - suggested by aik - keep sPAPRTCEAccess, a translation helper is introduced in the next patch > diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c > index 8cd9dba9ac4d..ddd0ea5cd4dd 100644 > --- a/hw/ppc/spapr_iommu.c > +++ b/hw/ppc/spapr_iommu.c > @@ -267,9 +267,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) { > >
diff --git a/hw/ppc/spapr_iommu.c b/hw/ppc/spapr_iommu.c index 8cd9dba9ac4d..ddd0ea5cd4dd 100644 --- a/hw/ppc/spapr_iommu.c +++ b/hw/ppc/spapr_iommu.c @@ -267,9 +267,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) {
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. This patch doesn't fix any bug, it is only code cleanup. Suggested-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/ppc/spapr_iommu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)