diff options
author | Atish Patra <atish.patra@wdc.com> | 2021-06-13 02:48:31 +0300 |
---|---|---|
committer | Emil Renner Berthing <kernel@esmil.dk> | 2021-09-12 15:35:04 +0300 |
commit | d01325233d1672ec3fc33e8c4d6e299d3f3e8f4e (patch) | |
tree | 6e225092ed27c8b1ffdd606ee4866c2ddd394dea | |
parent | fb5dc6f128d5fd788781312105013b5015be936a (diff) | |
download | linux-d01325233d1672ec3fc33e8c4d6e299d3f3e8f4e.tar.xz |
RISC-V: Support non-coherent DMA operations
** Do not upstream **
This is hacky fix just for testing. The actual patch would read the
RISCV_UNCACHED_OFFSET from the DT for only the non-coherent devices.
All other devices on beagleV and all other platform should just set
dma_default_coherent to true.
[Emil: remove spurious whitespace and fix format string warning]
Signed-off-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
-rw-r--r-- | arch/riscv/Kconfig | 14 | ||||
-rw-r--r-- | arch/riscv/Kconfig.socs | 1 | ||||
-rw-r--r-- | arch/riscv/mm/Makefile | 1 | ||||
-rw-r--r-- | arch/riscv/mm/dma-noncoherent.c | 63 |
4 files changed, 79 insertions, 0 deletions
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 3c3647ac33cb..216ad37cde55 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -206,6 +206,20 @@ config PGTABLE_LEVELS config LOCKDEP_SUPPORT def_bool y +config RISCV_UNCACHED_OFFSET + hex "Base address of uncached alias" + default 0xF80000000 if ARCH_HAS_DMA_SET_UNCACHED && SOC_STARFIVE_VIC7100 + default 0 if !ARCH_HAS_DMA_SET_UNCACHED + +config RISCV_DMA_NONCOHERENT + bool + select ARCH_HAS_DMA_PREP_COHERENT + select ARCH_HAS_SYNC_DMA_FOR_DEVICE + select ARCH_HAS_SYNC_DMA_FOR_CPU + select ARCH_HAS_DMA_SET_UNCACHED + select ARCH_HAS_DMA_CLEAR_UNCACHED + select ARCH_HAS_SETUP_DMA_OPS + source "arch/riscv/Kconfig.socs" source "arch/riscv/Kconfig.erratas" diff --git a/arch/riscv/Kconfig.socs b/arch/riscv/Kconfig.socs index 35b8ccf4e84b..0912f3d396de 100644 --- a/arch/riscv/Kconfig.socs +++ b/arch/riscv/Kconfig.socs @@ -28,6 +28,7 @@ config SOC_STARFIVE_VIC7100 select DW_AXI_DMAC_STARFIVE select PINCTRL select PINCTRL_STARFIVE + select RISCV_DMA_NONCOHERENT help This enables support for StarFive VIC7100 SoC Platform Hardware. diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index 7ebaef10ea1b..959bef49098b 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -27,3 +27,4 @@ KASAN_SANITIZE_init.o := n endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o +obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c new file mode 100644 index 000000000000..868dd02945fc --- /dev/null +++ b/arch/riscv/mm/dma-noncoherent.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * DMA mapping implementation inspired from arm/mm/dma-mapping.c + * + * Copyright (c) 2021 Western Digital Corporation or its affiliates. + */ + +#include <linux/dma-direct.h> +#include <linux/dma-map-ops.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/mm.h> +#include <asm/cpu_ops.h> +#include <asm/sbi.h> +#include <asm/smp.h> + +//TODO Do it through SBI +#include <soc/sifive/sifive_l2_cache.h> + +void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, enum dma_data_direction dir) +{ + sifive_l2_flush64_range(paddr, size); +} + +void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, enum dma_data_direction dir) +{ + sifive_l2_flush64_range(paddr, size); +} + +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, + const struct iommu_ops *iommu, bool coherent) +{ + dev_info(dev, "coherent device %d dev->dma_coherent %d\n", coherent, dev->dma_coherent); + dev->dma_coherent = coherent; +} + +//TODO: We are supposed to invalidate the cache here +void arch_dma_prep_coherent(struct page *page, size_t size) +{ + void *flush_addr = page_address(page); + + memset(flush_addr, 0, size); + sifive_l2_flush64_range(__pa(flush_addr), size); +} + +void arch_dma_clear_uncached(void *addr, size_t size) +{ + memunmap(addr); +} + +void *arch_dma_set_uncached(void *addr, size_t size) +{ + phys_addr_t phys_addr = __pa(addr) + CONFIG_RISCV_UNCACHED_OFFSET; + void *mem_base = NULL; + + mem_base = memremap(phys_addr, size, MEMREMAP_WT); + if (!mem_base) { + pr_err("%s memremap failed for addr %px\n", __func__, addr); + return ERR_PTR(-EINVAL); + } + + return mem_base; +} |