Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18b53a2d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc/dma: use phys_to_dma instead of get_dma_offset 



Use the standard portable helper instead of the powerpc specific one,
which is about to go away.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 11ddce15

arch/powerpc/kernel/dma.c

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */



#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-direct.h>

#include <linux/dma-debug.h>

#include <linux/gfp.h>

#include <linux/memblock.h>
@@ -42,7 +42,7 @@ static u64 __maybe_unused get_pfn_limit(struct device *dev) 
int dma_nommu_dma_supported(struct device *dev, u64 mask)

{

#ifdef CONFIG_PPC64

	u64 limit = get_dma_offset(dev) + (memblock_end_of_DRAM() - 1);

	u64 limit = phys_to_dma(dev, (memblock_end_of_DRAM() - 1));



	/* Limit fits in the mask, we are good */

	if (mask >= limit)
@@ -101,7 +101,7 @@ void *__dma_nommu_alloc_coherent(struct device *dev, size_t size, 
		return NULL;

	ret = page_address(page);

	memset(ret, 0, size);

	*dma_handle = __pa(ret) + get_dma_offset(dev);

	*dma_handle = phys_to_dma(dev,__pa(ret));



	return ret;

}
@@ -140,7 +140,7 @@ int dma_nommu_map_sg(struct device *dev, struct scatterlist *sgl, 
	int i;



	for_each_sg(sgl, sg, nents, i) {

		sg->dma_address = sg_phys(sg) + get_dma_offset(dev);

		sg->dma_address = phys_to_dma(dev, sg_phys(sg));

		sg->dma_length = sg->length;



		if (attrs & DMA_ATTR_SKIP_CPU_SYNC)
@@ -182,7 +182,7 @@ dma_addr_t dma_nommu_map_page(struct device *dev, struct page *page, 
	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		__dma_sync_page(page, offset, size, dir);



	return page_to_phys(page) + offset + get_dma_offset(dev);

	return phys_to_dma(dev, page_to_phys(page)) + offset;

}



static inline void dma_nommu_unmap_page(struct device *dev,