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 <mripard@xxxxxxxxxx>
---
drivers/dma-buf/heaps/carveout_heap.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/dma-buf/heaps/carveout_heap.c b/drivers/dma-buf/heaps/carveout_heap.c
index 896ca67e6bd9..81b167785999 100644
--- a/drivers/dma-buf/heaps/carveout_heap.c
+++ b/drivers/dma-buf/heaps/carveout_heap.c
@@ -6,10 +6,11 @@
#include <linux/of_reserved_mem.h>
struct carveout_heap_priv {
struct dma_heap *heap;
struct gen_pool *pool;
+ bool ecc_enabled;
};
struct carveout_heap_buffer_priv {
struct mutex lock;
struct list_head attachments;
@@ -182,10 +183,16 @@ static struct dma_buf *carveout_heap_allocate(struct dma_heap *heap,
struct dma_buf *buf;
dma_addr_t daddr;
void *buffer;
int ret;
+ if (!heap_priv->ecc_enabled && (heap_flags & DMA_HEAP_FLAG_ECC_PROTECTED))
+ return ERR_PTR(-EINVAL);
+
+ if (heap_priv->ecc_enabled && (heap_flags & DMA_HEAP_FLAG_ECC_UNPROTECTED))
+ return ERR_PTR(-EINVAL);
+
buffer_priv = kzalloc(sizeof(*buffer_priv), GFP_KERNEL);
if (!buffer_priv)
return ERR_PTR(-ENOMEM);
INIT_LIST_HEAD(&buffer_priv->attachments);
@@ -235,20 +242,29 @@ static int __init carveout_heap_setup(struct device_node *node)
const struct reserved_mem *rmem;
struct carveout_heap_priv *priv;
struct dma_heap *heap;
struct gen_pool *pool;
void *base;
+ u32 val = 0;
int ret;
rmem = of_reserved_mem_lookup(node);
if (!rmem)
return -EINVAL;
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
+ of_property_read_u32(node, "ecc-correction-bits", &val);
+ if (val <= 0) {
+ if (of_memory_get_ecc_correction_bits() > 0)
+ priv->ecc_enabled = true;
+ } else {
+ priv->ecc_enabled = true;
+ }
+
pool = gen_pool_create(PAGE_SHIFT, NUMA_NO_NODE);
if (!pool) {
ret = -ENOMEM;
goto err_cleanup_heap;
}
--
2.44.0
