Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

openrisc: use generic dma_noncoherent_ops

Browse Source 
Switch to the generic noncoherent direct mapping implementation.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Stafford Horne <shorne@gmail.com>
This commit is contained in:
Christoph Hellwig 2018-07-19 06:02:32 -07:00 committed by Stafford Horne
parent 2c1de929ae
commit 5600779ea5
4 changed files with 12 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/openrisc/Kconfig
View File

@ -6,6 +6,8 @@
config OPENRISC config OPENRISC
def_bool y def_bool y
select ARCH_HAS_SYNC_DMA_FOR_DEVICE
select DMA_NONCOHERENT_OPS
select OF select OF
select OF_EARLY_FLATTREE select OF_EARLY_FLATTREE
select IRQ_DOMAIN select IRQ_DOMAIN

1
arch/openrisc/include/asm/Kbuild
View File

@ -7,6 +7,7 @@ generic-y += current.h
generic-y += device.h generic-y += device.h
generic-y += div64.h generic-y += div64.h
generic-y += dma.h generic-y += dma.h
generic-y += dma-mapping.h
generic-y += emergency-restart.h generic-y += emergency-restart.h
generic-y += exec.h generic-y += exec.h
generic-y += extable.h generic-y += extable.h

35
arch/openrisc/include/asm/dma-mapping.h
View File

@ -1,35 +0,0 @@
/*
* OpenRISC Linux
*
* Linux architectural port borrowing liberally from similar works of
* others. All original copyrights apply as per the original source
* declaration.
*
* OpenRISC implementation:
* Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#ifndef __ASM_OPENRISC_DMA_MAPPING_H
#define __ASM_OPENRISC_DMA_MAPPING_H
/*
* See Documentation/DMA-API-HOWTO.txt and
* Documentation/DMA-API.txt for documentation.
*/
#include <linux/dma-debug.h>
#include <linux/dma-mapping.h>
extern const struct dma_map_ops or1k_dma_map_ops;
static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
{
return &or1k_dma_map_ops;
}
#endif /* __ASM_OPENRISC_DMA_MAPPING_H */

65
arch/openrisc/kernel/dma.c
View File

@ -19,9 +19,7 @@
* the only thing implemented properly. The rest need looking into... * the only thing implemented properly. The rest need looking into...
*/ */
#include <linux/dma-mapping.h> #include <linux/dma-noncoherent.h>
#include <linux/dma-debug.h>
#include <linux/export.h>
#include <asm/cpuinfo.h> #include <asm/cpuinfo.h>
#include <asm/spr_defs.h> #include <asm/spr_defs.h>
@ -80,10 +78,9 @@ page_clear_nocache(pte_t *pte, unsigned long addr,
* is being ignored for now; uncached but write-combined memory is a * is being ignored for now; uncached but write-combined memory is a
* missing feature of the OR1K. * missing feature of the OR1K.
*/ */
static void * void *
or1k_dma_alloc(struct device *dev, size_t size, arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle,
dma_addr_t *dma_handle, gfp_t gfp, gfp_t gfp, unsigned long attrs)
unsigned long attrs)
{ {
unsigned long va; unsigned long va;
void *page; void *page;
@ -115,9 +112,9 @@ or1k_dma_alloc(struct device *dev, size_t size,
return (void *)va; return (void *)va;
} }
static void void
or1k_dma_free(struct device *dev, size_t size, void *vaddr, arch_dma_free(struct device *dev, size_t size, void *vaddr,
dma_addr_t dma_handle, unsigned long attrs) dma_addr_t dma_handle, unsigned long attrs)
{ {
unsigned long va = (unsigned long)vaddr; unsigned long va = (unsigned long)vaddr;
struct mm_walk walk = { struct mm_walk walk = {
@ -133,13 +130,10 @@ or1k_dma_free(struct device *dev, size_t size, void *vaddr,
free_pages_exact(vaddr, size); free_pages_exact(vaddr, size);
} }
static void void arch_sync_dma_for_device(struct device *dev, phys_addr_t addr, size_t size,
or1k_sync_single_for_device(struct device *dev, enum dma_data_direction dir)
dma_addr_t dma_handle, size_t size,
enum dma_data_direction dir)
{ {
unsigned long cl; unsigned long cl;
dma_addr_t addr = dma_handle;
struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[smp_processor_id()]; struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[smp_processor_id()];
switch (dir) { switch (dir) {
@ -163,45 +157,4 @@ or1k_sync_single_for_device(struct device *dev,
*/ */
break; break;
} }
} }
static dma_addr_t
or1k_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size,
enum dma_data_direction dir,
unsigned long attrs)
{
unsigned long cl;
dma_addr_t addr = page_to_phys(page) + offset;
struct cpuinfo_or1k *cpuinfo = &cpuinfo_or1k[smp_processor_id()];
if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
or1k_sync_single_for_device(dev, addr, size, dir);
return addr;
}
static int
or1k_map_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction dir,
unsigned long attrs)
{
struct scatterlist *s;
int i;
for_each_sg(sg, s, nents, i) {
s->dma_address = or1k_map_page(dev, sg_page(s), s->offset,
s->length, dir, 0);
}
return nents;
}
const struct dma_map_ops or1k_dma_map_ops = {
.alloc = or1k_dma_alloc,
.free = or1k_dma_free,
.map_page = or1k_map_page,
.map_sg = or1k_map_sg,
.sync_single_for_device = or1k_sync_single_for_device,
};
EXPORT_SYMBOL(or1k_dma_map_ops);