]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
dm: core: Support allocating driver-private data for DMA
authorSimon Glass <sjg@chromium.org>
Wed, 25 Mar 2015 18:21:53 +0000 (12:21 -0600)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 8 Sep 2015 19:47:52 +0000 (21:47 +0200)
Some driver want to put DMA buffers in their private data. Add a flag
to tell driver model to align driver-private data to a cache boundary so
that DMA will work correctly in this case.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
drivers/core/device.c
include/dm/device.h

index 748340598a5f1ba4dcb7cfc4c5e8ffdc8c3c07c6..1ca5d1c7bcca6ec117d2458de78423e5af28de31 100644 (file)
@@ -164,6 +164,21 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
                           -1, devp);
 }
 
+static void *alloc_priv(int size, uint flags)
+{
+       void *priv;
+
+       if (flags & DM_FLAG_ALLOC_PRIV_DMA) {
+               priv = memalign(ARCH_DMA_MINALIGN, size);
+               if (priv)
+                       memset(priv, '\0', size);
+       } else {
+               priv = calloc(1, size);
+       }
+
+       return priv;
+}
+
 int device_probe_child(struct udevice *dev, void *parent_priv)
 {
        struct driver *drv;
@@ -182,7 +197,7 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
 
        /* Allocate private data if requested */
        if (drv->priv_auto_alloc_size) {
-               dev->priv = calloc(1, drv->priv_auto_alloc_size);
+               dev->priv = alloc_priv(drv->priv_auto_alloc_size, drv->flags);
                if (!dev->priv) {
                        ret = -ENOMEM;
                        goto fail;
@@ -206,7 +221,7 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                                        per_child_auto_alloc_size;
                }
                if (size) {
-                       dev->parent_priv = calloc(1, size);
+                       dev->parent_priv = alloc_priv(size, drv->flags);
                        if (!dev->parent_priv) {
                                ret = -ENOMEM;
                                goto fail;
index 698095493ed4d26d98ab6a3a1953b453e5e95b20..f27b34b69960c9bfe142f198b2485de2e2b7d60f 100644 (file)
@@ -30,6 +30,9 @@ struct driver_info;
 /* DM is responsible for allocating and freeing parent_platdata */
 #define DM_FLAG_ALLOC_PARENT_PDATA     (1 << 3)
 
+/* Allocate driver private data on a DMA boundary */
+#define DM_FLAG_ALLOC_PRIV_DMA (1 << 4)
+
 /**
  * struct udevice - An instance of a driver
  *