Make use of the new priv/plat data region if enabled. This is implemented as a simple offset from the position set up by dtoc to the new position.
So long as all access goes through dm_priv_to_rw() this is safe.
Signed-off-by: Simon Glass sjg@chromium.org ---
drivers/core/device.c | 12 ++++++------ drivers/core/root.c | 9 +++++++++ include/dm/util.h | 9 +++++++++ 3 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/drivers/core/device.c b/drivers/core/device.c index 2fe42888e90..dcf8d39f156 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -533,7 +533,7 @@ void *dev_get_plat(const struct udevice *dev) return NULL; }
- return dev->plat_; + return dm_priv_to_rw(dev->plat_); }
void *dev_get_parent_plat(const struct udevice *dev) @@ -543,7 +543,7 @@ void *dev_get_parent_plat(const struct udevice *dev) return NULL; }
- return dev->parent_plat_; + return dm_priv_to_rw(dev->parent_plat_); }
void *dev_get_uclass_plat(const struct udevice *dev) @@ -553,7 +553,7 @@ void *dev_get_uclass_plat(const struct udevice *dev) return NULL; }
- return dev->uclass_plat_; + return dm_priv_to_rw(dev->uclass_plat_); }
void *dev_get_priv(const struct udevice *dev) @@ -563,7 +563,7 @@ void *dev_get_priv(const struct udevice *dev) return NULL; }
- return dev->priv_; + return dm_priv_to_rw(dev->priv_); }
void *dev_get_uclass_priv(const struct udevice *dev) @@ -573,7 +573,7 @@ void *dev_get_uclass_priv(const struct udevice *dev) return NULL; }
- return dev->uclass_priv_; + return dm_priv_to_rw(dev->uclass_priv_); }
void *dev_get_parent_priv(const struct udevice *dev) @@ -583,7 +583,7 @@ void *dev_get_parent_priv(const struct udevice *dev) return NULL; }
- return dev->parent_priv_; + return dm_priv_to_rw(dev->parent_priv_); }
static int device_get_device_tail(struct udevice *dev, int ret, diff --git a/drivers/core/root.c b/drivers/core/root.c index e12d7049995..9d9ab676681 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -341,6 +341,15 @@ __weak int dm_scan_other(bool pre_reloc_only) return 0; }
+#if CONFIG_IS_ENABLED(OF_PLATDATA_INST) && CONFIG_IS_ENABLED(READ_ONLY) +void *dm_priv_to_rw(void *priv) +{ + long offset = priv - (void *)__priv_data_start; + + return gd_dm_priv_base() + offset; +} +#endif + /** * dm_scan() - Scan tables to bind devices * diff --git a/include/dm/util.h b/include/dm/util.h index 01a044992f2..138893c9354 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -49,3 +49,12 @@ void dm_dump_driver_compat(void); void dm_dump_static_driver_info(void);
#endif + +#if CONFIG_IS_ENABLED(OF_PLATDATA_INST) && CONFIG_IS_ENABLED(READ_ONLY) +void *dm_priv_to_rw(void *priv); +#else +static inline void *dm_priv_to_rw(void *priv) +{ + return priv; +} +#endif