RFC: dm: Implement driver model support in SPL
Subsystems (7)
cover RFC: 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 on ARMv7. Data usage is typically 200-300 bytes. In many cases this can squeeze into the available SPL RAM space.
Note this is an RFC mainly because of the SPL global_data revert (commit 1ee30ae) since we need that revert undone to be able to support the simple malloc in SPL on ARM.
This series is available at u-boot-dm branch 'spl-working'.
Simon Glass (14):
dm: dts: Move omap device tree includes to correct place
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: Don't used named GPIOs in SPL
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/dts/dt-bindings/gpio/gpio.h | 15 --
arch/arm/lib/crt0.S | 2 +-
board/nvidia/common/board.c | 8 +
board/nvidia/seaboard/seaboard.c | 4 +-
common/Makefile | 1 +
common/board_r.c | 3 +-
common/dlmalloc.c | 19 +--
common/malloc_simple.c | 38 +++++
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 | 67 +++++---
drivers/serial/serial-uclass.c | 8 +-
drivers/serial/serial_tegra.c | 16 ++
include/asm-generic/global_data.h | 1 +
include/config_defaults.h | 6 +
include/configs/tegra-common.h | 12 +-
include/dm/device-internal.h | 10 ++
include/dm/util.h | 6 +
.../dts => include}/dt-bindings/pinctrl/am33xx.h | 0
.../arm/dts => include}/dt-bindings/pinctrl/omap.h | 0
include/malloc.h | 60 ++++---
scripts/Makefile.spl | 1 +
28 files changed, 555 insertions(+), 270 deletions(-)
delete mode 100644 arch/arm/dts/dt-bindings/gpio/gpio.h
create mode 100644 common/malloc_simple.c
create mode 100644 drivers/core/device-remove.c
rename {arch/arm/dts => include}/dt-bindings/pinctrl/am33xx.h (100%)
rename {arch/arm/dts => include}/dt-bindings/pinctrl/omap.h (100%)Signature · 1 line
2.1.0.rc2.206.gedb03e5
RFC PATCH 1/14 dm: dts: Move omap device tree includes to correct place
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.
---
arch/arm/dts/dt-bindings/gpio/gpio.h | 15 ---------------
{arch/arm/dts => include}/dt-bindings/pinctrl/am33xx.h | 0
{arch/arm/dts => include}/dt-bindings/pinctrl/omap.h | 0
3 files changed, 15 deletions(-)
delete mode 100644 arch/arm/dts/dt-bindings/gpio/gpio.h
rename {arch/arm/dts => include}/dt-bindings/pinctrl/am33xx.h (100%)
rename {arch/arm/dts => include}/dt-bindings/pinctrl/omap.h (100%)arch/arm/dts/dt-bindings/gpio/gpio.h deleted +0 -15
@@ -1,15 +0,0 @@ -/* -* This header provides constants for most GPIO bindings. -* -* Most GPIO bindings include a flags cell as part of the GPIO specifier. -* In most cases, the format of the flags cell uses the standard values -* defined in this header. -*/ - -#ifndef _DT_BINDINGS_GPIO_GPIO_H -#define _DT_BINDINGS_GPIO_GPIO_H - -#define GPIO_ACTIVE_HIGH 0 -#define GPIO_ACTIVE_LOW 1 - -#endif
include/dt-bindings/pinctrl/am33xx.h renamed from arch/arm/dts/dt-bindings/pinctrl/am33xx.h +0 -0
include/dt-bindings/pinctrl/omap.h renamed from arch/arm/dts/dt-bindings/pinctrl/omap.h +0 -0
Signature · 1 line
2.1.0.rc2.206.gedb03e5
RFC PATCH 2/14 dm: Split the simple malloc() implementation into its own file
In reply to Simon GlassThe 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.
---
common/Makefile | 1 + common/board_r.c | 3 +- common/dlmalloc.c | 19 ++++--------- common/malloc_simple.c | 38 +++++++++++++++++++++++++ include/asm-generic/global_data.h | 1 + include/malloc.h | 60 ++++++++++++++++++++++++--------------- 6 files changed, 84 insertions(+), 38 deletions(-) create mode 100644 common/malloc_simple.c
common/Makefile +1 -0
@@ -255,6 +255,7 @@ obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o obj-y += console.o obj-$(CONFIG_CROS_EC) += cros_ec.o obj-y += dlmalloc.o +obj-$(CONFIG_SYS_MALLOC_F_LEN) += malloc_simple.o 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
@@ -105,7 +105,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
@@ -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 +38 -0
@@ -0,0 +1,38 @@ +/* +* Simple malloc implementation +* +* Copyright (c) 2014 Google, Inc +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <malloc.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
@@ -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
RFC PATCH 3/14 dm: arm: spl: Allow simple malloc() in SPL
In reply to Simon GlassFor 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.
---
arch/arm/lib/crt0.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/crt0.S +1 -1
@@ -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
RFC PATCH 4/14 dm: spl: Make simple malloc() available when enabled
In reply to Simon GlassSet up the simple malloc() implementation when requested, in preference to the full malloc().
---
common/spl/spl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
common/spl/spl.c +10 -1
@@ -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
RFC PATCH 5/14 dm: spl: Allow driver model to be used
In reply to Simon GlassWhen enabled, set up driver model for SPL. This allows SPL to use the same drivers as the main U-Boot.
---
common/spl/spl.c | 5 +++++ scripts/Makefile.spl | 1 + 2 files changed, 6 insertions(+)
common/spl/spl.c +5 -0
@@ -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
@@ -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
RFC PATCH 6/14 dm: Allow device removal features to be dropped
In reply to Simon GlassFor 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.
---
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
@@ -4,4 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_DM) := 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_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
@@ -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
@@ -74,7 +74,11 @@ int device_probe(struct udevice *dev);* @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
@@ -86,6 +90,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
RFC PATCH 7/14 dm: Allow stdio registration to be dropped
In reply to Simon GlassProvide 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.
---
drivers/serial/serial-uclass.c | 8 +++++--- include/config_defaults.h | 1 + 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/serial/serial-uclass.c +5 -3
@@ -180,9 +180,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 */
@@ -192,9 +194,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));
@@ -205,7 +207,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
@@ -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
RFC PATCH 8/14 dm: Disable dm_warn() in SPL
In reply to Simon GlassSince 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.
---
include/config_defaults.h | 1 + include/dm/util.h | 6 ++++++ 2 files changed, 7 insertions(+)
include/config_defaults.h +1 -0
@@ -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
@@ -6,7 +6,13 @@#ifndef __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
RFC PATCH 9/14 dm: tegra: Add platform data for the SPL uart
In reply to Simon GlassSince we currently don't have device tree available in SPL, add platform data so the uart works.
---
drivers/serial/serial_tegra.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/serial/serial_tegra.c +16 -0
@@ -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
RFC PATCH 9/14 dm: tegra: Add platform data for the SPL uart
Quoted 14 lines · Simon Glass
Since we currently don't have device tree available in SPL, add platform data so the uart works.
drivers/serial/serial_tegra.c +2
-0+#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
drivers/serial/serial_tegra.c static int tegra_serial_ofdata_to_platdata(struct udevice *dev) · line 40
Quoted 10 lines
drivers/serial/serial_tegra.c +10
-0+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
If we're going to have to add "hard-coded" instantiation of devices to the code to support SPL, I rather wonder what the point is of having DT support in these (or honestly, any) drivers at all. Why not just switch directly to always using the hard-coded instantiation. Then, we can drop all the DT parsing code from the drivers, simplify the code, and completely avoid all the annoying DT ABI and binding consistency issues.
Quoted 13 lines
drivers/serial/serial_tegra.c +3
-0U_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 , };
RFC PATCH 9/14 dm: tegra: Add platform data for the SPL uart
Hi Stephen,
Quoted 16 lines · Stephen Warren
Quoted 14 lines · Simon Glass
Since we currently don't have device tree available in SPL, add platform data so the uart works.
drivers/serial/serial_tegra.c +1
-0+#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)
Quoted 16 lines
drivers/serial/serial_tegra.c static int tegra_serial_ofdata_to_platdata(struct udevice *dev) · line 40
Quoted 13 lines
drivers/serial/serial_tegra.c +11
-0return 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 If we're going to have to add "hard-coded" instantiation of devices to the code to support SPL, I rather wonder what the point is of having DT support in these (or honestly, any) drivers at all. Why not just switch directly to always using the hard-coded instantiation. Then, we can drop all the DT parsing code from the drivers, simplify the code, and completely avoid all the annoying DT ABI and binding consistency issues.
This is a temporary state along the way to perfection. It just replaces the existing CONFIG options which currently feed into the driver, which are currently not in the device tree in SPL. At present we only use device tree for U-Boot, not for SPL. I don't see the point of duplicating all the device tree information in a different format. I also feel that the binding inconsistencies are reducing now. Your issue with the UART clock was resolved (on OMAP the clock is in the binding but not on Tegra).
Also this isn't really hard-coded. Both CONFIG_SYS_NS16550_COM1 and V_NS16550_CLK are actually board-specific. I've just moved it out of the ns16550 driver and into a tegra file.
Regards,
Simon
RFC PATCH 10/14 dm: tegra: Add platform data for the GPIO driver
In reply to Simon GlassAdd 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.
---
board/nvidia/common/board.c | 8 ++++++++ 1 file changed, 8 insertions(+)
board/nvidia/common/board.c +8 -0
@@ -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
RFC PATCH 11/14 dm: arm: spl: Make driver model linker lists available
In reply to Simon GlassThe linker lists feature is useful in SPL as it holds the driver model platform data. So don't throw away the lists.
---
arch/arm/cpu/u-boot-spl.lds | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/cpu/u-boot-spl.lds +7 -0
@@ -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
RFC PATCH 12/14 dm: tegra: Don't used named GPIOs in SPL
In reply to Simon GlassThere is little point in supporting this, and it bloats the code.
(This may be moved into the uclass before final submission)
---
drivers/gpio/tegra_gpio.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-)
drivers/gpio/tegra_gpio.c +35 -5
@@ -37,9 +37,15 @@ struct tegra_gpio_platdata {int base_gpio;/* Port number for this port (0, 1,.., n-1) */ }; +#ifndef CONFIG_SPL_BUILD +#define NAMED_PORTS +#endif +/* Information about each port at run-time */ struct tegra_port_info { +#ifdef NAMED_PORTS char label[TEGRA_GPIOS_PER_PORT ][GPIO_NAME_SIZE ]; +#endif struct gpio_ctlr_bank *bank;int base_gpio;/* Port number for this port (0, 1,.., n-1) */ };
@@ -132,13 +138,29 @@ static void set_level(unsigned gpio, int high)writel (u, &bank->gpio_out[GPIO_PORT (gpio)]); } +/** +* gpio_is_requested() - check if a GPIO has been requested +* +* @state: Bank to check +* @offset: GPIO offset within bank to check +* @return true if marked as requested, false if not +*/ +static inline bool gpio_is_requested (struct tegra_port_info *state,int offset) +{ +#ifdef NAMED_PORTS +return *state->label[offset] !='\0' ; +#else +return true; +#endif +} +static int check_reserved (struct udevice *dev,unsigned offset,const char *func) {struct tegra_port_info *state =dev_get_priv (dev);struct gpio_dev_priv *uc_priv = dev->uclass_priv; -if (!*state->label[offset]) { +if (!gpio_is_requested (state, offset)) {printf ("tegra_gpio: %s: error: gpio %s%d not reserved\n" , func, uc_priv->bank_name, offset);return -EBUSY ;
@@ -171,12 +193,12 @@ static int tegra_gpio_request(struct udevice *dev, unsigned offset, {struct tegra_port_info *state =dev_get_priv (dev); -if (*state->label[offset]) +#ifdef NAMED_PORTS +if (gpio_is_requested (state, offset))return -EBUSY ; -strncpy (state->label[offset], label,GPIO_NAME_SIZE ); state->label[offset][GPIO_NAME_SIZE -1 ] ='\0' ; - +#endif /* Configure as a GPIO */ set_config (state->base_gpio + offset,1 );
@@ -185,13 +207,17 @@ static int tegra_gpio_request(struct udevice *dev, unsigned offset,static int tegra_gpio_free (struct udevice *dev,unsigned offset) { +#ifdef NAMED_PORTS struct tegra_port_info *state =dev_get_priv (dev); +#endif int ret; ret =check_reserved (dev, offset, __func__);if (ret)return ret; +#ifdef NAMED_PORTS state->label[offset][0 ] ='\0' ; +#endif return 0 ; }
@@ -314,7 +340,7 @@ static int tegra_gpio_get_function(struct udevice *dev, unsigned offset)struct tegra_port_info *state =dev_get_priv (dev);int gpio = state->base_gpio + offset; -if (!*state->label[offset]) +if (!gpio_is_requested (state, offset))return GPIOF_UNUSED ;if (!get_config (gpio))return GPIOF_FUNC ;
@@ -335,7 +361,11 @@ static int tegra_gpio_get_state(struct udevice *dev, unsigned int offset,int is_gpio;int size; +#ifdef NAMED_PORTS label = state->label[offset]; +#else + label ="?" ; +#endif is_gpio =get_config (gpio);/* GPIO, not SFPIO */ size =snprintf (buf, bufsize,"%s%d: " , uc_priv->bank_name ? uc_priv->bank_name :"" , offset);
Signature · 1 line
2.1.0.rc2.206.gedb03e5
RFC PATCH 13/14 dm: tegra: Enable driver model in SPL and adjust the GPIO driver
In reply to Simon GlassUse 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.
---
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
@@ -19,10 +19,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
@@ -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
@@ -169,21 +169,6 @@ static int check_reserved(struct udevice *dev, unsigned offset,return 0 ; } -/* 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. */
@@ -460,12 +445,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
@@ -475,6 +467,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;
@@ -510,4 +504,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
@@ -19,11 +19,10 @@#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_GPIO #define CONFIG_SYS_TIMER_RATE 1000000#define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE
@@ -49,13 +48,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 /*
@@ -135,6 +128,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
RFC PATCH 14/14 dm: Update documentation to include CONFIG_DM... options
In reply to Simon GlassAdd documentation for the various driver model options that are now available.
---
README | 119 ++++++++++++++++++++++++++++++++++++++++++++ doc/driver-model/README.txt | 44 ++++++++++++---- 2 files changed, 153 insertions(+), 10 deletions(-)
README +119 -0
@@ -618,6 +618,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 + 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
@@ -3852,6 +3966,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