| Message ID | 20231016054755.915155-9-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/12] riscv: RISCV_NONSTANDARD_CACHE_OPS shouldn't depend on RISCV_DMA_NONCOHERENT | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/vmtest-fixes-PR | fail | merge-conflict |
On 16/10/2023 6:47 am, Christoph Hellwig wrote: > Log a warning once when dma_alloc_coherent fails because the platform > does not support coherent allocations at all. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > kernel/dma/direct.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index 1327d04fa32a25..fddfea3b2fe173 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -240,8 +240,10 @@ void *dma_direct_alloc(struct device *dev, size_t size, > */ > set_uncached = IS_ENABLED(CONFIG_ARCH_HAS_DMA_SET_UNCACHED); > remap = IS_ENABLED(CONFIG_DMA_DIRECT_REMAP); > - if (!set_uncached && !remap) > + if (!set_uncached && !remap) { > + pr_warn_once("coherent DMA allocations not supported on this platform.\n"); > return NULL; > + } > } > > /*
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 1327d04fa32a25..fddfea3b2fe173 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c @@ -240,8 +240,10 @@ void *dma_direct_alloc(struct device *dev, size_t size, */ set_uncached = IS_ENABLED(CONFIG_ARCH_HAS_DMA_SET_UNCACHED); remap = IS_ENABLED(CONFIG_DMA_DIRECT_REMAP); - if (!set_uncached && !remap) + if (!set_uncached && !remap) { + pr_warn_once("coherent DMA allocations not supported on this platform.\n"); return NULL; + } } /*
Log a warning once when dma_alloc_coherent fails because the platform does not support coherent allocations at all. Signed-off-by: Christoph Hellwig <hch@lst.de> --- kernel/dma/direct.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)