Add PMEM support for RISC-V
v3 cover Add PMEM support for RISC-V
The Linux NVDIMM PEM drivers require arch support to map and access the persistent memory device. This series adds RISC-V PMEM support using recently added Svpbmt and Zicbom support.
First two patches are fixes and remaining two patches add the required PMEM support for Linux RISC-V.
These patches can also be found in riscv_pmem_v3 branch at:
https://github.com/avpatel/linux.git
Changes since v2:
- Rebased on Linux-6.1-rc1
- Replaced PATCH1 with the patch proposed by Drew
Changes since v1:
- Fix error reported by test bot
https://lore.kernel.org/all/[email protected]/
Andrew Jones (1):
RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Anup Patel (3):
RISC-V: Fix ioremap_cache() and ioremap_wc() for systems with Svpbmt
RISC-V: Implement arch specific PMEM APIs
RISC-V: Enable PMEM drivers
arch/riscv/Kconfig | 1 + arch/riscv/configs/defconfig | 1 + arch/riscv/include/asm/io.h | 10 ++++++++ arch/riscv/include/asm/pgtable.h | 2 ++ arch/riscv/mm/Makefile | 1 + arch/riscv/mm/cacheflush.c | 41 ++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 -------------------------------- arch/riscv/mm/pmem.c | 21 ++++++++++++++++ 8 files changed, 77 insertions(+), 41 deletions(-) create mode 100644 arch/riscv/mm/pmem.c
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 1/4 RISC-V: Fix compilation without RISCV_ISA_ZICBOM
From: Andrew Jones <[email protected]>
riscv_cbom_block_size and riscv_init_cbom_blocksize() should always be available and riscv_init_cbom_blocksize() should always be invoked, even when compiling without RISCV_ISA_ZICBOM enabled. This is because disabling RISCV_ISA_ZICBOM means "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use with RISCV_ISA_ZICBOM or not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling without RISCV_ISA_ZICBOM.
--- arch/riscv/mm/cacheflush.c | 41 +++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 --------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)
arch/riscv/mm/cacheflush.c +41 -0
@@ -3,6 +3,8 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP
@@ -86,3 +88,42 @@ void flush_icache_pte(pte_t pte)flush_icache_all (); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} +#endif
arch/riscv/mm/dma-noncoherent.c +0 -41
55 lines not on this page · raw message
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Hi Palmer,
Quoted 13 lines · Anup Patel
From: Andrew Jones <[email protected]>
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked, even when compiling withoutRISCV_ISA_ZICBOMenabled. This is because disablingRISCV_ISA_ZICBOMmeans "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use withRISCV_ISA_ZICBOMor not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling withoutRISCV_ISA_ZICBOM.
Quoted 5 lines
Fixes 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")Reported-by kernel test robot <[email protected]>Signed-off-by Andrew Jones <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Conor Dooley <[email protected]>
Currently, the KVM RISC-V compilation is broken for toolchains not having Zicbom support.
I plan to take this patch through the KVM RISC-V tree and I will be sending a PR by the end of this week. Let me know if you want this patch to go through the RISC-V tree.
Regards,
Anup
Quoted 123 lines
--- arch/riscv/mm/cacheflush.c | 41 +++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 --------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)arch/riscv/mm/cacheflush.c +41
-0@@ -3,6 +3,8 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP @@ -86,3 +88,42 @@ void flush_icache_pte(pte_t pte)flush_icache_all (); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} +#endif arch/riscv/mm/dma-noncoherent.c +0
-42@@ -8,13 +8,8 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/mm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <asm/cacheflush.h> -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL (riscv_cbom_block_size); -static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,@@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize (void ) -{ -struct device_node *node; -unsigned long cbom_hartid; -u32 val, probed_block_size; -int ret; - - probed_block_size =0 ; -for_each_of_cpu_node (node) { -unsigned long hartid; - - ret =riscv_of_processor_hartid (node, &hartid); -if (ret) -continue ; - -/* set block-size for cbom extension if available */ - ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); -if (ret) -continue ; - -if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - }else { -if (probed_block_size != val) -pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , - cbom_hartid, hartid); - } - } - -if (probed_block_size) - riscv_cbom_block_size = probed_block_size; -} -#endif -void riscv_noncoherent_supported (void ) { WARN(!riscv_cbom_block_size, --
Quoted 2 lines
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM
In reply to Anup PatelHi Anup,
Am Mittwoch, 19. Oktober 2022, 14:16:19 CEST schrieb Anup Patel:
Quoted 11 lines
From: Andrew Jones <[email protected]>
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked, even when compiling withoutRISCV_ISA_ZICBOMenabled. This is because disablingRISCV_ISA_ZICBOMmeans "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use withRISCV_ISA_ZICBOMor not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling withoutRISCV_ISA_ZICBOM.
either I'm way very low on coffee or something is strange here :-) .
I can fully grasp the need to init the cbom blocksize for guests, even when the main kernel isn't using it, but below in the patch itself it is still:
+#ifdef CONFIG_RISCV_ISA_ZICBOM
+void riscv_init_cbom_blocksize(void)
+{
[...]
so the init_cbom_blocksize function is still inside a RISCV_ISA_ZICBOM ifdef?
Heiko
Quoted 119 lines
Fixes 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")Reported-by kernel test robot <[email protected]>Signed-off-by Andrew Jones <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/mm/cacheflush.c | 41 +++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 --------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)arch/riscv/mm/cacheflush.c +41
-0@@ -3,6 +3,8 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP @@ -86,3 +88,42 @@ void flush_icache_pte(pte_t pte)flush_icache_all (); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} +#endif arch/riscv/mm/dma-noncoherent.c +0
-34@@ -8,13 +8,8 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/mm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <asm/cacheflush.h> -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL (riscv_cbom_block_size); -static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,@@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize (void ) -{ -struct device_node *node; -unsigned long cbom_hartid; -u32 val, probed_block_size; -int ret; - - probed_block_size =0 ; -for_each_of_cpu_node (node) { -unsigned long hartid; - - ret =riscv_of_processor_hartid (node, &hartid); -if (ret) -continue ; - -/* set block-size for cbom extension if available */ - ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); -if (ret) -continue ; - -if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - }else { -if (probed_block_size != val) -pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , - cbom_hartid, hartid); - }
arch/riscv/mm/dma-noncoherent.c void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, · line 77
Quoted 10 lines
arch/riscv/mm/dma-noncoherent.c +0
-7- } - -if (probed_block_size) - riscv_cbom_block_size = probed_block_size; -} -#endif -void riscv_noncoherent_supported (void ) { WARN(!riscv_cbom_block_size,
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Quoted 27 lines · Heiko Stuebner
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Hi Anup,
Am Mittwoch, 19. Oktober 2022, 14:16:19 CEST schrieb Anup Patel:
Quoted 11 lines
From: Andrew Jones <[email protected]>
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked, even when compiling withoutRISCV_ISA_ZICBOMenabled. This is because disablingRISCV_ISA_ZICBOMmeans "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use withRISCV_ISA_ZICBOMor not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling withoutRISCV_ISA_ZICBOM.either I'm way very low on coffee or something is strange here :-) .
I can fully grasp the need to init the cbom blocksize for guests, even when the main kernel isn't using it, but below in the patch itself it is still:
arch/riscv/mm/cacheflush.c +3
-0+#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{
Quoted 2 lines
so the
init_cbom_blocksizefunction is still inside aRISCV_ISA_ZICBOMifdef?
FWIW:
Drew's patch, or at least the version of it that I have been using/did a review of, does not have init_cbom_blocksize() inside such a #ifdef.
Quoted 139 lines
Heiko
Quoted 119 lines
Fixes 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")Reported-by kernel test robot <[email protected]>Signed-off-by Andrew Jones <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/mm/cacheflush.c | 41 +++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 --------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)arch/riscv/mm/cacheflush.c +41
-0@@ -3,6 +3,8 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP @@ -86,3 +88,42 @@ void flush_icache_pte(pte_t pte)flush_icache_all (); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} +#endif arch/riscv/mm/dma-noncoherent.c +0
-34@@ -8,13 +8,8 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/mm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <asm/cacheflush.h> -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL (riscv_cbom_block_size); -static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,@@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize (void ) -{ -struct device_node *node; -unsigned long cbom_hartid; -u32 val, probed_block_size; -int ret; - - probed_block_size =0 ; -for_each_of_cpu_node (node) { -unsigned long hartid; - - ret =riscv_of_processor_hartid (node, &hartid); -if (ret) -continue ; - -/* set block-size for cbom extension if available */ - ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); -if (ret) -continue ; - -if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - }else { -if (probed_block_size != val) -pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , - cbom_hartid, hartid); - }arch/riscv/mm/dma-noncoherent.c void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, · line 77
Quoted 10 lines
arch/riscv/mm/dma-noncoherent.c +0
-7- } - -if (probed_block_size) - riscv_cbom_block_size = probed_block_size; -} -#endif -void riscv_noncoherent_supported (void ) { WARN(!riscv_cbom_block_size,
Quoted 4 lines
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v3 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM
In reply to Heiko StuebnerQuoted 16 lines · Heiko Stuebner
Hi Anup,
Am Mittwoch, 19. Oktober 2022, 14:16:19 CEST schrieb Anup Patel:
Quoted 11 lines
From: Andrew Jones <[email protected]>
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked, even when compiling withoutRISCV_ISA_ZICBOMenabled. This is because disablingRISCV_ISA_ZICBOMmeans "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use withRISCV_ISA_ZICBOMor not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling withoutRISCV_ISA_ZICBOM.
Quoted 4 lines
either I'm way very low on coffee or something is strange here :-) .
I can fully grasp the need to init the cbom blocksize for guests, even when the main kernel isn't using it, but below in the patch itself it is still:
The Guest might have pass-through access to a device which is not cache-coherent whereas Host might have all devices cache-coherent.
Quoted 8 lines
arch/riscv/mm/cacheflush.c +3
-0+#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{so the
init_cbom_blocksizefunction is still inside aRISCV_ISA_ZICBOMifdef?
Argh, I mixed changes from my previous patch and Drew's patch.
I will quickly send v4. Thanks for catching.
Regards,
Anup
Quoted 126 lines
Heiko
Quoted 121 lines
Fixes 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")Reported-by kernel test robot <[email protected]>Signed-off-by Andrew Jones <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Conor Dooley <[email protected]>--- arch/riscv/mm/cacheflush.c | 41 +++++++++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 --------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-)arch/riscv/mm/cacheflush.c +41
-0@@ -3,6 +3,8 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP @@ -86,3 +88,42 @@ void flush_icache_pte(pte_t pte)flush_icache_all (); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +#ifdef CONFIG_RISCV_ISA_ZICBOM +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +} +#endif arch/riscv/mm/dma-noncoherent.c +0
-37@@ -8,13 +8,8 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/mm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <asm/cacheflush.h> -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL (riscv_cbom_block_size); -static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,@@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize (void ) -{ -struct device_node *node; -unsigned long cbom_hartid; -u32 val, probed_block_size; -int ret; - - probed_block_size =0 ; -for_each_of_cpu_node (node) { -unsigned long hartid; - - ret =riscv_of_processor_hartid (node, &hartid); -if (ret) -continue ; - -/* set block-size for cbom extension if available */ - ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); -if (ret) -continue ; - -if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - }else { -if (probed_block_size != val) -pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , - cbom_hartid, hartid); - } - } - -if (probed_block_size)
Quoted 12 lines
arch/riscv/mm/dma-noncoherent.c void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, · line 77
Quoted 8 lines
arch/riscv/mm/dma-noncoherent.c +0
-4- riscv_cbom_block_size = probed_block_size; -} -#endif -void riscv_noncoherent_supported (void ) { WARN(!riscv_cbom_block_size,
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 2/4 RISC-V: Fix ioremap_cache() and ioremap_wc() for systems with Svpbmt
In reply to Anup PatelCurrently, all flavors of ioremap_xyz() function maps to the generic ioremap() which means any ioremap_xyz() call will always map the target memory as IO using _PAGE_IOREMAP page attributes. This breaks ioremap_cache() and ioremap_wc() on systems with Svpbmt because memory remapped using ioremap_cache() and ioremap_wc() will use _PAGE_IOREMAP page attributes.
To address above (just like other architectures), we implement RISC-V specific ioremap_cache() and ioremap_wc() which maps memory using page attributes as defined by the Svpbmt specification.
--- arch/riscv/include/asm/io.h | 10 ++++++++++ arch/riscv/include/asm/pgtable.h | 2 ++ 2 files changed, 12 insertions(+)
arch/riscv/include/asm/io.h +10 -0
@@ -133,6 +133,16 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#define outsq (addr, buffer, count) __outsq(PCI_IOBASE + (addr), buffer, count)#endif +#ifdef CONFIG_MMU +#define ioremap_wc (addr, size) \ + ioremap_prot((addr), (size), _PAGE_IOREMAP_WC) +#endif +#include <asm-generic/io.h> +#ifdef CONFIG_MMU +#define ioremap_cache (addr, size) \ + ioremap_prot((addr), (size), _PAGE_KERNEL) +#endif +#endif /* _ASM_RISCV_IO_H */
arch/riscv/include/asm/pgtable.h +2 -0
@@ -182,6 +182,8 @@ extern struct pt_alloc_ops pt_ops __initdata;#define PAGE_TABLE __pgprot(_PAGE_TABLE)#define _PAGE_IOREMAP ((_PAGE_KERNEL & ~_PAGE_MTMASK) | _PAGE_IO) +#define _PAGE_IOREMAP_WC ((_PAGE_KERNEL & ~_PAGE_MTMASK) | \ + _PAGE_NOCACHE)#define PAGE_KERNEL_IO __pgprot(_PAGE_IOREMAP)extern pgd_t swapper_pg_dir[];
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 3/4 RISC-V: Implement arch specific PMEM APIs
In reply to Anup PatelThe NVDIMM PMEM driver expects arch specific APIs for cache maintenance and if arch does not provide these APIs then NVDIMM PMEM driver will always use MEMREMAP_WT to map persistent memory which in-turn maps as UC memory type defined by the RISC-V Svpbmt specification.
Now that the Svpbmt and Zicbom support is available in RISC-V kernel, we implement PMEM APIs using ALT_CMO_OP() macros so that the NVDIMM PMEM driver can use MEMREMAP_WB to map persistent memory.
--- arch/riscv/Kconfig | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/pmem.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 arch/riscv/mm/pmem.c
arch/riscv/Kconfig +1 -0
@@ -25,6 +25,7 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MMIOWB + select ARCH_HAS_PMEM_API select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMU
arch/riscv/mm/Makefile +1 -0
@@ -31,3 +31,4 @@ endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o +obj-$(CONFIG_ARCH_HAS_PMEM_API) += pmem.o
arch/riscv/mm/pmem.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2022 Ventana Micro Systems Inc. +*/ + +#include <linux/export.h> +#include <linux/libnvdimm.h> + +#include <asm/cacheflush.h> + +void arch_wb_cache_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_wb_cache_pmem); + +void arch_invalidate_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_invalidate_pmem);
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v3 4/4 RISC-V: Enable PMEM drivers
In reply to Anup PatelWe now have PMEM arch support available in RISC-V kernel so let us enable relevant drivers in defconfig.
--- arch/riscv/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/configs/defconfig +1 -0
@@ -159,6 +159,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_CTRL=y CONFIG_RPMSG_VIRTIO=y +CONFIG_LIBNVDIMM=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv