Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Loongon64: DMA functions cleanup

Split the common dma.c which shared by Loongson-2E and Loongson-2F,
since the code in 'common' directory is assumed be shared by all 64bit
Loongson platforms (but Loongson-3 doesn't use it now). By the way,
Loongson-2E and Loongson-2F have already dropped 32bit kernel support,
so CONFIG_64BIT isn't needed.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/20302/
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: Fuxin Zhang <zhangfx@lemote.com>
Cc: Zhangjin Wu <wuzhangjin@gmail.com>
Cc: Huacai Chen <chenhuacai@gmail.com>

authored by

Huacai Chen and committed by
Paul Burton
33f2ac54 5b394b2d

+14 -7
-1
arch/mips/loongson64/common/Makefile
··· 6 6 obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \ 7 7 bonito-irq.o mem.o machtype.o platform.o serial.o 8 8 obj-$(CONFIG_PCI) += pci.o 9 - obj-$(CONFIG_CPU_LOONGSON2) += dma.o 10 9 11 10 # 12 11 # Serial port support
-4
arch/mips/loongson64/common/dma.c arch/mips/loongson64/lemote-2f/dma.c
··· 8 8 9 9 phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr) 10 10 { 11 - #if defined(CONFIG_CPU_LOONGSON2F) && defined(CONFIG_64BIT) 12 11 if (dma_addr > 0x8fffffff) 13 12 return dma_addr; 14 13 return dma_addr & 0x0fffffff; 15 - #else 16 - return dma_addr & 0x7fffffff; 17 - #endif 18 14 }
+1 -1
arch/mips/loongson64/fuloong-2e/Makefile
··· 2 2 # Makefile for Lemote Fuloong2e mini-PC board. 3 3 # 4 4 5 - obj-y += irq.o reset.o 5 + obj-y += irq.o reset.o dma.o
+12
arch/mips/loongson64/fuloong-2e/dma.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 2 + #include <linux/dma-direct.h> 3 + 4 + dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr) 5 + { 6 + return paddr | 0x80000000; 7 + } 8 + 9 + phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr) 10 + { 11 + return dma_addr & 0x7fffffff; 12 + }
+1 -1
arch/mips/loongson64/lemote-2f/Makefile
··· 2 2 # Makefile for lemote loongson2f family machines 3 3 # 4 4 5 - obj-y += clock.o machtype.o irq.o reset.o ec_kb3310b.o 5 + obj-y += clock.o machtype.o irq.o reset.o dma.o ec_kb3310b.o 6 6 7 7 # 8 8 # Suspend Support