From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 677081A0545 for ; Thu, 27 Aug 2015 19:37:54 +1000 (AEST) In-Reply-To: <1440655276-6596-1-git-send-email-aik@ozlabs.ru> To: Alexey Kardashevskiy , linuxppc-dev@lists.ozlabs.org From: Michael Ellerman Cc: Alexey Kardashevskiy , Wei Yang , Gavin Shan Subject: Re: [kernel] powerpc/iommu: Set default DMA offset in dma_dev_setup Message-Id: <20150827093754.4BE371401F6@ozlabs.org> Date: Thu, 27 Aug 2015 19:37:54 +1000 (AEST) List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, 2015-27-08 at 06:01:16 UTC, Alexey Kardashevskiy wrote: > "powerpc/iommu: Cleanup setting of DMA base/offset" expects that This should be: Commit e91c25111aa3 "powerpc/iommu: Cleanup setting of DMA base/offset" ... > the default DMA offset is set from pnv_ioda_setup_bus_dma() which > is correct unless it is SRIOV where the code flow is different - at > the moment when pnv_ioda_setup_bus_dma() is called, there is no PE for > the just created VF. > > This adds missing set_dma_offset() to pnv_pci_ioda_dma_dev_setup() > to cover the case of SRIOV. > > Note that we still need set_dma_offset() in pnv_ioda_setup_bus_dma() > as at the boot time pnv_pci_ioda_dma_dev_setup() is called when no PE > was created yet, this happens at the PHB fixup stage. And here we should have: Fixes: e91c25111aa3 ("powerpc/iommu: Cleanup setting of DMA base/offset") > Signed-off-by: Alexey Kardashevskiy > Reviewed-by: Gavin Shan > --- > > Makes sense to squash it to "powerpc/iommu: Cleanup setting of DMA base/offset". We don't squash things that are already in next. I've fixed the change log up with my comments above and your reworded explanation. cheers