dm: Implement driver model support in SPL

These ended up in arch/arm/dts/dt-bindings temporarily, but in fact the correct place is now include/dt-bindings. Move them to be consistent.

Signed-off-by Simon Glass <[email protected]>

The simple malloc() implementation is used when memory is tight. It provides a simple buffer with an incrementing pointer.

At present the implementation is inside dlmalloc. Move it into its own file so that it is easier to find.

Rather than using relocation as a signal that the full malloc() is available, add a special GD_FLG_FULL_MALLOC_INIT flag. This signals that the simple malloc() should no longer be used.

In some cases, such as SPL, even the code space used by the full malloc() is wasteful. Add a CONFIG_SYS_MALLOC_SIMPLE option to provide only the simple malloc. In this case the full malloc is not available at all. It saves about 1KB of code space and about 0.5KB of data on Thumb 2.

Signed-off-by Simon Glass <[email protected]>

Set up the simple malloc() implementation when requested, in preference to the full malloc().

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2: None

 common/spl/spl.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

common/spl/spl.c +5 -1

index b16664f..7168854 100644
@@ -134,9 +134,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	u32 boot_device;
 	debug(">>spl:board_init_r()\n");
 
-#ifdef CONFIG_SYS_SPL_MALLOC_START
+#if defined(CONFIG_SYS_SPL_MALLOC_START)
 	mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
 			CONFIG_SYS_SPL_MALLOC_SIZE);
+	gd->flags |= GD_FLG_FULL_MALLOC_INIT;
+#elif defined(CONFIG_SYS_MALLOC_F_LEN)
+	gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
+	gd->malloc_ptr = 0;
 #endif
 
 #ifndef CONFIG_PPC

Quoted 40 lines · Simon Glass

Set up the simple malloc() implementation when requested, in preference to the full malloc().

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2: None

 common/spl/spl.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

common/spl/spl.c +10 -1

index b16664f..7168854 100644
@@ -134,9 +134,13 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
      u32 boot_device;
      debug(">>spl:board_init_r()\n");
 
-#ifdef CONFIG_SYS_SPL_MALLOC_START
+#if defined(CONFIG_SYS_SPL_MALLOC_START)
      mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
                      CONFIG_SYS_SPL_MALLOC_SIZE);
+     gd->flags |= GD_FLG_FULL_MALLOC_INIT;
+#elif defined(CONFIG_SYS_MALLOC_F_LEN)
+     gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
+     gd->malloc_ptr = 0;
 #endif
 
 #ifndef CONFIG_PPC

@@ -233,6 +237,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
      default:
              debug("Unsupported OS image.. Jumping nevertheless..\n");
      }
+#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SYS_SPL_MALLOC_SIZE)
+     debug("SPL malloc() used %#lx bytes (%ld KB)\n", gd->malloc_ptr,
+           gd->malloc_ptr / 1024);
+#endif
+
      jump_to_image_no_args(&spl_image);

common/spl/spl.c void board_init_r(gd_t *dummy1, ulong dummy2) · line 246

Quoted 1 line

common/spl/spl.c +0 -0

 }

I don't know if this is right. Take the example of am335x + booting from a FAT fs image. We'll need early malloc prior to DDR being available, so the tiny space (1-2kb). But once DDR is up we need a more complete malloc so that we can use FAT. I don't have the size handy but I'm going to guess that (a) it's bigger than 1-2kb (b) bigger than we can squeeze into SRAM.

When enabled, set up driver model for SPL. This allows SPL to use the same drivers as the main U-Boot.

Signed-off-by Simon Glass <[email protected]>

Provide a CONFIG_DM_STDIO option to enable registering a serial device with the stdio library. This is seldom useful in SPL, so disable it by default when building for SPL.

Signed-off-by Simon Glass <[email protected]>

Since this function can use up quite a bit of space for its strings, disable it by default in SPL. Use CONFIG_DM_WARN to re-enable it.

Signed-off-by Simon Glass <[email protected]>

The linker lists feature is useful in SPL as it holds the driver model platform data. So don't throw away the lists.

Signed-off-by Simon Glass <[email protected]>

Add documentation for the various driver model options that are now available.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Rebase to master

 README                      | 119 ++++++++++++++++++++++++++++++++++++++++++++
 doc/driver-model/README.txt |  44 ++++++++++++----
 2 files changed, 153 insertions(+), 10 deletions(-)

README +103 -0

index 19abe20..b679164 100644
@@ -630,6 +630,120 @@ The following options need to be configured:
                get_timer() must operate in milliseconds and this CONFIG
                option must be set to 1000.
 
+- Driver Model
+               Driver model is a new framework for devices in U-Boot
+               introduced in early 2014. U-Boot is being progressively
+               moved over to this. It offers a consistent device structure,
+               supports grouping devices into classes and has built-in
+               handling of platform data and device tree.
+
+               To enable transition to driver model in a relatively
+               painful fashion, each subsystem can be independently
+               switched between the legacy/ad-hoc approach and the new
+               driver model using the options below. Also, many uclass
+               interfaces include compatibility features which may be
+               removed once the conversion of that subsystem is complete.
+               As a result, the API provided by the subsystem may in fact
+               not change with driver model.
+
+               See doc/driver-model/README.txt for more information.
+
+               CONFIG_DM
+
+               Enable driver model. This brings in the core support,
+               including scanning of platform data on start-up. If
+               CONFIG_OF_CONTROL is enabled, the device tree will be
+               scanned also when available.
+
+               CONFIG_CMD_DM
+
+               Enable driver model test commands. These allow you to print
+               out the driver model tree and the uclasses.
+
+               CONFIG_DM_DEMO
+
+               Enable some demo devices and the 'demo' command. These are
+               really only useful for playing around while trying to
+               understand driver model in sandbox.
+
+               CONFIG_SPL_DM
+
+               Enable driver model in SPL. You will need to provide a
+               suitable malloc() implementation. If you are not using the
+               full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+               consider using CONFIG_SYS_MALLOC_SIMPLE. In that case you
+               must provide CONFIG_SYS_MALLOC_F_LEN to set the size.
+               In most cases driver model will only allocate a few uclasses
+               and devices in SPL, so 1KB should be enable. See
+               CONFIG_SYS_MALLOC_F_LEN for more details on how to enable
+               it.
+
+               CONFIG_DM_SERIAL
+
+               Enable driver model for serial. This replaces
+               drivers/serial/serial.c with the serial uclass, which
+               implements serial_putc() etc. The uclass interface is
+               defined in include/serial.h.
+
+               CONFIG_DM_GPIO
+
+               Enable driver model for GPIO access. The standard GPIO
+               interface (gpio_get_value(), etc.) is then implemented by
+               the GPIO uclass. Drivers provide methods to query the
+               particular GPIOs that they provide. The uclass interface
+               is defined in include/asm-generic/gpio.h.
+
+               CONFIG_DM_SPI
+
+               Enable driver model for SPI. The SPI slave interface
+               (spi_setup_slave(), spi_xfer(), etc.) is then implemented by
+               the SPI uclass. Drivers provide methods to access the SPI
+               buses that they control. The uclass interface is defined in
+               include/spi.h. The existing spi_slave structure is attached
+               as 'parent data' to every slave on each bus. Slaves
+               typically use driver-private data instead of extending the
+               spi_slave structure.
+
+               CONFIG_DM_SPI_FLASH
+
+               Enable driver model for SPI flash. This SPI flash interface
+               (spi_flash_probe(), spi_flash_write(), etc.) is then
+               implemented by the SPI flash uclass. There is one standard
+               SPI flash driver which knows how to probe most chips
+               supported by U-Boot. The uclass interface is defined in
+               include/spi_flash.h, but is currently fully compatible
+               with the old interface to avoid confusion and duplication
+               during the transition parent. SPI and SPI flash must be
+               enabled together (it is not possible to use driver model
+               for one and not the other).
+
+               CONFIG_DM_CROS_EC
+
+               Enable driver model for the Chrome OS EC interface. This
+               allows the cros_ec SPI driver to operate with CONFIG_DM_SPI
+               but otherwise makes few changes. Since cros_ec also supports
+               I2C and LPC (which don't support driver model yet), a full
+               conversion is not yet possible.
+
+
+               ** Code size options: The following options are enabled by
+               default except in SPL. Enable them explicitly to get these
+               features in SPL.
+
+               CONFIG_DM_WARN
+
+               Enable the dm_warn() function. This can use up quite a bit

Hi Simon,

2014-10-24 4:16 GMT+09:00 Simon Glass <[email protected]>:

Quoted 124 lines

Add documentation for the various driver model options that are now available.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Rebase to master

 README                      | 119 ++++++++++++++++++++++++++++++++++++++++++++
 doc/driver-model/README.txt |  44 ++++++++++++----
 2 files changed, 153 insertions(+), 10 deletions(-)

README +103 -0

index 19abe20..b679164 100644
@@ -630,6 +630,120 @@ The following options need to be configured:
                get_timer() must operate in milliseconds and this CONFIG
                option must be set to 1000.
 
+- Driver Model
+               Driver model is a new framework for devices in U-Boot
+               introduced in early 2014. U-Boot is being progressively
+               moved over to this. It offers a consistent device structure,
+               supports grouping devices into classes and has built-in
+               handling of platform data and device tree.
+
+               To enable transition to driver model in a relatively
+               painful fashion, each subsystem can be independently
+               switched between the legacy/ad-hoc approach and the new
+               driver model using the options below. Also, many uclass
+               interfaces include compatibility features which may be
+               removed once the conversion of that subsystem is complete.
+               As a result, the API provided by the subsystem may in fact
+               not change with driver model.
+
+               See doc/driver-model/README.txt for more information.
+
+               CONFIG_DM
+
+               Enable driver model. This brings in the core support,
+               including scanning of platform data on start-up. If
+               CONFIG_OF_CONTROL is enabled, the device tree will be
+               scanned also when available.
+
+               CONFIG_CMD_DM
+
+               Enable driver model test commands. These allow you to print
+               out the driver model tree and the uclasses.
+
+               CONFIG_DM_DEMO
+
+               Enable some demo devices and the 'demo' command. These are
+               really only useful for playing around while trying to
+               understand driver model in sandbox.
+
+               CONFIG_SPL_DM
+
+               Enable driver model in SPL. You will need to provide a
+               suitable malloc() implementation. If you are not using the
+               full malloc() enabled by CONFIG_SYS_SPL_MALLOC_START,
+               consider using CONFIG_SYS_MALLOC_SIMPLE. In that case you
+               must provide CONFIG_SYS_MALLOC_F_LEN to set the size.
+               In most cases driver model will only allocate a few uclasses
+               and devices in SPL, so 1KB should be enable. See
+               CONFIG_SYS_MALLOC_F_LEN for more details on how to enable
+               it.
+
+               CONFIG_DM_SERIAL
+
+               Enable driver model for serial. This replaces
+               drivers/serial/serial.c with the serial uclass, which
+               implements serial_putc() etc. The uclass interface is
+               defined in include/serial.h.
+
+               CONFIG_DM_GPIO
+
+               Enable driver model for GPIO access. The standard GPIO
+               interface (gpio_get_value(), etc.) is then implemented by
+               the GPIO uclass. Drivers provide methods to query the
+               particular GPIOs that they provide. The uclass interface
+               is defined in include/asm-generic/gpio.h.
+
+               CONFIG_DM_SPI
+
+               Enable driver model for SPI. The SPI slave interface
+               (spi_setup_slave(), spi_xfer(), etc.) is then implemented by
+               the SPI uclass. Drivers provide methods to access the SPI
+               buses that they control. The uclass interface is defined in
+               include/spi.h. The existing spi_slave structure is attached
+               as 'parent data' to every slave on each bus. Slaves
+               typically use driver-private data instead of extending the
+               spi_slave structure.
+
+               CONFIG_DM_SPI_FLASH
+
+               Enable driver model for SPI flash. This SPI flash interface
+               (spi_flash_probe(), spi_flash_write(), etc.) is then
+               implemented by the SPI flash uclass. There is one standard
+               SPI flash driver which knows how to probe most chips
+               supported by U-Boot. The uclass interface is defined in
+               include/spi_flash.h, but is currently fully compatible
+               with the old interface to avoid confusion and duplication
+               during the transition parent. SPI and SPI flash must be
+               enabled together (it is not possible to use driver model
+               for one and not the other).
+
+               CONFIG_DM_CROS_EC
+
+               Enable driver model for the Chrome OS EC interface. This
+               allows the cros_ec SPI driver to operate with CONFIG_DM_SPI
+               but otherwise makes few changes. Since cros_ec also supports
+               I2C and LPC (which don't support driver model yet), a full
+               conversion is not yet possible.
+
+
+               ** Code size options: The following options are enabled by
+               default except in SPL. Enable them explicitly to get these
+               features in SPL.
+
+               CONFIG_DM_WARN
+
+               Enable the dm_warn() function. This can use up quite a bit

README The following options need to be configured: · line 745

Quoted 10 lines

README +10 -0

+               of space for its strings.
+
+               CONFIG_DM_STDIO
+
+               Enable registering a serial device with the stdio library.
+
+               CONFIG_DM_DEVICE_REMOVE
+
+               Enable removing of devices.
+

Nice!

Can we move them to Kconfig help (in this series or in a follow-up patch) ?

I added some of them just for my instant necessity:
http://patchwork.ozlabs.org/patch/402483/
but my help messages might not be very nice. Please feel free to rewrite them as you like. Your documentation is more detailed!

If you could send patches to prepare DM entries in Kconfig, that would be really helpful.