dm: core: Add option to configure an offset for the address translation
PATCH v3 1/1 dm: core: Add option to configure an offset for the address translation
Some platforms need to ability to configure an offset to the standard addresses extracted from the device-tree. This patch allows this by adding a function to DM to configure this offset (if needed).
---
v3:
- Add comment to variable desclaration
- Remove unnecessary checks for "!root"
v2:
- Change translation_offset type from u32 to fdt_addr_t
- Add comments to function declarations
drivers/core/device.c | 33 +++++++++++++++++++++------------ drivers/core/root.c | 21 +++++++++++++++++++++ include/dm/device.h | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 12 deletions(-)
drivers/core/device.c +21 -12
@@ -597,22 +597,31 @@ fdt_addr_t dev_get_addr(struct udevice *dev)* Use the full-fledged translate function for complex * bus setups. */ -return fdt_translate_address ((void *)gd->fdt_blob, + addr =fdt_translate_address ((void *)gd->fdt_blob, dev->of_offset, reg); + }else { +/* +* Use the "simple" translate function for less complex +* bus setups. +*/ + 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); + } }/* -* Use the "simple" translate function for less complex -* bus setups. -*/ - 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); - } +* 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 +=dm_get_translation_offset ();return addr;#else
drivers/core/root.c +21 -0
@@ -23,6 +23,10 @@DECLARE_GLOBAL_DATA_PTR ; +struct root_priv { +fdt_addr_t translation_offset;/* optional translation offset */ +}; +static const struct driver_info root_info = { .name ="root_driver" , };
@@ -37,6 +41,22 @@ struct udevice *dm_root(void)return gd->dm_root; } +fdt_addr_t dm_get_translation_offset (void ) +{ +struct udevice *root =dm_root (); +struct root_priv *priv =dev_get_priv (root); + +return priv->translation_offset; +} + +void dm_set_translation_offset (fdt_addr_t offs) +{ +struct udevice *root =dm_root (); +struct root_priv *priv =dev_get_priv (root); + + priv->translation_offset = offs; +} +#if defined(CONFIG_NEEDS_MANUAL_RELOC )void fix_drivers (void ) {
@@ -228,6 +248,7 @@ int dm_init_and_scan(bool pre_reloc_only)U_BOOT_DRIVER (root_driver) = { .name ="root_driver" , .id =UCLASS_ROOT , + .priv_auto_alloc_size =sizeof (struct root_priv ), };/* This is the root uclass */
include/dm/device.h +21 -0
@@ -776,4 +776,25 @@ static inline void devm_kfree(struct udevice *dev, void *ptr)#endif /* ! CONFIG_DEVRES */ +/** +* dm_set_translation_offset() - Set translation offset +* @offs: Translation offset +* +* Some platforms need a special address translation. Those +* platforms (e.g. mvebu in SPL) can configure a translation +* offset in the DM by calling this function. It will be +* added to all addresses returned in dev_get_addr(). +*/ +void dm_set_translation_offset (fdt_addr_t offs); + +/** +* dm_get_translation_offset() - Get translation offset +* +* This function returns the translation offset that can +* be configured by calling dm_set_translation_offset(). +* +* @return translation offset for the device address (0 as default). +*/ +fdt_addr_t dm_get_translation_offset (void ); +#endif
Signature · 1 line
2.6.4
PATCH v3 1/1 dm: core: Add option to configure an offset for the address translation
Quoted 12 lines · Stefan Roese
Some platforms need to ability to configure an offset to the standard addresses extracted from the device-tree. This patch allows this by adding a function to DM to configure this offset (if needed).
Signed-off-by Stefan Roese <[email protected]>Acked-by Simon Glass <[email protected]>Cc Simon Glass <[email protected]>---
v3:
- Add comment to variable desclaration
- Remove unnecessary checks for "!root"
Quoted 8 lines
v2:
- Changetranslation_offsettype from u32 tofdt_addr_t
- Add comments to function declarationsdrivers/core/device.c | 33 +++++++++++++++++++++------------ drivers/core/root.c | 21 +++++++++++++++++++++ include/dm/device.h | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 12 deletions(-)
Fixed whitespace nit and:
Applied to u-boot-dm/next.
PATCH v3 1/1 dm: core: Add option to configure an offset for the address translation
Quoted 17 lines · Simon Glass
Quoted 16 lines · Stefan Roese
Some platforms need to ability to configure an offset to the standard addresses extracted from the device-tree. This patch allows this by adding a function to DM to configure this offset (if needed).
Signed-off-by Stefan Roese <[email protected]>Acked-by Simon Glass <[email protected]>Cc Simon Glass <[email protected]>---
v3:
- Add comment to variable desclaration
- Remove unnecessary checks for "!root"v2:
- Changetranslation_offsettype from u32 tofdt_addr_t
- Add comments to function declarations
Quoted 8 lines
Quoted 4 lines
drivers/core/device.c | 33 +++++++++++++++++++++------------ drivers/core/root.c | 21 +++++++++++++++++++++ include/dm/device.h | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 12 deletions(-)Fixed whitespace nit and:
Applied to u-boot-dm/next.
Simon, just a quick question. Do you plan to send a pull request for this next branch soon after the merge window open? I'm asking, since I would like to prepare a Marvell / mvebu branch to pull also quickly after the release. And this depends on this small DM core patch.
Thanks,
Stefan
PATCH v3 1/1 dm: core: Add option to configure an offset for the address translation
Hi Stefan,
Quoted 28 lines · Stefan Roese
Quoted 27 lines · Simon Glass
Quoted 13 lines · Stefan Roese
Some platforms need to ability to configure an offset to the standard addresses extracted from the device-tree. This patch allows this by adding a function to DM to configure this offset (if needed).
Signed-off-by Stefan Roese <[email protected]>Acked-by Simon Glass <[email protected]>Cc Simon Glass <[email protected]>---
v3:
- Add comment to variable desclaration
- Remove unnecessary checks for "!root"Quoted 8 lines
v2:
- Changetranslation_offsettype from u32 tofdt_addr_t
- Add comments to function declarationsdrivers/core/device.c | 33 +++++++++++++++++++++------------ drivers/core/root.c | 21 +++++++++++++++++++++ include/dm/device.h | 21 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 12 deletions(-)Fixed whitespace nit and:
Quoted 8 lines
Quoted 1 line
Applied to u-boot-dm/next.
Simon, just a quick question. Do you plan to send a pull request for this next branch soon after the merge window open? I'm asking, since I would like to prepare a Marvell / mvebu branch to pull also quickly after the release. And this depends on this small DM core patch.
Yes, will do.
Regards,
Simon