Add non-coherent DMA support for AX45MP
Subsystems (4)
v12 cover Add non-coherent DMA support for AX45MP
From: Lad Prabhakar <[email protected]>
Hi All,
non-coherent DMA support for AX45MP
====================================
On the Andes AX45MP core, cache coherency is a specification option so it may not be supported. In this case DMA will fail. To get around with this issue this patch series does the below:
1] Andes alternative ports is implemented as errata which checks if the IOCP is missing and only then applies to CMO errata. One vendor specific SBI EXT (ANDES_SBI_EXT_IOCP_SW_WORKAROUND) is implemented as part of errata.
Below are the configs which Andes port provides (and are selected by RZ/Five):
- ERRATA_ANDES
- ERRATA_ANDES_CMO
OpenSBI patch supporting ANDES_SBI_EXT_IOCP_SW_WORKAROUND SBI is now part v1.3 release.
2] Andes AX45MP core has a Programmable Physical Memory Attributes (PMA) block that allows dynamic adjustment of memory attributes in the runtime. It contains a configurable amount of PMA entries implemented as CSR registers to control the attributes of memory locations in interest. OpenSBI configures the PMA regions as required and creates a reserve memory node and propagates it to the higher boot stack.
Currently OpenSBI (upstream) configures the required PMA region and passes this a shared DMA pool to Linux.
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
pma_resv0@58000000 {
compatible = "shared-dma-pool";
reg = <0x0 0x58000000 0x0 0x08000000>;
no-map;
linux,dma-default;
};
};The above shared DMA pool gets appended to Linux DTB so the DMA memory requests go through this region.
3] We provide callbacks to synchronize specific content between memory and cache.
4] RZ/Five SoC selects the below configs
- AX45MP_L2_CACHE
- DMA_GLOBAL_POOL
- ERRATA_ANDES
- ERRATA_ANDES_CMO
----------x---------------------x--------------------x---------------x----
Note,
- Ive used GCC 12.2.0 for compilation
- Tested all the IP blocks on RZ/Five which use DMA
- Patch series is dependent on the series from Arnd,
https://patchwork.kernel.org/project/linux-renesas-soc/cover/[email protected]/.
- Patches applies on top of palmer/master (25aa0bebba72) +
palmer/for-next (174e8ac0272d5) + palmer/fixes (7e3811521dc39)
- Ive pushed the complete tree here https://github.com/prabhakarlad/linux/tree/rzfive-cmo-v12
v11 -> v12
* Renamed struct riscv_cache_ops -> struct riscv_nonstd_cache_ops
v10 -> v11
* Changed data type of size from unsigned long to size_t
* Reworded doc for struct riscv_cache_ops
* Marked ax45mp_cmo_ops as __initdata
v9 -> v10
* Included RB/TB tags from Conor
* Fixed review comments pointed by Geert to rename cache callbacks
* Dropped preserving the cache lines in ax45mp_dma_cache_inv() callback
v8 -> v9
* Dropped adding ALTERNATIVE_3
* Implemented function pointer support for nonstandard noncoherent systems
* Added a new config option CONFIG_RISCV_NONSTANDARD_CACHE_OPS
* Updated Andes errata code to drop patching the calls as we no more use ALTERNATIVE_X() macro.
* Updated Andes CMO code to use function pointer for doing cache management.
v7 -> v8
* Dropped using function pointers and switched to ALTERNATIVE_X()
* Added new patches (#1, #2)
v6 -> v7
* Reworked the code based on Arnd's work
* Fixed review comments pointed by Arnd
* Fixed review comments pointed by Conor
v5.1 -> v6
* Dropped use of ALTERNATIVE_x() macro
* Now switched to used function pointers for CMO
* Moved driver to drivers/cache folder
v5 -> v5.1
* https://patchwork.kernel.org/project/linux-riscv/list/?series=708610&state=%2A&archive=both
v4 -> v5
* Rebased ALTERNATIVE_3() macro on top of Andrew's patches
* Rebased the changes on top of Heiko's alternative call patches
* Dropped configuring the PMA from Linux
* Dropped configuring the L2 cache from Linux and dropped the binding for same
* Now using runtime patching mechanism instead of compile time config
RFC v3 -> v4
* Implemented ALTERNATIVE_3() macro
* Now using runtime patching mechanism instead of compile time config
* Added Andes CMO as and errata
* Fixed comments pointed by Geert
RFC v2-> RFC v3
* Fixed review comments pointed by Conor
* Move DT binding into cache folder
* Fixed DT binding check issue
* Added andestech,ax45mp-cache.h header file
* Now passing the flags for the PMA setup as part of andestech,pma-regions property.
* Added andestech,inst/data-prefetch and andestech,tag/data-ram-ctl properties to configure the L2 cache.
* Registered the cache driver as platform driver
RFC v1-> RFC v2
* Moved out the code from arc/riscv to drivers/soc/renesas
* Now handling the PMA setup as part of the L2 cache
* Now making use of dma-noncoherent.c instead SoC specific implementation.
* Dropped arch_dma_alloc() and arch_dma_free()
* Switched to RISCV_DMA_NONCOHERENT
* Included DT binding doc
RFC v2: https://patchwork.kernel.org/project/linux-renesas-soc/cover/[email protected]/
RFC v1: https://patchwork.kernel.org/project/linux-renesas-soc/cover/[email protected]/
Cheers,
Prabhakar
Lad Prabhakar (6):
riscv: asm: vendorid_list: Add Andes Technology to the vendors list
riscv: errata: Add Andes alternative ports
riscv: mm: dma-noncoherent: nonstandard cache operations support
dt-bindings: cache: andestech,ax45mp-cache: Add DT binding
documentation for L2 cache controller
cache: Add L2 cache management for Andes AX45MP RISC-V core
soc: renesas: Kconfig: Select the required configs for RZ/Five SoC
.../cache/andestech,ax45mp-cache.yaml | 81 +++++++ MAINTAINERS | 7 + arch/riscv/Kconfig | 7 + arch/riscv/Kconfig.errata | 21 ++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 66 ++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/dma-noncoherent.h | 28 +++ arch/riscv/include/asm/errata_list.h | 5 + arch/riscv/include/asm/vendorid_list.h | 1 + arch/riscv/kernel/alternative.c | 5 + arch/riscv/mm/dma-noncoherent.c | 43 ++++ arch/riscv/mm/pmem.c | 13 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 11 + drivers/cache/Makefile | 3 + drivers/cache/ax45mp_cache.c | 213 ++++++++++++++++++ drivers/soc/renesas/Kconfig | 4 + 20 files changed, 516 insertions(+) create mode 100644 Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.c create mode 100644 arch/riscv/include/asm/dma-noncoherent.h create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/ax45mp_cache.c
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 1/6 riscv: asm: vendorid_list: Add Andes Technology to the vendors list
From: Lad Prabhakar <[email protected]>
Add Andes Technology to the vendors list.
---
v11 -> v12
* No change
v10 -> v11
* No change
v9 -> v10
* Included TB tag from Conor
v8 -> v9
* Included RB tag from Geert
v7 -> v8
* No change
v6 -> v7
* No change
v5 -> v6
* No change
v4 -> v5
* Included RB tags
RFC v3 -> v4
* New patch
--- arch/riscv/include/asm/vendorid_list.h | 1 + 1 file changed, 1 insertion(+)
arch/riscv/include/asm/vendorid_list.h +1 -0
@@ -5,6 +5,7 @@#ifndef ASM_VENDOR_LIST_H #define ASM_VENDOR_LIST_H +#define ANDESTECH_VENDOR_ID 0x31e#define SIFIVE_VENDOR_ID 0x489#define THEAD_VENDOR_ID 0x5b7
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 2/6 riscv: errata: Add Andes alternative ports
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Add required ports of the Alternative scheme for Andes CPU cores.
I/O Coherence Port (IOCP) provides an AXI interface for connecting external non-caching masters, such as DMA controllers. IOCP is a specification option and is disabled on the Renesas RZ/Five SoC due to this reason cache management needs a software workaround.
---
v11 -> v12
* No change
v10 -> v11
* No change
v9 -> v10
* Included TB tag from Conor
v8 -> v9
* Rebased to code on Palmer's for/next
* Dropped calling patch_text_nosync() as dont use
patch_text_nosync() call
v7 -> v8
* Now patching the code using patch_text_nosync() and riscv_alternative_fix_offsets()
v6 -> v7
* Renamed RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND -> ANDES_SBI_EXT_IOCP_SW_WORKAROUND
* Dropped "depends on !XIP_KERNEL" for ERRATA_ANDES config
v5 -> v6
* Dropped patching alternative and now just probing IOCP
v4 -> v5
* Sorted the Kconfig/Makefile/Switch based on Core name
* Added a comments
* Introduced RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND SBI EXT ID to check if CMO needs to be applied. Is there a way we can access the DTB while patching as we can drop this SBI EXT ID and add a DT property instead for cmo?
RFC v3 -> v4
* New patch
--- arch/riscv/Kconfig.errata | 21 +++++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 66 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 ++ arch/riscv/include/asm/errata_list.h | 5 +++ arch/riscv/kernel/alternative.c | 5 +++ 7 files changed, 102 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.c
arch/riscv/Kconfig.errata +21 -0
@@ -1,5 +1,26 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on RISCV_ALTERNATIVE + help + All Andes errata Kconfig depend on this Kconfig. Disabling + this Kconfig will disable all Andes errata. Please say "Y" + here if your platform uses Andes CPU cores. + + Otherwise, please say "N" here to avoid unnecessary overhead. + +config ERRATA_ANDES_CMO + bool "Apply Andes cache management errata" + depends on ERRATA_ANDES && MMU && ARCH_R9A07G043 + select RISCV_DMA_NONCOHERENT + default y + help + This will apply the cache management errata to handle the + non-standard handling on non-coherent operations on Andes cores. + + If you don't know what to do here, say "Y". + config ERRATA_SIFIVE bool "SiFive errata" depends on RISCV_ALTERNATIVE
arch/riscv/errata/Makefile +1 -0
@@ -2,5 +2,6 @@ ifdef CONFIG_RELOCATABLE KBUILD_CFLAGS += -fno-pie endif +obj-$(CONFIG_ERRATA_ANDES) += andes/ obj-$(CONFIG_ERRATA_SIFIVE) += sifive/ obj-$(CONFIG_ERRATA_THEAD) += thead/
arch/riscv/errata/andes/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-y += errata.o
arch/riscv/errata/andes/errata.c new file +66 -0
66 lines not on this page · raw message
arch/riscv/include/asm/alternative.h +3 -0
@@ -46,6 +46,9 @@ struct alt_entry {u32 patch_id;/* The patch ID (erratum ID or cpufeature ID) */ }; +void andes_errata_patch_func (struct alt_entry *begin,struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage);void sifive_errata_patch_func (struct alt_entry *begin,struct alt_entry *end,unsigned long archid,unsigned long impid,unsigned int stage);
arch/riscv/include/asm/errata_list.h +5 -0
@@ -11,6 +11,11 @@#include <asm/hwcap.h> #include <asm/vendorid_list.h> +#ifdef CONFIG_ERRATA_ANDES +#define ERRATA_ANDESTECH_NO_IOCP 0 +#define ERRATA_ANDESTECH_NUMBER 1 +#endif +#ifdef CONFIG_ERRATA_SIFIVE #define ERRATA_SIFIVE_CIP_453 0#define ERRATA_SIFIVE_CIP_1200 1
arch/riscv/kernel/alternative.c +5 -0
@@ -45,6 +45,11 @@ static void riscv_fill_cpu_mfr_info(struct cpu_manufacturer_info_t *cpu_mfr_info cpu_mfr_info->feature_probe_func =NULL ;switch (cpu_mfr_info->vendor_id) { +#ifdef CONFIG_ERRATA_ANDES +case ANDESTECH_VENDOR_ID : + cpu_mfr_info->patch_func = andes_errata_patch_func; +break ; +#endif #ifdef CONFIG_ERRATA_SIFIVE case SIFIVE_VENDOR_ID : cpu_mfr_info->patch_func = sifive_errata_patch_func;
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 3/6 riscv: mm: dma-noncoherent: nonstandard cache operations support
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Introduce support for nonstandard noncoherent systems in the RISC-V architecture. It enables function pointer support to handle cache management in such systems.
This patch adds a new configuration option called "RISCV_NONSTANDARD_CACHE_OPS." This option is a boolean flag that depends on "RISCV_DMA_NONCOHERENT" and enables the function pointer support for cache management in nonstandard noncoherent systems.
---
v11 -> v12
* Renamed struct riscv_cache_ops -> struct riscv_nonstd_cache_ops
v10 -> v11
* Changed data type of size from unsigned long to size_t
* Reworded doc for struct riscv_cache_ops
v9 -> v10
* Added __ro_after_init compiler attribute for noncoherent_cache_ops
* Renamed clean -> wback
* Renamed inval -> inv
* Renamed flush -> wback_inv
v8 -> v9
* New patch
--- arch/riscv/Kconfig | 7 ++++ arch/riscv/include/asm/dma-noncoherent.h | 28 +++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 43 ++++++++++++++++++++++++ arch/riscv/mm/pmem.c | 13 +++++++ 4 files changed, 91 insertions(+) create mode 100644 arch/riscv/include/asm/dma-noncoherent.h
arch/riscv/Kconfig +7 -0
@@ -269,6 +269,13 @@ config RISCV_DMA_NONCOHERENT select ARCH_HAS_SYNC_DMA_FOR_DEVICE select DMA_DIRECT_REMAP +config RISCV_NONSTANDARD_CACHE_OPS + bool + depends on RISCV_DMA_NONCOHERENT + help + This enables function pointer support for non-standard noncoherent + systems to handle cache management. + config AS_HAS_INSN def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)
arch/riscv/include/asm/dma-noncoherent.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2023 Renesas Electronics Corp. +*/ + +#ifndef __ASM_DMA_NONCOHERENT_H +#define __ASM_DMA_NONCOHERENT_H + +#include <linux/dma-direct.h> + +/* +* struct riscv_nonstd_cache_ops - Structure for non-standard CMO function pointers +* +* @wback: Function pointer for cache writeback +* @inv: Function pointer for invalidating cache +* @wback_inv: Function pointer for flushing the cache (writeback + invalidating) +*/ +struct riscv_nonstd_cache_ops { +void (*wback)(phys_addr_t paddr,size_t size); +void (*inv)(phys_addr_t paddr,size_t size); +void (*wback_inv)(phys_addr_t paddr,size_t size); +}; + +extern struct riscv_nonstd_cache_ops noncoherent_cache_ops; + +void riscv_noncoherent_register_cache_ops (const struct riscv_nonstd_cache_ops *ops); + +#endif /* __ASM_DMA_NONCOHERENT_H */
arch/riscv/mm/dma-noncoherent.c +43 -0
77 lines not on this page · raw message
arch/riscv/mm/pmem.c +13 -0
@@ -7,15 +7,28 @@#include <linux/libnvdimm.h> #include <asm/cacheflush.h> +#include <asm/dma-noncoherent.h> void arch_wb_cache_pmem (void *addr,size_t size) { +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.wback)) { + noncoherent_cache_ops.wback (virt_to_phys (addr), size); +return ; + } +#endif ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); }EXPORT_SYMBOL_GPL (arch_wb_cache_pmem);void arch_invalidate_pmem (void *addr,size_t size) { +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.inv)) { + noncoherent_cache_ops.inv (virt_to_phys (addr), size); +return ; + } +#endif ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); }EXPORT_SYMBOL_GPL (arch_invalidate_pmem);
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v12 3/6] riscv: mm: dma-noncoherent: nonstandard cache operations support
Quoted 7 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce support for nonstandard noncoherent systems in the RISC-V architecture. It enables function pointer support to handle cache management in such systems.
Quoted 8 lines
This patch adds a new configuration option called "
RISCV_NONSTANDARD_CACHE_OPS." This option is a boolean flag that depends on "RISCV_DMA_NONCOHERENT" and enables the function pointer support for cache management in nonstandard noncoherent systems.Signed-off-by Lad Prabhakar <[email protected]>Reviewed-by Conor Dooley <[email protected]>
on the StarFive JH7100
Quoted 196 lines
---
v11 -> v12
* Renamed structriscv_cache_ops-> structriscv_nonstd_cache_opsv10 -> v11
* Changed data type of size from unsigned long tosize_t
* Reworded doc for structriscv_cache_opsv9 -> v10
* Added__ro_after_initcompiler attribute fornoncoherent_cache_ops
* Renamed clean -> wback
* Renamed inval -> inv
* Renamed flush ->wback_invv8 -> v9
* New patch--- arch/riscv/Kconfig | 7 ++++ arch/riscv/include/asm/dma-noncoherent.h | 28 +++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 43 ++++++++++++++++++++++++ arch/riscv/mm/pmem.c | 13 +++++++ 4 files changed, 91 insertions(+) create mode 100644 arch/riscv/include/asm/dma-noncoherent.harch/riscv/Kconfig +7
-0@@ -269,6 +269,13 @@ config RISCV_DMA_NONCOHERENT select ARCH_HAS_SYNC_DMA_FOR_DEVICE select DMA_DIRECT_REMAP +config RISCV_NONSTANDARD_CACHE_OPS + bool + depends on RISCV_DMA_NONCOHERENT + help + This enables function pointer support for non-standard noncoherent + systems to handle cache management. + config AS_HAS_INSN def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)arch/riscv/include/asm/dma-noncoherent.h new file +28
-0@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2023 Renesas Electronics Corp. +*/ + +#ifndef __ASM_DMA_NONCOHERENT_H +#define __ASM_DMA_NONCOHERENT_H + +#include <linux/dma-direct.h> + +/* +* struct riscv_nonstd_cache_ops - Structure for non-standard CMO function pointers +* +* @wback: Function pointer for cache writeback +* @inv: Function pointer for invalidating cache +* @wback_inv: Function pointer for flushing the cache (writeback + invalidating) +*/ +struct riscv_nonstd_cache_ops { +void (*wback)(phys_addr_t paddr,size_t size); +void (*inv)(phys_addr_t paddr,size_t size); +void (*wback_inv)(phys_addr_t paddr,size_t size); +}; + +extern struct riscv_nonstd_cache_ops noncoherent_cache_ops; + +void riscv_noncoherent_register_cache_ops (const struct riscv_nonstd_cache_ops *ops); + +#endif /* __ASM_DMA_NONCOHERENT_H */ arch/riscv/mm/dma-noncoherent.c +43
-0@@ -9,13 +9,26 @@#include <linux/dma-map-ops.h> #include <linux/mm.h> #include <asm/cacheflush.h> +#include <asm/dma-noncoherent.h> static bool noncoherent_supported__ro_after_init ; +struct riscv_nonstd_cache_ops noncoherent_cache_ops__ro_after_init = { + .wback =NULL , + .inv =NULL , + .wback_inv =NULL , +}; +static inline void arch_dma_cache_wback (phys_addr_t paddr,size_t size) {void *vaddr =phys_to_virt (paddr); +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.wback)) { + noncoherent_cache_ops.wback (paddr, size); +return ; + } +#endif ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); }@@ -23,6 +36,13 @@ static inline void arch_dma_cache_inv(phys_addr_t paddr, size_t size) {void *vaddr =phys_to_virt (paddr); +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.inv)) { + noncoherent_cache_ops.inv (paddr, size); +return ; + } +#endif +ALT_CMO_OP (inval, vaddr, size, riscv_cbom_block_size); }@@ -30,6 +50,13 @@ static inline void arch_dma_cache_wback_inv(phys_addr_t paddr, size_t size) {void *vaddr =phys_to_virt (paddr); +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.wback_inv)) { + noncoherent_cache_ops.wback_inv (paddr, size); +return ; + } +#endif +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); }@@ -95,6 +122,13 @@ void arch_dma_prep_coherent(struct page *page, size_t size) {void *flush_addr =page_address (page); +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.wback_inv)) { + noncoherent_cache_ops.wback_inv (page_to_phys (page), size); +return ; + } +#endif +ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size); }@@ -120,3 +154,12 @@ void riscv_noncoherent_supported(void) "Non-coherent DMA support enabled without a block size\n"); noncoherent_supported = true; } + +void riscv_noncoherent_register_cache_ops (const struct riscv_nonstd_cache_ops *ops) +{ +if (!ops) +return ; + + noncoherent_cache_ops = *ops; +} +EXPORT_SYMBOL_GPL (riscv_noncoherent_register_cache_ops);arch/riscv/mm/pmem.c +13
-1@@ -7,15 +7,28 @@#include <linux/libnvdimm.h> #include <asm/cacheflush.h> +#include <asm/dma-noncoherent.h> void arch_wb_cache_pmem (void *addr,size_t size) { +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.wback)) { + noncoherent_cache_ops.wback (virt_to_phys (addr), size); +return ; + } +#endif ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); }EXPORT_SYMBOL_GPL (arch_wb_cache_pmem);void arch_invalidate_pmem (void *addr,size_t size) { +#ifdef CONFIG_RISCV_NONSTANDARD_CACHE_OPS +if (unlikely (noncoherent_cache_ops.inv)) { + noncoherent_cache_ops.inv (virt_to_phys (addr), size); +return ; + } +#endif ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); }EXPORT_SYMBOL_GPL (arch_invalidate_pmem); --
Quoted 2 lines
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 4/6 dt-bindings: cache: andestech,ax45mp-cache: Add DT binding documentation for L2 cache controller
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Add DT binding documentation for L2 cache controller found on RZ/Five SoC.
The Renesas RZ/Five microprocessor includes a RISC-V CPU Core (AX45MP Single) from Andes. The AX45MP core has an L2 cache controller, this patch describes the L2 cache block.
---
v11 -> v12
* No Change
v10 -> v11
* No Change
v9 -> v10
* No Change
v8 -> v9
* No Change
v7 -> v8
* Updated commit header message
v6 -> v7
* No Change
v5 -> v6
* Included RB tag from Rob
v4 -> v5
* Dropped L2 cache configuration properties
* Dropped PMA configuration properties
* Ordered the required list to match the properties list
RFC v3 -> v4
* Dropped l2 cache configuration parameters
* s/larger/large
* Added minItems/maxItems for andestech,pma-regions
--- .../cache/andestech,ax45mp-cache.yaml | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml
Documentation/devicetree/bindings/cache/andestech,ax45mp-cache.yaml new file +81 -0
@@ -0,0 +1,81 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright (C) 2023 Renesas Electronics Corp. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/cache/andestech,ax45mp-cache.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Andestech AX45MP L2 Cache Controller + +maintainers: + - Lad Prabhakar <[email protected]> + +description: + A level-2 cache (L2C) is used to improve the system performance by providing + a large amount of cache line entries and reasonable access delays. The L2C + is shared between cores, and a non-inclusive non-exclusive policy is used. + +select: + properties: + compatible: + contains: + enum: + - andestech,ax45mp-cache + + required: + - compatible + +properties: + compatible: + items: + - const: andestech,ax45mp-cache + - const: cache + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + cache-line-size: + const: 64 + + cache-level: + const: 2 + + cache-sets: + const: 1024 + + cache-size: + enum: [131072, 262144, 524288, 1048576, 2097152] + + cache-unified: true + + next-level-cache: true + +additionalProperties: false + +required: + - compatible + - reg + - interrupts + - cache-line-size + - cache-level + - cache-sets + - cache-size + - cache-unified + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + cache-controller@2010000 { + compatible = "andestech,ax45mp-cache", "cache"; + reg = <0x13400000 0x100000>; + interrupts = <508 IRQ_TYPE_LEVEL_HIGH>; + cache-line-size = <64>; + cache-level = <2>; + cache-sets = <1024>; + cache-size = <262144>; + cache-unified; + };
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 5/6 cache: Add L2 cache management for Andes AX45MP RISC-V core
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
I/O Coherence Port (IOCP) provides an AXI interface for connecting external non-caching masters, such as DMA controllers. The accesses from IOCP are coherent with D-Caches and L2 Cache.
IOCP is a specification option and is disabled on the Renesas RZ/Five SoC due to this reason IP blocks using DMA will fail.
The Andes AX45MP core has a Programmable Physical Memory Attributes (PMA) block that allows dynamic adjustment of memory attributes in the runtime. It contains a configurable amount of PMA entries implemented as CSR registers to control the attributes of memory locations in interest. Below are the memory attributes supported:
* Device, Non-bufferable
* Device, bufferable
* Memory, Non-cacheable, Non-bufferable
* Memory, Non-cacheable, Bufferable
* Memory, Write-back, No-allocate
* Memory, Write-back, Read-allocate
* Memory, Write-back, Write-allocate
* Memory, Write-back, Read and Write-allocate
More info about PMA (section 10.3):
As a workaround for SoCs with IOCP disabled CMO needs to be handled by software. Firstly OpenSBI configures the memory region as "Memory, Non-cacheable, Bufferable" and passes this region as a global shared dma pool as a DT node. With DMA_GLOBAL_POOL enabled all DMA allocations happen from this region and synchronization callbacks are implemented to synchronize when doing DMA transactions.
Example PMA region passes as a DT node from OpenSBI:
reserved-memory {
#address-cells = <2>;
#size-cells = <2>;
ranges;
pma_resv0@58000000 {
compatible = "shared-dma-pool";
reg = <0x0 0x58000000 0x0 0x08000000>;
no-map;
linux,dma-default;
};
};---
v11 -> v12
* Used struct riscv_nonstd_cache_ops -> struct riscv_cache_ops
v10 -> v11
* Marked ax45mp_cmo_ops as __initdata
v9 -> v10
* Dropped preserving the cache lines in ax45mp_dma_cache_inv() callback
v8 -> v9
* Updated function pointers
v8 -> v9
* Dropped exporting CMO functions as we no more used ALTERNATIVE_X() macro
* Now using the riscv_noncoherent_register_cache_ops() for registering CMO ops
* Added RB tag from Conor
v7 -> v8
* Dropped function pointer usage
* Now exporting the functions for clean/inval/flush
* Switched to using early_initcall instead of arch_initcall
* Dropped entry for "include/cache" from MAINTAINERS
* Dropped dependency of RISCV on AX45MP_L2_CACHE
* Returning error in case of cache line mismatch
* Renamed clean/inval/flush functions
v6 -> v7
* Implemented flush callback
* Dropped using riscv_dma_noncoherent_cmo_ops
v5 -> v6
* Moved driver to cache folder
* Switched to new API for CMO
v4 -> v5
* Dropped code for configuring L2 cache
* Dropped code for configuring PMA
* Updated commit message
* Added comments
* Changed static branch enable/disable order
RFC v3 -> v4
* Made use of runtime patching instead of compile time
* Now just exposing single function ax45mp_no_iocp_cmo() for CMO handling
* Added a check to make sure cache line size is always 64 bytes
* Renamed folder rzf -> rzfive
* Improved Kconfig description
* Dropped L2 cache configuration
* Dropped unnecessary casts
* Fixed comments pointed by Geert.
--- MAINTAINERS | 7 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/cache/Kconfig | 11 ++ drivers/cache/Makefile | 3 + drivers/cache/ax45mp_cache.c | 213 +++++++++++++++++++++++++++++++++++ 6 files changed, 237 insertions(+) create mode 100644 drivers/cache/Kconfig create mode 100644 drivers/cache/Makefile create mode 100644 drivers/cache/ax45mp_cache.c
MAINTAINERS +7 -0
@@ -20250,6 +20250,13 @@ S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git F: drivers/staging/ +STANDALONE CACHE CONTROLLER DRIVERS +M: Conor Dooley <[email protected]> +L: [email protected] +S: Maintained +T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ +F: drivers/cache + STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <[email protected]> S: Odd Fixes
drivers/Kconfig +2 -0
@@ -15,6 +15,8 @@ source "drivers/base/Kconfig" source "drivers/bus/Kconfig" +source "drivers/cache/Kconfig" + source "drivers/connector/Kconfig" source "drivers/firmware/Kconfig"
drivers/Makefile +1 -0
@@ -11,6 +11,7 @@ ifdef building_out_of_srctree MAKEFLAGS += --include-dir=$(srctree) endif +obj-y += cache/ obj-y += irqchip/ obj-y += bus/
drivers/cache/Kconfig new file +11 -0
@@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +menu "Cache Drivers" + +config AX45MP_L2_CACHE + bool "Andes Technology AX45MP L2 Cache controller" + depends on RISCV_DMA_NONCOHERENT + select RISCV_NONSTANDARD_CACHE_OPS + help + Support for the L2 cache controller on Andes Technology AX45MP platforms. + +endmenu
drivers/cache/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_AX45MP_L2_CACHE) += ax45mp_cache.o
drivers/cache/ax45mp_cache.c new file +213 -0
213 lines not on this page · raw message
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v12 6/6 soc: renesas: Kconfig: Select the required configs for RZ/Five SoC
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Explicitly select the required Cache management and Errata configs required for the RZ/Five SoC.
---
v11 -> v12
* No change
v10 -> v11
* No change
v9 -> v10
* No change
v8 -> v9
* No change
v7 -> v8
* Included RB tag from Geert
v6 -> v7
* Included RB tag from Conor
v5 -> v6
* New patch
--- drivers/soc/renesas/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
drivers/soc/renesas/Kconfig +4 -0
@@ -334,6 +334,10 @@ if RISCV config ARCH_R9A07G043 bool "RISC-V Platform support for RZ/Five" select ARCH_RZG2L + select AX45MP_L2_CACHE + select DMA_GLOBAL_POOL + select ERRATA_ANDES + select ERRATA_ANDES_CMO help This enables support for the Renesas RZ/Five SoC.
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This series was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 8 lines · On Fri, 18 Aug 2023 14:57:17 +0100 you wrote:
From: Lad Prabhakar <[email protected]>
Hi All,
non-coherent DMA support for AX45MP
====================================[...]
Here is the summary with links:
- [v12,1/6] riscv: asm: vendorid_list: Add Andes Technology to the vendors list
https://git.kernel.org/riscv/c/93e0e2419b65 - [v12,2/6] riscv: errata: Add Andes alternative ports https://git.kernel.org/riscv/c/f2863f30d1b0 - [v12,3/6] riscv: mm: dma-noncoherent: nonstandard cache operations support https://git.kernel.org/riscv/c/30bc090f40f8 - [v12,4/6] dt-bindings: cache: andestech,ax45mp-cache: Add DT binding documentation for L2 cache controller https://git.kernel.org/riscv/c/555dd72bc06e - [v12,5/6] cache: Add L2 cache management for Andes AX45MP RISC-V core https://git.kernel.org/riscv/c/f508b0175578 - [v12,6/6] soc: renesas: Kconfig: Select the required configs for RZ/Five SoC https://git.kernel.org/riscv/c/ed1a8872ff83
You are awesome, thank you!
Signature · 9 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv