dm: core: Add flags parameter to device_remove()

[J-u-boot.git] / drivers / core / device.c

diff --git a/drivers/core/device.c b/drivers/core/device.c
index a3dc2ca679a0ea9ef22df34a3bfa0546466783dd..e1b0ebffc559c9ddf52c86c68b4404eafe966dae 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -10,6 +10,7 @@
  */
 
 #include <common.h>
  */
 
 #include <common.h>

+#include <asm/io.h>

 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <malloc.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
 #include <malloc.h>


@@ -26,9 +27,10 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
 
 DECLARE_GLOBAL_DATA_PTR;
 

-int device_bind(struct udevice *parent, const struct driver *drv,
-               const char *name, void *platdata, int of_offset,
-               struct udevice **devp)
+static int device_bind_common(struct udevice *parent, const struct driver *drv,
+                             const char *name, void *platdata,
+                             ulong driver_data, int of_offset,
+                             uint of_platdata_size, struct udevice **devp)

 {
        struct udevice *dev;
        struct uclass *uc;
 {
        struct udevice *dev;
        struct uclass *uc;


@@ -56,6 +58,7 @@ int device_bind(struct udevice *parent, const struct driver *drv,
        INIT_LIST_HEAD(&dev->devres_head);
 #endif
        dev->platdata = platdata;
        INIT_LIST_HEAD(&dev->devres_head);
 #endif
        dev->platdata = platdata;

+       dev->driver_data = driver_data;

        dev->name = name;
        dev->of_offset = of_offset;
        dev->parent = parent;
        dev->name = name;
        dev->of_offset = of_offset;
        dev->parent = parent;


@@ -64,14 +67,14 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        dev->seq = -1;
        dev->req_seq = -1;
 
        dev->seq = -1;
        dev->req_seq = -1;

-       if (CONFIG_IS_ENABLED(OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) {
+       if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS)) {

                /*
                /*

-               * Some devices, such as a SPI bus, I2C bus and serial ports
-               * are numbered using aliases.
-               *
-               * This is just a 'requested' sequence, and will be
-               * resolved (and ->seq updated) when the device is probed.
-               */
+                * Some devices, such as a SPI bus, I2C bus and serial ports
+                * are numbered using aliases.
+                *
+                * This is just a 'requested' sequence, and will be
+                * resolved (and ->seq updated) when the device is probed.
+                */

                if (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS) {
                        if (uc->uc_drv->name && of_offset != -1) {
                                fdtdec_get_alias_seq(gd->fdt_blob,
                if (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS) {
                        if (uc->uc_drv->name && of_offset != -1) {
                                fdtdec_get_alias_seq(gd->fdt_blob,


@@ -81,12 +84,29 @@ int device_bind(struct udevice *parent, const struct driver *drv,
                }
        }
 
                }
        }
 

-       if (!dev->platdata && drv->platdata_auto_alloc_size) {
-               dev->flags |= DM_FLAG_ALLOC_PDATA;
-               dev->platdata = calloc(1, drv->platdata_auto_alloc_size);
-               if (!dev->platdata) {
-                       ret = -ENOMEM;
-                       goto fail_alloc1;
+       if (drv->platdata_auto_alloc_size) {
+               bool alloc = !platdata;
+
+               if (CONFIG_IS_ENABLED(OF_PLATDATA)) {
+                       if (of_platdata_size) {
+                               dev->flags |= DM_FLAG_OF_PLATDATA;
+                               if (of_platdata_size <
+                                               drv->platdata_auto_alloc_size)
+                                       alloc = true;
+                       }
+               }
+               if (alloc) {
+                       dev->flags |= DM_FLAG_ALLOC_PDATA;
+                       dev->platdata = calloc(1,
+                                              drv->platdata_auto_alloc_size);
+                       if (!dev->platdata) {
+                               ret = -ENOMEM;
+                               goto fail_alloc1;
+                       }
+                       if (CONFIG_IS_ENABLED(OF_PLATDATA) && platdata) {
+                               memcpy(dev->platdata, platdata,
+                                      of_platdata_size);
+                       }

                }
        }
 
                }
        }
 


@@ -135,6 +155,11 @@ int device_bind(struct udevice *parent, const struct driver *drv,
                if (ret)
                        goto fail_child_post_bind;
        }
                if (ret)
                        goto fail_child_post_bind;
        }

+       if (uc->uc_drv->post_bind) {
+               ret = uc->uc_drv->post_bind(dev);
+               if (ret)
+                       goto fail_uclass_post_bind;
+       }

 
        if (parent)
                dm_dbg("Bound device %s to %s\n", dev->name, parent->name);
 
        if (parent)
                dm_dbg("Bound device %s to %s\n", dev->name, parent->name);


@@ -145,6 +170,8 @@ int device_bind(struct udevice *parent, const struct driver *drv,
 
        return 0;
 
 
        return 0;
 

+fail_uclass_post_bind:
+       /* There is no child unbind() method, so no clean-up required */

 fail_child_post_bind:
        if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (drv->unbind && drv->unbind(dev)) {
 fail_child_post_bind:
        if (CONFIG_IS_ENABLED(DM_DEVICE_REMOVE)) {
                if (drv->unbind && drv->unbind(dev)) {


@@ -186,10 +213,28 @@ fail_alloc1:
        return ret;
 }
 
        return ret;
 }
 

+int device_bind_with_driver_data(struct udevice *parent,
+                                const struct driver *drv, const char *name,
+                                ulong driver_data, int of_offset,
+                                struct udevice **devp)
+{
+       return device_bind_common(parent, drv, name, NULL, driver_data,
+                                 of_offset, 0, devp);
+}
+
+int device_bind(struct udevice *parent, const struct driver *drv,
+               const char *name, void *platdata, int of_offset,
+               struct udevice **devp)
+{
+       return device_bind_common(parent, drv, name, platdata, 0, of_offset, 0,
+                                 devp);
+}
+

 int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
                        const struct driver_info *info, struct udevice **devp)
 {
        struct driver *drv;
 int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
                        const struct driver_info *info, struct udevice **devp)
 {
        struct driver *drv;

+       uint platdata_size = 0;

 
        drv = lists_driver_lookup_name(info->name);
        if (!drv)
 
        drv = lists_driver_lookup_name(info->name);
        if (!drv)


@@ -197,8 +242,11 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
        if (pre_reloc_only && !(drv->flags & DM_FLAG_PRE_RELOC))
                return -EPERM;
 
        if (pre_reloc_only && !(drv->flags & DM_FLAG_PRE_RELOC))
                return -EPERM;
 

-       return device_bind(parent, drv, info->name, (void *)info->platdata,
-                          -1, devp);
+#if CONFIG_IS_ENABLED(OF_PLATDATA)
+       platdata_size = info->platdata_size;
+#endif
+       return device_bind_common(parent, drv, info->name,
+                       (void *)info->platdata, 0, -1, platdata_size, devp);

 }
 
 static void *alloc_priv(int size, uint flags)
 }
 
 static void *alloc_priv(int size, uint flags)


@@ -216,7 +264,7 @@ static void *alloc_priv(int size, uint flags)
        return priv;
 }
 
        return priv;
 }
 

-int device_probe_child(struct udevice *dev, void *parent_priv)
+int device_probe(struct udevice *dev)

 {
        const struct driver *drv;
        int size = 0;
 {
        const struct driver *drv;
        int size = 0;


@@ -263,8 +311,6 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                                ret = -ENOMEM;
                                goto fail;
                        }
                                ret = -ENOMEM;
                                goto fail;
                        }

-                       if (parent_priv)
-                               memcpy(dev->parent_priv, parent_priv, size);

                }
 
                ret = device_probe(dev->parent);
                }
 
                ret = device_probe(dev->parent);


@@ -292,9 +338,11 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
 
        /*
         * Process pinctrl for everything except the root device, and
 
        /*
         * Process pinctrl for everything except the root device, and

-        * continue regardless of the result of pinctrl.
+        * continue regardless of the result of pinctrl. Don't process pinctrl
+        * settings for pinctrl devices since the device may not yet be
+        * probed.

         */
         */

-       if (dev->parent)
+       if (dev->parent && device_get_uclass_id(dev) != UCLASS_PINCTRL)

                pinctrl_select_state(dev, "default");
 
        ret = uclass_pre_probe_device(dev);
                pinctrl_select_state(dev, "default");
 
        ret = uclass_pre_probe_device(dev);


@@ -307,7 +355,7 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
                        goto fail;
        }
 
                        goto fail;
        }
 

-       if (drv->ofdata_to_platdata && dev->of_offset >= 0) {
+       if (drv->ofdata_to_platdata && dev_of_offset(dev) >= 0) {

                ret = drv->ofdata_to_platdata(dev);
                if (ret)
                        goto fail;
                ret = drv->ofdata_to_platdata(dev);
                if (ret)
                        goto fail;


@@ -325,9 +373,12 @@ int device_probe_child(struct udevice *dev, void *parent_priv)
        if (ret)
                goto fail_uclass;
 
        if (ret)
                goto fail_uclass;
 

+       if (dev->parent && device_get_uclass_id(dev) == UCLASS_PINCTRL)
+               pinctrl_select_state(dev, "default");
+

        return 0;
 fail_uclass:
        return 0;
 fail_uclass:

-       if (device_remove(dev)) {
+       if (device_remove(dev, DM_REMOVE_NORMAL)) {

                dm_warn("%s: Device '%s' failed to remove on error path\n",
                        __func__, dev->name);
        }
                dm_warn("%s: Device '%s' failed to remove on error path\n",
                        __func__, dev->name);
        }


@@ -340,11 +391,6 @@ fail:
        return ret;
 }
 
        return ret;
 }
 

-int device_probe(struct udevice *dev)
-{
-       return device_probe_child(dev, NULL);
-}
-

 void *dev_get_platdata(struct udevice *dev)
 {
        if (!dev) {
 void *dev_get_platdata(struct udevice *dev)
 {
        if (!dev) {


@@ -395,7 +441,7 @@ void *dev_get_uclass_priv(struct udevice *dev)
        return dev->uclass_priv;
 }
 
        return dev->uclass_priv;
 }
 

-void *dev_get_parentdata(struct udevice *dev)
+void *dev_get_parent_priv(struct udevice *dev)

 {
        if (!dev) {
                dm_warn("%s: null device\n", __func__);
 {
        if (!dev) {
                dm_warn("%s: null device\n", __func__);


@@ -478,7 +524,7 @@ int device_find_child_by_of_offset(struct udevice *parent, int of_offset,
        *devp = NULL;
 
        list_for_each_entry(dev, &parent->child_head, sibling_node) {
        *devp = NULL;
 
        list_for_each_entry(dev, &parent->child_head, sibling_node) {

-               if (dev->of_offset == of_offset) {
+               if (dev_of_offset(dev) == of_offset) {

                        *devp = dev;
                        return 0;
                }
                        *devp = dev;
                        return 0;
                }


@@ -503,7 +549,7 @@ static struct udevice *_device_find_global_by_of_offset(struct udevice *parent,
 {
        struct udevice *dev, *found;
 
 {
        struct udevice *dev, *found;
 

-       if (parent->of_offset == of_offset)
+       if (dev_of_offset(parent) == of_offset)

                return parent;
 
        list_for_each_entry(dev, &parent->child_head, sibling_node) {
                return parent;
 
        list_for_each_entry(dev, &parent->child_head, sibling_node) {


@@ -581,38 +627,66 @@ const char *dev_get_uclass_name(struct udevice *dev)
        return dev->uclass->uc_drv->name;
 }
 
        return dev->uclass->uc_drv->name;
 }
 

-fdt_addr_t dev_get_addr(struct udevice *dev)
+fdt_addr_t dev_get_addr_index(struct udevice *dev, int index)

 {
 {

-#if CONFIG_IS_ENABLED(OF_CONTROL)
+#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)

        fdt_addr_t addr;
 
        if (CONFIG_IS_ENABLED(OF_TRANSLATE)) {
                const fdt32_t *reg;
        fdt_addr_t addr;
 
        if (CONFIG_IS_ENABLED(OF_TRANSLATE)) {
                const fdt32_t *reg;

+               int len = 0;
+               int na, ns;

 
 

-               reg = fdt_getprop(gd->fdt_blob, dev->of_offset, "reg", NULL);
-               if (!reg)
+               na = fdt_address_cells(gd->fdt_blob,
+                                      dev_of_offset(dev->parent));
+               if (na < 1) {
+                       debug("bad #address-cells\n");

                        return FDT_ADDR_T_NONE;
                        return FDT_ADDR_T_NONE;

+               }
+
+               ns = fdt_size_cells(gd->fdt_blob, dev_of_offset(dev->parent));
+               if (ns < 0) {
+                       debug("bad #size-cells\n");
+                       return FDT_ADDR_T_NONE;
+               }
+
+               reg = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "reg",
+                                 &len);
+               if (!reg || (len <= (index * sizeof(fdt32_t) * (na + ns)))) {
+                       debug("Req index out of range\n");
+                       return FDT_ADDR_T_NONE;
+               }
+
+               reg += index * (na + ns);

 
                /*
                 * Use the full-fledged translate function for complex
                 * bus setups.
                 */
 
                /*
                 * Use the full-fledged translate function for complex
                 * bus setups.
                 */

-               return fdt_translate_address((void *)gd->fdt_blob,
-                                            dev->of_offset, reg);
+               addr = fdt_translate_address((void *)gd->fdt_blob,
+                                            dev_of_offset(dev), reg);
+       } else {
+               /*
+                * Use the "simple" translate function for less complex
+                * bus setups.
+                */
+               addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
+                               dev_of_offset(dev->parent), dev_of_offset(dev),
+                               "reg", index, NULL, false);
+               if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) {
+                       if (device_get_uclass_id(dev->parent) ==
+                           UCLASS_SIMPLE_BUS)
+                               addr = simple_bus_translate(dev->parent, addr);
+               }

        }
 
        /*
        }
 
        /*

-        * Use the "simple" translate function for less complex
-        * bus setups.
+        * Some platforms need a special address translation. Those
+        * platforms (e.g. mvebu in SPL) can configure a translation
+        * offset in the DM by calling dm_set_translation_offset() that
+        * will get added to all addresses returned by dev_get_addr().

         */
         */

-       addr = fdtdec_get_addr_size_auto_parent(gd->fdt_blob,
-                                               dev->parent->of_offset,
-                                               dev->of_offset, "reg",
-                                               0, NULL);
-       if (CONFIG_IS_ENABLED(SIMPLE_BUS) && addr != FDT_ADDR_T_NONE) {
-               if (device_get_uclass_id(dev->parent) == UCLASS_SIMPLE_BUS)
-                       addr = simple_bus_translate(dev->parent, addr);
-       }
+       addr += dm_get_translation_offset();

 
        return addr;
 #else
 
        return addr;
 #else


@@ -620,6 +694,64 @@ fdt_addr_t dev_get_addr(struct udevice *dev)
 #endif
 }
 
 #endif
 }
 

+fdt_addr_t dev_get_addr_size_index(struct udevice *dev, int index,
+                                  fdt_size_t *size)
+{
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       /*
+        * Only get the size in this first call. We'll get the addr in the
+        * next call to the exisiting dev_get_xxx function which handles
+        * all config options.
+        */
+       fdtdec_get_addr_size_auto_noparent(gd->fdt_blob, dev_of_offset(dev),
+                                          "reg", index, size, false);
+
+       /*
+        * Get the base address via the existing function which handles
+        * all Kconfig cases
+        */
+       return dev_get_addr_index(dev, index);
+#else
+       return FDT_ADDR_T_NONE;
+#endif
+}
+
+fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name)
+{
+#if CONFIG_IS_ENABLED(OF_CONTROL)
+       int index;
+
+       index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
+                                     "reg-names", name);
+       if (index < 0)
+               return index;
+
+       return dev_get_addr_index(dev, index);
+#else
+       return FDT_ADDR_T_NONE;
+#endif
+}
+
+fdt_addr_t dev_get_addr(struct udevice *dev)
+{
+       return dev_get_addr_index(dev, 0);
+}
+
+void *dev_get_addr_ptr(struct udevice *dev)
+{
+       return (void *)(uintptr_t)dev_get_addr_index(dev, 0);
+}
+
+void *dev_map_physmem(struct udevice *dev, unsigned long size)
+{
+       fdt_addr_t addr = dev_get_addr(dev);
+
+       if (addr == FDT_ADDR_T_NONE)
+               return NULL;
+
+       return map_physmem(addr, size, MAP_NOCACHE);
+}
+

 bool device_has_children(struct udevice *dev)
 {
        return !list_empty(&dev->child_head);
 bool device_has_children(struct udevice *dev)
 {
        return !list_empty(&dev->child_head);


@@ -648,12 +780,32 @@ bool device_is_last_sibling(struct udevice *dev)
        return list_is_last(&dev->sibling_node, &parent->child_head);
 }
 
        return list_is_last(&dev->sibling_node, &parent->child_head);
 }
 

+void device_set_name_alloced(struct udevice *dev)
+{
+       dev->flags |= DM_FLAG_NAME_ALLOCED;
+}
+

 int device_set_name(struct udevice *dev, const char *name)
 {
        name = strdup(name);
        if (!name)
                return -ENOMEM;
        dev->name = name;
 int device_set_name(struct udevice *dev, const char *name)
 {
        name = strdup(name);
        if (!name)
                return -ENOMEM;
        dev->name = name;

+       device_set_name_alloced(dev);

 
        return 0;
 }
 
        return 0;
 }

+
+bool of_device_is_compatible(struct udevice *dev, const char *compat)
+{
+       const void *fdt = gd->fdt_blob;
+
+       return !fdt_node_check_compatible(fdt, dev_of_offset(dev), compat);
+}
+
+bool of_machine_is_compatible(const char *compat)
+{
+       const void *fdt = gd->fdt_blob;
+
+       return !fdt_node_check_compatible(fdt, 0, compat);
+}