AX45MP: Add support to non-coherent DMA
Subsystems (6)
v5 cover AX45MP: Add support to non-coherent DMA
From: Lad Prabhakar <[email protected]>
Hi All,
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 (RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND) is implemented as part of errata. If we could access the DTB in errata I can get rid of this EXT ID from OpenSBI. Is there any approach we can access the DTB in patch callback?
Below are the configs which Andes port provides (and are selected by RZ/Five):
- ERRATA_ANDES
- ERRATA_ANDES_CMO
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.
An RFC patch for OpenSBI is posted here:
https://patchwork.ozlabs.org/project/opensbi/patch/[email protected]/
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.
- arch_sync_dma_for_device()
- arch_sync_dma_for_cpu()
4] RZ/Five SoC selects the below configs
- AX45MP_L2_CACHE
- DMA_GLOBAL_POOL
- ERRATA_ANDES
- ERRATA_ANDES_CMO
OpenSBI implementation patches can be found here:
1] https://patchwork.ozlabs.org/project/opensbi/cover/[email protected]/
2]https://patchwork.ozlabs.org/project/opensbi/patch/[email protected]/
Note,
- This series requires testing on Cores with zibcom and T-Head SoCs
- Ive used GCC 12.2.0 for compilation (tested with allmodconfig)
- Tested all the IP blocks on RZ/Five which use DMA
- Series is dependant on https://patchwork.kernel.org/project/linux-riscv/cover/[email protected]/
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: alternative-macros: Introduce ALTERNATIVE_3() macro
riscv: asm: vendorid_list: Add Andes Technology to the vendors list
riscv: errata: Add Andes alternative ports
riscv: mm: dma-noncoherent: Pass direction and operation to
ALT_CMO_OP()
dt-bindings: cache: r9a07g043f-l2-cache: Add DT binding documentation
for L2 cache controller
soc: renesas: Add L2 cache management for RZ/Five SoC
.../cache/andestech,ax45mp-cache.yaml | 81 ++++++ arch/riscv/Kconfig.erratas | 22 ++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 +++++++ arch/riscv/include/asm/alternative-macros.h | 46 +++- arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/cacheflush.h | 12 + arch/riscv/include/asm/errata_list.h | 41 ++- arch/riscv/include/asm/vendorid_list.h | 1 + arch/riscv/kernel/alternative.c | 5 + arch/riscv/mm/dma-noncoherent.c | 15 +- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++ 17 files changed, 576 insertions(+), 18 deletions(-) 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 drivers/soc/renesas/rzfive/Kconfig create mode 100644 drivers/soc/renesas/rzfive/Makefile create mode 100644 drivers/soc/renesas/rzfive/ax45mp_cache.c
Signature · 1 line
2.25.1
PATCH v5 1/6 riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
From: Lad Prabhakar <[email protected]>
Introduce ALTERNATIVE_3() macro.
A vendor wants to replace an old_content, but another vendor has used ALTERNATIVE_2() to patch its customized content at the same location. In this case, this vendor can use macro ALTERNATIVE_3() and then replace ALTERNATIVE_2() with ALTERNATIVE_3() to append its customized content.
While at it update comment above ALTERNATIVE_2() macro and make it generic so that the comment holds good for any new addition of ALTERNATIVE_X() macros.
---v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment for ALTERNATIVE_x() as suggested by Heiko
RFC v3 -> v4
* New patch
--- arch/riscv/include/asm/alternative-macros.h | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-)
arch/riscv/include/asm/alternative-macros.h +41 -5
@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */
@@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \
@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__
@@ -152,15 +175,28 @@_ALTERNATIVE_CFG (old_content, new_content, vendor_id, errata_id, CONFIG_k)/* -* A vendor wants to replace an old_content, but another vendor has used -* ALTERNATIVE() to patch its customized content at the same location. In -* this case, this vendor can create a new macro ALTERNATIVE_2() based -* on the following sample code and then replace ALTERNATIVE() with -* ALTERNATIVE_2() to append its customized content. +* ALTERNATIVE_x macros allow providing multiple replacement options +* for an ALTERNATIVE code section. This is helpful if multiple +* implementation variants for the same functionality exist for +* different cpu cores. +* +* Usage: +* ALTERNATIVE_x(old_content, +* new_content1, vendor_id1, errata_id1, CONFIG_k1, +* new_content2, vendor_id2, errata_id2, CONFIG_k2, +* ... +* new_contentx, vendor_idx, errata_idx, CONFIG_kx) */#define ALTERNATIVE_2 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) +#endif
Signature · 1 line
2.25.1
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Am Montag, 12. Dezember 2022, 12:55:00 CET schrieb Prabhakar:
Quoted 9 lines
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.
Quoted 5 lines
While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Signed-off-by Lad Prabhakar <[email protected]>
Quoted 86 lines
---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by HeikoRFC v3 -> v4
* New patch--- arch/riscv/include/asm/alternative-macros.h | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-)arch/riscv/include/asm/alternative-macros.h +34
-5@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__@@ -152,15 +175,28 @@_ALTERNATIVE_CFG (old_content, new_content, vendor_id, errata_id, CONFIG_k)/* -* A vendor wants to replace an old_content, but another vendor has used -* ALTERNATIVE() to patch its customized content at the same location. In -* this case, this vendor can create a new macro ALTERNATIVE_2() based -* on the following sample code and then replace ALTERNATIVE() with -* ALTERNATIVE_2() to append its customized content. +* ALTERNATIVE_x macros allow providing multiple replacement options +* for an ALTERNATIVE code section. This is helpful if multiple +* implementation variants for the same functionality exist for +* different cpu cores. +* +* Usage: +* ALTERNATIVE_x(old_content, +* new_content1, vendor_id1, errata_id1, CONFIG_k1, +* new_content2, vendor_id2, errata_id2, CONFIG_k2, +* ... +* new_contentx, vendor_idx, errata_idx, CONFIG_kx) */#define ALTERNATIVE_2 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
arch/riscv/include/asm/alternative-macros.h line 202
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +7
-0new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) +#endif
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
In reply to PrabhakarHi Prabhakar,
Quoted 13 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.
Quoted 5 lines
Signed-off-by Lad Prabhakar <[email protected]>---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by Heiko
Thanks for the update!
Quoted 36 lines
arch/riscv/include/asm/alternative-macros.h +16
-0@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@ __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \
arch/riscv/include/asm/alternative-macros.h line 134
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +7
-0new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */
To avoid breaking the build for K210 (and VexRiscv), you need to provide _ALTERNATIVE_CFG_3() for the !CONFIG_RISCV_ALTERNATIVE case, too:
@@ -144,6 +144,9 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
ALTERNATIVE_CFG old_c
+#define _ALTERNATIVE_CFG_3(old_c, ...) \
+ ALTERNATIVE_CFG old_c
+
#else /* !__ASSEMBLY__ */
#define __ALTERNATIVE_CFG(old_c) \
@@ -155,6 +158,9 @@
#define _ALTERNATIVE_CFG_2(old_c, ...) \
__ALTERNATIVE_CFG(old_c)
+#define _ALTERNATIVE_CFG_3(old_c, ...) \
+ __ALTERNATIVE_CFG(old_c)
+
#endif /* __ASSEMBLY__ */
#endif /* CONFIG_RISCV_ALTERNATIVE */
Else it fails (on riscv/for-next) with:
arch/riscv/mm/pmem.c: In function ‘arch_wb_cache_pmem’:arch/riscv/include/asm/alternative-macros.h:198:8: error: expected string literal before ‘_ALTERNATIVE_CFG_3’
198 | _ALTERNATIVE_CFG_3(old_content, new_content_1,
vendor_id_1, errata_id_1, CONFIG_k_1, \
| ^~~~~~~~~~~~~~~~~~
arch/riscv/include/asm/errata_list.h:128:14: note: in expansion of
macro ‘ALTERNATIVE_3’
128 | asm volatile(ALTERNATIVE_3( \
| ^~~~~~~~~~~~~
arch/riscv/mm/pmem.c:13:2: note: in expansion of macro ‘ALT_CMO_OP’
13 | ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size, 0, 0);
| ^~~~~~~~~~Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Hi Geert,
Thank you for the review.
Quoted 63 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 13 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Quoted 5 lines
Signed-off-by Lad Prabhakar <[email protected]>---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by HeikoThanks for the update!
Quoted 38 lines
arch/riscv/include/asm/alternative-macros.h +16
-0@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2,IS_ENABLED (CONFIG_k_2))
Quoted 12 lines
arch/riscv/include/asm/alternative-macros.h line 134
Quoted 8 lines
arch/riscv/include/asm/alternative-macros.h +7
-0+#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ To avoid breaking the build for K210 (and VexRiscv), you need to provide
_ALTERNATIVE_CFG_3()for the !CONFIG_RISCV_ALTERNATIVE case, too:
Thanks for testing this.
Quoted 20 lines
(quoted diff) +6
-0@@ -144,6 +144,9 @@ #define _ALTERNATIVE_CFG_2(old_c, ...) \ ALTERNATIVE_CFG old_c +#define _ALTERNATIVE_CFG_3(old_c, ...) \ + ALTERNATIVE_CFG old_c + #else /* !__ASSEMBLY__ */ #define __ALTERNATIVE_CFG(old_c) \@@ -155,6 +158,9 @@ #define _ALTERNATIVE_CFG_2(old_c, ...) \ __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG_3(old_c, ...) \ + __ALTERNATIVE_CFG(old_c) + #endif /* __ASSEMBLY__ */ #endif /* CONFIG_RISCV_ALTERNATIVE */
Quoted 2 lines
Else it fails (on riscv/for-next) with:
I'll include the above hunk in next version.
Quoted 16 lines
arch/riscv/mm/pmem.c: In function ‘arch_wb_cache_pmem’:arch/riscv/include/asm/alternative-macros.h:198:8: error: expected string literal before ‘_ALTERNATIVE_CFG_3’
198 | _ALTERNATIVE_CFG_3(old_content,new_content_1,vendor_id_1, errata_id_1, CONFIG_k_1, \ | ^~~~~~~~~~~~~~~~~~ arch/riscv/include/asm/errata_list.h:128:14: note: in expansion of macro ‘ALTERNATIVE_3’ 128 | asm volatile(ALTERNATIVE_3( \ | ^~~~~~~~~~~~~ arch/riscv/mm/pmem.c:13:2: note: in expansion of macro ‘ALT_CMO_OP’ 13 | ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size, 0, 0); | ^~~~~~~~~~Gr{oetje,eeting}s,
Quoted 8 lines
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Quoted 102 lines · Prabhakar
Hi Geert,
Thank you for the review.
Quoted 63 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 13 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Quoted 5 lines
Signed-off-by Lad Prabhakar <[email protected]>---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by HeikoThanks for the update!
Quoted 38 lines
arch/riscv/include/asm/alternative-macros.h +16
-0@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2,IS_ENABLED (CONFIG_k_2))Quoted 12 lines
arch/riscv/include/asm/alternative-macros.h line 134
Quoted 8 lines
arch/riscv/include/asm/alternative-macros.h +7
-0+#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ To avoid breaking the build for K210 (and VexRiscv), you need to provide
_ALTERNATIVE_CFG_3()for the !CONFIG_RISCV_ALTERNATIVE case, too:Thanks for testing this.
Quoted 20 lines
(quoted diff) +6
-0@@ -144,6 +144,9 @@ #define _ALTERNATIVE_CFG_2(old_c, ...) \ ALTERNATIVE_CFG old_c +#define _ALTERNATIVE_CFG_3(old_c, ...) \ + ALTERNATIVE_CFG old_c + #else /* !__ASSEMBLY__ */ #define __ALTERNATIVE_CFG(old_c) \@@ -155,6 +158,9 @@ #define _ALTERNATIVE_CFG_2(old_c, ...) \ __ALTERNATIVE_CFG(old_c) +#define _ALTERNATIVE_CFG_3(old_c, ...) \ + __ALTERNATIVE_CFG(old_c) + #endif /* __ASSEMBLY__ */ #endif /* CONFIG_RISCV_ALTERNATIVE */
Quoted 3 lines
Quoted 2 lines
Else it fails (on riscv/for-next) with:
I'll include the above hunk in next version.
Yes, those two hunks are in my example in [1] as well.
[1] https://lore.kernel.org/all/[email protected]/
Thanks,
drew
Quoted 25 lines
Quoted 25 lines
arch/riscv/mm/pmem.c: In function ‘arch_wb_cache_pmem’:arch/riscv/include/asm/alternative-macros.h:198:8: error: expected string literal before ‘_ALTERNATIVE_CFG_3’
198 | _ALTERNATIVE_CFG_3(old_content,new_content_1,vendor_id_1, errata_id_1, CONFIG_k_1, \ | ^~~~~~~~~~~~~~~~~~ arch/riscv/include/asm/errata_list.h:128:14: note: in expansion of macro ‘ALTERNATIVE_3’ 128 | asm volatile(ALTERNATIVE_3( \ | ^~~~~~~~~~~~~ arch/riscv/mm/pmem.c:13:2: note: in expansion of macro ‘ALT_CMO_OP’ 13 | ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size, 0, 0); | ^~~~~~~~~~Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
In reply to PrabhakarQuoted 78 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Signed-off-by Lad Prabhakar <[email protected]>---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by HeikoRFC v3 -> v4
* New patch--- arch/riscv/include/asm/alternative-macros.h | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-)arch/riscv/include/asm/alternative-macros.h +23
-0@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__@@ -152,15 +175,28 @@_ALTERNATIVE_CFG (old_content, new_content, vendor_id, errata_id, CONFIG_k)
arch/riscv/include/asm/alternative-macros.h line 181
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +4
-5/* -* A vendor wants to replace an old_content, but another vendor has used -* ALTERNATIVE() to patch its customized content at the same location. In -* this case, this vendor can create a new macro ALTERNATIVE_2() based -* on the following sample code and then replace ALTERNATIVE() with -* ALTERNATIVE_2() to append its customized content. +* ALTERNATIVE_x macros allow providing multiple replacement options +* for an ALTERNATIVE code section. This is helpful if multiple +* implementation variants for the same functionality exist for +* different cpu cores.
I think this last sentence should be:
"This is helpful if multiple implementation variants exist for the same functionality."
I don't think CPU cores is the right level of "granularity".
Quoted 9 lines
arch/riscv/include/asm/alternative-macros.h +7
-0+* +* Usage: +* ALTERNATIVE_x(old_content, +* new_content1, vendor_id1, errata_id1, CONFIG_k1, +* new_content2, vendor_id2, errata_id2, CONFIG_k2, +* ... +* new_contentx, vendor_idx, errata_idx, CONFIG_kx) */ #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \
arch/riscv/include/asm/alternative-macros.h line 200
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +6
-0new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \_ALTERNATIVE_CFG_2 (old_content ,new_content_1 ,vendor_id_1 ,errata_id_1 ,CONFIG_k_1 , \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3)
btw, why is this indented with spaces when the line above it is indented with tabs? (At least, that is how it appears in mutt).
With those minor bits & the suggested fixes from Drew/Geert:
Thanks,
Conor.
Quoted 5 lines
arch/riscv/include/asm/alternative-macros.h +1
-0+#endif Signature · 1 line
2.25.1
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Hi Conor,
Thank you for the review.
Quoted 80 lines · Conor Dooley
Quoted 78 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Signed-off-by Lad Prabhakar <[email protected]>---
v4->v5
* Rebased the patch on top of Andrew's series (now in Palmers for next-branch)
* Updated comment forALTERNATIVE_x()as suggested by HeikoRFC v3 -> v4
* New patch--- arch/riscv/include/asm/alternative-macros.h | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-)arch/riscv/include/asm/alternative-macros.h +23
-0@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */ @@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__@@ -152,15 +175,28 @@_ALTERNATIVE_CFG (old_content, new_content, vendor_id, errata_id, CONFIG_k)
Quoted 16 lines
arch/riscv/include/asm/alternative-macros.h line 181
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +4
-5/* -* A vendor wants to replace an old_content, but another vendor has used -* ALTERNATIVE() to patch its customized content at the same location. In -* this case, this vendor can create a new macro ALTERNATIVE_2() based -* on the following sample code and then replace ALTERNATIVE() with -* ALTERNATIVE_2() to append its customized content. +* ALTERNATIVE_x macros allow providing multiple replacement options +* for an ALTERNATIVE code section. This is helpful if multiple +* implementation variants for the same functionality exist for +* different cpu cores. I think this last sentence should be:
"This is helpful if multiple implementation variants exist for the same functionality."
I don't think CPU cores is the right level of "granularity".
Ok, I'll update it as above.
Quoted 20 lines
Quoted 9 lines
arch/riscv/include/asm/alternative-macros.h +7
-0+* +* Usage: +* ALTERNATIVE_x(old_content, +* new_content1, vendor_id1, errata_id1, CONFIG_k1, +* new_content2, vendor_id2, errata_id2, CONFIG_k2, +* ... +* new_contentx, vendor_idx, errata_idx, CONFIG_kx) */ #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \arch/riscv/include/asm/alternative-macros.h line 200
Quoted 10 lines
arch/riscv/include/asm/alternative-macros.h +6
-0new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \_ALTERNATIVE_CFG_2 (old_content ,new_content_1 ,vendor_id_1 ,errata_id_1 ,CONFIG_k_1 , \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3)
Quoted 3 lines
btw, why is this indented with spaces when the line above it is indented with tabs? (At least, that is how it appears in mutt).
I'll update it with spaces.
Quoted 3 lines
With those minor bits & the suggested fixes from Drew/Geert:
Reviewed-by Conor Dooley <[email protected]>
Cheers,
Prabhakar
Conor Dooley
maintainerRe: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Quoted 36 lines · Prabhakar
Quoted 36 lines · Prabhakar
Quoted 34 lines
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Signed-off-by Lad Prabhakar <[email protected]>+ *
+ * Usage:
+ * ALTERNATIVE_x(old_content,+ * new_content1, vendor_id1, errata_id1, CONFIG_k1, + * new_content2, vendor_id2, errata_id2, CONFIG_k2, + * ... + * new_contentx, vendor_idx, errata_idx, CONFIG_kx) */ #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2)arch/riscv/include/asm/alternative-macros.h +6
-0+#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3)
Quoted 4 lines
Quoted 3 lines
btw, why is this indented with spaces when the line above it is indented with tabs? (At least, that is how it appears in mutt).
I'll update it with spaces.
The file uses tabs, so it'd be switching the spaces you added with tabs, right?
Re: [PATCH v5 1/6] riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
Hi Conor,
Quoted 38 lines · Conor Dooley
Quoted 36 lines · Prabhakar
Quoted 36 lines · Prabhakar
Quoted 34 lines
From: Lad Prabhakar <[email protected]>
Introduce
ALTERNATIVE_3()macro.A vendor wants to replace an
old_content, but another vendor has usedALTERNATIVE_2()to patch its customized content at the same location. In this case, this vendor can use macroALTERNATIVE_3()and then replaceALTERNATIVE_2()withALTERNATIVE_3()to append its customized content.While at it update comment above
ALTERNATIVE_2()macro and make it generic so that the comment holds good for any new addition ofALTERNATIVE_X()macros.Signed-off-by Lad Prabhakar <[email protected]>+ *
+ * Usage:
+ * ALTERNATIVE_x(old_content,+ * new_content1, vendor_id1, errata_id1, CONFIG_k1, + * new_content2, vendor_id2, errata_id2, CONFIG_k2, + * ... + * new_contentx, vendor_idx, errata_idx, CONFIG_kx) */ #define ALTERNATIVE_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2)arch/riscv/include/asm/alternative-macros.h +6
-0+#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3)
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
btw, why is this indented with spaces when the line above it is indented with tabs? (At least, that is how it appears in mutt).
I'll update it with spaces.
The file uses tabs, so it'd be switching the spaces you added with tabs, right?
My bad that was a typo, I meant tabs :p
Cheers,
Prabhakar
PATCH v5 2/6 riscv: asm: vendorid_list: Add Andes Technology to the vendors list
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Add Andes Technology to the vendors list.
---
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 · 1 line
2.25.1
PATCH v5 3/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.
---
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.erratas | 22 +++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/errata_list.h | 5 ++ arch/riscv/kernel/alternative.c | 5 ++ 7 files changed, 130 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.c
arch/riscv/Kconfig.erratas +22 -0
@@ -1,5 +1,27 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on !XIP_KERNEL + select 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 !XIP_KERNEL
arch/riscv/errata/Makefile +1 -0
@@ -1,2 +1,3 @@ +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 +93 -0
93 lines not on this page · raw message
arch/riscv/include/asm/alternative.h +3 -0
@@ -43,6 +43,9 @@ struct errata_checkfunc_id {bool (*func)(struct alt_entry *alt); }; +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
@@ -9,6 +9,11 @@#include <asm/csr.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
@@ -40,6 +40,11 @@ static void __init_or_module riscv_fill_cpu_mfr_info(struct cpu_manufacturer_inf#endif 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 · 1 line
2.25.1
Conor Dooley
maintainerRe: [PATCH v5 3/6] riscv: errata: Add Andes alternative ports
Quoted 106 lines · Prabhakar
From: 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.
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Sorted the Kconfig/Makefile/Switch based on Core name
* Added a comments
* IntroducedRZFIVE_SBI_EXT_IOCP_SW_WORKAROUNDSBI 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.erratas | 22 +++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/errata_list.h | 5 ++ arch/riscv/kernel/alternative.c | 5 ++ 7 files changed, 130 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.carch/riscv/Kconfig.erratas +22
-0@@ -1,5 +1,27 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on !XIP_KERNEL + select 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 !XIP_KERNELarch/riscv/errata/Makefile +1
-0@@ -1,2 +1,3 @@ +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.oarch/riscv/errata/andes/errata.c new file +21
-0@@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Erratas to be applied for Andes CPU cores +* +* Copyright (C) 2022 Renesas Electronics Corporation. +* +* Author: Lad Prabhakar <[email protected]> +*/ + +#include <linux/kernel.h> +#include <linux/module.h> + +#include <asm/alternative.h> +#include <asm/cacheflush.h> +#include <asm/errata_list.h> +#include <asm/patch.h> +#include <asm/sbi.h> +#include <asm/vendorid_list.h> + +#define ANDESTECH_AX45MP_MARCHID 0x8000000000008a45UL +#define ANDESTECH_AX45MP_MIMPID 0x500UL
arch/riscv/errata/andes/errata.c line 31
Quoted 10 lines
arch/riscv/errata/andes/errata.c new file +10
-0+#define ANDESTECH_SBI_EXT_ANDES 0x0900031E + +#define RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND 0 + +static long ax45mp_iocp_sw_workaround (void ) +{ +struct sbiret ret; + + ret =sbi_ecall (ANDESTECH_SBI_EXT_ANDES ,RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND , +0 ,0 ,0 ,0 ,0 ,0 );
Seeing as you need a new version for some of the other bits, I think it would be good to add a minor comment here somewhere (be it here or the commit message) that links to the SBI specs for this.
I think this looks pretty good though.
Thanks,
Conor.
Quoted 111 lines
arch/riscv/errata/andes/errata.c new file +62
-0+ +return ret.error ?0 : ret.value; +} + +static bool errata_probe_iocp (unsigned int stage,unsigned long arch_id,unsigned long impid) +{ +if (!IS_ENABLED (CONFIG_ERRATA_ANDES_CMO )) +return false; + +if (arch_id !=ANDESTECH_AX45MP_MARCHID || impid !=ANDESTECH_AX45MP_MIMPID ) +return false; + +if (!ax45mp_iocp_sw_workaround ()) +return false; + +/* Set this just to make core cbo code happy */ + riscv_cbom_block_size =1 ; +riscv_noncoherent_supported (); + +return true; +} + +static u32 andes_errata_probe (unsigned int stage,unsigned long archid,unsigned long impid) +{ +u32 cpu_req_errata =0 ; + +/* +* In the absence of the I/O Coherency Port, access to certain peripherals +* requires vendor specific DMA handling. +*/ +if (errata_probe_iocp (stage, archid, impid)) + cpu_req_errata |=BIT (ERRATA_ANDESTECH_NO_IOCP ); + +return cpu_req_errata; +} + +void __init_or_module andes_errata_patch_func(struct alt_entry *begin, struct alt_entry *end, +unsigned long archid,unsigned long impid, +unsigned int stage) +{ +u32 cpu_req_errata =andes_errata_probe (stage, archid, impid); +struct alt_entry *alt; +u32 tmp; + +if (stage ==RISCV_ALTERNATIVES_EARLY_BOOT ) +return ; + +for (alt = begin; alt < end; alt++) { +if (alt->vendor_id !=ANDESTECH_VENDOR_ID ) +continue ; +if (alt->errata_id >=ERRATA_ANDESTECH_NUMBER ) +continue ; + + tmp =BIT (alt->errata_id); +if (cpu_req_errata & tmp) { +patch_text_nosync (alt->old_ptr, alt->alt_ptr, alt->alt_len); + +riscv_alternative_fix_offsets (alt->old_ptr, alt->alt_len, + alt->old_ptr - alt->alt_ptr); + } + } +}arch/riscv/include/asm/alternative.h +3
-0@@ -43,6 +43,9 @@ struct errata_checkfunc_id {bool (*func)(struct alt_entry *alt); }; +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@@ -9,6 +9,11 @@#include <asm/csr.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 1arch/riscv/kernel/alternative.c +5
-0@@ -40,6 +40,11 @@ static void __init_or_module riscv_fill_cpu_mfr_info(struct cpu_manufacturer_inf#endif 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 · 1 line
2.25.1
Re: [PATCH v5 3/6] riscv: errata: Add Andes alternative ports
Hi Conor,
Thank you for the review.
Quoted 115 lines · Conor Dooley
Quoted 113 lines · Prabhakar
From: 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.
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Sorted the Kconfig/Makefile/Switch based on Core name
* Added a comments
* IntroducedRZFIVE_SBI_EXT_IOCP_SW_WORKAROUNDSBI 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.erratas | 22 +++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/errata_list.h | 5 ++ arch/riscv/kernel/alternative.c | 5 ++ 7 files changed, 130 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.carch/riscv/Kconfig.erratas +22
-0@@ -1,5 +1,27 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on !XIP_KERNEL + select 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 !XIP_KERNELarch/riscv/errata/Makefile +1
-0@@ -1,2 +1,3 @@ +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.oarch/riscv/errata/andes/errata.c new file +28
-0@@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Erratas to be applied for Andes CPU cores +* +* Copyright (C) 2022 Renesas Electronics Corporation. +* +* Author: Lad Prabhakar <[email protected]> +*/ + +#include <linux/kernel.h> +#include <linux/module.h> + +#include <asm/alternative.h> +#include <asm/cacheflush.h> +#include <asm/errata_list.h> +#include <asm/patch.h> +#include <asm/sbi.h> +#include <asm/vendorid_list.h> + +#define ANDESTECH_AX45MP_MARCHID 0x8000000000008a45UL +#define ANDESTECH_AX45MP_MIMPID 0x500UL +#define ANDESTECH_SBI_EXT_ANDES 0x0900031E + +#define RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND 0 + +static long ax45mp_iocp_sw_workaround (void ) +{ +struct sbiret ret;
Quoted 8 lines
arch/riscv/errata/andes/errata.c line 31
Quoted 3 lines
arch/riscv/errata/andes/errata.c new file +3
-0+ + ret =sbi_ecall (ANDESTECH_SBI_EXT_ANDES ,RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND , +0 ,0 ,0 ,0 ,0 ,0 );Seeing as you need a new version for some of the other bits, I think it would be good to add a minor comment here somewhere (be it here or the commit message) that links to the SBI specs for this.
I think this looks pretty good though.
Sure I'll add a comment here.
I was wondering if we can get rid of this vendor specific extension here if we get access to the DT here (for example having a DT property which would indicate if IOCP CMO should be applied or not). Do you think that would be good approach? ATM we dont have a pointer here for FDT whie early patching.
Cheers,
Prabhakar
Conor Dooley
maintainerRe: [PATCH v5 3/6] riscv: errata: Add Andes alternative ports
Quoted 128 lines · Prabhakar
Hi Conor,
Thank you for the review.
Quoted 115 lines · Conor Dooley
Quoted 113 lines · Prabhakar
From: 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.
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Sorted the Kconfig/Makefile/Switch based on Core name
* Added a comments
* IntroducedRZFIVE_SBI_EXT_IOCP_SW_WORKAROUNDSBI 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.erratas | 22 +++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/errata_list.h | 5 ++ arch/riscv/kernel/alternative.c | 5 ++ 7 files changed, 130 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.carch/riscv/Kconfig.erratas +22
-0@@ -1,5 +1,27 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on !XIP_KERNEL + select 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 !XIP_KERNELarch/riscv/errata/Makefile +1
-0@@ -1,2 +1,3 @@ +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.oarch/riscv/errata/andes/errata.c new file +28
-0@@ -0,0 +1,93 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Erratas to be applied for Andes CPU cores +* +* Copyright (C) 2022 Renesas Electronics Corporation. +* +* Author: Lad Prabhakar <[email protected]> +*/ + +#include <linux/kernel.h> +#include <linux/module.h> + +#include <asm/alternative.h> +#include <asm/cacheflush.h> +#include <asm/errata_list.h> +#include <asm/patch.h> +#include <asm/sbi.h> +#include <asm/vendorid_list.h> + +#define ANDESTECH_AX45MP_MARCHID 0x8000000000008a45UL +#define ANDESTECH_AX45MP_MIMPID 0x500UL +#define ANDESTECH_SBI_EXT_ANDES 0x0900031E + +#define RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND 0 + +static long ax45mp_iocp_sw_workaround (void ) +{ +struct sbiret ret;Quoted 8 lines
arch/riscv/errata/andes/errata.c line 31
Quoted 3 lines
arch/riscv/errata/andes/errata.c new file +3
-0+ + ret =sbi_ecall (ANDESTECH_SBI_EXT_ANDES ,RZFIVE_SBI_EXT_IOCP_SW_WORKAROUND , +0 ,0 ,0 ,0 ,0 ,0 );Seeing as you need a new version for some of the other bits, I think it would be good to add a minor comment here somewhere (be it here or the commit message) that links to the SBI specs for this.
I think this looks pretty good though.
Quoted 7 lines
Sure I'll add a comment here.
I was wondering if we can get rid of this vendor specific extension here if we get access to the DT here (for example having a DT property which would indicate if IOCP CMO should be applied or not). Do you think that would be good approach? ATM we dont have a pointer here for FDT whie early patching.
I dunno. I think it is fine to use the ECALL to be honest - I'd rather that than a property that someone may omit.
That said, for the cache management stuff we are gonna need for PolarFire SoC, we will need to have info from the DT AFAICT - marchid etc are all set to zero on our platform so cannot be used.
I was thinking about using the compatible instead, but... we've not tried to "forward"-port our stuff from 5.15 yet as we have not yet completed testing testing on our vendor tree (and need some PCI changes accepted upstream first anyway), as a result I have not looked into what's needed there for use with alternatives. We've been using a pre-alternatives version of that patchset from around the 5.15 development point in time instead.
Thanks,
Conor.
Re: [PATCH v5 3/6] riscv: errata: Add Andes alternative ports
Hi Conor,
Quoted 27 lines · Conor Dooley
Quoted 25 lines · Prabhakar
Hi Conor,
Thank you for the review.
Quoted 20 lines · Conor Dooley
Quoted 18 lines · Prabhakar
From: 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.
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Sorted the Kconfig/Makefile/Switch based on Core name
* Added a comments
* IntroducedRZFIVE_SBI_EXT_IOCP_SW_WORKAROUNDSBI 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?
<snip>
Quoted 6 lines
Quoted 6 lines
Quoted 4 lines
Seeing as you need a new version for some of the other bits, I think it would be good to add a minor comment here somewhere (be it here or the commit message) that links to the SBI specs for this.
I think this looks pretty good though.Sure I'll add a comment here.
Quoted 9 lines
Quoted 5 lines
I was wondering if we can get rid of this vendor specific extension here if we get access to the DT here (for example having a DT property which would indicate if IOCP CMO should be applied or not). Do you think that would be good approach? ATM we dont have a pointer here for FDT whie early patching.
I dunno. I think it is fine to use the ECALL to be honest - I'd rather that than a property that someone may omit.
Ok, I was so I will stick with the current implementation.
Quoted 4 lines
That said, for the cache management stuff we are gonna need for PolarFire SoC, we will need to have info from the DT AFAICT - marchid etc are all set to zero on our platform so cannot be used.
Aha so while patching you will need a pointer to FDT node.
Quoted 8 lines
I was thinking about using the compatible instead, but... we've not tried to "forward"-port our stuff from 5.15 yet as we have not yet completed testing testing on our vendor tree (and need some PCI changes accepted upstream first anyway), as a result I have not looked into what's needed there for use with alternatives. We've been using a pre-alternatives version of that patchset from around the 5.15 development point in time instead.
Good to know. Let me know if you plan to implement the patching mechanism based on FDT soon. I can give it a test.
Cheers,
Prabhakar
PATCH v5 4/6 riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
In reply to PrabhakarFrom: Lad Prabhakar <[email protected]>
Pass direction and operation to ALT_CMO_OP() macro.
Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/ arch_dma_prep_coherent) so to handle such cases pass the direction and operation to ALT_CMO_OP() macro. This is in preparation for adding errata for the Andes CPU core.
---
v4 -> v5
* Updated commit message.
RFC v3 -> v4
* New patch
--- arch/riscv/include/asm/cacheflush.h | 4 ++++ arch/riscv/include/asm/errata_list.h | 8 ++++++-- arch/riscv/mm/dma-noncoherent.c | 15 ++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-)
arch/riscv/include/asm/cacheflush.h +4 -0
@@ -8,6 +8,10 @@#include <linux/mm.h> +#define NON_COHERENT_SYNC_DMA_FOR_DEVICE 0 +#define NON_COHERENT_SYNC_DMA_FOR_CPU 1 +#define NON_COHERENT_DMA_PREP 2 +static inline void local_flush_icache_all (void ) { asmvolatile ("fence.i" :::"memory" );
arch/riscv/include/asm/errata_list.h +6 -2
@@ -124,7 +124,7 @@ asm volatile(ALTERNATIVE( \#define THEAD_flush_A0 ".long 0x0275000b"#define THEAD_SYNC_S ".long 0x0190000b" -#define ALT_CMO_OP (_op, _start, _size, _cachesize) \ +#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \ asm volatile(ALTERNATIVE_2( \ __nops(6), \ "mv a0, %1\n\t" \
@@ -146,7 +146,11 @@ asm volatile(ALTERNATIVE_2( \ ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO) \ : : "r"(_cachesize), \" r"((unsigned long)(_start) & ~((_cachesize) - 1UL)), \ - "r"((unsigned long)(_start) + (_size)) \ +" r"((unsigned long)(_start) + (_size)), \ +" r"((unsigned long)(_start)), \ +" r"((unsigned long)(_size)), \ +" r"((unsigned long)(_dir)), \ +" r"((unsigned long)(_ops)) \ : "a0") #define THEAD_C9XX_RV_IRQ_PMU 17
arch/riscv/mm/dma-noncoherent.c +10 -5
@@ -19,13 +19,16 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,switch (dir) {case DMA_TO_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_FROM_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;default :break ;
@@ -42,7 +45,8 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,break ;case DMA_FROM_DEVICE :case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_CPU );break ;default :break ;
@@ -53,7 +57,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) {void *flush_addr =page_address (page); -ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size, +0 ,NON_COHERENT_DMA_PREP ); } void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
Signature · 1 line
2.25.1
Re: [PATCH v5 4/6] riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
Hi Prabhakar,
Quoted 11 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Pass direction and operation to
ALT_CMO_OP()macro.Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/
arch_dma_prep_coherent) so to handle such cases pass the direction and operation toALT_CMO_OP()macro. This is in preparation for adding errata for the Andes CPU core.Signed-off-by Lad Prabhakar <[email protected]>
Thanks for your patch!
arch/riscv/include/asm/errata_list.h asm volatile(ALTERNATIVE( \ · line 127
Quoted 8 lines
arch/riscv/include/asm/errata_list.h +1
-1@@ -124,7 +124,7 @@ asm volatile(ALTERNATIVE( \#define THEAD_flush_A0 ".long 0x0275000b"#define THEAD_SYNC_S ".long 0x0190000b" -#define ALT_CMO_OP (_op, _start, _size, _cachesize) \ +#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \
Since commit a49ab905a1fc8630 ("RISC-V: Implement arch specific PMEM APIs") in riscv/for-next, there are two new users of this macro, which need to be updated to (add two zeroes?).
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v5 4/6] riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
Hi Geert,
Quoted 24 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 11 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Pass direction and operation to
ALT_CMO_OP()macro.Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/
arch_dma_prep_coherent) so to handle such cases pass the direction and operation toALT_CMO_OP()macro. This is in preparation for adding errata for the Andes CPU core.Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 6 lines
arch/riscv/include/asm/errata_list.h +0
-0@@ -124,7 +124,7 @@ asm volatile(ALTERNATIVE( \#define THEAD_flush_A0 ".long 0x0275000b"#define THEAD_SYNC_S ".long 0x0190000b"
Quoted 7 lines
arch/riscv/include/asm/errata_list.h asm volatile(ALTERNATIVE( \ · line 127
Quoted 2 lines
arch/riscv/include/asm/errata_list.h +1
-1-#define ALT_CMO_OP (_op, _start, _size, _cachesize) \ +#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \Since commit
a49ab905a1fc8630("RISC-V: Implement arch specific PMEM APIs") in riscv/for-next, there are two new users of this macro, which need to be updated to (add two zeroes?).
Thanks for pointing that out, I'll rebase on for-next. I think -1 would be a better option than zeros.
Cheers,
Prabhakar
Conor Dooley
maintainerRe: [PATCH v5 4/6] riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
In reply to PrabhakarHey Prabhakar,
Quoted 9 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Pass direction and operation to
ALT_CMO_OP()macro.Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/
arch_dma_prep_coherent) so to handle such cases pass the direction and operation toALT_CMO_OP()macro. This is in preparation for adding errata for the Andes CPU core.
This patch seems to break the build on top of the most recent
linux-next:......./stuff/linux/arch/riscv/mm/pmem.c:13:53: error: too few arguments provided to function-like macro invocation
ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size);
^
/stuff/linux/arch/riscv/include/asm/errata_list.h:127:9: note: macro 'ALT_CMO_OP' defined here
#define ALT_CMO_OP(_op, _start, _size, _cachesize, _dir, _ops) \
^
.. CC block/partitions/sgi.o
.+...+/stuff/linux/arch/riscv/mm/pmem.c:13:2: error: use of undeclared identifier 'ALT_CMO_OP'
ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size);
^
/stuff/linux/arch/riscv/mm/pmem.c:19:53: error: too few arguments provided to function-like macro invocation
ALT_CMO_OP(inval, addr, size, riscv_cbom_block_size);
^
/stuff/linux/arch/riscv/include/asm/errata_list.h:127:9: note: macro 'ALT_CMO_OP' defined here
#define ALT_CMO_OP(_op, _start, _size, _cachesize, _dir, _ops) \
^
........... AR lib/math/built-in.a
./stuff/linux/arch/riscv/mm/pmem.c:19:2: .error: use of undeclared identifier 'ALT_CMO_OP'
ALT_CMO_OP(inval, addr, size, riscv_cbom_block_size);
^..4 errors generated.
The pmem stuff is new so that'd be why it has not come up before.
(FWIW, clang allmodconfig)
Quoted 102 lines
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Updated commit message.RFC v3 -> v4
* New patch--- arch/riscv/include/asm/cacheflush.h | 4 ++++ arch/riscv/include/asm/errata_list.h | 8 ++++++-- arch/riscv/mm/dma-noncoherent.c | 15 ++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-)arch/riscv/include/asm/cacheflush.h +4
-0@@ -8,6 +8,10 @@#include <linux/mm.h> +#define NON_COHERENT_SYNC_DMA_FOR_DEVICE 0 +#define NON_COHERENT_SYNC_DMA_FOR_CPU 1 +#define NON_COHERENT_DMA_PREP 2 +static inline void local_flush_icache_all (void ) { asmvolatile ("fence.i" :::"memory" );arch/riscv/include/asm/errata_list.h +6
-2@@ -124,7 +124,7 @@ asm volatile(ALTERNATIVE( \#define THEAD_flush_A0 ".long 0x0275000b"#define THEAD_SYNC_S ".long 0x0190000b" -#define ALT_CMO_OP (_op, _start, _size, _cachesize) \ +#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \ asm volatile(ALTERNATIVE_2( \ __nops(6), \ "mv a0, %1\n\t" \@@ -146,7 +146,11 @@ asm volatile(ALTERNATIVE_2( \ ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO) \ : : "r"(_cachesize), \" r"((unsigned long)(_start) & ~((_cachesize) - 1UL)), \ - "r"((unsigned long)(_start) + (_size)) \ +" r"((unsigned long)(_start) + (_size)), \ +" r"((unsigned long)(_start)), \ +" r"((unsigned long)(_size)), \ +" r"((unsigned long)(_dir)), \ +" r"((unsigned long)(_ops)) \ : "a0") #define THEAD_C9XX_RV_IRQ_PMU 17arch/riscv/mm/dma-noncoherent.c +10
-5@@ -19,13 +19,16 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,switch (dir) {case DMA_TO_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_FROM_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;default :break ;@@ -42,7 +45,8 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,break ;case DMA_FROM_DEVICE :case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_CPU );break ;default :break ;@@ -53,7 +57,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) {void *flush_addr =page_address (page); -ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size, +0 ,NON_COHERENT_DMA_PREP ); } void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,Signature · 1 line
2.25.1
Re: [PATCH v5 4/6] riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
Hi Conor,
Thank you for the review.
Quoted 36 lines · Conor Dooley
Hey Prabhakar,
Quoted 9 lines · Prabhakar
From: Lad Prabhakar <[email protected]>
Pass direction and operation to
ALT_CMO_OP()macro.Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/
arch_dma_prep_coherent) so to handle such cases pass the direction and operation toALT_CMO_OP()macro. This is in preparation for adding errata for the Andes CPU core.This patch seems to break the build on top of the most recent
linux-next:......./stuff/linux/arch/riscv/mm/pmem.c:13:53: error: too few arguments provided to function-like macro invocationALT_CMO_OP(clean, addr, size, riscv_cbom_block_size); ^ /stuff/linux/arch/riscv/include/asm/errata_list.h:127:9: note: macro 'ALT_CMO_OP' defined here #define ALT_CMO_OP(_op, _start, _size, _cachesize, _dir, _ops) \ ^ .. CC block/partitions/sgi.o .+...+/stuff/linux/arch/riscv/mm/pmem.c:13:2: error: use of undeclared identifier 'ALT_CMO_OP' ALT_CMO_OP(clean, addr, size, riscv_cbom_block_size); ^ /stuff/linux/arch/riscv/mm/pmem.c:19:53: error: too few arguments provided to function-like macro invocation ALT_CMO_OP(inval, addr, size, riscv_cbom_block_size); ^ /stuff/linux/arch/riscv/include/asm/errata_list.h:127:9: note: macro 'ALT_CMO_OP' defined here #define ALT_CMO_OP(_op, _start, _size, _cachesize, _dir, _ops) \ ^ ........... AR lib/math/built-in.a ./stuff/linux/arch/riscv/mm/pmem.c:19:2: .error: use of undeclared identifier 'ALT_CMO_OP' ALT_CMO_OP(inval, addr, size, riscv_cbom_block_size); ^
Quoted 6 lines
..4 errors generated.
The pmem stuff is new so that'd be why it has not come up before.
(FWIW, clang allmodconfig)
Yes I need to rebase my changes on Palmer's branch.
Cheers,
Prabhakar
PATCH v5 5/6 dt-bindings: cache: r9a07g043f-l2-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.
---
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) 2022 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 · 1 line
2.25.1
Re: [PATCH v5 5/6] dt-bindings: cache: r9a07g043f-l2-cache: Add DT binding documentation for L2 cache controller
Quoted 15 lines · Prabhakar
From: 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.
Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Dropped L2 cache configuration properties
* Dropped PMA configuration properties
* Ordered the required list to match the properties list
Quoted 9 lines
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
PATCH v5 6/6 soc: renesas: Add L2 cache management for RZ/Five SoC
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;
};
};---
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.
--- arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++ 7 files changed, 303 insertions(+), 6 deletions(-) create mode 100644 drivers/soc/renesas/rzfive/Kconfig create mode 100644 drivers/soc/renesas/rzfive/Makefile create mode 100644 drivers/soc/renesas/rzfive/ax45mp_cache.c
arch/riscv/include/asm/cacheflush.h +8 -0
@@ -68,6 +68,14 @@ static inline void riscv_noncoherent_supported(void) {}#define SYS_RISCV_FLUSH_ICACHE_LOCAL 1UL#define SYS_RISCV_FLUSH_ICACHE_ALL (SYS_RISCV_FLUSH_ICACHE_LOCAL) +#ifdef CONFIG_AX45MP_L2_CACHE +extern asmlinkage void ax45mp_no_iocp_cmo(unsigned int cache_size, void *vaddr, +size_t size,int dir,int ops); +#else +static inline void ax45mp_no_iocp_cmo (unsigned int cache_size,void *vaddr, +size_t size,int dir,int ops) {} +#endif +#include <asm-generic/cacheflush.h> #endif /* _ASM_RISCV_CACHEFLUSH_H */
arch/riscv/include/asm/errata_list.h +22 -6
@@ -125,8 +125,8 @@ asm volatile(ALTERNATIVE( \#define THEAD_SYNC_S ".long 0x0190000b"#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \ -asm volatile(ALTERNATIVE_2( \ - __nops(6), \ +asm volatile(ALTERNATIVE_3( \ + __nops(14), \ "mv a0, %1\n\t" \ "j 2f\n\t" \ "3:\n\t" \
@@ -134,7 +134,7 @@ asm volatile(ALTERNATIVE_2( \"add a0, a0, %0\n\t" \"2:\n\t" \"bltu a0, %2, 3b\n\t" \ -"nop" ,0 ,CPUFEATURE_ZICBOM ,CONFIG_RISCV_ISA_ZICBOM , \ + __nops(9 ),0 ,CPUFEATURE_ZICBOM ,CONFIG_RISCV_ISA_ZICBOM , \"mv a0, %1\n\t" \"j 2f\n\t" \"3:\n\t" \
@@ -142,8 +142,24 @@ asm volatile(ALTERNATIVE_2( \ "add a0, a0, %0\n\t" \ "2:\n\t" \ "bltu a0, %2, 3b\n\t" \ - THEAD_SYNC_S, THEAD_VENDOR_ID, \ - ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO) \ + THEAD_SYNC_S "\n\t" \ + __nops(8), THEAD_VENDOR_ID, \ + ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO, \ + "addi sp,sp,-16\n\t" \ + "sd s0,0(sp)\n\t" \ + "sd ra,8(sp)\n\t" \ + "addi s0,sp,16\n\t" \ + "mv a4,%6\n\t" \ + "mv a3,%5\n\t" \ + "mv a2,%4\n\t" \ + "mv a1,%3\n\t" \ + "mv a0,%0\n\t" \ + "call ax45mp_no_iocp_cmo\n\t" \ + "ld ra,8(sp)\n\t" \ + "ld s0,0(sp)\n\t" \ + "addi sp,sp,16\n\t", \ + ANDESTECH_VENDOR_ID, ERRATA_ANDESTECH_NO_IOCP, \ + CONFIG_ERRATA_ANDES_CMO) \ : : "r"(_cachesize), \"r" ((unsigned long )(_start) & ~((_cachesize) -1UL )), \ "r"((unsigned long)(_start) + (_size)), \
@@ -151,7 +167,7 @@ asm volatile(ALTERNATIVE_2( \ "r"((unsigned long)(_size)), \ "r"((unsigned long)(_dir)), \ "r"((unsigned long)(_ops)) \ - : "a0") + : "a0", "a1", "a2", "a3", "a4", "memory")#define THEAD_C9XX_RV_IRQ_PMU 17#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5
drivers/soc/renesas/Kconfig +6 -0
@@ -340,9 +340,15 @@ 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. +source "drivers/soc/renesas/rzfive/Kconfig" + endif # RISCV config RST_RCAR
drivers/soc/renesas/Makefile +2 -0
@@ -31,6 +31,8 @@ ifdef CONFIG_SMP obj-$(CONFIG_ARCH_R9A06G032) += r9a06g032-smp.o endif +obj-$(CONFIG_RISCV) += rzfive/ + # Family obj-$(CONFIG_RST_RCAR) += rcar-rst.o obj-$(CONFIG_SYSC_RCAR) += rcar-sysc.o
drivers/soc/renesas/rzfive/Kconfig new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 + +config AX45MP_L2_CACHE + bool "Andes Technology AX45MP L2 Cache controller" + help + Support for the L2 cache controller on Andes Technology AX45MP platforms.
drivers/soc/renesas/rzfive/Makefile new file +3 -0
@@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_AX45MP_L2_CACHE) += ax45mp_cache.o
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +256 -0
256 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Prabhakar,
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };
Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>
Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++
Given this touches arch/riscv/include/asm/, I don't think the code belongs under drivers/soc/renesas/.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Geert,
Quoted 63 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++
Quoted 3 lines
Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.
Ok. Do you have any suggestions on where you want me to put this code?
Cheers,
Prabhakar
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Prabhakar,
Quoted 62 lines · Prabhakar
Quoted 60 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++
Quoted 4 lines
Quoted 3 lines
Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under arch/riscv/.
if the RISC-V maintainers object to that, another option is drivers/soc/andestech/ or (new) drivers/cache/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Geert,
Quoted 70 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 65 lines · Prabhakar
Quoted 63 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.
Quoted 7 lines
Quoted 1 line
Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under
arch/riscv/.
if the RISC-V maintainers object to that, another option isdrivers/soc/andestech/or (new)drivers/cache/
RISC-V maintainers had already made it clear to not to include vendor specific stuff in the arch/riscv folder, so I'll consider putting this into drivers/cache/ folder to sync with the bindings.
Conor/Palmer - do you have any objections/suggestions?
Cheers,
Prabhakar
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 81 lines · Prabhakar
Hi Geert,
Quoted 70 lines · Geert Uytterhoeven
Hi Prabhakar,
Quoted 65 lines · Prabhakar
Quoted 63 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.Quoted 7 lines
Quoted 1 line
Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under
arch/riscv/.
if the RISC-V maintainers object to that, another option isdrivers/soc/andestech/or (new)drivers/cache/
Quoted 5 lines
RISC-V maintainers had already made it clear to not to include vendor specific stuff in the
arch/riscvfolder, so I'll consider putting this intodrivers/cache/folder to sync with the bindings.Conor/Palmer - do you have any objections/suggestions?
I'm not its maintainer so sorta moot what I say, but having drivers in arch/riscv makes little sense to me..
Putting stuff in drivers/cache does sound like a good idea since the binding is going there too.
The SiFive ccache driver is in drivers/soc and it was suggested to me this week that there's likely going to be a second SiFive cache driver at some point in the near future. Plus Microchip are going to have to add cache management stuff to the existing SiFive ccache driver. Having them be their own thing makes sense in my mind - especially since they're not tied to SoCs sold by Andes or SiFive.
I had a quick, and I mean *quick* look through other soc drivers to see if there were any other cache controller drivers but nothing stood out to me. Maybe someone else has more of a clue there. Ditto for misc, had a look but nothing seemed obvious.
If we do do drivers/cache & move the SiFive stuff there too, someone needs to look after it. I guess I can if noone else feels strongly since I seem to be the Responsible Adult for the SiFive ones already?
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Conor,
Quoted 95 lines · Conor Dooley
Quoted 76 lines · Prabhakar
Quoted 67 lines · Geert Uytterhoeven
Quoted 65 lines · Prabhakar
Quoted 63 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.Quoted 7 lines
Quoted 1 line
Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under
arch/riscv/.
if the RISC-V maintainers object to that, another option isdrivers/soc/andestech/or (new)drivers/cache/Quoted 5 lines
RISC-V maintainers had already made it clear to not to include vendor specific stuff in the
arch/riscvfolder, so I'll consider putting this intodrivers/cache/folder to sync with the bindings.Conor/Palmer - do you have any objections/suggestions?
I'm not its maintainer so sorta moot what I say, but having drivers in
arch/riscvmakes little sense to me..
Putting stuff indrivers/cachedoes sound like a good idea since the binding is going there too.The SiFive ccache driver is in
drivers/socand it was suggested to me this week that there's likely going to be a second SiFive cache driver at some point in the near future. Plus Microchip are going to have to add cache management stuff to the existing SiFive ccache driver. Having them be their own thing makes sense in my mind - especially since they're not tied to SoCs sold by Andes or SiFive.
Quoted 4 lines
I had a quick, and I mean *quick* look through other soc drivers to see if there were any other cache controller drivers but nothing stood out to me. Maybe someone else has more of a clue there. Ditto for misc, had a look but nothing seemed obvious.
Usually they're under arch/:
$ git ls-files -- "arch/*cache*" | wc -l 148 $ git ls-files -- "drivers/*cache*" | wc -l 63
E.g. arch/arm/mm/cache-l2x0.c.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 103 lines · Geert Uytterhoeven
Hi Conor,
Quoted 95 lines · Conor Dooley
Quoted 76 lines · Prabhakar
Quoted 67 lines · Geert Uytterhoeven
Quoted 65 lines · Prabhakar
Quoted 63 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.Quoted 7 lines
Quoted 1 line
Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under
arch/riscv/.
if the RISC-V maintainers object to that, another option isdrivers/soc/andestech/or (new)drivers/cache/Quoted 5 lines
RISC-V maintainers had already made it clear to not to include vendor specific stuff in the
arch/riscvfolder, so I'll consider putting this intodrivers/cache/folder to sync with the bindings.Conor/Palmer - do you have any objections/suggestions?
I'm not its maintainer so sorta moot what I say, but having drivers in
arch/riscvmakes little sense to me..
Putting stuff indrivers/cachedoes sound like a good idea since the binding is going there too.The SiFive ccache driver is in
drivers/socand it was suggested to me this week that there's likely going to be a second SiFive cache driver at some point in the near future. Plus Microchip are going to have to add cache management stuff to the existing SiFive ccache driver. Having them be their own thing makes sense in my mind - especially since they're not tied to SoCs sold by Andes or SiFive.Quoted 4 lines
I had a quick, and I mean *quick* look through other soc drivers to see if there were any other cache controller drivers but nothing stood out to me. Maybe someone else has more of a clue there. Ditto for misc, had a look but nothing seemed obvious.
Quoted 5 lines
Usually they're under
arch/:$ git ls-files -- "arch/*cache*" | wc -l 148 $ git ls-files -- "drivers/*cache*" | wc -l 63
That's for checking what I could not!
Don't think my roaming data would cover a kernel clone!
Quoted 1 line
E.g.
arch/arm/mm/cache-l2x0.c.
If that's where they usually go, is there a real reason not to do the same here?
Whatever about a limited set of riscv cache drivers, moving all the other ones around to a new directory doesnt seem like a great idea.
Palmer Dabbelt
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
In reply to Geert UytterhoevenQuoted 82 lines · On Thu, 15 Dec 2022 12:17:38 PST (-0800), [email protected] wrote:
Hi Conor,
Quoted 79 lines · Conor Dooley
Quoted 78 lines · Prabhakar
Quoted 67 lines · Geert Uytterhoeven
Quoted 65 lines · Prabhakar
Quoted 63 lines · Geert Uytterhoeven
Quoted 47 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Quoted 1 line
Signed-off-by Lad Prabhakar <[email protected]>Thanks for your patch!
Quoted 7 lines
arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++Given this touches
arch/riscv/include/asm/, I don't think the code belongs underdrivers/soc/renesas/.Quoted 7 lines
Quoted 1 line
Ok. Do you have any suggestions on where you want me to put this code?
As it plugs into core riscv functionality, I think it should be under
arch/riscv/.
if the RISC-V maintainers object to that, another option isdrivers/soc/andestech/or (new)drivers/cache/RISC-V maintainers had already made it clear to not to include vendor specific stuff in the
arch/riscvfolder, so I'll consider putting this
We have vendor-specific behavior in arch/riscv now, and it's even in the policies (the behavior has been there for a while, the policy is new). There's probably a bunch of posts saying otherwise because we used to not take vendor-specific behavior, but that's not the case any more.
Quoted 6 lines
Quoted 6 lines
Quoted 3 lines
into
drivers/cache/folder to sync with the bindings.Conor/Palmer - do you have any objections/suggestions?
I'm not its maintainer so sorta moot what I say, but having drivers in
arch/riscvmakes little sense to me..
Some drivers are pretty tightly coupled to an ISA, I'm thinking of things like interrupts/timers where we're writing CSRs. I could see how cache controllers would fall into that category, doubly so as they get integrated to the memory model. That leaves us in sort of a grey area and there's certainly ports that have way more drivers in arch so it's not an uncommon way to do things.
I generally lean pretty heavily towards keeping things that could at all be considered out of arch/riscv and instead have them in some sort of driver folder. That probably results in more total work to do, as we've got to have arch/riscv interfaces with one use case and sync up between multiple trees sometimes to get stuff merged. I think it also results in better code: being closer to the other drivers makes us more likely to get reviewed by folks who understand the space, and it's generally easier to share code in the subsystems.
Quoted 15 lines
Quoted 10 lines
Putting stuff in
drivers/cachedoes sound like a good idea since the binding is going there too.The SiFive ccache driver is in
drivers/socand it was suggested to me this week that there's likely going to be a second SiFive cache driver at some point in the near future. Plus Microchip are going to have to add cache management stuff to the existing SiFive ccache driver. Having them be their own thing makes sense in my mind - especially since they're not tied to SoCs sold by Andes or SiFive.Quoted 4 lines
I had a quick, and I mean *quick* look through other soc drivers to see if there were any other cache controller drivers but nothing stood out to me. Maybe someone else has more of a clue there. Ditto for misc, had a look but nothing seemed obvious.
Quoted 7 lines
Usually they're under
arch/:$ git ls-files -- "arch/*cache*" | wc -l 148 $ git ls-files -- "drivers/*cache*" | wc -l 63E.g.
arch/arm/mm/cache-l2x0.c.
Above all I like to do things as normally as possible, so if most cache drivers are in arch then I'm OK with. Looks like we originally had it arch/riscv, though, until 9209fb51896f ("riscv: move sifive_l2_cache.c to drivers/soc") moved it out.
I don't really remember this history/rationale here, at the time the SiFive cache driver wasn't really doing anything all that exciting: it was just way enable and some statistics, we hadn't really planned on using it for the non-coherent stuff that folks are now trying to retrofit it to handle. That sort of thing makes it a lot more coupled to the ISA.
Given that we already moved the SiFive one out it seems sane to just start with the rest in drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).
Quoted 3 lines
Gr{oetje,eeting}s,
Geert
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).
Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in drivers/ as they aren't really core architecture code.
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Palmer Dabbelt
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in
drivers/as they aren't really core architecture code.
That makes sense to me, it just looks like the SiFive ccache is the only one that's in drivers/soc/$VENDOR, the rest are in arch. It looks like mostly older ports that have vendor-specific cache files in arch (ie, arm has it but arm64 doesn't). Maybe that's just because the newer architectures sorted out standard ISA interfaces for these and thus don't need the vendor-specific bits? I think we're likely to end up with quite a few of these vendor-specific cache management schemes on RISC-V.
I'm always happy to keep stuff out of arch/riscv, though. So maybe we just buck the trend here and stick to drivers/soc/$VENDOR like we did for the first one?
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 21 lines · Palmer Dabbelt
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in
drivers/as they aren't really core architecture code.That makes sense to me, it just looks like the SiFive ccache is the only one that's in
drivers/soc/$VENDOR, the rest are in arch. It looks like mostly older ports that have vendor-specific cache files in arch (ie, arm has it but arm64 doesn't). Maybe that's just because the newer architectures sorted out standard ISA interfaces for these and thus don't need the vendor-specific bits? I think we're likely to end up with quite a few of these vendor-specific cache management schemes on RISC-V.
Quoted 3 lines
I'm always happy to keep stuff out of
arch/riscv, though. So maybe we just buck the trend here and stick todrivers/soc/$VENDORlike we did for the first one?
I don't particularly like drivers/soc/ to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.
The other things we have in drivers/soc/ are usually either soc_device drivers for identifying the system, or they export interfaces used by soc specific drivers.
Arnd
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 32 lines · Arnd Bergmann
Quoted 21 lines · Palmer Dabbelt
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in
drivers/as they aren't really core architecture code.That makes sense to me, it just looks like the SiFive ccache is the only one that's in
drivers/soc/$VENDOR, the rest are in arch. It looks like mostly older ports that have vendor-specific cache files in arch (ie, arm has it but arm64 doesn't). Maybe that's just because the newer architectures sorted out standard ISA interfaces for these and thus don't need the vendor-specific bits? I think we're likely to end up with quite a few of these vendor-specific cache management schemes on RISC-V.Quoted 3 lines
I'm always happy to keep stuff out of
arch/riscv, though. So maybe we just buck the trend here and stick todrivers/soc/$VENDORlike we did for the first one?I don't particularly like
drivers/soc/to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.
Quoted 3 lines
The other things we have in
drivers/soc/are usually eithersoc_devicedrivers for identifying the system, or they export interfaces used by soc specific drivers.
Sounds like that's two "not in my back yard" votes from the maintainers in question..
Doing drivers/cache would allow us to co-locate the RISC-V cache management bits since it is not just going to be the ax45mp l2 driver that will need to have them.
Would it be okay to put this driver in soc/andestech for now & then move it, and the SiFive one, once we've got patches posted for cache management with that?
Thanks,
Conor.
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Hi Conor,
Quoted 44 lines · Conor Dooley
Quoted 32 lines · Arnd Bergmann
Quoted 21 lines · Palmer Dabbelt
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in
drivers/as they aren't really core architecture code.That makes sense to me, it just looks like the SiFive ccache is the only one that's in
drivers/soc/$VENDOR, the rest are in arch. It looks like mostly older ports that have vendor-specific cache files in arch (ie, arm has it but arm64 doesn't). Maybe that's just because the newer architectures sorted out standard ISA interfaces for these and thus don't need the vendor-specific bits? I think we're likely to end up with quite a few of these vendor-specific cache management schemes on RISC-V.Quoted 3 lines
I'm always happy to keep stuff out of
arch/riscv, though. So maybe we just buck the trend here and stick todrivers/soc/$VENDORlike we did for the first one?I don't particularly like
drivers/soc/to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.Quoted 3 lines
The other things we have in
drivers/soc/are usually eithersoc_devicedrivers for identifying the system, or they export interfaces used by soc specific drivers.Sounds like that's two "not in my back yard" votes from the maintainers in question..
Doingdrivers/cachewould allow us to co-locate the RISC-V cache management bits since it is not just going to be the ax45mp l2 driver that will need to have them.
Quoted 4 lines
Would it be okay to put this driver in soc/andestech for now & then move it, and the SiFive one, once we've got patches posted for cache management with that?
I think to start with it would be better if we place the Andes cache driver in the proposed "drivers/cache" folder. We would avoid unnecessary movement of code?
Cheers,
Prabhakar
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 47 lines · Prabhakar
Hi Conor,
Quoted 44 lines · Conor Dooley
Quoted 32 lines · Arnd Bergmann
Quoted 21 lines · Palmer Dabbelt
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Palmer Dabbelt
Given that we already moved the SiFive one out it seems sane to just start with the rest in
drivers/soc/$VENDOR. Looks like it was Christoph's idea to do the move, so I'm adding him in case he's got an opinion (and also the SOC alias, as that seems generally relevant).Well, it isn't an integral architecture feature, so it doesn't really beloing into arch. Even the irqchip and timer drivers that are more less architectural are in
drivers/as they aren't really core architecture code.That makes sense to me, it just looks like the SiFive ccache is the only one that's in
drivers/soc/$VENDOR, the rest are in arch. It looks like mostly older ports that have vendor-specific cache files in arch (ie, arm has it but arm64 doesn't). Maybe that's just because the newer architectures sorted out standard ISA interfaces for these and thus don't need the vendor-specific bits? I think we're likely to end up with quite a few of these vendor-specific cache management schemes on RISC-V.Quoted 3 lines
I'm always happy to keep stuff out of
arch/riscv, though. So maybe we just buck the trend here and stick todrivers/soc/$VENDORlike we did for the first one?I don't particularly like
drivers/soc/to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.Quoted 3 lines
The other things we have in
drivers/soc/are usually eithersoc_devicedrivers for identifying the system, or they export interfaces used by soc specific drivers.Sounds like that's two "not in my back yard" votes from the maintainers in question..
Doingdrivers/cachewould allow us to co-locate the RISC-V cache management bits since it is not just going to be the ax45mp l2 driver that will need to have them.
Quoted 7 lines
Quoted 4 lines
Would it be okay to put this driver in soc/andestech for now & then move it, and the SiFive one, once we've got patches posted for cache management with that?
I think to start with it would be better if we place the Andes cache driver in the proposed "
drivers/cache" folder. We would avoid unnecessary movement of code?
Uh, go for it I guess. I'll try to put out a few patches for moving the sifive ccache driver & adding management stuff to it whenever I inevitably get bored over Christmas.
The offer to make me responsible for applying patches for drivers/cache still stands.
Thanks,
Conor.
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
In reply to Conor DooleyQuoted 20 lines · Conor Dooley
Quoted 9 lines · Arnd Bergmann
Quoted 1 line · Palmer Dabbelt
On Thu, 15 Dec 2022 23:02:58 PST (-0800), Christoph Hellwig wrote:
I don't particularly like
drivers/soc/to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.Quoted 3 lines
The other things we have in
drivers/soc/are usually eithersoc_devicedrivers for identifying the system, or they export interfaces used by soc specific drivers.Sounds like that's two "not in my back yard" votes from the maintainers in question..
Doingdrivers/cachewould allow us to co-locate the RISC-V cache management bits since it is not just going to be the ax45mp l2 driver that will need to have them.
Quoted 3 lines
Would it be okay to put this driver in soc/andestech for now & then move it, and the SiFive one, once we've got patches posted for cache management with that?
I actually had a look at both of these drivers now and found that they do entirely different things, so I would revise what I had said earlier. Sorry for not having paid enough attention at first.
The Sifive L2 cache driver handles an interrupt from the cache controller that is trigger by data corruption (corectable or uncorrectable). This is used as an implementation detail of drivers/edac/sifive_edac.c and could probably just be merged into that file.
The Andes cache driver in this series on the other hand does not do EDAC at all but instead handles cache maintenance for the dma-mapping interface by hooking into the inline-asm implementation details of arch/riscv/mm/dma-noncoherent.c as an errata fix. If we expect more nonstandard ways
to manage cache controllers for this, I think this
needs a proper interface in arch/riscv or drivers/cache.
This could be done the same way as arch/arm/include/asm/cacheflush.h with CPU specific cache management callback pointers, but can't really be a separate device driver without interacting with low-level architecture code.
Arnd
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
Quoted 21 lines · Arnd Bergmann
Quoted 20 lines · Conor Dooley
Quoted 9 lines · Arnd Bergmann
Quoted 1 line · Palmer Dabbelt
On Thu, 15 Dec 2022 23:02:58 PST (-0800), Christoph Hellwig wrote:
I don't particularly like
drivers/soc/to become more of a dumping ground for random drivers. If there are several SoCs that have the same requirement to do a particular thing, the logical step would be to put them into a proper subsystem, with a well-defined interface to dma-mapping and virtualization frameworks.Quoted 3 lines
The other things we have in
drivers/soc/are usually eithersoc_devicedrivers for identifying the system, or they export interfaces used by soc specific drivers.Sounds like that's two "not in my back yard" votes from the maintainers in question..
Doingdrivers/cachewould allow us to co-locate the RISC-V cache management bits since it is not just going to be the ax45mp l2 driver that will need to have them.
Quoted 8 lines
Quoted 3 lines
Would it be okay to put this driver in soc/andestech for now & then move it, and the SiFive one, once we've got patches posted for cache management with that?
I actually had a look at both of these drivers now and found that they do entirely different things, so I would revise what I had said earlier. Sorry for not having paid enough attention at first.
Eh, I wouldn't consider it to be your fault as, I at least, have been ignoring this difference as...
Quoted 11 lines
The Sifive L2 cache driver handles an interrupt from the cache controller that is trigger by data corruption (corectable or uncorrectable). This is used as an implementation detail of
drivers/edac/sifive_edac.cand could probably just be merged into that file.The Andes cache driver in this series on the other hand does not do EDAC at all but instead handles cache maintenance for the dma-mapping interface by hooking into the inline-asm implementation details of
arch/riscv/mm/dma-noncoherent.cas an errata fix.
...we (Microchip) need to add similar cache maintenance to the SiFive driver. Should have posted patches by now, but conferences + Christmas have delayed that a bit.
Quoted 3 lines
If we expect more nonstandard ways
to manage cache controllers for this, I think this needs a proper interface inarch/riscvordrivers/cache.
The Zicbo* extensions for cache management arrived after people had already been shipping SoCs that need stuff that isn't cache coherent. On top of the two already mentioned, I am told there are two other non-Zicbo* cache management solutions from SiFive alone - so I think it is likely that we'll have variants here, unfortunately.
Quoted 4 lines
This could be done the same way as
arch/arm/include/asm/cacheflush.hwith CPU specific cache management callback pointers, but can't really be a separate device driver without interacting with low-level architecture code.
I'll take a look at our patches again this week (they're 5.15 based, so well out of date, vendor tree stuff). I'll try to whip up something based on top of this series.
Thanks,
Conor.
Conor Dooley
maintainercover Generic function based cache management operations (was Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC)
From: Conor Dooley <[email protected]>
Hey all, hopefully the $subject arrived intact!
See here for prior discussion:
https://lore.kernel.org/linux-riscv/Y62nOqzyuUKqYDpq@spud/#R
Rather than continue that back and forth about where these drivers belonged, I've gone and created a mock-up for what it would look like if we picked drivers/cache.
IMO, doing drivers/cache for the detail of vendor behaviour makes sense as it'll keep 'em out of arch/riscv while keeping the drivers together.
I've taken v5 of Prabhakar's patchset & hacked at it a bit, so here is a tyre-kicked (more) generic implementation of cache management stuff via functions.
I initially went and moved both the ax45mp and ccache drivers to drivers/cache & created a "subsystem" like interface, but quickly realised it was all far too trivial to exist & was intrinsically tied to the ALT_CMO_OP alternative setup on RISC-V.
I trashed that so, and instead copied the interface currently used by riscv_set_cacheinfo_ops(), and created a corollary which registers cache management operations. Or maintenance, IDC which.
Instead of having the vendor specific cache controller function in the errata, the generic one is there instead, which then calls the one registered by the vendor driver.
I figure that even if no other non-coherent implementation ends up making it upstream, ax45mp is not going to be the only Andestech product that has a "no-iocp" variant...
I sent this over the Prabhakar the other day & it works for him, so I am now sending this here as RFC. I've not yet tested it on PolarFire SoC, as we have to sort out some "fun" where archid etc are all zero. We'll require some massaging before we can use the alternatives framework as is, so that'll have to come at a later date. I included a patch, but it's marked "DON'T APPLY" for a reason ;)
Notably, I have not fixed up any comments which were left against v5, bar a rebase on top of riscv/for-next. I blindly "fixed" the pmem issue, so that needs to be fixed properly for a v6, alongside the other couple bits.
The other thing that is missing, and I could not think immediately of a way to do it, is a way to add additional users of this type of CMO to the alternative without having to add a specific entry for each vendor. I had first thought about using archid of 0, but that runs into problems pretty quickly as that "archid" is what we use for enabling CPU_FEATURE stuff, like Zicbom itself.
Since archid uses the JEDEC IDs, perhaps we could squat on either a continuation code (or some vendor that won't make a RISC-V CPU, like Actel *cough*).
I didn't go through with mocking that up, as until we sort out PolarFire SoC, there's only one user for this that I, at least, would like to have supported properly.
So if anyone has ideas that are in any way less hacky than that, I am all ears.
Thanks,
Conor.
Conor Dooley (2):
cache,soc: Move SiFive CCache driver & create drivers/cache
RISC-V: create a function based cache management interface
Daire McNamara (1):
[DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Lad Prabhakar (6):
riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
riscv: asm: vendorid_list: Add Andes Technology to the vendors list
riscv: errata: Add Andes alternative ports
riscv: mm: dma-noncoherent: Pass direction and operation to
ALT_CMO_OP()
dt-bindings: cache: r9a07g043f-l2-cache: Add DT binding documentation
for L2 cache controller
soc: renesas: Add L2 cache management for RZ/Five SoC
.../cache/andestech,ax45mp-cache.yaml | 81 ++++++
MAINTAINERS | 15 +-
arch/riscv/Kconfig.erratas | 26 ++
arch/riscv/errata/Makefile | 1 +
arch/riscv/errata/andes/Makefile | 1 +
arch/riscv/errata/andes/errata.c | 93 +++++++
arch/riscv/include/asm/alternative-macros.h | 46 +++-
arch/riscv/include/asm/alternative.h | 3 +
arch/riscv/include/asm/cacheflush.h | 23 ++
arch/riscv/include/asm/errata_list.h | 41 ++-
arch/riscv/include/asm/vendorid_list.h | 1 +
arch/riscv/kernel/alternative.c | 5 +
arch/riscv/mm/dma-noncoherent.c | 36 ++-
arch/riscv/mm/pmem.c | 4 +-
drivers/Kconfig | 2 +
drivers/Makefile | 2 +
drivers/cache/Kconfig | 25 ++
drivers/{soc/sifive => cache}/Makefile | 2 +
drivers/cache/ax45mp_cache.c | 253 ++++++++++++++++++
drivers/{soc/sifive => cache}/sifive_ccache.c | 47 +++-
drivers/edac/sifive_edac.c | 2 +-
drivers/soc/Kconfig | 1 -
drivers/soc/Makefile | 1 -
drivers/soc/renesas/Kconfig | 4 +
drivers/soc/sifive/Kconfig | 10 -
include/{soc/sifive => cache}/sifive_ccache.h | 0
26 files changed, 684 insertions(+), 41 deletions(-)
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 drivers/cache/Kconfig
rename drivers/{soc/sifive => cache}/Makefile (62%)
create mode 100644 drivers/cache/ax45mp_cache.c
rename drivers/{soc/sifive => cache}/sifive_ccache.c (86%)
delete mode 100644 drivers/soc/sifive/Kconfig
rename include/{soc/sifive => cache}/sifive_ccache.h (100%)base-commit: b07de94d4501c61a3015cb0035227e449c51d87e
Signature · 1 line
2.39.0
Conor Dooley
maintainerRFC 1/9 riscv: asm: alternative-macros: Introduce ALTERNATIVE_3() macro
In reply to Conor DooleyFrom: Lad Prabhakar <[email protected]>
Introduce ALTERNATIVE_3() macro.
A vendor wants to replace an old_content, but another vendor has used ALTERNATIVE_2() to patch its customized content at the same location. In this case, this vendor can use macro ALTERNATIVE_3() and then replace ALTERNATIVE_2() with ALTERNATIVE_3() to append its customized content.
While at it update comment above ALTERNATIVE_2() macro and make it generic so that the comment holds good for any new addition of ALTERNATIVE_X() macros.
--- arch/riscv/include/asm/alternative-macros.h | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-)
arch/riscv/include/asm/alternative-macros.h +41 -5
@@ -50,8 +50,17 @@ ALT_NEW_CONTENT \vendor_id_2, \errata_id_2, \enable_2, \new_c_2 .endm +.macro ALTERNATIVE_CFG_3 old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3 + ALTERNATIVE_CFG_2 \old_c, \new_c_1, \vendor_id_1, \errata_id_1, \enable_1, \ + \new_c_2, \vendor_id_2, \errata_id_2, \enable_2 + ALT_NEW_CONTENT \vendor_id_3, \errata_id_3, \enable_3, \new_c_3 +.endm + #define __ALTERNATIVE_CFG(...) ALTERNATIVE_CFG __VA_ARGS__ #define __ALTERNATIVE_CFG_2(...) ALTERNATIVE_CFG_2 __VA_ARGS__ +#define __ALTERNATIVE_CFG_3(...) ALTERNATIVE_CFG_3 __VA_ARGS__#else /* !__ASSEMBLY__ */
@@ -98,6 +107,13 @@ __ALTERNATIVE_CFG(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1) \ ALT_NEW_CONTENT(vendor_id_2, errata_id_2, enable_2, new_c_2) +#define __ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2, \ + new_c_3, vendor_id_3, errata_id_3, enable_3) \ + __ALTERNATIVE_CFG_2(old_c, new_c_1, vendor_id_1, errata_id_1, enable_1, \ + new_c_2, vendor_id_2, errata_id_2, enable_2) \ + ALT_NEW_CONTENT(vendor_id_3, errata_id_3, enable_3, new_c_3) +#endif /* __ASSEMBLY__ */ #define _ALTERNATIVE_CFG (old_c, new_c, vendor_id, errata_id, CONFIG_k) \
@@ -108,6 +124,13 @@__ALTERNATIVE_CFG_2 (old_c, new_c_1, vendor_id_1, errata_id_1,IS_ENABLED (CONFIG_k_1), \ new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2)) +#define _ALTERNATIVE_CFG_3 (old_c, new_c_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_c_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_c_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + __ALTERNATIVE_CFG_3(old_c, new_c_1, vendor_id_1, errata_id_1, IS_ENABLED(CONFIG_k_1), \ + new_c_2, vendor_id_2, errata_id_2, IS_ENABLED(CONFIG_k_2), \ + new_c_3, vendor_id_3, errata_id_3, IS_ENABLED(CONFIG_k_3)) +#else /* CONFIG_RISCV_ALTERNATIVE */ #ifdef __ASSEMBLY__
@@ -152,15 +175,28 @@_ALTERNATIVE_CFG (old_content, new_content, vendor_id, errata_id, CONFIG_k)/* -* A vendor wants to replace an old_content, but another vendor has used -* ALTERNATIVE() to patch its customized content at the same location. In -* this case, this vendor can create a new macro ALTERNATIVE_2() based -* on the following sample code and then replace ALTERNATIVE() with -* ALTERNATIVE_2() to append its customized content. +* ALTERNATIVE_x macros allow providing multiple replacement options +* for an ALTERNATIVE code section. This is helpful if multiple +* implementation variants for the same functionality exist for +* different cpu cores. +* +* Usage: +* ALTERNATIVE_x(old_content, +* new_content1, vendor_id1, errata_id1, CONFIG_k1, +* new_content2, vendor_id2, errata_id2, CONFIG_k2, +* ... +* new_contentx, vendor_idx, errata_idx, CONFIG_kx) */#define ALTERNATIVE_2 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) \ _ALTERNATIVE_CFG_2(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2) +#define ALTERNATIVE_3 (old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) \ + _ALTERNATIVE_CFG_3(old_content, new_content_1, vendor_id_1, errata_id_1, CONFIG_k_1, \ + new_content_2, vendor_id_2, errata_id_2, CONFIG_k_2, \ + new_content_3, vendor_id_3, errata_id_3, CONFIG_k_3) +#endif
Signature · 1 line
2.39.0
Conor Dooley
maintainerRFC 2/9 riscv: asm: vendorid_list: Add Andes Technology to the vendors list
In reply to Conor DooleyFrom: Lad Prabhakar <[email protected]>
Add Andes Technology to the vendors list.
--- 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 · 1 line
2.39.0
Conor Dooley
maintainerRFC 3/9 riscv: errata: Add Andes alternative ports
In reply to Conor DooleyFrom: 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.
--- arch/riscv/Kconfig.erratas | 22 +++++++ arch/riscv/errata/Makefile | 1 + arch/riscv/errata/andes/Makefile | 1 + arch/riscv/errata/andes/errata.c | 93 ++++++++++++++++++++++++++++ arch/riscv/include/asm/alternative.h | 3 + arch/riscv/include/asm/errata_list.h | 5 ++ arch/riscv/kernel/alternative.c | 5 ++ 7 files changed, 130 insertions(+) create mode 100644 arch/riscv/errata/andes/Makefile create mode 100644 arch/riscv/errata/andes/errata.c
arch/riscv/Kconfig.erratas +22 -0
@@ -1,5 +1,27 @@ menu "CPU errata selection" +config ERRATA_ANDES + bool "Andes AX45MP errata" + depends on !XIP_KERNEL + select 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 !XIP_KERNEL
arch/riscv/errata/Makefile +1 -0
@@ -1,2 +1,3 @@ +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 +93 -0
93 lines not on this page · raw message
arch/riscv/include/asm/alternative.h +3 -0
@@ -43,6 +43,9 @@ struct errata_checkfunc_id {bool (*func)(struct alt_entry *alt); }; +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
@@ -9,6 +9,11 @@#include <asm/csr.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
@@ -40,6 +40,11 @@ static void __init_or_module riscv_fill_cpu_mfr_info(struct cpu_manufacturer_inf#endif 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 · 1 line
2.39.0
Conor Dooley
maintainerRFC 4/9 riscv: mm: dma-noncoherent: Pass direction and operation to ALT_CMO_OP()
In reply to Conor DooleyFrom: Lad Prabhakar <[email protected]>
Pass direction and operation to ALT_CMO_OP() macro.
Vendors might want to perform different operations based on the direction and callbacks (arch_sync_dma_for_device/arch_sync_dma_for_cpu/ arch_dma_prep_coherent) so to handle such cases pass the direction and operation to ALT_CMO_OP() macro. This is in preparation for adding errata for the Andes CPU core.
[Conor: blindy & incorrectly "fixed" pmem compilation. I've not even tried to use the defines.]
--- arch/riscv/include/asm/cacheflush.h | 4 ++++ arch/riscv/include/asm/errata_list.h | 8 ++++++-- arch/riscv/mm/dma-noncoherent.c | 15 ++++++++++----- arch/riscv/mm/pmem.c | 4 ++-- 4 files changed, 22 insertions(+), 9 deletions(-)
arch/riscv/include/asm/cacheflush.h +4 -0
@@ -8,6 +8,10 @@#include <linux/mm.h> +#define NON_COHERENT_SYNC_DMA_FOR_DEVICE 0 +#define NON_COHERENT_SYNC_DMA_FOR_CPU 1 +#define NON_COHERENT_DMA_PREP 2 +static inline void local_flush_icache_all (void ) { asmvolatile ("fence.i" :::"memory" );
arch/riscv/include/asm/errata_list.h +6 -2
@@ -124,7 +124,7 @@ asm volatile(ALTERNATIVE( \#define THEAD_flush_A0 ".long 0x0275000b"#define THEAD_SYNC_S ".long 0x0190000b" -#define ALT_CMO_OP (_op, _start, _size, _cachesize) \ +#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \ asm volatile(ALTERNATIVE_2( \ __nops(6), \ "mv a0, %1\n\t" \
@@ -146,7 +146,11 @@ asm volatile(ALTERNATIVE_2( \ ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO) \ : : "r"(_cachesize), \" r"((unsigned long)(_start) & ~((_cachesize) - 1UL)), \ - "r"((unsigned long)(_start) + (_size)) \ +" r"((unsigned long)(_start) + (_size)), \ +" r"((unsigned long)(_start)), \ +" r"((unsigned long)(_size)), \ +" r"((unsigned long)(_dir)), \ +" r"((unsigned long)(_ops)) \ : "a0") #define THEAD_C9XX_RV_IRQ_PMU 17
arch/riscv/mm/dma-noncoherent.c +10 -5
@@ -19,13 +19,16 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,switch (dir) {case DMA_TO_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_FROM_DEVICE : -ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_DEVICE );break ;default :break ;
@@ -42,7 +45,8 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size,break ;case DMA_FROM_DEVICE :case DMA_BIDIRECTIONAL : -ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, vaddr, size, riscv_cbom_block_size, + dir,NON_COHERENT_SYNC_DMA_FOR_CPU );break ;default :break ;
@@ -53,7 +57,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) {void *flush_addr =page_address (page); -ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size); +ALT_CMO_OP (flush, flush_addr, size, riscv_cbom_block_size, +0 ,NON_COHERENT_DMA_PREP ); } void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
arch/riscv/mm/pmem.c +2 -2
@@ -10,12 +10,12 @@void arch_wb_cache_pmem (void *addr,size_t size) { -ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); +ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size,0 ,0 ); }EXPORT_SYMBOL_GPL (arch_wb_cache_pmem);void arch_invalidate_pmem (void *addr,size_t size) { -ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); +ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size,0 ,0 ); }EXPORT_SYMBOL_GPL (arch_invalidate_pmem);
Signature · 1 line
2.39.0
Conor Dooley
maintainerRFC 5/9 dt-bindings: cache: r9a07g043f-l2-cache: Add DT binding documentation for L2 cache controller
In reply to Conor DooleyFrom: 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.
--- .../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) 2022 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 · 1 line
2.39.0
Conor Dooley
maintainerRFC 6/9 cache,soc: Move SiFive CCache driver & create drivers/cache
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
The Zicbo* set of extensions for cache maintenance arrived too late & several SoCs exist without them that require non-coherent DMA. As things stand, the StarFive JH7100, Microchip PolarFire SoC & Renesas RZ/Five all require cache maintenance and lack instructions for this purpose.
Create a subsystem for cache drivers so that vendor specific behaviour can be isolated from arch code, but keep the interfaces etc consistent. Move the existing SiFive CCache driver to create drivers/cache.
---
MAINTAINERS | 15 ++++++++-------
drivers/Kconfig | 2 ++
drivers/Makefile | 2 ++
drivers/{soc/sifive => cache}/Kconfig | 8 +++++++-
drivers/{soc/sifive => cache}/Makefile | 0
drivers/{soc/sifive => cache}/sifive_ccache.c | 2 +-
drivers/edac/sifive_edac.c | 2 +-
drivers/soc/Kconfig | 1 -
drivers/soc/Makefile | 1 -
include/{soc/sifive => cache}/sifive_ccache.h | 0
10 files changed, 21 insertions(+), 12 deletions(-)
rename drivers/{soc/sifive => cache}/Kconfig (56%)
rename drivers/{soc/sifive => cache}/Makefile (100%)
rename drivers/{soc/sifive => cache}/sifive_ccache.c (99%)
rename include/{soc/sifive => cache}/sifive_ccache.h (100%)MAINTAINERS +8 -7
@@ -19054,13 +19054,6 @@ S: Maintained F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml F: drivers/dma/sf-pdma/ -SIFIVE SOC 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/soc/sifive/ - SILEAD TOUCHSCREEN DRIVER M: Hans de Goede <[email protected]> L: [email protected]
@@ -19873,6 +19866,14 @@ 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 +F: include/cache + STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <[email protected]> S: Odd Fixes
drivers/Kconfig +2 -0
@@ -241,4 +241,6 @@ source "drivers/peci/Kconfig" source "drivers/hte/Kconfig" +source "drivers/cache/Kconfig" + endmenu
drivers/Makefile +2 -0
@@ -38,6 +38,8 @@ obj-y += clk/ # really early. obj-$(CONFIG_DMADEVICES) += dma/ +obj-y += cache/ + # SOC specific infrastructure drivers. obj-y += soc/
drivers/cache/Kconfig renamed from drivers/soc/sifive/Kconfig +7 -1
@@ -1,9 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -if SOC_SIFIVE +menuconfig CACHE_CONTROLLER + bool "Cache controller driver support" + default y if RISCV + +if CACHE_CONTROLLER config SIFIVE_CCACHE bool "Sifive Composable Cache controller" + depends on RISCV + default y help Support for the composable cache controller on SiFive platforms.
drivers/cache/Makefile renamed from drivers/soc/sifive/Makefile +0 -0
drivers/cache/sifive_ccache.c renamed from drivers/soc/sifive/sifive_ccache.c +1 -1
@@ -15,7 +15,7 @@#include <linux/device.h> #include <linux/bitfield.h> #include <asm/cacheinfo.h> -#include <soc/sifive/sifive_ccache.h> +#include <cache/sifive_ccache.h> #define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100#define SIFIVE_CCACHE_DIRECCFIX_HIGH 0x104
drivers/edac/sifive_edac.c +1 -1
@@ -10,7 +10,7 @@#include <linux/edac.h> #include <linux/platform_device.h> #include "edac_module.h" -#include <soc/sifive/sifive_ccache.h> +#include <cache/sifive_ccache.h> #define DRVNAME "sifive_edac"
drivers/soc/Kconfig +0 -1
@@ -21,7 +21,6 @@ source "drivers/soc/qcom/Kconfig" source "drivers/soc/renesas/Kconfig" source "drivers/soc/rockchip/Kconfig" source "drivers/soc/samsung/Kconfig" -source "drivers/soc/sifive/Kconfig" source "drivers/soc/sunxi/Kconfig" source "drivers/soc/tegra/Kconfig" source "drivers/soc/ti/Kconfig"
drivers/soc/Makefile +0 -1
@@ -27,7 +27,6 @@ obj-y += qcom/ obj-y += renesas/ obj-y += rockchip/ obj-$(CONFIG_SOC_SAMSUNG) += samsung/ -obj-$(CONFIG_SOC_SIFIVE) += sifive/ obj-y += sunxi/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-y += ti/
include/cache/sifive_ccache.h renamed from include/soc/sifive/sifive_ccache.h +0 -0
Signature · 1 line
2.39.0
Re: [RFC v5.1 6/9] cache,soc: Move SiFive CCache driver & create drivers/cache
Quoted 48 lines · Conor Dooley
From: Conor Dooley <[email protected]>
The Zicbo* set of extensions for cache maintenance arrived too late & several SoCs exist without them that require non-coherent DMA. As things stand, the StarFive JH7100, Microchip PolarFire SoC & Renesas RZ/Five all require cache maintenance and lack instructions for this purpose.
Create a subsystem for cache drivers so that vendor specific behaviour can be isolated from arch code, but keep the interfaces etc consistent. Move the existing SiFive CCache driver to createdrivers/cache.Signed-off-by Conor Dooley <[email protected]>--- MAINTAINERS | 15 ++++++++------- drivers/Kconfig | 2 ++ drivers/Makefile | 2 ++ drivers/{soc/sifive => cache}/Kconfig | 8 +++++++- drivers/{soc/sifive => cache}/Makefile | 0 drivers/{soc/sifive => cache}/sifive_ccache.c | 2 +- drivers/edac/sifive_edac.c | 2 +- drivers/soc/Kconfig | 1 - drivers/soc/Makefile | 1 - include/{soc/sifive => cache}/sifive_ccache.h | 0 10 files changed, 21 insertions(+), 12 deletions(-)rename
drivers/{soc/sifive=> cache}/Kconfig (56%) renamedrivers/{soc/sifive=> cache}/Makefile (100%) renamedrivers/{soc/sifive=>cache}/sifive_ccache.c(99%) renameinclude/{soc/sifive=>cache}/sifive_ccache.h(100%)MAINTAINERS +0
-7@@ -19054,13 +19054,6 @@ S: Maintained F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml F: drivers/dma/sf-pdma/ -SIFIVE SOC 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/soc/sifive/ - SILEAD TOUCHSCREEN DRIVER M: Hans de Goede <[email protected]> L: [email protected]
MAINTAINERS S: Supported · line 19875
Quoted 10 lines
MAINTAINERS +7
-0@@ -19873,6 +19866,14 @@ 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 +F: include/cache
I thought the riscv list was subscribers only?
Maybe if we do the suggestion of other cache drivers here we should either use the main kernel one or find some arch non-specific list.
Quoted 42 lines
MAINTAINERS +1
-0+ STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <[email protected]> S: Odd Fixesdrivers/Kconfig +2
-0@@ -241,4 +241,6 @@ source "drivers/peci/Kconfig" source "drivers/hte/Kconfig" +source "drivers/cache/Kconfig" + endmenudrivers/Makefile +2
-0@@ -38,6 +38,8 @@ obj-y += clk/ # really early. obj-$(CONFIG_DMADEVICES) += dma/ +obj-y += cache/ + # SOC specific infrastructure drivers. obj-y += soc/drivers/cache/Kconfig renamed from drivers/soc/sifive/Kconfig +3
-1@@ -1,9 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -if SOC_SIFIVE +menuconfig CACHE_CONTROLLER + bool "Cache controller driver support" + default y if RISCV
drivers/cache/Kconfig line 15
Quoted 10 lines
drivers/cache/Kconfig renamed from drivers/soc/sifive/Kconfig +4
-0+ +if CACHE_CONTROLLER config SIFIVE_CCACHE bool "Sifive Composable Cache controller" + depends on RISCV + default y help Support for the composable cache controller on SiFive platforms.
Maybe we should find and move the ARM PL cache controllers and have them here too?
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Conor Dooley
maintainerRe: [RFC v5.1 6/9] cache,soc: Move SiFive CCache driver & create drivers/cache
Quoted 50 lines · Ben Dooks
Quoted 49 lines · Conor Dooley
From: Conor Dooley <[email protected]>
The Zicbo* set of extensions for cache maintenance arrived too late & several SoCs exist without them that require non-coherent DMA. As things stand, the StarFive JH7100, Microchip PolarFire SoC & Renesas RZ/Five all require cache maintenance and lack instructions for this purpose.
Create a subsystem for cache drivers so that vendor specific behaviour can be isolated from arch code, but keep the interfaces etc consistent. Move the existing SiFive CCache driver to createdrivers/cache.Signed-off-by Conor Dooley <[email protected]>--- MAINTAINERS | 15 ++++++++------- drivers/Kconfig | 2 ++ drivers/Makefile | 2 ++ drivers/{soc/sifive => cache}/Kconfig | 8 +++++++- drivers/{soc/sifive => cache}/Makefile | 0 drivers/{soc/sifive => cache}/sifive_ccache.c | 2 +- drivers/edac/sifive_edac.c | 2 +- drivers/soc/Kconfig | 1 - drivers/soc/Makefile | 1 - include/{soc/sifive => cache}/sifive_ccache.h | 0 10 files changed, 21 insertions(+), 12 deletions(-)rename
drivers/{soc/sifive=> cache}/Kconfig (56%) renamedrivers/{soc/sifive=> cache}/Makefile (100%) renamedrivers/{soc/sifive=>cache}/sifive_ccache.c(99%) renameinclude/{soc/sifive=>cache}/sifive_ccache.h(100%)MAINTAINERS +0
-6@@ -19054,13 +19054,6 @@ S: Maintained F: Documentation/devicetree/bindings/dma/sifive,fu540-c000-pdma.yaml F: drivers/dma/sf-pdma/ -SIFIVE SOC 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/soc/sifive/ - SILEAD TOUCHSCREEN DRIVER M: Hans de Goede <[email protected]> L: [email protected]@@ -19873,6 +19866,14 @@ S: Supported T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git F: drivers/staging/
Quoted 8 lines
MAINTAINERS S: Supported · line 19875
Quoted 7 lines
MAINTAINERS +6
-0+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 +F: include/cacheI thought the riscv list was subscribers only?
Shouldn't be. At least, I'm not one on this account and I don't get complaints!
Quoted 2 lines
Maybe if we do the suggestion of other cache drivers here we should either use the main kernel one or find some arch non-specific list.
Yah, good point. I just moved the existing one, otherwise my script would yell at me about the maintainers pattern ;)
Quoted 42 lines
Quoted 42 lines
MAINTAINERS +1
-0+ STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <[email protected]> S: Odd Fixesdrivers/Kconfig +1
-0@@ -241,4 +241,6 @@ source "drivers/peci/Kconfig" source "drivers/hte/Kconfig" +source "drivers/cache/Kconfig" + endmenudrivers/Makefile +1
-0@@ -38,6 +38,8 @@ obj-y += clk/ # really early. obj-$(CONFIG_DMADEVICES) += dma/ +obj-y += cache/ + # SOC specific infrastructure drivers. obj-y += soc/ diff --git a/drivers/soc/sifive/Kconfig b/drivers/cache/Kconfigsimilarity index 56%
rename fromdrivers/soc/sifive/Kconfig
rename todrivers/cache/Kconfig
indexed4c571f8771..bc852f005c10100644drivers/cache/Kconfig renamed from drivers/soc/sifive/Kconfig +5
-0@@ -1,9 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 -if SOC_SIFIVE +menuconfig CACHE_CONTROLLER + bool "Cache controller driver support" + default y if RISCV + +if CACHE_CONTROLLER config SIFIVE_CCACHE bool "Sifive Composable Cache controller"
Quoted 8 lines
drivers/cache/Kconfig line 15
Quoted 5 lines
drivers/cache/Kconfig renamed from drivers/soc/sifive/Kconfig +2
-0+ depends on RISCV + default y help Support for the composable cache controller on SiFive platforms.Maybe we should find and move the ARM PL cache controllers and have them here too?
What to do there is up to Arnd et al :)
The maintainers entry would certainly have to look significantly different then.
Conor Dooley
maintainerRFC 7/9 RISC-V: create a function based cache management interface
In reply to Conor DooleyFrom: Conor Dooley <[email protected]>
The Zicbo* set of extensions for cache maintenance arrived too late & several SoCs exist without them that require non-coherent DMA. As things stand, the StarFive JH7100, Microchip PolarFire SoC & Renesas RZ/Five all require cache maintenance and lack instructions for this purpose.
Similar to the interface already used by the SiFive CCache driver to add cacheinfo_ops, create an interface for registering cache management functions for a given cache controller.
---
Yes, I made the cmo_patchfunc() __maybe_unused to escape LKP complaints. The other option that Prabhakar mentioned was having explicit functions for each of the operations, in which case I cmo_patchfunc() would go away. I don't particularly like the name of that function, so any suggestions there would be great!
--- arch/riscv/Kconfig.erratas | 4 ++++ arch/riscv/include/asm/cacheflush.h | 19 +++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+)
arch/riscv/Kconfig.erratas +4 -0
@@ -1,5 +1,8 @@ menu "CPU errata selection" +config ERRATA_CMO_FUNC + bool + config ERRATA_ANDES bool "Andes AX45MP errata" depends on !XIP_KERNEL
@@ -14,6 +17,7 @@ config ERRATA_ANDES config ERRATA_ANDES_CMO bool "Apply Andes cache management errata" depends on ERRATA_ANDES && MMU && ARCH_R9A07G043 + select ERRATA_CMO_FUNC select RISCV_DMA_NONCOHERENT default y help
arch/riscv/include/asm/cacheflush.h +19 -0
@@ -62,6 +62,25 @@ void riscv_noncoherent_supported(void);static inline void riscv_noncoherent_supported (void ) {}#endif +struct riscv_cache_maint_ops { +void (*cmo_patchfunc) (unsigned int cache_size,void *vaddr, +size_t size,int dir,int ops); +}; + +#ifdef CONFIG_RISCV_DMA_NONCOHERENT +void riscv_set_cache_maint_ops (struct riscv_cache_maint_ops *ops); +#else +static void riscv_set_cache_maint_ops (struct riscv_cache_maint_ops *ops) {} +#endif + +#ifdef CONFIG_ERRATA_CMO_FUNC +asmlinkage void cmo_patchfunc(unsigned int cache_size, void *vaddr, size_t size, +int dir,int ops); +#else +__maybe_unused static void cmo_patchfunc (unsigned int cache_size,void *vaddr, +size_t size,int dir,int ops) {} +#endif +/* * Bits in sys_riscv_flush_icache()'s flags argument. */
arch/riscv/mm/dma-noncoherent.c +21 -0
@@ -83,3 +83,24 @@ void riscv_noncoherent_supported(void) "Non-coherent DMA support enabled without a block size\n"); noncoherent_supported = true; } + +static struct riscv_cache_maint_ops *rv_cache_maint_ops; +static DEFINE_STATIC_KEY_FALSE (cmo_patchfunc_present); + +void riscv_set_cache_maint_ops (struct riscv_cache_maint_ops *ops) +{ + rv_cache_maint_ops = ops; +static_branch_enable (&cmo_patchfunc_present); +} +EXPORT_SYMBOL_GPL (riscv_set_cache_maint_ops); + +#ifdef CONFIG_ERRATA_CMO_FUNC +asmlinkage void cmo_patchfunc(unsigned int cache_size, void *vaddr, size_t size, +int dir,int ops) +{ +if (!static_branch_unlikely (&cmo_patchfunc_present)) +return ; + + rv_cache_maint_ops->cmo_patchfunc (cache_size, vaddr, size, dir, ops); +} +#endif
Signature · 1 line
2.39.0
Conor Dooley
maintainerRFC 8/9 soc: renesas: Add L2 cache management for RZ/Five SoC
In reply to Conor DooleyFrom: 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;
};
};--- arch/riscv/include/asm/errata_list.h | 28 ++- drivers/cache/Kconfig | 9 + drivers/cache/Makefile | 2 + drivers/cache/ax45mp_cache.c | 253 +++++++++++++++++++++++++++ drivers/soc/renesas/Kconfig | 4 + 5 files changed, 290 insertions(+), 6 deletions(-) create mode 100644 drivers/cache/ax45mp_cache.c
arch/riscv/include/asm/errata_list.h +22 -6
@@ -125,8 +125,8 @@ asm volatile(ALTERNATIVE( \#define THEAD_SYNC_S ".long 0x0190000b"#define ALT_CMO_OP (_op, _start, _size, _cachesize, _dir, _ops) \ -asm volatile(ALTERNATIVE_2( \ - __nops(6), \ +asm volatile(ALTERNATIVE_3( \ + __nops(14), \ "mv a0, %1\n\t" \ "j 2f\n\t" \ "3:\n\t" \
@@ -134,7 +134,7 @@ asm volatile(ALTERNATIVE_2( \"add a0, a0, %0\n\t" \"2:\n\t" \"bltu a0, %2, 3b\n\t" \ -"nop" ,0 ,CPUFEATURE_ZICBOM ,CONFIG_RISCV_ISA_ZICBOM , \ + __nops(9 ),0 ,CPUFEATURE_ZICBOM ,CONFIG_RISCV_ISA_ZICBOM , \"mv a0, %1\n\t" \"j 2f\n\t" \"3:\n\t" \
@@ -142,8 +142,24 @@ asm volatile(ALTERNATIVE_2( \ "add a0, a0, %0\n\t" \ "2:\n\t" \ "bltu a0, %2, 3b\n\t" \ - THEAD_SYNC_S, THEAD_VENDOR_ID, \ - ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO) \ + THEAD_SYNC_S "\n\t" \ + __nops(8), THEAD_VENDOR_ID, \ + ERRATA_THEAD_CMO, CONFIG_ERRATA_THEAD_CMO, \ + "addi sp,sp,-16\n\t" \ + "sd s0,0(sp)\n\t" \ + "sd ra,8(sp)\n\t" \ + "addi s0,sp,16\n\t" \ + "mv a4,%6\n\t" \ + "mv a3,%5\n\t" \ + "mv a2,%4\n\t" \ + "mv a1,%3\n\t" \ + "mv a0,%0\n\t" \ + "call cmo_patchfunc\n\t" \ + "ld ra,8(sp)\n\t" \ + "ld s0,0(sp)\n\t" \ + "addi sp,sp,16\n\t", \ + ANDESTECH_VENDOR_ID, ERRATA_ANDESTECH_NO_IOCP, \ + CONFIG_ERRATA_ANDES_CMO) \ : : "r"(_cachesize), \"r" ((unsigned long )(_start) & ~((_cachesize) -1UL )), \ "r"((unsigned long)(_start) + (_size)), \
@@ -151,7 +167,7 @@ asm volatile(ALTERNATIVE_2( \ "r"((unsigned long)(_size)), \ "r"((unsigned long)(_dir)), \ "r"((unsigned long)(_ops)) \ - : "a0") + : "a0", "a1", "a2", "a3", "a4", "memory")#define THEAD_C9XX_RV_IRQ_PMU 17#define THEAD_C9XX_CSR_SCOUNTEROF 0x5c5
drivers/cache/Kconfig +9 -0
@@ -6,6 +6,15 @@ menuconfig CACHE_CONTROLLER if CACHE_CONTROLLER +config AX45MP_L2_CACHE + bool "Andes Technology AX45MP L2 Cache controller" + depends on RISCV + depends on RISCV_SBI + default y + help + Support for the L2 cache controller on Andes Technology AX45MP + platforms. + config SIFIVE_CCACHE bool "Sifive Composable Cache controller" depends on RISCV
drivers/cache/Makefile +2 -0
@@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_AX45MP_L2_CACHE) += ax45mp_cache.o obj-$(CONFIG_SIFIVE_CCACHE) += sifive_ccache.o
drivers/cache/ax45mp_cache.c new file +253 -0
253 lines not on this page · raw message
drivers/soc/renesas/Kconfig +4 -0
@@ -340,6 +340,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 · 1 line
2.39.0
Conor Dooley
maintainerRFC 9/9 cache: sifive-ccache: add cache flushing capability
In reply to Conor DooleyFrom: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
drivers/cache/sifive_ccache.c +45 -0
@@ -9,12 +9,14 @@#define pr_fmt (fmt) "CCACHE: " fmt#include <linux/debugfs.h> +#include <linux/dma-direction.h> #include <linux/interrupt.h> #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/device.h> #include <linux/bitfield.h> #include <asm/cacheinfo.h> +#include <asm/cacheflush.h> #include <cache/sifive_ccache.h> #define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100
@@ -42,11 +44,15 @@#define SIFIVE_CCACHE_WAYENABLE 0x08#define SIFIVE_CCACHE_ECCINJECTERR 0x40 +#define SIFIVE_CCACHE_FLUSH64 0x200 +#define SIFIVE_CCACHE_FLUSH32 0x240 +#define SIFIVE_CCACHE_MAX_ECCINTR 4static void __iomem *ccache_base;static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR ];static struct riscv_cacheinfo_ops ccache_cache_ops; +static struct riscv_cache_maint_ops ccache_cmos;static int level;enum {
@@ -205,6 +211,42 @@ static irqreturn_t ccache_int_handler(int irq, void *device)return IRQ_HANDLED ; } +static void sifive_ccache_dma_wback_inv (void * vaddr,unsigned long size) +{ +void *__iomem flush = ccache_base +SIFIVE_CCACHE_FLUSH64 ; +phys_addr_t start =virt_to_phys (vaddr); +phys_addr_t aligned_start = start & ~0x3f ; +u64 addr; +u64 end; +u64 aligned_end; + + size += start - aligned_start; + end = start + size; + aligned_end = end +=0x3f ; + aligned_end &= ~0x3f ; + +for (addr = aligned_start; addr < aligned_end; addr +=64 ) +writeq (addr, flush); +} + +static void sifive_ccache_cmo (unsigned int cache_size,void *vaddr,size_t size, +int dir,int ops) +{ +switch (dir) { +case DMA_TO_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_FROM_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_BIDIRECTIONAL : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +default : +break ; + } +} +static int __init sifive_ccache_init (void ) {struct device_node *np;
@@ -254,6 +296,9 @@ static int __init sifive_ccache_init(void) ccache_cache_ops.get_priv_group = ccache_get_priv_group;riscv_set_cacheinfo_ops (&ccache_cache_ops); + ccache_cmos.cmo_patchfunc = sifive_ccache_cmo; +riscv_set_cache_maint_ops (&ccache_cmos); +#ifdef CONFIG_DEBUG_FS setup_sifive_debug ();#endif
Signature · 1 line
2.39.0
Palmer Dabbelt
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 3 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via
Do you have a pointer to the datasheet for whatever L2 controller is in the PFSOC? IIRC whether it's possible to correctly flush the cache is kind of subtle, as it depends on what else is floating around the SOC.
Quoted 104 lines
driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)drivers/cache/sifive_ccache.c +45
-0@@ -9,12 +9,14 @@#define pr_fmt (fmt) "CCACHE: " fmt#include <linux/debugfs.h> +#include <linux/dma-direction.h> #include <linux/interrupt.h> #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/device.h> #include <linux/bitfield.h> #include <asm/cacheinfo.h> +#include <asm/cacheflush.h> #include <cache/sifive_ccache.h> #define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100@@ -42,11 +44,15 @@#define SIFIVE_CCACHE_WAYENABLE 0x08#define SIFIVE_CCACHE_ECCINJECTERR 0x40 +#define SIFIVE_CCACHE_FLUSH64 0x200 +#define SIFIVE_CCACHE_FLUSH32 0x240 +#define SIFIVE_CCACHE_MAX_ECCINTR 4static void __iomem *ccache_base;static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR ];static struct riscv_cacheinfo_ops ccache_cache_ops; +static struct riscv_cache_maint_ops ccache_cmos;static int level;enum {@@ -205,6 +211,42 @@ static irqreturn_t ccache_int_handler(int irq, void *device)return IRQ_HANDLED ; } +static void sifive_ccache_dma_wback_inv (void * vaddr,unsigned long size) +{ +void *__iomem flush = ccache_base +SIFIVE_CCACHE_FLUSH64 ; +phys_addr_t start =virt_to_phys (vaddr); +phys_addr_t aligned_start = start & ~0x3f ; +u64 addr; +u64 end; +u64 aligned_end; + + size += start - aligned_start; + end = start + size; + aligned_end = end +=0x3f ; + aligned_end &= ~0x3f ; + +for (addr = aligned_start; addr < aligned_end; addr +=64 ) +writeq (addr, flush); +} + +static void sifive_ccache_cmo (unsigned int cache_size,void *vaddr,size_t size, +int dir,int ops) +{ +switch (dir) { +case DMA_TO_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_FROM_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_BIDIRECTIONAL : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +default : +break ; + } +} +static int __init sifive_ccache_init (void ) {struct device_node *np;@@ -254,6 +296,9 @@ static int __init sifive_ccache_init(void) ccache_cache_ops.get_priv_group = ccache_get_priv_group;riscv_set_cacheinfo_ops (&ccache_cache_ops); + ccache_cmos.cmo_patchfunc = sifive_ccache_cmo; +riscv_set_cache_maint_ops (&ccache_cmos); +#ifdef CONFIG_DEBUG_FS setup_sifive_debug ();#endif
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
In reply to Conor DooleyQuoted 15 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.
Quoted 3 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
My feeling here is that the cacheflush code is unrelated to the EDAC code and it should just be a separate file. From what I can tell, all of the existing contents of this file can simply get merged into drivers/edac/sifive_edac.c, with the newly added code becoming a standalone driver.
Arnd
Conor Dooley
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 20 lines · Arnd Bergmann
Quoted 15 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.Quoted 3 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
Quoted 5 lines
My feeling here is that the cacheflush code is unrelated to the EDAC code and it should just be a separate file. From what I can tell, all of the existing contents of this file can simply get merged into
drivers/edac/sifive_edac.c, with the newly added code becoming a standalone driver.
Sure? I'd like to do that independently of whatever is done for the ax45mp CMOs though, don't think it's worth holding up that platform's support on me splitting this out.
Thanks,
Conor.
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 27 lines · Conor Dooley
Quoted 20 lines · Arnd Bergmann
Quoted 15 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.Quoted 3 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)Quoted 5 lines
My feeling here is that the cacheflush code is unrelated to the EDAC code and it should just be a separate file. From what I can tell, all of the existing contents of this file can simply get merged into
drivers/edac/sifive_edac.c, with the newly added code becoming a standalone driver.
Quoted 3 lines
Sure? I'd like to do that independently of whatever is done for the ax45mp CMOs though, don't think it's worth holding up that platform's support on me splitting this out.
Right, no need to touch the existing file as part of this series, it probably just gets in the way of defining a good interface here.
Arnd
Conor Dooley
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 28 lines · Arnd Bergmann
Quoted 27 lines · Conor Dooley
Quoted 25 lines · Arnd Bergmann
Quoted 15 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.Quoted 3 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)My feeling here is that the cacheflush code is unrelated to the EDAC code and it should just be a separate file. From what I can tell, all of the existing contents of this file can simply get merged into
drivers/edac/sifive_edac.c, with the newly added code becoming a standalone driver.
Quoted 6 lines
Quoted 3 lines
Sure? I'd like to do that independently of whatever is done for the ax45mp CMOs though, don't think it's worth holding up that platform's support on me splitting this out.
Right, no need to touch the existing file as part of this series, it probably just gets in the way of defining a good interface here.
Sure. Can leave it where it was & I'll sort it out later when it's errata etc get added.
Btw, would you mind pointing out where you wanted to have that if/else you mentioned on IRC?
Thanks,
Conor.
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 8 lines · Conor Dooley
Quoted 2 lines
Right, no need to touch the existing file as part of this series, it probably just gets in the way of defining a good interface here.
Sure. Can leave it where it was & I'll sort it out later when it's errata etc get added.
Btw, would you mind pointing out where you wanted to have that if/else you mentioned on IRC?
I meant replacing both of the runtime patching indirections in arch_sync_dma_for_device(). At the moment, this function calls ALT_CMO_OP(), which is patched to either call the ZICBOM or the THEAD variant, and if I read this right you add a third case there with another level of indirection using static_branch.
I would try to replace both of these indirections and instead handle it all from C code in arch_sync_dma_for_device() directly, for the purpose of readability and maintainability.
static inline void dma_cache_clean(void *vaddr, size_t size)
{
if (!cache_maint_ops.clean)
zicbom_cache_clean(vaddr, size, riscv_cbom_block_size);
else
cache_maint_ops.clean(vaddr, size, riscv_cbom_block_size);
}void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,
enum dma_data_direction dir)
{
void *vaddr = phys_to_virt(paddr);
switch (dir) {
case DMA_TO_DEVICE:
case DMA_FROM_DEVICE:
dma_cache_clean(vaddr, size);
break;
case DMA_BIDIRECTIONAL:
dma_cache_flush(vaddr, size);
break;
default:
break;
}
}which then makes it very clear what the actual code path is, while leaving the zicbom case free of indirect function calls. You can still use a static_branch() to optimize the conditional, but I would try to avoid any extra indirection levels or errata checks.
Arnd
Conor Dooley
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Hey Arnd,
Quoted 7 lines · Arnd Bergmann
Quoted 6 lines · Conor Dooley
Quoted 2 lines
Right, no need to touch the existing file as part of this series, it probably just gets in the way of defining a good interface here.
Sure. Can leave it where it was & I'll sort it out later when it's errata etc get added.
Quoted 8 lines
Quoted 2 lines
Btw, would you mind pointing out where you wanted to have that if/else you mentioned on IRC?
I meant replacing both of the runtime patching indirections in
arch_sync_dma_for_device(). At the moment, this function callsALT_CMO_OP(), which is patched to either call the ZICBOM or the THEAD variant, and if I read this right you add a third case there with another level of indirection usingstatic_branch.
Yah, pretty much.
Quoted 7 lines
I would try to replace both of these indirections and instead handle it all from C code in
arch_sync_dma_for_device()directly, for the purpose of readability and maintainability. static inline voiddma_cache_clean(void *vaddr, size_t size){ if (!cache_maint_ops.clean) zicbom_cache_clean(vaddr, size, riscv_cbom_block_size);
And I figure that this function is effectively a wrapper around ALT_CMO_OP()?
Quoted 2 lines
else
cache_maint_ops.clean(vaddr, size, riscv_cbom_block_size);And this one gets registered by the driver using an interface like the one I already proposed, just with the cache_maint_ops struct expanded?
Extrapolating, with these changes having an errata would not even be needed in order to do cache maintenance.
Since the ALT_CMO_OP() version would only be used inside zicbom_cache_clean(), assuming I understood correctly, a driver could just register cache_maint_ops for a given platform without having to muck around with errata.
If so, that seems like a distinct improvement over my suggestion & gets around the thing I mentioned in 0/9 about a shared case in the alternative application code.
Again, assuming I understood correctly, I like this a lot.
Quoted 20 lines
}
void arch_sync_dma_for_device(phys_addr_t paddr,
size_tsize,
enumdma_data_directiondir){ void *vaddr = phys_to_virt(paddr); switch (dir) { case DMA_TO_DEVICE: case DMA_FROM_DEVICE: dma_cache_clean(vaddr, size); break; case DMA_BIDIRECTIONAL: dma_cache_flush(vaddr, size); break; default: break; } }
Quoted 5 lines
which then makes it very clear what the actual code path is, while leaving the zicbom case free of indirect function calls. You can still use a
static_branch()to optimize the conditional, but I would try to avoid any extra indirection levels or errata checks.
The other thing that I like about this is we can then remove the various calls to ALT_CMO_OP() that are scattered around arch/riscv now & replace them with functions that have more understandable names.
Thanks Arnd!
Conor.
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 10 lines · Conor Dooley
Quoted 8 lines · Arnd Bergmann
On Wed, Jan 4, 2023, at 10:23, Conor Dooley wrote:
I would try to replace both of these indirections and instead handle it all from C code inarch_sync_dma_for_device()directly, for the purpose of readability and maintainability. static inline voiddma_cache_clean(void *vaddr, size_t size){ if (!cache_maint_ops.clean) zicbom_cache_clean(vaddr, size, riscv_cbom_block_size);
Quoted 7 lines
And I figure that this function is effectively a wrapper around
ALT_CMO_OP()?Quoted 2 lines
else cache_maint_ops.clean(vaddr, size, riscv_cbom_block_size);And this one gets registered by the driver using an interface like the one I already proposed, just with the
cache_maint_opsstruct expanded?
Yes, exactly.
Quoted 6 lines
Extrapolating, with these changes having an errata would not even be needed in order to do cache maintenance.
Since theALT_CMO_OP()version would only be used insidezicbom_cache_clean(), assuming I understood correctly, a driver could just registercache_maint_opsfor a given platform without having to muck around with errata.
That is the idea, and ALT_CMO_OP() itself can just go away as by just putting the inline asm without the alternative into the zicbom_cache_clean() version, making the THEAD branch yet another cache_maint_ops instance.
Quoted 9 lines
Quoted 5 lines
which then makes it very clear what the actual code path is, while leaving the zicbom case free of indirect function calls. You can still use a
static_branch()to optimize the conditional, but I would try to avoid any extra indirection levels or errata checks.The other thing that I like about this is we can then remove the various calls to
ALT_CMO_OP()that are scattered aroundarch/riscvnow & replace them with functions that have more understandable names.
I only see them in arch/riscv/mm/dma-noncoherent.c and arch/riscv/mm/pmem.c, but yes, both of these should just call the new functions, whatever the calling conventions end up being.
Arnd
Conor Dooley
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 28 lines · Arnd Bergmann
Quoted 10 lines · Conor Dooley
Quoted 8 lines · Arnd Bergmann
On Wed, Jan 4, 2023, at 10:23, Conor Dooley wrote:
I would try to replace both of these indirections and instead handle it all from C code inarch_sync_dma_for_device()directly, for the purpose of readability and maintainability. static inline voiddma_cache_clean(void *vaddr, size_t size){ if (!cache_maint_ops.clean) zicbom_cache_clean(vaddr, size, riscv_cbom_block_size);Quoted 7 lines
And I figure that this function is effectively a wrapper around
ALT_CMO_OP()?Quoted 2 lines
else cache_maint_ops.clean(vaddr, size, riscv_cbom_block_size);And this one gets registered by the driver using an interface like the one I already proposed, just with the
cache_maint_opsstruct expanded?Yes, exactly.
Quoted 6 lines
Extrapolating, with these changes having an errata would not even be needed in order to do cache maintenance.
Since theALT_CMO_OP()version would only be used insidezicbom_cache_clean(), assuming I understood correctly, a driver could just registercache_maint_opsfor a given platform without having to muck around with errata.
Quoted 4 lines
That is the idea, and
ALT_CMO_OP()itself can just go away as by just putting the inline asm without the alternative into thezicbom_cache_clean()version, making the THEAD branch yet anothercache_maint_opsinstance.
Perhaps more of a question for Palmer than you, but how about leaving ALT_CMO_OP as-is in riscv/for-next at the moment, wrapping it in zicbom_cache_foo() & leaving that extraction for a follow-on work? There's another conversation going on about expanding the THEAD stuff, so that could be done on top of Prabhakar's v6.
That series is here:
https://lore.kernel.org/linux-riscv/CAJF2gTQp1bOp9kfoOkbvNnSXQhzrCpG3rn8C+LPPoJtMCCDOdA@mail.gmail.com/T/#t
Although unfortunately Icenowy is having issues getting their patches to the lists so I assume it'll get let through at some point today.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
which then makes it very clear what the actual code path is, while leaving the zicbom case free of indirect function calls. You can still use a
static_branch()to optimize the conditional, but I would try to avoid any extra indirection levels or errata checks.
Quoted 7 lines
Quoted 3 lines
The other thing that I like about this is we can then remove the various calls to
ALT_CMO_OP()that are scattered aroundarch/riscvnow & replace them with functions that have more understandable names.I only see them in
arch/riscv/mm/dma-noncoherent.candarch/riscv/mm/pmem.c, but yes, both of these should just call the new functions, whatever the calling conventions end up being.
Dunno why I had it in my head there was a third place. Seeing ghosts maybe!
Thanks,
Conor.
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 8 lines · Conor Dooley
Quoted 2 lines · Arnd Bergmann
Quoted 1 line · Conor Dooley
On Wed, Jan 04, 2023 at 11:19:44AM +0100, Arnd Bergmann wrote:
Perhaps more of a question for Palmer than you, but how about leaving
ALT_CMO_OPas-is in riscv/for-next at the moment, wrapping it inzicbom_cache_foo()& leaving that extraction for a follow-on work? There's another conversation going on about expanding the THEAD stuff, so that could be done on top of Prabhakar's v6.
Right, makes sense to me.
Arnd
Re: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
In reply to Conor DooleyQuoted 8 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>
Quoted 7 lines
---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.
I think errata isn't the right word here, it's more of a system requirement for anything that isn't coherent. All the SiFive systems I have are coherent so won't need this.
Quoted 45 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)drivers/cache/sifive_ccache.c +8
-0@@ -9,12 +9,14 @@#define pr_fmt (fmt) "CCACHE: " fmt#include <linux/debugfs.h> +#include <linux/dma-direction.h> #include <linux/interrupt.h> #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/device.h> #include <linux/bitfield.h> #include <asm/cacheinfo.h> +#include <asm/cacheflush.h> #include <cache/sifive_ccache.h> #define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100@@ -42,11 +44,15 @@#define SIFIVE_CCACHE_WAYENABLE 0x08#define SIFIVE_CCACHE_ECCINJECTERR 0x40 +#define SIFIVE_CCACHE_FLUSH64 0x200 +#define SIFIVE_CCACHE_FLUSH32 0x240 +#define SIFIVE_CCACHE_MAX_ECCINTR 4static void __iomem *ccache_base;static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR ];static struct riscv_cacheinfo_ops ccache_cache_ops; +static struct riscv_cache_maint_ops ccache_cmos;static int level;enum {@@ -205,6 +211,42 @@ static irqreturn_t ccache_int_handler(int irq, void *device)return IRQ_HANDLED ; } +static void sifive_ccache_dma_wback_inv (void * vaddr,unsigned long size) +{
drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 225
Quoted 10 lines
drivers/cache/sifive_ccache.c +10
-0+void *__iomem flush = ccache_base +SIFIVE_CCACHE_FLUSH64 ; +phys_addr_t start =virt_to_phys (vaddr); +phys_addr_t aligned_start = start & ~0x3f ; +u64 addr; +u64 end; +u64 aligned_end; + + size += start - aligned_start; + end = start + size; + aligned_end = end +=0x3f ;
I think you meant + 0x3f here. There is an align macro in the kernel headers, and I'm not sure by inspection if you'd miss the last line with this code.
drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 230
Quoted 5 lines
drivers/cache/sifive_ccache.c +5
-0+ aligned_end &= ~0x3f ; + +for (addr = aligned_start; addr < aligned_end; addr +=64 ) +writeq (addr, flush); +}
The p550 manual states that the zero device flush method is quicker for any large area flush. However not sure what that level is and whether it is worth dealing with here? If so we need to have the L3 zero are mapped.
drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 234
Quoted 4 lines
drivers/cache/sifive_ccache.c +4
-0+ +static void sifive_ccache_cmo (unsigned int cache_size,void *vaddr,size_t size, +int dir,int ops) +{
technically dir should have been of type "enum dma_data_direction"
Quoted 4 lines
drivers/cache/sifive_ccache.c +4
-0+switch (dir) { +case DMA_TO_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ;
drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 248
Quoted 10 lines
drivers/cache/sifive_ccache.c +10
-0+case DMA_FROM_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_BIDIRECTIONAL : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +default : +break ; + } +}
I'm not sure why you'd bother checking the dir here, the cache can only be flushed (I hope DMA_FROM_DEVICE is done /before/ the DMA op).
You could have saved yourself an include if just ignoring dir.
Quoted 14 lines
drivers/cache/sifive_ccache.c +4
-0+static int __init sifive_ccache_init (void ) {struct device_node *np;@@ -254,6 +296,9 @@ static int __init sifive_ccache_init(void) ccache_cache_ops.get_priv_group = ccache_get_priv_group;riscv_set_cacheinfo_ops (&ccache_cache_ops); + ccache_cmos.cmo_patchfunc = sifive_ccache_cmo; +riscv_set_cache_maint_ops (&ccache_cmos); +#ifdef CONFIG_DEBUG_FS setup_sifive_debug ();#endif
Signature · 4 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius https://www.codethink.co.uk/privacy.html
Conor Dooley
maintainerRe: [RFC v5.1 9/9] [DON'T APPLY] cache: sifive-ccache: add cache flushing capability
Quoted 17 lines · Ben Dooks
Quoted 8 lines · Conor Dooley
From: Daire McNamara <[email protected]>
SiFive L2 cache controller can flush L2 cache. Expose this capability via driver.
Signed-off-by Daire McNamara <[email protected]>[Conor: rebase on top of move to cache subsystem]Signed-off-by Conor Dooley <[email protected]>Quoted 7 lines
---
This commit needs more work, and a way to enable it from errata. I've not gone and done this as PolarFire SoC has archid etc all set to zero. So we need to go figure out a workaround for this, before adding in errata enabling code for this. I've included it here as a second user of the cache management stuff, since what's currently upstream for the ccache driver does not do any cache management.
Quoted 2 lines
I think errata isn't the right word here, it's more of a system requirement for anything that isn't coherent. All the SiFive systems I have are coherent so won't need this.
That's the mechanism we currently have for turning this stuff on.
This patch is going away anyway for an actual submission, so we can debate this sort of thing when it shows up for real. This patch does certainly seem to be distracting from the main point, which was supposed to be the interface to arch/riscv.
Quoted 105 lines
Quoted 39 lines
--- drivers/cache/sifive_ccache.c | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)drivers/cache/sifive_ccache.c +6
-0@@ -9,12 +9,14 @@#define pr_fmt (fmt) "CCACHE: " fmt#include <linux/debugfs.h> +#include <linux/dma-direction.h> #include <linux/interrupt.h> #include <linux/of_irq.h> #include <linux/of_address.h> #include <linux/device.h> #include <linux/bitfield.h> #include <asm/cacheinfo.h> +#include <asm/cacheflush.h> #include <cache/sifive_ccache.h> #define SIFIVE_CCACHE_DIRECCFIX_LOW 0x100@@ -42,11 +44,15 @@#define SIFIVE_CCACHE_WAYENABLE 0x08#define SIFIVE_CCACHE_ECCINJECTERR 0x40 +#define SIFIVE_CCACHE_FLUSH64 0x200 +#define SIFIVE_CCACHE_FLUSH32 0x240 +#define SIFIVE_CCACHE_MAX_ECCINTR 4static void __iomem *ccache_base;static int g_irq[SIFIVE_CCACHE_MAX_ECCINTR ];static struct riscv_cacheinfo_ops ccache_cache_ops; +static struct riscv_cache_maint_ops ccache_cmos;static int level;enum {@@ -205,6 +211,42 @@ static irqreturn_t ccache_int_handler(int irq, void *device)return IRQ_HANDLED ; } +static void sifive_ccache_dma_wback_inv(void* vaddr, unsigned long size) +{drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 224
Quoted 10 lines
drivers/cache/sifive_ccache.c +10
-0+void *__iomem flush = ccache_base +SIFIVE_CCACHE_FLUSH64 ; +phys_addr_t start =virt_to_phys (vaddr); +phys_addr_t aligned_start = start & ~0x3f ; +u64 addr; +u64 end; +u64 aligned_end; + + size += start - aligned_start; + end = start + size; + aligned_end = end +=0x3f ;I think you meant +
0x3fhere. There is an align macro in the kernel headers, and I'm not sure by inspection if you'd miss the last line with this code.drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 230
Quoted 5 lines
drivers/cache/sifive_ccache.c +5
-0+ aligned_end &= ~0x3f ; + +for (addr = aligned_start; addr < aligned_end; addr +=64 ) +writeq (addr, flush); +}The p550 manual states that the zero device flush method is quicker for any large area flush. However not sure what that level is and whether it is worth dealing with here? If so we need to have the L3 zero are mapped.
drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 234
Quoted 4 lines
drivers/cache/sifive_ccache.c +4
-0+ +static void sifive_ccache_cmo (unsigned int cache_size,void *vaddr,size_t size, +int dir,int ops) +{technically dir should have been of type "enum
dma_data_direction"Quoted 4 lines
drivers/cache/sifive_ccache.c +4
-0+switch (dir) { +case DMA_TO_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ;drivers/cache/sifive_ccache.c static irqreturn_t ccache_int_handler(int irq, void *device) · line 248
Quoted 10 lines
drivers/cache/sifive_ccache.c +10
-0+case DMA_FROM_DEVICE : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +case DMA_BIDIRECTIONAL : +sifive_ccache_dma_wback_inv (vaddr, size); +break ; +default : +break ; + } +}I'm not sure why you'd bother checking the dir here, the cache can only be flushed (I hope
DMA_FROM_DEVICEis done /before/ the DMA op).You could have saved yourself an include if just ignoring dir.
Quoted 13 lines
drivers/cache/sifive_ccache.c +3
-0+static int __init sifive_ccache_init (void ) {struct device_node *np;@@ -254,6 +296,9 @@ static int __init sifive_ccache_init(void) ccache_cache_ops.get_priv_group = ccache_get_priv_group;riscv_set_cacheinfo_ops (&ccache_cache_ops); + ccache_cmos.cmo_patchfunc = sifive_ccache_cmo; +riscv_set_cache_maint_ops (&ccache_cmos); +#ifdef CONFIG_DEBUG_FS setup_sifive_debug ();#endif
Conor Dooley
maintainerRe: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
In reply to PrabhakarHey Prabhakar,
Just a couple kinda minor bits here.
Quoted 172 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Dropped code for configuring L2 cache
* Dropped code for configuring PMA
* Updated commit message
* Added comments
* Changed static branch enable/disable orderRFC v3 -> v4
* Made use of runtime patching instead of compile time
* Now just exposing single functionax45mp_no_iocp_cmo()for CMO handling
* Added a check to make sure cache line size is always 64 bytes
* Renamed folder rzf -> rzfive
* ImprovedKconfigdescription
* Dropped L2 cache configuration
* Dropped unnecessary casts
* Fixed comments pointed by Geert.--- arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++ 7 files changed, 303 insertions(+), 6 deletions(-) create mode 100644 drivers/soc/renesas/rzfive/Kconfig create mode 100644 drivers/soc/renesas/rzfive/Makefile create mode 100644 drivers/soc/renesas/rzfive/ax45mp_cache.cdrivers/soc/renesas/rzfive/ax45mp_cache.c new file +88
-0@@ -0,0 +1,256 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* non-coherent cache functions for Andes AX45MP +* +* Copyright (C) 2022 Renesas Electronics Corp. +*/ + +#include <linux/cacheflush.h> +#include <linux/cacheinfo.h> +#include <linux/dma-direction.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> + +#include <asm/cacheflush.h> +#include <asm/sbi.h> + +/* L2 cache registers */ +#define AX45MP_L2C_REG_CTL_OFFSET 0x8 + +#define AX45MP_L2C_REG_C0_CMD_OFFSET 0x40 +#define AX45MP_L2C_REG_C0_ACC_OFFSET 0x48 +#define AX45MP_L2C_REG_STATUS_OFFSET 0x80 + +/* D-cache operation */ +#define AX45MP_CCTL_L1D_VA_INVAL 0 +#define AX45MP_CCTL_L1D_VA_WB 1 + +/* L2 CCTL status */ +#define AX45MP_CCTL_L2_STATUS_IDLE 0 + +/* L2 CCTL status cores mask */ +#define AX45MP_CCTL_L2_STATUS_C0_MASK 0xf + +/* L2 cache operation */ +#define AX45MP_CCTL_L2_PA_INVAL 0x8 +#define AX45MP_CCTL_L2_PA_WB 0x9 + +#define AX45MP_L2C_REG_PER_CORE_OFFSET 0x10 +#define AX45MP_CCTL_L2_STATUS_PER_CORE_OFFSET 4 + +#define AX45MP_L2C_REG_CN_CMD_OFFSET (n) \ + (AX45MP_L2C_REG_C0_CMD_OFFSET + ((n) * AX45MP_L2C_REG_PER_CORE_OFFSET)) +#define AX45MP_L2C_REG_CN_ACC_OFFSET (n) \ + (AX45MP_L2C_REG_C0_ACC_OFFSET + ((n) * AX45MP_L2C_REG_PER_CORE_OFFSET)) +#define AX45MP_CCTL_L2_STATUS_CN_MASK (n) \ + (AX45MP_CCTL_L2_STATUS_C0_MASK << ((n) * AX45MP_CCTL_L2_STATUS_PER_CORE_OFFSET)) + +#define AX45MP_CCTL_REG_UCCTLBEGINADDR_NUM 0x80b +#define AX45MP_CCTL_REG_UCCTLCOMMAND_NUM 0x80c + +#define AX45MP_CACHE_LINE_SIZE 64 + +struct ax45mp_priv { +void __iomem *l2c_base; +u32 ax45mp_cache_line_size; +}; + +static struct ax45mp_priv *ax45mp_priv; +static DEFINE_STATIC_KEY_FALSE (ax45mp_l2c_configured); + +/* L2 Cache operations */ +static inline uint32_t ax45mp_cpu_l2c_get_cctl_status (void ) +{ +return readl (ax45mp_priv->l2c_base +AX45MP_L2C_REG_STATUS_OFFSET ); +} + +/* +* Software trigger CCTL operation (cache maintenance operations) by writing +* to ucctlcommand and ucctlbeginaddr registers and write-back an L2 cache +* entry. +*/ +static void ax45mp_cpu_dcache_wb_range (void *start,void *end,int line_size) +{ +void __iomem *base = ax45mp_priv->l2c_base; +int mhartid =smp_processor_id (); +unsigned long pa; + +while (end > start) { +csr_write (AX45MP_CCTL_REG_UCCTLBEGINADDR_NUM , start); +csr_write (AX45MP_CCTL_REG_UCCTLCOMMAND_NUM ,AX45MP_CCTL_L1D_VA_WB ); + + pa =virt_to_phys (start); +writel (pa, base +AX45MP_L2C_REG_CN_ACC_OFFSET (mhartid)); +writel (AX45MP_CCTL_L2_PA_WB , + base +AX45MP_L2C_REG_CN_CMD_OFFSET (mhartid)); +while ((ax45mp_cpu_l2c_get_cctl_status () & +AX45MP_CCTL_L2_STATUS_CN_MASK (mhartid)) != +AX45MP_CCTL_L2_STATUS_IDLE )
drivers/soc/renesas/rzfive/ax45mp_cache.c line 98
Quoted 10 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +10
-0+ ; + + start += line_size; + } +} + +/* +* Software trigger CCTL operation by writing to ucctlcommand and ucctlbeginaddr +* registers and invalidate the L2 cache entry. +*/
This comment and the above are written in the wrong tense, I think it should be s/trigger/triggers/ & s/invalidate/invalidating/.
Quoted 31 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +31
-0+static void ax45mp_cpu_dcache_inval_range (void *start,void *end,int line_size) +{ +void __iomem *base = ax45mp_priv->l2c_base; +int mhartid =smp_processor_id (); +unsigned long pa; + +while (end > start) { +csr_write (AX45MP_CCTL_REG_UCCTLBEGINADDR_NUM , start); +csr_write (AX45MP_CCTL_REG_UCCTLCOMMAND_NUM ,AX45MP_CCTL_L1D_VA_INVAL ); + + pa =virt_to_phys (start); +writel (pa, base +AX45MP_L2C_REG_CN_ACC_OFFSET (mhartid)); +writel (AX45MP_CCTL_L2_PA_INVAL , + base +AX45MP_L2C_REG_CN_CMD_OFFSET (mhartid)); +while ((ax45mp_cpu_l2c_get_cctl_status () & +AX45MP_CCTL_L2_STATUS_CN_MASK (mhartid)) != +AX45MP_CCTL_L2_STATUS_IDLE ) + ; + + start += line_size; + } +} + +static void ax45mp_cpu_dma_inval_range (void *vaddr,size_t size) +{ +char cache_buf[2 ][AX45MP_CACHE_LINE_SIZE ]; +unsigned long start = (unsigned long )vaddr; +unsigned long end = start + size; +unsigned long old_start = start; +unsigned long old_end = end; +unsigned long line_size;
drivers/soc/renesas/rzfive/ax45mp_cache.c line 139
Quoted 10 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +10
-0+unsigned long flags; + +if (unlikely (start == end)) +return ; + + line_size = ax45mp_priv->ax45mp_cache_line_size; + +memset (&cache_buf,0x0 ,sizeof (cache_buf)); + start = start & (~(line_size -1 )); + end = ((end + line_size -1 ) & (~(line_size -1 )));
You've got an extra () in a lot of these operations that you can drop, both here and below.
Quoted 66 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +66
-0+ +local_irq_save (flags); +if (unlikely (start != old_start)) +memcpy (&cache_buf[0 ][0 ], (void *)start, line_size); + +if (unlikely (end != old_end)) +memcpy (&cache_buf[1 ][0 ], (void *)(old_end & (~(line_size -1 ))), line_size); + +ax45mp_cpu_dcache_inval_range (vaddr, (void *)end, line_size); + +if (unlikely (start != old_start)) +memcpy ((void *)start, &cache_buf[0 ][0 ], (old_start & (line_size -1 ))); + +local_irq_restore (flags); +} + +static void ax45mp_cpu_dma_wb_range (void *vaddr,size_t size) +{ +unsigned long start = (unsigned long )vaddr; +unsigned long end = start + size; +unsigned long line_size; +unsigned long flags; + + line_size = ax45mp_priv->ax45mp_cache_line_size; +local_irq_save (flags); + start = start & (~(line_size -1 )); +ax45mp_cpu_dcache_wb_range (vaddr, (void *)end, line_size); +local_irq_restore (flags); +} + +void ax45mp_no_iocp_cmo (unsigned int cache_size,void *vaddr,size_t size,int dir,int ops) +{ +if (ops ==NON_COHERENT_DMA_PREP ) +return ; + +if (!static_branch_unlikely (&ax45mp_l2c_configured)) +return ; + +if (ops ==NON_COHERENT_SYNC_DMA_FOR_DEVICE ) { +switch (dir) { +case DMA_FROM_DEVICE : +ax45mp_cpu_dma_inval_range (vaddr, size); +break ; +case DMA_TO_DEVICE : +case DMA_BIDIRECTIONAL : +ax45mp_cpu_dma_wb_range (vaddr, size); +break ; +default : +break ; + } +return ; + } + +/* op == NON_COHERENT_SYNC_DMA_FOR_CPU */ +if (dir ==DMA_BIDIRECTIONAL || dir ==DMA_FROM_DEVICE ) +ax45mp_cpu_dma_inval_range (vaddr, size); +} +EXPORT_SYMBOL (ax45mp_no_iocp_cmo); + +static void ax45mp_configure_l2_cache (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *dev = &pdev->dev; +int ret; + + ret =of_property_read_u32 (np,"cache-line-size" , &ax45mp_priv->ax45mp_cache_line_size);
drivers/soc/renesas/rzfive/ax45mp_cache.c line 215
Quoted 10 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +10
-0+if (ret) { +dev_err (dev,"Failed to get cache-line-size, defaulting to 64 bytes\n" ); + ax45mp_priv->ax45mp_cache_line_size =AX45MP_CACHE_LINE_SIZE ; + } + +if (ax45mp_priv->ax45mp_cache_line_size !=AX45MP_CACHE_LINE_SIZE ) { +dev_err (dev,"Expected cache-line-size to be 64 bytes (found:%u). Defaulting to 64 bytes\n" , + ax45mp_priv->ax45mp_cache_line_size); + ax45mp_priv->ax45mp_cache_line_size =AX45MP_CACHE_LINE_SIZE ; + }
Between both of your checks here, line-size is forced to be 64. Is anything other than 64 actually supported by this l2 cache? If not, should we in fact fail to probe if something else is detected rather than falling back?
If other sizes are possible, forcing it to 64 doesn't seem advisable either.
Thanks,
Conor.
Quoted 44 lines
drivers/soc/renesas/rzfive/ax45mp_cache.c new file +41
-0+} + +static int ax45mp_l2c_probe (struct platform_device *pdev) +{ + ax45mp_priv =devm_kzalloc (&pdev->dev,sizeof (*ax45mp_priv),GFP_KERNEL ); +if (!ax45mp_priv) +return -ENOMEM ; + + ax45mp_priv->l2c_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (ax45mp_priv->l2c_base)) +return PTR_ERR (ax45mp_priv->l2c_base); + +ax45mp_configure_l2_cache (pdev); + +static_branch_enable (&ax45mp_l2c_configured); + +return 0 ; +} + +static const struct of_device_id ax45mp_cache_ids[] = { + { .compatible ="andestech,ax45mp-cache" }, + {/* sentinel */ } +}; + +static struct platform_driver ax45mp_l2c_driver = { + .driver = { + .name ="ax45mp-l2c" , + .of_match_table = ax45mp_cache_ids, + }, + .probe = ax45mp_l2c_probe, +}; + +static int __init ax45mp_cache_init (void ) +{ +return platform_driver_register (&ax45mp_l2c_driver); +} +arch_initcall (ax45mp_cache_init); + +MODULE_AUTHOR ("Lad Prabhakar <[email protected]>" ); +MODULE_DESCRIPTION ("Andes AX45MP L2 cache driver" ); +MODULE_LICENSE ("GPL" );Signature · 1 line
2.25.1
Re: [PATCH v5 6/6] soc: renesas: Add L2 cache management for RZ/Five SoC
In reply to PrabhakarQuoted 65 lines · Prabhakar
From: 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-allocateMore 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_POOLenabled 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; }; };Signed-off-by Lad Prabhakar <[email protected]>---
v4 -> v5
* Dropped code for configuring L2 cache
* Dropped code for configuring PMA
* Updated commit message
* Added comments
* Changed static branch enable/disable orderRFC v3 -> v4
* Made use of runtime patching instead of compile time
* Now just exposing single functionax45mp_no_iocp_cmo()for CMO handling
* Added a check to make sure cache line size is always 64 bytes
* Renamed folder rzf -> rzfive
* ImprovedKconfigdescription
* Dropped L2 cache configuration
* Dropped unnecessary casts
* Fixed comments pointed by Geert.
Quoted 12 lines
--- arch/riscv/include/asm/cacheflush.h | 8 + arch/riscv/include/asm/errata_list.h | 28 ++- drivers/soc/renesas/Kconfig | 6 + drivers/soc/renesas/Makefile | 2 + drivers/soc/renesas/rzfive/Kconfig | 6 + drivers/soc/renesas/rzfive/Makefile | 3 + drivers/soc/renesas/rzfive/ax45mp_cache.c | 256 ++++++++++++++++++++++ 7 files changed, 303 insertions(+), 6 deletions(-) create mode 100644 drivers/soc/renesas/rzfive/Kconfig create mode 100644 drivers/soc/renesas/rzfive/Makefile create mode 100644 drivers/soc/renesas/rzfive/ax45mp_cache.c
Thanks for the updates! This looks much cleaner and easier to understand now that the driver is only trying to do one thing.
Quoted 5 lines
drivers/soc/renesas/rzfive/Makefile new file +0
-0
...
Quoted 16 lines
drivers/soc/renesas/rzfive/Makefile new file +16
-0+void ax45mp_no_iocp_cmo(unsigned int cache_size, void *vaddr, size_t size, int dir, int ops) +{ + if (ops == NON_COHERENT_DMA_PREP) + return; + + if (!static_branch_unlikely(&ax45mp_l2c_configured)) + return; + + if (ops == NON_COHERENT_SYNC_DMA_FOR_DEVICE) { + switch (dir) { + case DMA_FROM_DEVICE: + ax45mp_cpu_dma_inval_range(vaddr, size); + break; + case DMA_TO_DEVICE: + case DMA_BIDIRECTIONAL: + ax45mp_cpu_dma_wb_range(vaddr, size);
drivers/soc/renesas/rzfive/Makefile
Quoted 10 lines
drivers/soc/renesas/rzfive/Makefile new file +10
-0+ break; + default: + break; + } + return; + } + + /* op == NON_COHERENT_SYNC_DMA_FOR_CPU */ + if (dir == DMA_BIDIRECTIONAL || dir == DMA_FROM_DEVICE) + ax45mp_cpu_dma_inval_range(vaddr, size);
I think this at least deserves a comment explaining why it differs from the clean/flush/invalidate choices in arch/riscv/mm/dma-noncoherent.c.
Regards,
Samuel