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

Unverified Commit f6d302e3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Burton
Browse files

MIPS: consolidate the swiotlb implementations 



Octeon and Loongson share exactly the same code, move it into a common
implementation, and use that implementation directly from get_arch_dma_ops.

Also provide the expected dma-direct.h helpers directly instead of
delegating to platform dma-coherence.h headers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Patchwork: https://patchwork.linux-mips.org/patch/19534/


Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Kevin Cernekee <cernekee@gmail.com>
Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Tom Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: iommu@lists.linux-foundation.org
Cc: linux-mips@linux-mips.org
parent e799de3e

arch/mips/cavium-octeon/dma-octeon.c

+0 −61
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
 * Copyright (C) 2010 Cavium Networks, Inc.

 */

#include <linux/dma-direct.h>

#include <linux/scatterlist.h>

#include <linux/bootmem.h>

#include <linux/swiotlb.h>

#include <linux/types.h>
@@ -169,49 +168,6 @@ void __init octeon_pci_dma_init(void) 
}

#endif /* CONFIG_PCI */



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

	unsigned long offset, size_t size, enum dma_data_direction direction,

	unsigned long attrs)

{

	dma_addr_t daddr = swiotlb_map_page(dev, page, offset, size,

					    direction, attrs);

	mb();



	return daddr;

}



static int octeon_dma_map_sg(struct device *dev, struct scatterlist *sg,

	int nents, enum dma_data_direction direction, unsigned long attrs)

{

	int r = swiotlb_map_sg_attrs(dev, sg, nents, direction, attrs);

	mb();

	return r;

}



static void octeon_dma_sync_single_for_device(struct device *dev,

	dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)

{

	swiotlb_sync_single_for_device(dev, dma_handle, size, direction);

	mb();

}



static void octeon_dma_sync_sg_for_device(struct device *dev,

	struct scatterlist *sg, int nelems, enum dma_data_direction direction)

{

	swiotlb_sync_sg_for_device(dev, sg, nelems, direction);

	mb();

}



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

	dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

{

	void *ret = swiotlb_alloc(dev, size, dma_handle, gfp, attrs);



	mb();



	return ret;

}



dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

#ifdef CONFIG_PCI
@@ -230,21 +186,6 @@ phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr) 
	return daddr;

}



static const struct dma_map_ops octeon_swiotlb_ops = {

	.alloc			= octeon_dma_alloc_coherent,

	.free			= swiotlb_free,

	.map_page		= octeon_dma_map_page,

	.unmap_page		= swiotlb_unmap_page,

	.map_sg			= octeon_dma_map_sg,

	.unmap_sg		= swiotlb_unmap_sg_attrs,

	.sync_single_for_cpu	= swiotlb_sync_single_for_cpu,

	.sync_single_for_device	= octeon_dma_sync_single_for_device,

	.sync_sg_for_cpu	= swiotlb_sync_sg_for_cpu,

	.sync_sg_for_device	= octeon_dma_sync_sg_for_device,

	.mapping_error		= swiotlb_dma_mapping_error,

	.dma_supported		= swiotlb_dma_supported

};



char *octeon_swiotlb;



void __init plat_swiotlb_setup(void)
@@ -307,6 +248,4 @@ void __init plat_swiotlb_setup(void) 


	if (swiotlb_init_with_tbl(octeon_swiotlb, swiotlb_nslabs, 1) == -ENOMEM)

		panic("Cannot allocate SWIOTLB buffer");



	mips_dma_map_ops = &octeon_swiotlb_ops;

}

arch/mips/include/asm/dma-direct.h

+16 −1
Original line number Diff line number Diff line 
#include <asm/dma-coherence.h>
 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _MIPS_DMA_DIRECT_H

#define _MIPS_DMA_DIRECT_H 1



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	if (!dev->dma_mask)

		return false;



	return addr + size - 1 <= *dev->dma_mask;

}



dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);



#endif /* _MIPS_DMA_DIRECT_H */

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

+5 −0
Original line number Diff line number Diff line
@@ -11,10 +11,15 @@ 
#endif



extern const struct dma_map_ops *mips_dma_map_ops;

extern const struct dma_map_ops mips_swiotlb_ops;



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

{

#ifdef CONFIG_SWIOTLB

	return &mips_swiotlb_ops;

#else

	return mips_dma_map_ops;

#endif

}



#define arch_setup_dma_ops arch_setup_dma_ops

arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h

+0 −11
Original line number Diff line number Diff line
@@ -61,17 +61,6 @@ static inline void plat_post_dma_flush(struct device *dev) 
{

}



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	if (!dev->dma_mask)

		return false;



	return addr + size - 1 <= *dev->dma_mask;

}



dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);



extern char *octeon_swiotlb;



#endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */

arch/mips/include/asm/mach-loongson64/dma-coherence.h

+0 −10
Original line number Diff line number Diff line
@@ -17,16 +17,6 @@ 


struct device;



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{

	if (!dev->dma_mask)

		return false;



	return addr + size - 1 <= *dev->dma_mask;

}



extern dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr);

extern phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);

static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr,

					  size_t size)

{