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

Commit 23475ad4 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

h8300: use dma-direct 



Replace the bare-bones h8300 direct dma mapping implementation with
the fully featured generic dma-direct one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent f73337f4

arch/h8300/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ config H8300 
	select HAVE_ARCH_KGDB

	select HAVE_ARCH_HASH

	select CPU_NO_EFFICIENT_FFS

	select DMA_DIRECT_OPS



config CPU_BIG_ENDIAN

	def_bool y

arch/h8300/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ generic-y += delay.h 
generic-y += device.h

generic-y += div64.h

generic-y += dma.h

generic-y += dma-mapping.h

generic-y += emergency-restart.h

generic-y += exec.h

generic-y += extable.h

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

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

#ifndef _H8300_DMA_MAPPING_H

#define _H8300_DMA_MAPPING_H



extern const struct dma_map_ops h8300_dma_map_ops;



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

{

	return &h8300_dma_map_ops;

}



#endif

arch/h8300/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ extra-y := vmlinux.lds 


obj-y := process.o traps.o ptrace.o \

	 signal.o setup.o syscalls.o \

	 irq.o entry.o dma.o

	 irq.o entry.o



obj-$(CONFIG_ROMKERNEL) += head_rom.o

obj-$(CONFIG_RAMKERNEL) += head_ram.o

arch/h8300/kernel/dma.c

deleted100644 → 0
+0 −66
Original line number Diff line number Diff line 
/*

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 */



#include <linux/dma-mapping.h>

#include <linux/kernel.h>

#include <linux/scatterlist.h>

#include <linux/module.h>

#include <asm/pgalloc.h>



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

		       dma_addr_t *dma_handle, gfp_t gfp,

		       unsigned long attrs)

{

	void *ret;



	if (dev == NULL || (*dev->dma_mask < 0xffffffff))

		gfp |= GFP_DMA;

	ret = (void *)__get_free_pages(gfp, get_order(size));



	if (ret != NULL) {

		memset(ret, 0, size);

		*dma_handle = virt_to_phys(ret);

	}

	return ret;

}



static void 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));

}



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

				  unsigned long offset, size_t size,

				  enum dma_data_direction direction,

				  unsigned long attrs)

{

	return page_to_phys(page) + offset;

}



static int map_sg(struct device *dev, struct scatterlist *sgl,

		  int nents, enum dma_data_direction direction,

		  unsigned long attrs)

{

	struct scatterlist *sg;

	int i;



	for_each_sg(sgl, sg, nents, i) {

		sg->dma_address = sg_phys(sg);

	}



	return nents;

}



const struct dma_map_ops h8300_dma_map_ops = {

	.alloc = dma_alloc,

	.free = dma_free,

	.map_page = map_page,

	.map_sg = map_sg,

};

EXPORT_SYMBOL(h8300_dma_map_ops);