Skip to contentSkip to conversation

dm: Implement driver model support in SPL

PATCH New Simon Glass 3 participants 28 messages Nov 11, 2014 – Nov 23, 2014

Subsystems (5)
Arm (32-bit) Kbuild GPIO Tegra architecture support +1 more subsystems
lore
Share & tools
lore

Simon Glass

author
#0 lore raw

v3 cover dm: Implement driver model support in SPL

Now that driver model operations prior to relocation, the remaining area where it does not work is SPL. This series enables this.

Since SPL is quite memory-constrained, code and data size need to be kept as small as possible. This series includes a few changes to help with this:

- Small and simple malloc() implementation
- Dropping device removal features
- Dropping stdio features
- Dropping driver model warnings

With these the code size impact of driver model is small, around 2-3KB. Data usage is typically 200-300 bytes. In many cases this can squeeze into the available SPL RAM space.

This requires a revert of the SPL global_data revert (commit 1ee30ae). I believe that is planned for early in this merge window. We need that revert undone to be able to support the simple malloc in SPL on ARM.

Note that the driver model docs will be added/moved to Kconfig in a follow-on patch.

This series is available at u-boot-dm branch 'spl-working'.

Changes in v3:
- Add new patch to avoid using arch-specific memcpy() in SPL
- Add #ifdef around serial_stub_puts() to fix error when building SPL
- Rebase to master

Changes in v2:
- Correct the Makefile condition for simple_malloc
- Rebase on top of the SPI series
- Rebase to master

Simon Glass (14):
arm: spl: Avoid setting up a duplicate global data structure
dm: tegra: Avoid using arch-specific memcpy() in SPL
dm: Split the simple malloc() implementation into its own file
dm: arm: spl: Allow simple malloc() in SPL
dm: spl: Make simple malloc() available when enabled
dm: spl: Allow driver model to be used
dm: Allow device removal features to be dropped
dm: Allow stdio registration to be dropped
dm: Disable dm_warn() in SPL
dm: tegra: Add platform data for the SPL uart
dm: tegra: Add platform data for the GPIO driver
dm: arm: spl: Make driver model linker lists available
dm: tegra: Enable driver model in SPL and adjust the GPIO driver
dm: Update documentation to include CONFIG_DM... options

 README                            | 119 ++++++++++++++++++++++++
 arch/arm/cpu/u-boot-spl.lds       |   7 ++
 arch/arm/lib/crt0.S               |   2 +-
 arch/arm/lib/spl.c                |   4 -
 board/nvidia/common/board.c       |   8 ++
 board/nvidia/seaboard/seaboard.c  |   4 +-
 common/Makefile                   |   3 +
 common/board_r.c                  |   3 +-
 common/dlmalloc.c                 |  19 +---
 common/malloc_simple.c            |  39 ++++++++
 common/spl/spl.c                  |  16 +++-
 doc/driver-model/README.txt       |  44 +++++++--
 drivers/core/Makefile             |   3 +-
 drivers/core/device-remove.c      | 187 ++++++++++++++++++++++++++++++++++++++
 drivers/core/device.c             | 168 ----------------------------------
 drivers/gpio/Makefile             |   4 +
 drivers/gpio/tegra_gpio.c         |  27 +++---
 drivers/serial/serial-uclass.c    |  10 +-
 drivers/serial/serial_tegra.c     |  16 ++++
 include/asm-generic/global_data.h |   1 +
 include/config_defaults.h         |   6 ++
 include/configs/tegra-common.h    |  14 +--
 include/dm/device-internal.h      |  10 ++
 include/dm/util.h                 |   6 ++
 include/malloc.h                  |  60 +++++++-----
 scripts/Makefile.spl              |   1 +
 26 files changed, 527 insertions(+), 254 deletions(-)
 create mode 100644 common/malloc_simple.c
 create mode 100644 drivers/core/device-remove.c
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#1 lore raw

PATCH v3 1/14 arm: spl: Avoid setting up a duplicate global data structure

This is already set up in crt0.S. We don't need a new structure and don't really want one in the 'data' section of the image, since it will be empty and crt0.S's changes will be ignored.

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

---

Changes in v3: None
Changes in v2: None

 arch/arm/lib/spl.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/lib/spl.c +0 -4
index 75ab546..6361a62 100644
@@ -13,10 +13,6 @@
 #include <image.h>
 #include <linux/compiler.h>
 
-/* Pointer to as well as the global data structure for SPL */
-DECLARE_GLOBAL_DATA_PTR;
-gd_t gdata __attribute__ ((section(".data")));
-
 /*
  * In the context of SPL, board_init_f must ensure that any clocks/etc for
  * DDR are enabled, ensure that the stack pointer is valid, clear the BSS
Signature · 1 line
2.1.0.rc2.206.gedb03e5
#2 lore raw

PATCH v3 1/14 arm: spl: Avoid setting up a duplicate global data structure

Hello Simon,

Quoted 31 lines · Simon Glass

This is already set up in crt0.S. We don't need a new structure and don't really want one in the 'data' section of the image, since it will be empty and crt0.S's changes will be ignored.

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

---

Changes in v3: None
Changes in v2: None

 arch/arm/lib/spl.c | 4 ----
 1 file changed, 4 deletions(-)
arch/arm/lib/spl.c +0 -4
index 75ab546..6361a62 100644
@@ -13,10 +13,6 @@
 #include <image.h>
 #include <linux/compiler.h>
 
-/* Pointer to as well as the global data structure for SPL */
-DECLARE_GLOBAL_DATA_PTR;
-gd_t gdata __attribute__ ((section(".data")));
-
 /*
  * In the context of SPL, board_init_f must ensure that any clocks/etc for
  * DDR are enabled, ensure that the stack pointer is valid, clear the BSS
Signature · 1 line
2.1.0.rc2.206.gedb03e5
Acked-by Albert ARIBAUD <[email protected]>

Amicalement,

Signature · 1 line
Albert.
author
#3 lore raw

PATCH v3 2/14 dm: tegra: Avoid using arch-specific memcpy() in SPL

In reply to Simon Glass

The faster functions are not actually available in SPL and the code size likely isn't worth it. Use the normal memcpy() in SPL.

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

---

Changes in v3:
- Add new patch to avoid using arch-specific memcpy() in SPL

Changes in v2: None

 include/configs/tegra-common.h | 2 ++
 1 file changed, 2 insertions(+)
include/configs/tegra-common.h +2 -0
index 5d2b12a..d690045 100644
@@ -118,7 +118,9 @@
 #define CONFIG_SYS_MEMTEST_START	(NV_PA_SDRC_CS0 + 0x600000)
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 0x100000)
 
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_USE_ARCH_MEMCPY
+#endif
 
 /*-----------------------------------------------------------------------
  * Physical Memory Map
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#4 lore raw

PATCH v3 2/14 dm: tegra: Avoid using arch-specific memcpy() in SPL

Quoted 6 lines · Simon Glass

The faster functions are not actually available in SPL and the code size likely isn't worth it. Use the normal memcpy() in SPL.

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

---

Quoted 7 lines

Changes in v3:
- Add new patch to avoid using arch-specific memcpy() in SPL

Changes in v2: None

 include/configs/tegra-common.h | 2 ++
 1 file changed, 2 insertions(+)

Applied to u-boot-dm.

author
#5 lore raw

PATCH v3 3/14 dm: Split the simple malloc() implementation into its own file

In reply to Simon Glass

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.

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

---

Changes in v3: None
Changes in v2:
- Correct the Makefile condition for simple_malloc

 common/Makefile                   |  3 ++
 common/board_r.c                  |  3 +-
 common/dlmalloc.c                 | 19 ++++---------
 common/malloc_simple.c            | 39 +++++++++++++++++++++++++
 include/asm-generic/global_data.h |  1 +
 include/malloc.h                  | 60 ++++++++++++++++++++++++---------------
 6 files changed, 87 insertions(+), 38 deletions(-)
 create mode 100644 common/malloc_simple.c
common/Makefile +3 -0
index 6cc4de8..7a5c58e 100644
@@ -251,6 +251,9 @@ obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
 obj-y += console.o
 obj-$(CONFIG_CROS_EC) += cros_ec.o
 obj-y += dlmalloc.o
+ifdef CONFIG_SYS_MALLOC_F_LEN
+obj-y += malloc_simple.o
+endif
 obj-y += image.o
 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o
 obj-$(CONFIG_OF_LIBFDT) += image-fdt.o
common/board_r.c +2 -1
index 7c33900..19c6427 100644
@@ -99,7 +99,8 @@ static int initr_trace(void)
 
 static int initr_reloc(void)
 {
-	gd->flags |= GD_FLG_RELOC;	/* tell others: relocation done */
+	/* tell others: relocation done */
+	gd->flags |= GD_FLG_RELOC | GD_FLG_FULL_MALLOC_INIT;
 	bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r");
 
 	return 0;
common/dlmalloc.c +5 -14
index f987339..16dc2ff 100644
@@ -2181,17 +2181,8 @@ Void_t* mALLOc(bytes) size_t bytes;
   INTERNAL_SIZE_T nb;
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
-	if (!(gd->flags & GD_FLG_RELOC)) {
-		ulong new_ptr;
-		void *ptr;
-
-		new_ptr = gd->malloc_ptr + bytes;
-		if (new_ptr > gd->malloc_limit)
-			panic("Out of pre-reloc memory");
-		ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
-		gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
-		return ptr;
-	}
+	if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
+		return malloc_simple(bytes);
 #endif
 
   /* check if mem_malloc_init() was run */

@@ -2459,7 +2450,7 @@ void fREe(mem) Void_t* mem;
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
 	/* free() is a no-op - all the memory will be freed on relocation */
-	if (!(gd->flags & GD_FLG_RELOC))
+	if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT))
 		return;
 #endif
 

@@ -2615,7 +2606,7 @@ Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes;
   if (oldmem == NULL) return mALLOc(bytes);
 
 #ifdef CONFIG_SYS_MALLOC_F_LEN
-	if (!(gd->flags & GD_FLG_RELOC)) {
+	if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
 		/* This is harder to support and should not be needed */
 		panic("pre-reloc realloc() is not supported");
 	}

@@ -2967,7 +2958,7 @@ Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size;
   else
   {
 #ifdef CONFIG_SYS_MALLOC_F_LEN
-	if (!(gd->flags & GD_FLG_RELOC)) {
+	if (!(gd->flags & GD_FLG_FULL_MALLOC_INIT)) {
 		MALLOC_ZERO(mem, sz);
 		return mem;
 	}
common/malloc_simple.c new file +39 -0
new file mode 100644
index 0000000..afdacff
@@ -0,0 +1,39 @@
+/*
+ * Simple malloc implementation
+ *
+ * Copyright (c) 2014 Google, Inc
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <malloc.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+void *malloc_simple(size_t bytes)
+{
+	ulong new_ptr;
+	void *ptr;
+
+	new_ptr = gd->malloc_ptr + bytes;
+	if (new_ptr > gd->malloc_limit)
+		panic("Out of pre-reloc memory");
+	ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
+	gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+	return ptr;
+}
+
+#ifdef CONFIG_SYS_MALLOC_SIMPLE
+void *calloc(size_t nmemb, size_t elem_size)
+{
+	size_t size = nmemb * elem_size;
+	void *ptr;
+
+	ptr = malloc(size);
+	memset(ptr, '\0', size);
+
+	return ptr;
+}
+#endif
include/asm-generic/global_data.h +1 -0
index 74df210..5e5dc37 100644
@@ -107,5 +107,6 @@ typedef struct global_data {
 #define GD_FLG_DISABLE_CONSOLE	0x00040	/* Disable console (in & out)	   */
 #define GD_FLG_ENV_READY	0x00080	/* Env. imported into hash table   */
 #define GD_FLG_SERIAL_READY	0x00100	/* Pre-reloc serial console ready  */
+#define GD_FLG_FULL_MALLOC_INIT	0x00200	/* Full malloc() is ready	   */
 
 #endif /* __ASM_GENERIC_GBL_DATA_H */
include/malloc.h +37 -23

83 lines not on this page · raw message

Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#6 lore raw

PATCH v3 3/14 dm: Split the simple malloc() implementation into its own file

Quoted 23 lines · Simon Glass

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.

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

---

Changes in v3: None
Changes in v2:
- Correct the Makefile condition for simple_malloc

Quoted 8 lines
 common/Makefile                   |  3 ++
 common/board_r.c                  |  3 +-
 common/dlmalloc.c                 | 19 ++++---------
 common/malloc_simple.c            | 39 +++++++++++++++++++++++++
 include/asm-generic/global_data.h |  1 +
 include/malloc.h                  | 60 ++++++++++++++++++++++++---------------
 6 files changed, 87 insertions(+), 38 deletions(-)
 create mode 100644 common/malloc_simple.c

Applied to u-boot-dm.

author
#7 lore raw

PATCH v3 4/14 dm: arm: spl: Allow simple malloc() in SPL

In reply to Simon Glass

For SPL it is sometimes useful to have a simple malloc() just to permit driver model to work, in the cases where the full malloc() is not made available by the board config.

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

---

Changes in v3: None
Changes in v2: None

 arch/arm/lib/crt0.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/crt0.S +1 -1
index 29cdad0..823b233 100644
@@ -78,7 +78,7 @@ clr_gd:
 	strlo	r0, [r1]		/* clear 32-bit GD word */
 	addlo	r1, r1, #4		/* move to next */
 	blo	clr_gd
-#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_BUILD)
+#if defined(CONFIG_SYS_MALLOC_F_LEN)
 	sub	sp, sp, #CONFIG_SYS_MALLOC_F_LEN
 	str	sp, [r9, #GD_MALLOC_BASE]
 #endif
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#8 lore raw

PATCH v3 4/14 dm: arm: spl: Allow simple malloc() in SPL

Quoted 4 lines · Simon Glass

For SPL it is sometimes useful to have a simple malloc() just to permit driver model to work, in the cases where the full malloc() is not made available by the board config.

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

---

Changes in v3: None
Changes in v2: None

 arch/arm/lib/crt0.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to u-boot-dm.

author
#9 lore raw

PATCH v3 5/14 dm: spl: Make simple malloc() available when enabled

In reply to 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 v3: None
Changes in v2: None

 common/spl/spl.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
common/spl/spl.c +10 -1
index d85bab3..341287a 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);
 }
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#10 lore raw

PATCH v3 5/14 dm: spl: Make simple malloc() available when enabled

Quoted 12 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 v3: None
Changes in v2: None

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

Applied to u-boot-dm.

author
#11 lore raw

PATCH v3 6/14 dm: spl: Allow driver model to be used

In reply to Simon Glass

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]>
Acked-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 common/spl/spl.c     | 5 +++++
 scripts/Makefile.spl | 1 +
 2 files changed, 6 insertions(+)
common/spl/spl.c +5 -0
index 341287a..aef1c22 100644
@@ -7,6 +7,7 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
+#include <dm.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <nand.h>

@@ -15,6 +16,7 @@
 #include <i2c.h>
 #include <image.h>
 #include <malloc.h>
+#include <dm/root.h>
 #include <linux/compiler.h>
 
 DECLARE_GLOBAL_DATA_PTR;

@@ -142,6 +144,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 	gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
 	gd->malloc_ptr = 0;
 #endif
+#ifdef CONFIG_SPL_DM
+	dm_init_and_scan(true);
+#endif
 
 #ifndef CONFIG_PPC
 	/*
scripts/Makefile.spl +1 -0
index 7afe437..20869fd 100644
@@ -69,6 +69,7 @@ libs-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/
 libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/
 libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/
 libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/
+libs-$(CONFIG_SPL_DM) += drivers/core/
 libs-$(CONFIG_SPL_I2C_SUPPORT) += drivers/i2c/
 libs-$(CONFIG_SPL_GPIO_SUPPORT) += drivers/gpio/
 libs-$(CONFIG_SPL_MMC_SUPPORT) += drivers/mmc/
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#12 lore raw

PATCH v3 6/14 dm: spl: Allow driver model to be used

Quoted 5 lines · Simon Glass

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]>
Acked-by Tom Rini <[email protected]>
Quoted 8 lines

---

Changes in v3: None
Changes in v2: None

 common/spl/spl.c     | 5 +++++
 scripts/Makefile.spl | 1 +
 2 files changed, 6 insertions(+)

Applied to u-boot-dm.

author
#13 lore raw

PATCH v3 7/14 dm: Allow device removal features to be dropped

In reply to Simon Glass

For SPL we don't expect to need to remove a device. Save some code space by dropping this feature. The board config can define CONFIG_DM_DEVICE_REMOVE if this is in fact needed.

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

---

Changes in v3: None
Changes in v2: None

 drivers/core/Makefile        |   3 +-
 drivers/core/device-remove.c | 187 +++++++++++++++++++++++++++++++++++++++++++
 drivers/core/device.c        | 168 --------------------------------------
 include/config_defaults.h    |   4 +
 include/dm/device-internal.h |  10 +++
 5 files changed, 203 insertions(+), 169 deletions(-)
 create mode 100644 drivers/core/device-remove.c
drivers/core/Makefile +2 -1
index 151c239..f14695b 100644
@@ -4,5 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y := device.o lists.o root.o uclass.o util.o
+obj-$(CONFIG_DM)	+= device.o lists.o root.o uclass.o util.o
 obj-$(CONFIG_OF_CONTROL) += simple-bus.o
+obj-$(CONFIG_DM_DEVICE_REMOVE)	+= device-remove.o
drivers/core/device-remove.c new file +187 -0

187 lines not on this page · raw message

drivers/core/device.c +0 -168

186 lines not on this page · raw message

include/config_defaults.h +4 -0
index ad08c1d..985f055 100644
@@ -20,4 +20,8 @@
 #define CONFIG_ZLIB 1
 #define CONFIG_PARTITIONS 1
 
+#ifndef CONFIG_SPL_BUILD
+#define CONFIG_DM_DEVICE_REMOVE
+#endif
+
 #endif
include/dm/device-internal.h +10 -0
index 44cb7ef..f0cc794 100644
@@ -87,7 +87,11 @@ int device_probe_child(struct udevice *dev, void *parent_priv);
  * @dev: Pointer to device to remove
  * @return 0 if OK, -ve on error (an error here is normally a very bad thing)
  */
+#ifdef CONFIG_DM_DEVICE_REMOVE
 int device_remove(struct udevice *dev);
+#else
+static inline int device_remove(struct udevice *dev) { return 0; }
+#endif
 
 /**
  * device_unbind() - Unbind a device, destroying it

@@ -99,6 +103,12 @@ int device_remove(struct udevice *dev);
  */
 int device_unbind(struct udevice *dev);
 
+#ifdef CONFIG_DM_DEVICE_REMOVE
+void device_free(struct udevice *dev);
+#else
+static inline void device_free(struct udevice *dev) {}
+#endif
+
 /* Cast away any volatile pointer */
 #define DM_ROOT_NON_CONST		(((gd_t *)gd)->dm_root)
 #define DM_UCLASS_ROOT_NON_CONST	(((gd_t *)gd)->uclass_root)
Signature · 1 line
2.1.0.rc2.206.gedb03e5
#14 lore raw

PATCH v3 7/14 dm: Allow device removal features to be dropped

Quoted 5 lines · Simon Glass

For SPL we don't expect to need to remove a device. Save some code space by dropping this feature. The board config can define CONFIG_DM_DEVICE_REMOVE if this is in fact needed.

Signed-off-by Simon Glass <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141116/095fa310/attachment.pgp>
author
#15 lore raw

PATCH v3 8/14 dm: Allow stdio registration to be dropped

In reply to Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>

---

Changes in v3:
- Add #ifdef around serial_stub_puts() to fix error when building SPL

Changes in v2: None

 drivers/serial/serial-uclass.c | 10 +++++++---
 include/config_defaults.h      |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/serial/serial-uclass.c +7 -3
index 71f1a5c..66e6c2f 100644
@@ -157,10 +157,12 @@ void serial_stdio_init(void)
 {
 }
 
+#ifdef CONFIG_DM_STDIO
 static void serial_stub_putc(struct stdio_dev *sdev, const char ch)
 {
 	_serial_putc(sdev->priv, ch);
 }
+#endif
 
 void serial_stub_puts(struct stdio_dev *sdev, const char *str)
 {

@@ -179,9 +181,11 @@ int serial_stub_tstc(struct stdio_dev *sdev)
 
 static int serial_post_probe(struct udevice *dev)
 {
-	struct stdio_dev sdev;
 	struct dm_serial_ops *ops = serial_get_ops(dev);
+#ifdef CONFIG_DM_STDIO
 	struct serial_dev_priv *upriv = dev->uclass_priv;
+	struct stdio_dev sdev;
+#endif
 	int ret;
 
 	/* Set the baud rate */

@@ -191,9 +195,9 @@ static int serial_post_probe(struct udevice *dev)
 			return ret;
 	}
 
+#ifdef CONFIG_DM_STDIO
 	if (!(gd->flags & GD_FLG_RELOC))
 		return 0;
-
 	memset(&sdev, '\0', sizeof(sdev));
 
 	strncpy(sdev.name, dev->name, sizeof(sdev.name));

@@ -204,7 +208,7 @@ static int serial_post_probe(struct udevice *dev)
 	sdev.getc = serial_stub_getc;
 	sdev.tstc = serial_stub_tstc;
 	stdio_register_dev(&sdev, &upriv->sdev);
-
+#endif
 	return 0;
 }
include/config_defaults.h +1 -0
index 985f055..f1b225d 100644
@@ -22,6 +22,7 @@
 
 #ifndef CONFIG_SPL_BUILD
 #define CONFIG_DM_DEVICE_REMOVE
+#define CONFIG_DM_STDIO
 #endif
 
 #endif
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#16 lore raw

PATCH v3 8/14 dm: Allow stdio registration to be dropped

Quoted 8 lines · Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>

---

Quoted 8 lines

Changes in v3:
- Add #ifdef around serial_stub_puts() to fix error when building SPL

Changes in v2: None

 drivers/serial/serial-uclass.c | 10 +++++++---
 include/config_defaults.h      |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

Applied to u-boot-dm.

author
#17 lore raw

PATCH v3 9/14 dm: Disable dm_warn() in SPL

In reply to Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 include/config_defaults.h | 1 +
 include/dm/util.h         | 6 ++++++
 2 files changed, 7 insertions(+)
include/config_defaults.h +1 -0
index f1b225d..4d49315 100644
@@ -21,6 +21,7 @@
 #define CONFIG_PARTITIONS 1
 
 #ifndef CONFIG_SPL_BUILD
+#define CONFIG_DM_WARN
 #define CONFIG_DM_DEVICE_REMOVE
 #define CONFIG_DM_STDIO
 #endif
include/dm/util.h +6 -0
index 6ac3a38..0cec17b 100644
@@ -7,7 +7,13 @@
 #ifndef __DM_UTIL_H
 #define __DM_UTIL_H
 
+#ifdef CONFIG_DM_WARN
 void dm_warn(const char *fmt, ...);
+#else
+static inline void dm_warn(const char *fmt, ...)
+{
+}
+#endif
 
 #ifdef DEBUG
 void dm_dbg(const char *fmt, ...);
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#18 lore raw

PATCH v3 9/14 dm: Disable dm_warn() in SPL

Quoted 5 lines · Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>
Quoted 8 lines

---

Changes in v3: None
Changes in v2: None

 include/config_defaults.h | 1 +
 include/dm/util.h         | 6 ++++++
 2 files changed, 7 insertions(+)

Applied to u-boot-dm.

author
#19 lore raw

PATCH v3 10/14 dm: tegra: Add platform data for the SPL uart

In reply to Simon Glass

Since we currently don't have device tree available in SPL, add platform data so the uart works.

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

---

Changes in v3: None
Changes in v2: None

 drivers/serial/serial_tegra.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/serial/serial_tegra.c +16 -0
index 7eb70e1..b9227f0 100644
@@ -9,6 +9,7 @@
 #include <ns16550.h>
 #include <serial.h>
 
+#ifdef CONFIG_OF_CONTROL
 static const struct udevice_id tegra_serial_ids[] = {
 	{ .compatible = "nvidia,tegra20-uart" },
 	{ }

@@ -26,13 +27,28 @@ static int tegra_serial_ofdata_to_platdata(struct udevice *dev)
 
 	return 0;
 }
+#else
+struct ns16550_platdata tegra_serial = {
+	.base = CONFIG_SYS_NS16550_COM1,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK,
+};
+
+U_BOOT_DEVICE(ns16550_serial) = {
+	"serial_tegra20", &tegra_serial
+};
+#endif
+
 U_BOOT_DRIVER(serial_ns16550) = {
 	.name	= "serial_tegra20",
 	.id	= UCLASS_SERIAL,
+#ifdef CONFIG_OF_CONTROL
 	.of_match = tegra_serial_ids,
 	.ofdata_to_platdata = tegra_serial_ofdata_to_platdata,
 	.platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
+#endif
 	.priv_auto_alloc_size = sizeof(struct NS16550),
 	.probe = ns16550_serial_probe,
 	.ops	= &ns16550_serial_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
 };
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#20 lore raw

PATCH v3 10/14 dm: tegra: Add platform data for the SPL uart

Quoted 11 lines · Simon Glass

Since we currently don't have device tree available in SPL, add platform data so the uart works.

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

---

Changes in v3: None
Changes in v2: None

 drivers/serial/serial_tegra.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Applied to u-boot-dm.

author
#21 lore raw

PATCH v3 11/14 dm: tegra: Add platform data for the GPIO driver

In reply to Simon Glass

Add platform data for the GPIO driver. It doesn't need to contain anything since the GPIO driver will actually use information from the CONFIGs for now. This merely serves to ensure that the GPIO driver is bound.

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

---

Changes in v3: None
Changes in v2: None

 board/nvidia/common/board.c | 8 ++++++++
 1 file changed, 8 insertions(+)
board/nvidia/common/board.c +8 -0
index 51125df..0e4a65a 100644
@@ -6,6 +6,7 @@
  */
 
 #include <common.h>
+#include <dm.h>
 #include <ns16550.h>
 #include <linux/compiler.h>
 #include <asm/io.h>

@@ -43,6 +44,13 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_SPL_BUILD
+/* TODO(sjg at chromium.org): Remove once SPL supports device tree */
+U_BOOT_DEVICE(tegra_gpios) = {
+	"gpio_tegra"
+};
+#endif
+
 const struct tegra_sysinfo sysinfo = {
 	CONFIG_TEGRA_BOARD_STRING
 };
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#22 lore raw

PATCH v3 11/14 dm: tegra: Add platform data for the GPIO driver

Quoted 9 lines · Simon Glass

Add platform data for the GPIO driver. It doesn't need to contain anything since the GPIO driver will actually use information from the CONFIGs for now. This merely serves to ensure that the GPIO driver is bound.

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

---

Changes in v3: None
Changes in v2: None

Applied to u-boot-dm.

author
#23 lore raw

PATCH v3 12/14 dm: arm: spl: Make driver model linker lists available

In reply to Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>

---

Changes in v3: None
Changes in v2: None

 arch/arm/cpu/u-boot-spl.lds | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/cpu/u-boot-spl.lds +7 -0
index 4beddf0..a69b006 100644
@@ -34,6 +34,13 @@ SECTIONS
 	. = ALIGN(4);
 
 	. = .;
+#ifdef CONFIG_SPL_DM
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list_*_driver_*)));
+		KEEP(*(SORT(.u_boot_list_*_uclass_*)));
+	}
+#endif
+	. = ALIGN(4);
 
 	__image_copy_end = .;
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#24 lore raw

PATCH v3 12/14 dm: arm: spl: Make driver model linker lists available

Quoted 5 lines · Simon Glass

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]>
Reviewed-by Tom Rini <[email protected]>
Quoted 7 lines

---

Changes in v3: None
Changes in v2: None

 arch/arm/cpu/u-boot-spl.lds | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to u-boot-dm.

author
#25 lore raw

PATCH v3 13/14 dm: tegra: Enable driver model in SPL and adjust the GPIO driver

In reply to Simon Glass

Use the full driver model GPIO and serial drivers in SPL now that these are supported. Since device tree is not available they will use platform data.

Remove the special SPL GPIO function as it is no longer needed.

This is all in one commit to maintain bisectability.

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

---

Changes in v3: None
Changes in v2:
- Rebase on top of the SPI series

 board/nvidia/seaboard/seaboard.c |  4 +---
 drivers/gpio/Makefile            |  4 ++++
 drivers/gpio/tegra_gpio.c        | 27 +++++++++++----------------
 include/configs/tegra-common.h   | 12 +++---------
 4 files changed, 19 insertions(+), 28 deletions(-)
board/nvidia/seaboard/seaboard.c +1 -3
index 11472eb..25480e4 100644
@@ -20,10 +20,8 @@
 void gpio_early_init_uart(void)
 {
 	/* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */
-#ifndef CONFIG_SPL_BUILD
 	gpio_request(GPIO_PI3, NULL);
-#endif
-	tegra_spl_gpio_direction_output(GPIO_PI3, 0);
+	gpio_direction_output(GPIO_PI3, 0);
 }
 #endif
drivers/gpio/Makefile +4 -0
index aa11f15..fe9a3b2 100644
@@ -8,6 +8,10 @@
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_DM_GPIO)		+= gpio-uclass.o
 endif
+/* TODO(sjg at chromium.org): Only tegra supports driver model in SPL */
+ifdef CONFIG_TEGRA_GPIO
+obj-$(CONFIG_DM_GPIO)		+= gpio-uclass.o
+endif
 
 obj-$(CONFIG_AT91_GPIO)	+= at91_gpio.o
 obj-$(CONFIG_INTEL_ICH6_GPIO)	+= intel_ich6_gpio.o
drivers/gpio/tegra_gpio.c +11 -16
index 88f7ef5..a1e51c0 100644
@@ -131,21 +131,6 @@ static void set_level(unsigned gpio, int high)
 	writel(u, &bank->gpio_out[GPIO_PORT(gpio)]);
 }
 
-/* set GPIO pin 'gpio' as an output, with polarity 'value' */
-int tegra_spl_gpio_direction_output(int gpio, int value)
-{
-	/* Configure as a GPIO */
-	set_config(gpio, 1);
-
-	/* Configure GPIO output value. */
-	set_level(gpio, value);
-
-	/* Configure GPIO direction as output. */
-	set_direction(gpio, 1);
-
-	return 0;
-}
-
 /*
  * Generic_GPIO primitives.
  */

@@ -320,12 +305,19 @@ static int gpio_tegra_bind(struct udevice *parent)
 	int bank_count;
 	int bank;
 	int ret;
-	int len;
 
 	/* If this is a child device, there is nothing to do here */
 	if (plat)
 		return 0;
 
+	/* TODO(sjg at chromium.org): Remove once SPL supports device tree */
+#ifdef CONFIG_SPL_BUILD
+	ctlr = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
+	bank_count = TEGRA_GPIO_BANKS;
+#else
+	{
+	int len;
+
 	/*
 	 * This driver does not make use of interrupts, other than to figure
 	 * out the number of GPIO banks

@@ -335,6 +327,8 @@ static int gpio_tegra_bind(struct udevice *parent)
 	bank_count = len / 3 / sizeof(u32);
 	ctlr = (struct gpio_ctlr *)fdtdec_get_addr(gd->fdt_blob,
 						   parent->of_offset, "reg");
+	}
+#endif
 	for (bank = 0; bank < bank_count; bank++) {
 		int port;
 

@@ -370,4 +364,5 @@ U_BOOT_DRIVER(gpio_tegra) = {
 	.probe = gpio_tegra_probe,
 	.priv_auto_alloc_size = sizeof(struct tegra_port_info),
 	.ops	= &gpio_tegra_ops,
+	.flags	= DM_FLAG_PRE_RELOC,
 };
include/configs/tegra-common.h +3 -9
index d690045..1b01edc 100644
@@ -19,13 +19,12 @@
 #include <asm/arch/tegra.h>		/* get chip and board defs */
 
 #define CONFIG_DM
+#define CONFIG_SPL_DM
 #define CONFIG_CMD_DM
-#define CONFIG_DM_GPIO
-#ifndef CONFIG_SPL_BUILD
 #define CONFIG_DM_SERIAL
-#endif
 #define CONFIG_DM_SPI
 #define CONFIG_DM_SPI_FLASH
+#define CONFIG_DM_GPIO
 
 #define CONFIG_SYS_TIMER_RATE		1000000
 #define CONFIG_SYS_TIMER_COUNTER	NV_PA_TMRUS_BASE

@@ -51,13 +50,7 @@
 /*
  * NS16550 Configuration
  */
-#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-#define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK
-#else
 #define CONFIG_TEGRA_SERIAL
-#endif
 #define CONFIG_SYS_NS16550
 
 /*

@@ -141,6 +134,7 @@
 						GENERATED_GBL_DATA_SIZE)
 
 #define CONFIG_TEGRA_GPIO
+
 #define CONFIG_CMD_GPIO
 #define CONFIG_CMD_ENTERRCM
Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#26 lore raw

PATCH v3 14/14 dm: Update documentation to include CONFIG_DM... options

In reply to Simon Glass

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

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

---

Changes in v3:
- Rebase to master

Changes in v2:
- Rebase to master

 README                      | 119 ++++++++++++++++++++++++++++++++++++++++++++
 doc/driver-model/README.txt |  44 ++++++++++++----
 2 files changed, 153 insertions(+), 10 deletions(-)
README +119 -0
index 7b5538e..6011200 100644
@@ -623,6 +623,120 @@ The following options need to be configured:
 		exists, unlike the similar options in the Linux kernel. Do not
 		set these options unless they apply!
 
+- 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
+		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.
+
+
 - Linux Kernel Interface:
 		CONFIG_CLOCKS_IN_MHZ
 

@@ -3877,6 +3991,11 @@ Configuration Settings:
 		Pre-relocation malloc() is only supported on ARM and sandbox
 		at present but is fairly easy to enable for other archs.
 
+- CONFIG_SYS_MALLOC_SIMPLE
+		Provides a simple and small malloc() and calloc() for those
+		boards which do not use the full malloc in SPL (which is
+		enabled with CONFIG_SYS_SPL_MALLOC_START).
+
 - CONFIG_SYS_BOOTM_LEN:
 		Normally compressed uImages are limited to an
 		uncompressed size of 8 MBytes. If this is not enough,
doc/driver-model/README.txt +34 -10

53 lines not on this page · raw message

Signature · 1 line
2.1.0.rc2.206.gedb03e5
author
#27 lore raw

PATCH v3 14/14 dm: Update documentation to include CONFIG_DM... options

Quoted 9 lines · Simon Glass

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

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

---

Changes in v3:
- Rebase to master

Quoted 6 lines

Changes in v2:
- Rebase to master

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

Applied to u-boot-dm.