dm: core: Move flags to device-runtime info

When of-platdata-inst is active, use the flags in the new udevice_rt
table, dropping them from the main struct udevice. This ensures that the
latter is not updated at runtime.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 1990b6f69f808e46b50a942b08df28b513144d62..06d2467825fd52c0934154eb7c065fe611e11941 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -1136,3 +1136,36 @@ int dev_enable_by_path(const char *path)
        return lists_bind_fdt(parent, node, NULL, false);
 }
 #endif
+
+#if CONFIG_IS_ENABLED(OF_PLATDATA_RT)
+static struct udevice_rt *dev_get_rt(const struct udevice *dev)
+{
+       struct udevice *base = ll_entry_start(struct udevice, udevice);
+       int idx = dev - base;
+
+       struct udevice_rt *urt = gd_dm_udevice_rt() + idx;
+
+       return urt;
+}
+
+u32 dev_get_flags(const struct udevice *dev)
+{
+       const struct udevice_rt *urt = dev_get_rt(dev);
+
+       return urt->flags_;
+}
+
+void dev_or_flags(const struct udevice *dev, u32 or)
+{
+       struct udevice_rt *urt = dev_get_rt(dev);
+
+       urt->flags_ |= or;
+}
+
+void dev_bic_flags(const struct udevice *dev, u32 bic)
+{
+       struct udevice_rt *urt = dev_get_rt(dev);
+
+       urt->flags_ &= ~bic;
+}
+#endif /* OF_PLATDATA_RT */

diff --git a/include/dm/device.h b/include/dm/device.h
index 8e16f2ea49705fab5cdf4bccf3e3fd4bdf28b3db..0a9718a5b81a3096ec6c8224e6a1f8172d957f9e 100644 (file)
--- a/include/dm/device.h
+++ b/include/dm/device.h
@@ -177,7 +177,9 @@ struct udevice {
        struct list_head uclass_node;
        struct list_head child_head;
        struct list_head sibling_node;
+#if !CONFIG_IS_ENABLED(OF_PLATDATA_RT)
        u32 flags_;
+#endif
        int seq_;
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
        ofnode node_;
@@ -211,6 +213,11 @@ struct udevice_rt {
 /* Returns the operations for a device */
 #define device_get_ops(dev)    (dev->driver->ops)
 
+#if CONFIG_IS_ENABLED(OF_PLATDATA_RT)
+u32 dev_get_flags(const struct udevice *dev);
+void dev_or_flags(const struct udevice *dev, u32 or);
+void dev_bic_flags(const struct udevice *dev, u32 bic);
+#else
 static inline u32 dev_get_flags(const struct udevice *dev)
 {
        return dev->flags_;
@@ -225,6 +232,7 @@ static inline void dev_bic_flags(struct udevice *dev, u32 bic)
 {
        dev->flags_ &= ~bic;
 }
+#endif /* OF_PLATDATA_RT */
 
 /**
  * dev_ofnode() - get the DT node reference associated with a udevice