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

Commit 9eb8be60 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Geert Uytterhoeven
Browse files

m68k: Use generic dma_noncoherent_ops 



Switch to the generic noncoherent direct mapping implementation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Tested-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent a8c5cb99

arch/m68k/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
config M68K

	bool

	default y

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA

	select ARCH_NO_COHERENT_DMA_MMAP if !MMU

	select HAVE_IDE
@@ -24,6 +25,7 @@ config M68K 
	select MODULES_USE_ELF_RELA

	select OLD_SIGSUSPEND3

	select OLD_SIGACTION

	select DMA_NONCOHERENT_OPS if HAS_DMA



config CPU_BIG_ENDIAN

	def_bool y

arch/m68k/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
generic-y += barrier.h

generic-y += compat.h

generic-y += device.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

arch/m68k/include/asm/dma-mapping.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _M68K_DMA_MAPPING_H

#define _M68K_DMA_MAPPING_H



extern const struct dma_map_ops m68k_dma_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

        return &m68k_dma_ops;

}



#endif  /* _M68K_DMA_MAPPING_H */

arch/m68k/kernel/dma.c

+8 −60
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


#undef DEBUG



#include <linux/dma-mapping.h>

#include <linux/dma-noncoherent.h>

#include <linux/device.h>

#include <linux/kernel.h>

#include <linux/platform_device.h>
@@ -19,7 +19,7 @@ 


#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)



static void *m68k_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,

void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,

		gfp_t flag, unsigned long attrs)

{

	struct page *page, **map;
@@ -62,7 +62,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, 
	return addr;

}



static void m68k_dma_free(struct device *dev, size_t size, void *addr,

void arch_dma_free(struct device *dev, size_t size, void *addr,

		dma_addr_t handle, unsigned long attrs)

{

	pr_debug("dma_free_coherent: %p, %x\n", addr, handle);
@@ -73,8 +73,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *addr, 


#include <asm/cacheflush.h>



static void *m68k_dma_alloc(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp, unsigned long attrs)

{

	void *ret;
@@ -89,7 +89,7 @@ static void *m68k_dma_alloc(struct device *dev, size_t size, 
	return ret;

}



static void m68k_dma_free(struct device *dev, size_t size, void *vaddr,

void arch_dma_free(struct device *dev, size_t size, void *vaddr,

		dma_addr_t dma_handle, unsigned long attrs)

{

	free_pages((unsigned long)vaddr, get_order(size));
@@ -97,8 +97,8 @@ static void m68k_dma_free(struct device *dev, size_t size, void *vaddr, 


#endif /* CONFIG_MMU && !CONFIG_COLDFIRE */



static void m68k_dma_sync_single_for_device(struct device *dev,

		dma_addr_t handle, size_t size, enum dma_data_direction dir)

void arch_sync_dma_for_device(struct device *dev, phys_addr_t handle,

		size_t size, enum dma_data_direction dir)

{

	switch (dir) {

	case DMA_BIDIRECTIONAL:
@@ -115,58 +115,6 @@ static void m68k_dma_sync_single_for_device(struct device *dev, 
	}

}



static void m68k_dma_sync_sg_for_device(struct device *dev,

		struct scatterlist *sglist, int nents, enum dma_data_direction dir)

{

	int i;

	struct scatterlist *sg;



	for_each_sg(sglist, sg, nents, i) {

		dma_sync_single_for_device(dev, sg->dma_address, sg->length,

					   dir);

	}

}



static dma_addr_t m68k_dma_map_page(struct device *dev, struct page *page,

		unsigned long offset, size_t size, enum dma_data_direction dir,

		unsigned long attrs)

{

	dma_addr_t handle = page_to_phys(page) + offset;



	if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))

		dma_sync_single_for_device(dev, handle, size, dir);



	return handle;

}



static int m68k_dma_map_sg(struct device *dev, struct scatterlist *sglist,

		int nents, enum dma_data_direction dir, unsigned long attrs)

{

	int i;

	struct scatterlist *sg;



	for_each_sg(sglist, sg, nents, i) {

		sg->dma_address = sg_phys(sg);



		if (attrs & DMA_ATTR_SKIP_CPU_SYNC)

			continue;



		dma_sync_single_for_device(dev, sg->dma_address, sg->length,

					   dir);

	}

	return nents;

}



const struct dma_map_ops m68k_dma_ops = {

	.alloc			= m68k_dma_alloc,

	.free			= m68k_dma_free,

	.map_page		= m68k_dma_map_page,

	.map_sg			= m68k_dma_map_sg,

	.sync_single_for_device	= m68k_dma_sync_single_for_device,

	.sync_sg_for_device	= m68k_dma_sync_sg_for_device,

};

EXPORT_SYMBOL(m68k_dma_ops);



void arch_setup_pdev_archdata(struct platform_device *pdev)

{

	if (pdev->dev.coherent_dma_mask == DMA_MASK_NONE &&