Now that we have introduced ECC-related flags for the dma-heaps buffer
allocations, let's honour these flags depending on the memory setup.

Signed-off-by: Maxime Ripard <mrip...@kernel.org>
---
 drivers/dma-buf/heaps/cma_heap.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c
index 4a63567e93ba..1e6babbd8eb5 100644
--- a/drivers/dma-buf/heaps/cma_heap.c
+++ b/drivers/dma-buf/heaps/cma_heap.c
@@ -24,10 +24,11 @@
 
 
 struct cma_heap {
        struct dma_heap *heap;
        struct cma *cma;
+       bool ecc_enabled;
 };
 
 struct cma_heap_buffer {
        struct cma_heap *heap;
        struct list_head attachments;
@@ -286,10 +287,16 @@ static struct dma_buf *cma_heap_allocate(struct dma_heap 
*heap,
        struct page *cma_pages;
        struct dma_buf *dmabuf;
        int ret = -ENOMEM;
        pgoff_t pg;
 
+       if (!cma_heap->ecc_enabled && (heap_flags & 
DMA_HEAP_FLAG_ECC_PROTECTED))
+               return -EINVAL;
+
+       if (cma_heap->ecc_enabled && (heap_flags & 
DMA_HEAP_FLAG_ECC_UNPROTECTED))
+               return -EINVAL;
+
        buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
        if (!buffer)
                return ERR_PTR(-ENOMEM);
 
        INIT_LIST_HEAD(&buffer->attachments);
@@ -374,10 +381,13 @@ static int __add_cma_heap(struct cma *cma, void *data)
        cma_heap = kzalloc(sizeof(*cma_heap), GFP_KERNEL);
        if (!cma_heap)
                return -ENOMEM;
        cma_heap->cma = cma;
 
+       if (of_memory_get_ecc_correction_bits() > 0)
+               cma_heap->ecc_enabled = true;
+
        exp_info.name = cma_get_name(cma);
        exp_info.ops = &cma_heap_ops;
        exp_info.priv = cma_heap;
 
        cma_heap->heap = dma_heap_add(&exp_info);

-- 
2.44.0

Reply via email to