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

Commit 8aa26590 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Fix DMA offset for non-coherent DMA 



After Becky's work we can almost have different DMA offsets
between on-chip devices and PCI. Almost because there's a
problem with the non-coherent DMA code that basically ignores
the programmed offset to use the global one for everything.
This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 1263965f

arch/powerpc/kernel/dma.c

+6 −2
Original line number Diff line number Diff line
@@ -30,11 +30,15 @@ static unsigned long get_dma_direct_offset(struct device *dev) 
void *dma_direct_alloc_coherent(struct device *dev, size_t size,

				dma_addr_t *dma_handle, gfp_t flag)

{

	void *ret;

#ifdef CONFIG_NOT_COHERENT_CACHE

	return __dma_alloc_coherent(size, dma_handle, flag);

	ret = __dma_alloc_coherent(size, dma_handle, flag);

	if (ret == NULL)

		return NULL;

	*dma_handle += get_dma_direct_offset(dev);

	return ret;

#else

	struct page *page;

	void *ret;

	int node = dev_to_node(dev);



	/* ignore region specifiers */

arch/powerpc/lib/dma-noncoherent.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp) 
		/*

		 * Set the "dma handle"

		 */

		*handle = page_to_bus(page);

		*handle = page_to_phys(page);



		do {

			BUG_ON(!pte_none(*pte));