* [PATCH] riscv: split cache ops out of dma-noncoherent.c
@ 2023-10-28 15:51 Christoph Hellwig
2023-11-01 12:17 ` Conor Dooley
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Christoph Hellwig @ 2023-10-28 15:51 UTC (permalink / raw)
To: geert+renesas, paul.walmsley, palmer
Cc: conor.dooley, linux-riscv, soc, kernel test robot
The cache ops are also used by the pmem code which is unconditionally
built into the kernel. Move them into a separate file that is built
based on the correct config option.
Fixes: fd962781270e ("riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/riscv/mm/Makefile | 1 +
arch/riscv/mm/cache-ops.c | 17 +++++++++++++++++
arch/riscv/mm/dma-noncoherent.c | 15 ---------------
3 files changed, 18 insertions(+), 15 deletions(-)
create mode 100644 arch/riscv/mm/cache-ops.c
diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile
index 9c454f90fd3da2..3a4dfc8babcf8c 100644
--- a/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
@@ -36,3 +36,4 @@ endif
obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o
obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o
+obj-$(CONFIG_RISCV_NONSTANDARD_CACHE_OPS) += cache-ops.o
diff --git a/arch/riscv/mm/cache-ops.c b/arch/riscv/mm/cache-ops.c
new file mode 100644
index 00000000000000..a993ad11d0eca9
--- /dev/null
+++ b/arch/riscv/mm/cache-ops.c
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (c) 2021 Western Digital Corporation or its affiliates.
+ */
+
+#include <asm/dma-noncoherent.h>
+
+struct riscv_nonstd_cache_ops noncoherent_cache_ops __ro_after_init;
+
+void
+riscv_noncoherent_register_cache_ops(const struct riscv_nonstd_cache_ops *ops)
+{
+ if (!ops)
+ return;
+ noncoherent_cache_ops = *ops;
+}
+EXPORT_SYMBOL_GPL(riscv_noncoherent_register_cache_ops);
diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
index b76e7e192eb183..341bd6706b4c56 100644
--- a/arch/riscv/mm/dma-noncoherent.c
+++ b/arch/riscv/mm/dma-noncoherent.c
@@ -15,12 +15,6 @@ static bool noncoherent_supported __ro_after_init;
int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN;
EXPORT_SYMBOL_GPL(dma_cache_alignment);
-struct riscv_nonstd_cache_ops noncoherent_cache_ops __ro_after_init = {
- .wback = NULL,
- .inv = NULL,
- .wback_inv = NULL,
-};
-
static inline void arch_dma_cache_wback(phys_addr_t paddr, size_t size)
{
void *vaddr = phys_to_virt(paddr);
@@ -162,12 +156,3 @@ void __init riscv_set_dma_cache_alignment(void)
if (!noncoherent_supported)
dma_cache_alignment = 1;
}
-
-void riscv_noncoherent_register_cache_ops(const struct riscv_nonstd_cache_ops *ops)
-{
- if (!ops)
- return;
-
- noncoherent_cache_ops = *ops;
-}
-EXPORT_SYMBOL_GPL(riscv_noncoherent_register_cache_ops);
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: split cache ops out of dma-noncoherent.c
2023-10-28 15:51 [PATCH] riscv: split cache ops out of dma-noncoherent.c Christoph Hellwig
@ 2023-11-01 12:17 ` Conor Dooley
2023-11-01 16:54 ` Lad, Prabhakar
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Conor Dooley @ 2023-11-01 12:17 UTC (permalink / raw)
To: Christoph Hellwig
Cc: geert+renesas, paul.walmsley, palmer, conor.dooley, linux-riscv,
soc, kernel test robot
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
On Sat, Oct 28, 2023 at 05:51:01PM +0200, Christoph Hellwig wrote:
> The cache ops are also used by the pmem code which is unconditionally
> built into the kernel. Move them into a separate file that is built
> based on the correct config option.
>
> Fixes: fd962781270e ("riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
This fixes two different sets of built warnings reported by Randy.
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Tested-by: Conor Dooley <conor.dooley@microchip.com>
Cheers,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: split cache ops out of dma-noncoherent.c
2023-10-28 15:51 [PATCH] riscv: split cache ops out of dma-noncoherent.c Christoph Hellwig
2023-11-01 12:17 ` Conor Dooley
@ 2023-11-01 16:54 ` Lad, Prabhakar
2023-11-07 23:00 ` patchwork-bot+linux-riscv
2023-12-06 16:19 ` patchwork-bot+linux-soc
3 siblings, 0 replies; 5+ messages in thread
From: Lad, Prabhakar @ 2023-11-01 16:54 UTC (permalink / raw)
To: Christoph Hellwig
Cc: geert+renesas, paul.walmsley, palmer, conor.dooley, linux-riscv,
soc, kernel test robot
On Sat, Oct 28, 2023 at 4:55 PM Christoph Hellwig <hch@lst.de> wrote:
>
> The cache ops are also used by the pmem code which is unconditionally
> built into the kernel. Move them into a separate file that is built
> based on the correct config option.
>
> Fixes: fd962781270e ("riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> arch/riscv/mm/Makefile | 1 +
> arch/riscv/mm/cache-ops.c | 17 +++++++++++++++++
> arch/riscv/mm/dma-noncoherent.c | 15 ---------------
> 3 files changed, 18 insertions(+), 15 deletions(-)
> create mode 100644 arch/riscv/mm/cache-ops.c
>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> #
On RZ/Five SMARC
Cheers,
Prabhakar
> diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile
> index 9c454f90fd3da2..3a4dfc8babcf8c 100644
> --- a/arch/riscv/mm/Makefile
> +++ b/arch/riscv/mm/Makefile
> @@ -36,3 +36,4 @@ endif
>
> obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o
> obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o
> +obj-$(CONFIG_RISCV_NONSTANDARD_CACHE_OPS) += cache-ops.o
> diff --git a/arch/riscv/mm/cache-ops.c b/arch/riscv/mm/cache-ops.c
> new file mode 100644
> index 00000000000000..a993ad11d0eca9
> --- /dev/null
> +++ b/arch/riscv/mm/cache-ops.c
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Copyright (c) 2021 Western Digital Corporation or its affiliates.
> + */
> +
> +#include <asm/dma-noncoherent.h>
> +
> +struct riscv_nonstd_cache_ops noncoherent_cache_ops __ro_after_init;
> +
> +void
> +riscv_noncoherent_register_cache_ops(const struct riscv_nonstd_cache_ops *ops)
> +{
> + if (!ops)
> + return;
> + noncoherent_cache_ops = *ops;
> +}
> +EXPORT_SYMBOL_GPL(riscv_noncoherent_register_cache_ops);
> diff --git a/arch/riscv/mm/dma-noncoherent.c b/arch/riscv/mm/dma-noncoherent.c
> index b76e7e192eb183..341bd6706b4c56 100644
> --- a/arch/riscv/mm/dma-noncoherent.c
> +++ b/arch/riscv/mm/dma-noncoherent.c
> @@ -15,12 +15,6 @@ static bool noncoherent_supported __ro_after_init;
> int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN;
> EXPORT_SYMBOL_GPL(dma_cache_alignment);
>
> -struct riscv_nonstd_cache_ops noncoherent_cache_ops __ro_after_init = {
> - .wback = NULL,
> - .inv = NULL,
> - .wback_inv = NULL,
> -};
> -
> static inline void arch_dma_cache_wback(phys_addr_t paddr, size_t size)
> {
> void *vaddr = phys_to_virt(paddr);
> @@ -162,12 +156,3 @@ void __init riscv_set_dma_cache_alignment(void)
> if (!noncoherent_supported)
> dma_cache_alignment = 1;
> }
> -
> -void riscv_noncoherent_register_cache_ops(const struct riscv_nonstd_cache_ops *ops)
> -{
> - if (!ops)
> - return;
> -
> - noncoherent_cache_ops = *ops;
> -}
> -EXPORT_SYMBOL_GPL(riscv_noncoherent_register_cache_ops);
> --
> 2.39.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: split cache ops out of dma-noncoherent.c
2023-10-28 15:51 [PATCH] riscv: split cache ops out of dma-noncoherent.c Christoph Hellwig
2023-11-01 12:17 ` Conor Dooley
2023-11-01 16:54 ` Lad, Prabhakar
@ 2023-11-07 23:00 ` patchwork-bot+linux-riscv
2023-12-06 16:19 ` patchwork-bot+linux-soc
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+linux-riscv @ 2023-11-07 23:00 UTC (permalink / raw)
To: Christoph Hellwig
Cc: linux-riscv, geert+renesas, paul.walmsley, palmer, conor.dooley,
soc, lkp
Hello:
This patch was applied to riscv/linux.git (for-next)
by Palmer Dabbelt <palmer@rivosinc.com>:
On Sat, 28 Oct 2023 17:51:01 +0200 you wrote:
> The cache ops are also used by the pmem code which is unconditionally
> built into the kernel. Move them into a separate file that is built
> based on the correct config option.
>
> Fixes: fd962781270e ("riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> [...]
Here is the summary with links:
- riscv: split cache ops out of dma-noncoherent.c
https://git.kernel.org/riscv/c/946bb33d3302
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] riscv: split cache ops out of dma-noncoherent.c
2023-10-28 15:51 [PATCH] riscv: split cache ops out of dma-noncoherent.c Christoph Hellwig
` (2 preceding siblings ...)
2023-11-07 23:00 ` patchwork-bot+linux-riscv
@ 2023-12-06 16:19 ` patchwork-bot+linux-soc
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+linux-soc @ 2023-12-06 16:19 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: soc
Hello:
This patch was applied to soc/soc.git (arm/fixes)
by Palmer Dabbelt <palmer@rivosinc.com>:
On Sat, 28 Oct 2023 17:51:01 +0200 you wrote:
> The cache ops are also used by the pmem code which is unconditionally
> built into the kernel. Move them into a separate file that is built
> based on the correct config option.
>
> Fixes: fd962781270e ("riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
> [...]
Here is the summary with links:
- riscv: split cache ops out of dma-noncoherent.c
https://git.kernel.org/soc/soc/c/946bb33d3302
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-06 16:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-28 15:51 [PATCH] riscv: split cache ops out of dma-noncoherent.c Christoph Hellwig
2023-11-01 12:17 ` Conor Dooley
2023-11-01 16:54 ` Lad, Prabhakar
2023-11-07 23:00 ` patchwork-bot+linux-riscv
2023-12-06 16:19 ` patchwork-bot+linux-soc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).