Folks, On Fri, Jun 10, 2022 at 11:08:02AM +0300, Serge Semin wrote: > A basic device-specific linear memory mapping was introduced back in > commit ("dma: Take into account dma_pfn_offset") as a single-valued offset > preserved in the device.dma_pfn_offset field, which was initialized for > instance by means of the "dma-ranges" DT property. Afterwards the > functionality was extended to support more than one device-specific region > defined in the device.dma_range_map list of maps. But all of these > improvements concerned a single pointer, page or sg DMA-mapping methods, > while the system resource mapping function turned to miss the > corresponding modification. Thus the dma_direct_map_resource() method now > just casts the CPU physical address to the device DMA address with no > dma-ranges-based mapping taking into account, which is obviously wrong. > Let's fix it by using the phys_to_dma_direct() method to get the > device-specific bus address from the passed memory resource for the case > of the directly mapped DMA.
So any comment on the suggest modification? Any notes against or for? -Sergey > > Fixes: 25f1e1887088 ("dma: Take into account dma_pfn_offset") > Signed-off-by: Serge Semin <sergey.se...@baikalelectronics.ru> > > --- > > After a long discussion with Christoph and Robin regarding this patch > here: > https://lore.kernel.org/lkml/20220324014836.19149-4-sergey.se...@baikalelectronics.ru > and here > https://lore.kernel.org/linux-pci/20220503225104.12108-2-sergey.se...@baikalelectronics.ru/ > It was decided to consult with wider maintainers audience whether it's ok > to accept the change as is or a more sophisticated solution needs to be > found for the non-linear direct MMIO mapping. > > Cc: Christoph Hellwig <h...@lst.de> > Cc: Robin Murphy <robin.mur...@arm.com> > Cc: Manivannan Sadhasivam <manivannan.sadhasi...@linaro.org> > > file: arch/arm/mach-orion5x/board-dt.c > Cc: Andrew Lunn <and...@lunn.ch> > Cc: Sebastian Hesselbarth <sebastian.hesselba...@gmail.com> > Cc: Gregory Clement <gregory.clem...@bootlin.com> > Cc: linux-arm-ker...@lists.infradead.org > > file: drivers/crypto/marvell/cesa/cesa.c > Cc: Srujana Challa <scha...@marvell.com> > Cc: Arnaud Ebalard <a...@natisbad.org> > Cc: Boris Brezillon <bbrezil...@kernel.org> > Cc: linux-cry...@vger.kernel.org > > file: drivers/dma/{fsl-edma-common.c,pl330.c,sh/rcar-dmac.c} > Cc: Vinod Koul <vk...@kernel.org> > Cc: dmaeng...@vger.kernel.org > > file: > arch/arm/boot/dts/{vfxxx.dtsi,ls1021a.dtsi,imx7ulp.dtsi,fsl-ls1043a.dtsi} > Cc: Shawn Guo <shawn...@kernel.org> > Cc: Sascha Hauer <s.ha...@pengutronix.de> > Cc: Li Yang <leoyang...@nxp.com> > Cc: linux-arm-ker...@lists.infradead.org > > file: arch/arm/boot/dts/r8a77*.dtsi, arch/arm64/boot/dts/renesas/r8a77*.dtsi > Cc: Geert Uytterhoeven <geert+rene...@glider.be> > Cc: Magnus Damm <magnus.d...@gmail.com> > Cc: linux-renesas-...@vger.kernel.org > > file: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: "Christian König" <christian.koe...@amd.com> > Cc: "Pan, Xinhui" <xinhui....@amd.com> > > file: drivers/gpu/drm/virtio/virtgpu_vram.c > Cc: David Airlie <airl...@linux.ie> > Cc: Gerd Hoffmann <kra...@redhat.com> > > file: drivers/media/common/videobuf2/videobuf2-dma-contig.c > Cc: Tomasz Figa <tf...@chromium.org> > Cc: Marek Szyprowski <m.szyprow...@samsung.com> > > file: drivers/misc/habanalabs/common/memory.c > Cc: Oded Gabbay <ogab...@kernel.org> > Cc: Arnd Bergmann <a...@arndb.de> > Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > > file: drivers/mtd/nand/raw/qcom_nandc.c > Cc: Manivannan Sadhasivam <m...@kernel.org> > > file: > arch/arm64/boot/dts/qcom/{ipq8074.dtsi,ipq6018.dtsi,qcom-sdx55.dtsi,qcom-ipq4019.dtsi,qcom-ipq8064.dtsi} > Cc: Andy Gross <agr...@kernel.org> > Cc: Bjorn Andersson <bjorn.anders...@linaro.org> > Cc: linux-arm-...@vger.kernel.org > > file: drivers/net/ethernet/marvell/octeontx2/af/rvu.c > Cc: Sunil Goutham <sgout...@marvell.com> > Cc: Linu Cherian <lcher...@marvell.com> > Cc: Geetha sowjanya <gak...@marvell.com> > > file: drivers/ntb/ntb_transport.c > Cc: Jon Mason <jdma...@kudzu.us> > Cc: Dave Jiang <dave.ji...@intel.com> > Cc: n...@lists.linux.dev > --- > kernel/dma/direct.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index 9743c6ccce1a..bc06db74dfdb 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -497,7 +497,7 @@ int dma_direct_map_sg(struct device *dev, struct > scatterlist *sgl, int nents, > dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr, > size_t size, enum dma_data_direction dir, unsigned long attrs) > { > - dma_addr_t dma_addr = paddr; > + dma_addr_t dma_addr = phys_to_dma_direct(dev, paddr); > > if (unlikely(!dma_capable(dev, dma_addr, size, false))) { > dev_err_once(dev, > -- > 2.35.1 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu