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

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

MIPS: loongson64: use generic dma noncoherent ops 



Provide phys_to_dma/dma_to_phys helpers, everything else is generic.

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


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 f8c55dc6

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1828,6 +1828,7 @@ config CPU_LOONGSON2 
	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HUGEPAGES

	select ARCH_HAS_PHYS_TO_DMA



config CPU_LOONGSON1

	bool

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

deleted100644 → 0
+0 −69
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.

 *

 * Copyright (C) 2006, 07  Ralf Baechle <ralf@linux-mips.org>

 * Copyright (C) 2007 Lemote, Inc. & Institute of Computing Technology

 * Author: Fuxin Zhang, zhangfx@lemote.com

 *

 */

#ifndef __ASM_MACH_LOONGSON64_DMA_COHERENCE_H

#define __ASM_MACH_LOONGSON64_DMA_COHERENCE_H



#ifdef CONFIG_SWIOTLB

#include <linux/swiotlb.h>

#endif



struct device;



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

					  size_t size)

{

	return virt_to_phys(addr) | 0x80000000;

}



static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,

					       struct page *page)

{

	return page_to_phys(page) | 0x80000000;

}



static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

{

#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)

	return (dma_addr > 0x8fffffff) ? dma_addr : (dma_addr & 0x0fffffff);

#else

	return dma_addr & 0x7fffffff;

#endif

}



static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,

	size_t size, enum dma_data_direction direction)

{

}



static inline int plat_dma_supported(struct device *dev, u64 mask)

{

	/*

	 * we fall back to GFP_DMA when the mask isn't all 1s,

	 * so we can't guarantee allocations that must be

	 * within a tighter range than GFP_DMA..

	 */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}



static inline int plat_device_is_coherent(struct device *dev)

{

	return 0;

}



static inline void plat_post_dma_flush(struct device *dev)

{

}



#endif /* __ASM_MACH_LOONGSON64_DMA_COHERENCE_H */

arch/mips/loongson64/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ config LEMOTE_FULOONG2E 
	select CSRC_R4K

	select SYS_HAS_CPU_LOONGSON2E

	select DMA_NONCOHERENT

	select MIPS_DMA_DEFAULT

	select BOOT_ELF32

	select BOARD_SCACHE

	select HW_HAS_PCI
@@ -45,7 +44,6 @@ config LEMOTE_MACH2F 
	select CS5536

	select CSRC_R4K if ! MIPS_EXTERNAL_TIMER

	select DMA_NONCOHERENT

	select MIPS_DMA_DEFAULT

	select GENERIC_ISA_DMA_SUPPORT_BROKEN

	select HAVE_CLK

	select HW_HAS_PCI

arch/mips/loongson64/common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \

    bonito-irq.o mem.o machtype.o platform.o serial.o

obj-$(CONFIG_PCI) += pci.o

obj-$(CONFIG_CPU_LOONGSON2) += dma.o



#

# Serial port support

arch/mips/loongson64/common/dma.c

0 → 100644
+18 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/dma-direct.h>



dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)

{

	return paddr | 0x80000000;

}



phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr)

{

#if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT)

	if (dma_addr > 0x8fffffff)

		return dma_addr;

	return dma_addr & 0x0fffffff;

#else

	return dma_addr & 0x7fffffff;

#endif

}