dm: core: Change platform specific translation-offset handling

Testing has shown that the current DM implementation of a platform /
board specific translation offset, as its needed for the SPL on MVEBU
platforms is buggy. The translation offset is confingured too late,
after the driver bind functions are run. This may result in incorrect
address translations. With the current implementation its not possible
to configure the offset earlier, as the DM code has not run at all.

This patch now removed the set_/get_translation_offset() calls and
moves the translation offset into the GD variable translation_offset.
This variable will get used when CONFIG_TRANSLATION_OFFSET is enabled.
This option is enabled only for MVEBU on ARM32 platforms, where its
currenty needed and configured in the SPL.

Signed-off-by: Stefan Roese <[email protected]>
Cc: Pierre Bourdon <[email protected]>
Cc: Baruch Siach <[email protected]>
Cc: Simon Glass <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Tom Rini <[email protected]>
Tested-by: Pierre Bourdon <[email protected]>
Tested-by: Baruch Siach <[email protected]>

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index f5fd60d784560336ddd4170e10ffaff83f0c8f8c..f99bd3bf65672ee770ea10cd4d28fe7ad894e0bf 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -14,6 +14,7 @@ config ARMADA_32BIT
        select SPL_OF_CONTROL if SPL
        select SPL_SIMPLE_BUS if SPL
        select SUPPORT_SPL
+       select TRANSLATION_OFFSET
 
 config ARMADA_64BIT
        bool

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 9dd7c84b6874d6ba09729279a2227276463e3c9a..530b98c1aa31e637b5f869323d28a77a3840295f 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -93,15 +93,21 @@ void board_init_f(ulong dummy)
         */
 #endif
 
+       /*
+        * Use special translation offset for SPL. This needs to be
+        * configured *before* spl_init() is called as this function
+        * calls dm_init() which calls the bind functions of the
+        * device drivers. Here the base address needs to be configured
+        * (translated) correctly.
+        */
+       gd->translation_offset = 0xd0000000 - 0xf1000000;
+
        ret = spl_init();
        if (ret) {
                debug("spl_init() failed: %d\n", ret);
                hang();
        }
 
-       /* Use special translation offset for SPL */
-       dm_set_translation_offset(0xd0000000 - 0xf1000000);
-
        preloader_console_init();
 
        timer_init();

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index ddf2fb3fb828d16e370513ae9e86b04259d98039..2d195ae35ed526b7a0d73b226278b494d3feaf51 100644 (file)
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -225,6 +225,15 @@ config SPL_OF_TRANSLATE
          used for the address translation. This function is faster and
          smaller in size than fdt_translate_address().
 
+config TRANSLATION_OFFSET
+       bool "Platforms specific translation offset"
+       depends on DM && OF_CONTROL
+       help
+         Some platforms need a special address translation. Those
+         platforms (e.g. mvebu in SPL) can configure a translation
+         offset by enabling this option and setting the translation_offset
+         variable in the GD in their platform- / board-specific code.
+
 config OF_ISA_BUS
        bool
        depends on OF_TRANSLATE

diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c
index e113f1dd39c7cb0263e94fdaf9271303ceac8e69..c2873861dacd0cc1acec92bf2b71ccd75d6c49fe 100644 (file)
--- a/drivers/core/fdtaddr.c
+++ b/drivers/core/fdtaddr.c
@@ -74,13 +74,16 @@ fdt_addr_t devfdt_get_addr_index(struct udevice *dev, int index)
                }
        }
 
+#if defined(CONFIG_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 dm_set_translation_offset() that
-        * will get added to all addresses returned by devfdt_get_addr().
+        * offset by setting this value in the GD and enaling this
+        * feature via CONFIG_TRANSLATION_OFFSET. This value will
+        * get added to all addresses returned by devfdt_get_addr().
         */
-       addr += dm_get_translation_offset();
+       addr += gd->translation_offset;
+#endif
 
        return addr;
 #else

diff --git a/drivers/core/root.c b/drivers/core/root.c
index e6ec7faf3792c55b428923f71f2d73e46222a94d..8fa096648ed343e3f4e01982f278f8788ce3de19 100644 (file)
--- a/drivers/core/root.c
+++ b/drivers/core/root.c
@@ -25,10 +25,6 @@
 
 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",
 };
@@ -52,22 +48,6 @@ void dm_fixup_for_gd_move(struct global_data *new_gd)
        }
 }
 
-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)
 {
@@ -420,7 +400,6 @@ 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 */

diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h
index 78dcf40bff486841d7c34a2f49b4979806940f0c..65ee3e5d5a0ade4c1e654bebac29d5c72c641f73 100644 (file)
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -20,6 +20,7 @@
  */
 
 #ifndef __ASSEMBLY__
+#include <fdtdec.h>
 #include <membuff.h>
 #include <linux/list.h>
 
@@ -133,6 +134,9 @@ typedef struct global_data {
        struct spl_handoff *spl_handoff;
 # endif
 #endif
+#if defined(CONFIG_TRANSLATION_OFFSET)
+       fdt_addr_t translation_offset;  /* optional translation offset */
+#endif
 } gd_t;
 #endif
 

diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h
index c171d9bc2f42898aa02795280102f3e654132243..3bc2599b6cbd2eaa173ae272e88323fce91349bd 100644 (file)
--- a/include/dm/fdtaddr.h
+++ b/include/dm/fdtaddr.h
@@ -120,25 +120,4 @@ fdt_addr_t devfdt_get_addr_size_index(struct udevice *dev, int index,
  */
 fdt_addr_t devfdt_get_addr_name(struct udevice *dev, const char *name);
 
-/**
- * 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 devfdt_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