February 2019 - U-Boot

[U-Boot] [PATCH v3 1/2] fs: fat: dynamically allocate memory for temporary buffer
by tien.fong.chee＠intel.com 25 Feb '19

25 Feb '19

From: Tien Fong Chee <tien.fong.chee(a)intel.com> Drop the statically allocated get_contents_vfatname_block and dynamically allocate a buffer only if required. This saves 64KiB of memory. Signed-off-by: Stefan Agner <stefan.ag...(a)toradex.com> Signed-off-by: Tien Fong Chee <tien.fong.chee(a)intel.com> --- changes for v3 - Removed the cast on actsize --- fs/fat/fat.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index ecfa255..ea11250 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -306,9 +306,6 @@ get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) * into 'buffer'. * Update the number of bytes read in *gotsize or return -1 on fatal errors. */ -__u8 get_contents_vfatname_block[MAX_CLUSTSIZE] - __aligned(ARCH_DMA_MINALIGN); - static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, __u8 *buffer, loff_t maxsize, loff_t *gotsize) { @@ -351,15 +348,24 @@ static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, /* align to beginning of next cluster if any */ if (pos) { + __u8 *tmp_buffer; + actsize = min(filesize, (loff_t)bytesperclust); - if (get_cluster(mydata, curclust, get_contents_vfatname_block, - (int)actsize) != 0) { + tmp_buffer = malloc_cache_aligned(actsize); + if (!tmp_buffer) { + debug("Error: allocating buffer\n"); + return -ENOMEM; + } + + if (get_cluster(mydata, curclust, tmp_buffer, actsize) != 0) { printf("Error reading cluster\n"); + free(tmp_buffer); return -1; } filesize -= actsize; actsize -= pos; - memcpy(buffer, get_contents_vfatname_block + pos, actsize); + memcpy(buffer, tmp_buffer + pos, actsize); + free(tmp_buffer); *gotsize += actsize; if (!filesize) return 0; -- 2.2.0

7 19

[U-Boot] [RFC] efi_loader: memory type in device path allocation
by AKASHI Takahiro 25 Feb '19

25 Feb '19

In efi_device_path.c, dp_alloc() uses efi_allocate_pool() with EFI_ALLOCATE_ANY_PAGES. This usage is just wrong as the first argument to efi_allocate_pool() should be of efi_mem_type, not "allocation type." Since this routine is called as part of device path * protocol, I don't know what is the best value here. (EFI_BOOT_SERVICES_DATA as far as I looked into EDK2 shell implementation.) -Takahiro Akashi

1 0

[U-Boot] [PATCH v8 0/8] cmd: add efidebug for efi environment
by AKASHI Takahiro 25 Feb '19

25 Feb '19

This patch set is a collection of patches to enhance efi user interfaces /commands. It will help improve user experience on efi boot and make it more usable *without* edk2's shell utility. Let's see how it works: => efidebug boot add 1 SHELL scsi 1:1 /Shell.efi "" => efidebug boot add 2 HELLO scsi 1:1 /hello.efi "" => efidebug boot dump Boot0001: attributes: A-- (0x00000001) label: SHELL file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/Scsi(1,0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\Shell.efi data: Boot0002: attributes: A-- (0x00000001) label: HELLO file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/Scsi(1,0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\hello.efi data: => efidebug boot order 1 2 => efidebug boot order 1: Boot0001: SHELL 2: Boot0002: HELLO => run -e Boot0002 (or bootefi bootmgr - 2) ; '-' means no dtb specified WARNING: booting without device tree Booting: HELLO ## Starting EFI application at 000000007db8b040 ... Hello, world! ## Application terminated, r = 0 => env set -e PlatformLang en ; important! => env print -e Boot0001: BS|RT, DataSize = 0x79 00000000: 01 00 00 00 66 00 53 00 48 00 45 00 4c 00 4c 00 ....f.S.H.E.L.L. 00000010: 00 00 01 04 14 00 b9 73 1d e6 84 a3 cc 4a ae ab .......s.....J.. 00000020: 82 e8 28 f3 62 8b 03 02 08 00 01 00 00 00 04 01 ..(.b........... 00000030: 2a 00 01 00 00 00 00 08 00 00 00 00 00 00 00 00 *............... 00000040: 04 00 00 00 00 00 ba 46 62 08 00 00 00 00 00 00 .......Fb....... 00000050: 00 00 00 00 00 00 01 01 04 04 1c 00 5c 00 5c 00 ............\.\. 00000060: 53 00 68 00 65 00 6c 00 6c 00 2e 00 65 00 66 00 S.h.e.l.l...e.f. 00000070: 69 00 00 00 7f ff 04 00 00 i........ Boot0002: BS|RT, DataSize = 0x79 00000000: 01 00 00 00 66 00 48 00 45 00 4c 00 4c 00 4f 00 ....f.H.E.L.L.O. 00000010: 00 00 01 04 14 00 b9 73 1d e6 84 a3 cc 4a ae ab .......s.....J.. 00000020: 82 e8 28 f3 62 8b 03 02 08 00 01 00 00 00 04 01 ..(.b........... 00000030: 2a 00 01 00 00 00 00 08 00 00 00 00 00 00 00 00 *............... 00000040: 04 00 00 00 00 00 ba 46 62 08 00 00 00 00 00 00 .......Fb....... 00000050: 00 00 00 00 00 00 01 01 04 04 1c 00 5c 00 5c 00 ............\.\. 00000060: 68 00 65 00 6c 00 6c 00 6f 00 2e 00 65 00 66 00 h.e.l.l.o...e.f. 00000070: 69 00 00 00 7f ff 04 00 00 i........ BootOrder: BS|RT, DataSize = 0x4 00000000: 01 00 02 00 .... PlatformLang: BS|RT, DataSize = 0x2 00000000: 65 6e en => run -e Boot0001 or bootefi bootmgr (UEFI shell ...) "env set" command now supports UEFI shell-like syntax: => env set -e foo =S\"akashi\" =0x012345 =Habcdef => env print -e foo foo: BS|RT, DataSize = 0xd 00000000: 61 6b 61 73 68 69 45 23 01 00 ab cd ef akashiE#..... Other useful sub commands are: => efidebug devices ; print uefi devices => efidebug drivers ; print uefi drivers => efidebug dh ; print uefi handles => efidebug images ; print loaded images => efidebug memmap ; dump uefi memory map Enjoy! -Takahiro Akashi Changes in v7 (Feb 22, 2019) * additional EFI_CALL's * define LOAD_OPTION_XXX and use them * use "load option" instead of "boot option" in comments consistently * cosmetic changes * Travis CI result: https://travis-ci.org/t-akashi/u-boot/builds/496873704 Changes in v7 (Feb 21, 2019) * fix travis errors * make CMD_NVEDIT_EFI configurable * improve command help text * add function descriptions at every function * output error message when "boot add" fails * use locate_handle_buffer() instead of locate_handle() * use allocate_pool() instead of malloc() * wrap EFI function calls with EFI_CALL * Travis CI result: https://travis-ci.org/t-akashi/u-boot/builds/496298404 Changes in v6 (Jan 24, 2019) * re-organize the code so that we can compile in "env [set|print] -e" support with or without CONFIG_CMD_EFIDEBUG * remove "efidebug setvar" and "efidebug dumpvar" sub-commands * re-implement "env print -e" using GetNextVariableName API and print_hex_dump() * "env print -e" print more information, including attributes and size * change a header format at "devices" and "drivers" sub-commands Changes in v5 (Jan 21, 2019) * rename the command name from efitool to efidebug again * add it to MAINTAINERS * follow a standard way of adding sub commands * allow "env -e" syntax without enabling CONFIG_CMD_EFIDEBUG (merging v4's patch#8 into patch#1) * change "_"-prefixed function names * change some internal variables' names * not print an efi driver's name at "efidebug drivers", yet showing a device path * change protocol name strings from char to u16 at "efidebug dh" * add a helper function to print efi memory attributes at "efidebug memmap" Changes in v4 (Jan 15, 2019) * rename the command name from efishell to efitool * use efi_uintn_t for "size" if appropriate * correct a help text for "boot add" sub-command * "boot" sub-command always takes a hexadecimal number * use systab.boottime directly instead of a local variable, bs * fix a bug in "setvar" sub-command * fix a bug in "devices" and "dh" sub-command * fix a bug in "memmap" sub-command * add "boot next" sub-command to set BootNext variable * "drivers" sub-command prints more useful info, including a driver's name which originates from a corresponding u-boot efi driver * "dh" sub-commands prints more useful info, including a list of protocols which are bound to a given handle Changes in v3 (Dec 18, 2018) * split v2 into two separate patch series * add CONFIG_CMD_EFISHELL to enable/disable efishell command * add missing free() at several places in efishell command Changes in v2 (Nov 5, 2018) * modify efi_dp_from_name() for use in efishell * rename efi_marshal_load_option() to efi_serialize_load_option(), taking a "struct efi_load_option" as an argument * improve a format in dumping uefi variables * enhance a setvar syntax as efi's shell does * change a syntax from "bootefi bootmgr -2" to "bootefi bootmgr - 2" * add -e option to run command * add -e option to env command * add more sub-commands AKASHI Takahiro (8): cmd: env: add "-e" option for handling UEFI variables efi_loader: define load option attributes cmd: add efidebug command cmd: efidebug: add devices command cmd: efidebug: add drivers command cmd: efidebug: add dh command cmd: efidebug: add images command cmd: efidebug: add memmap command MAINTAINERS | 2 + cmd/Kconfig | 20 + cmd/Makefile | 2 + cmd/efidebug.c | 1038 ++++++++++++++++++++++++++++++++++ cmd/nvedit.c | 28 +- cmd/nvedit_efi.c | 399 +++++++++++++ include/command.h | 8 + include/efi_api.h | 9 + lib/efi_loader/efi_bootmgr.c | 4 - 9 files changed, 1505 insertions(+), 5 deletions(-) create mode 100644 cmd/efidebug.c create mode 100644 cmd/nvedit_efi.c -- 2.20.1

2 12

[U-Boot] [PATCH v7 0/7] cmd: add efidebug for efi environment
by AKASHI Takahiro 25 Feb '19

25 Feb '19

This patch set is a collection of patches to enhance efi user interfaces /commands. It will help improve user experience on efi boot and make it more usable *without* edk2's shell utility. Let's see how it works: => efidebug boot add 1 SHELL scsi 1:1 /Shell.efi "" => efidebug boot add 2 HELLO scsi 1:1 /hello.efi "" => efidebug boot dump Boot0001: attributes: A-- (0x00000001) label: SHELL file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/Scsi(1,0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\Shell.efi data: Boot0002: attributes: A-- (0x00000001) label: HELLO file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/Scsi(1,0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\hello.efi data: => efidebug boot order 1 2 => efidebug boot order 1: Boot0001: SHELL 2: Boot0002: HELLO => run -e Boot0002 (or bootefi bootmgr - 2) ; '-' means no dtb specified WARNING: booting without device tree Booting: HELLO ## Starting EFI application at 000000007db8b040 ... Hello, world! ## Application terminated, r = 0 => env set -e PlatformLang en ; important! => env print -e Boot0001: BS|RT, DataSize = 0x79 00000000: 01 00 00 00 66 00 53 00 48 00 45 00 4c 00 4c 00 ....f.S.H.E.L.L. 00000010: 00 00 01 04 14 00 b9 73 1d e6 84 a3 cc 4a ae ab .......s.....J.. 00000020: 82 e8 28 f3 62 8b 03 02 08 00 01 00 00 00 04 01 ..(.b........... 00000030: 2a 00 01 00 00 00 00 08 00 00 00 00 00 00 00 00 *............... 00000040: 04 00 00 00 00 00 ba 46 62 08 00 00 00 00 00 00 .......Fb....... 00000050: 00 00 00 00 00 00 01 01 04 04 1c 00 5c 00 5c 00 ............\.\. 00000060: 53 00 68 00 65 00 6c 00 6c 00 2e 00 65 00 66 00 S.h.e.l.l...e.f. 00000070: 69 00 00 00 7f ff 04 00 00 i........ Boot0002: BS|RT, DataSize = 0x79 00000000: 01 00 00 00 66 00 48 00 45 00 4c 00 4c 00 4f 00 ....f.H.E.L.L.O. 00000010: 00 00 01 04 14 00 b9 73 1d e6 84 a3 cc 4a ae ab .......s.....J.. 00000020: 82 e8 28 f3 62 8b 03 02 08 00 01 00 00 00 04 01 ..(.b........... 00000030: 2a 00 01 00 00 00 00 08 00 00 00 00 00 00 00 00 *............... 00000040: 04 00 00 00 00 00 ba 46 62 08 00 00 00 00 00 00 .......Fb....... 00000050: 00 00 00 00 00 00 01 01 04 04 1c 00 5c 00 5c 00 ............\.\. 00000060: 68 00 65 00 6c 00 6c 00 6f 00 2e 00 65 00 66 00 h.e.l.l.o...e.f. 00000070: 69 00 00 00 7f ff 04 00 00 i........ BootOrder: BS|RT, DataSize = 0x4 00000000: 01 00 02 00 .... PlatformLang: BS|RT, DataSize = 0x2 00000000: 65 6e en => run -e Boot0001 or bootefi bootmgr (UEFI shell ...) "env set" command now supports UEFI shell-like syntax: => env set -e foo =S\"akashi\" =0x012345 =Habcdef => env print -e foo foo: BS|RT, DataSize = 0xd 00000000: 61 6b 61 73 68 69 45 23 01 00 ab cd ef akashiE#..... Other useful sub commands are: => efidebug devices ; print uefi devices => efidebug drivers ; print uefi drivers => efidebug dh ; print uefi handles => efidebug images ; print loaded images => efidebug memmap ; dump uefi memory map Enjoy! -Takahiro Akashi Changes in v7 (Feb 21, 2019) * fix travis errors * make CMD_NVEDIT_EFI configurable * improve command help text * add function descriptions at every function * output error message when "boot add" fails * use locate_handle_buffer() instead of locate_handle() * use allocate_pool() instead of malloc() * wrap EFI function calls with EFI_CALL * Travis CI result: https://travis-ci.org/t-akashi/u-boot/builds/496298404 Changes in v6 (Jan 24, 2019) * re-organize the code so that we can compile in "env [set|print] -e" support with or without CONFIG_CMD_EFIDEBUG * remove "efidebug setvar" and "efidebug dumpvar" sub-commands * re-implement "env print -e" using GetNextVariableName API and print_hex_dump() * "env print -e" print more information, including attributes and size * change a header format at "devices" and "drivers" sub-commands Changes in v5 (Jan 21, 2019) * rename the command name from efitool to efidebug again * add it to MAINTAINERS * follow a standard way of adding sub commands * allow "env -e" syntax without enabling CONFIG_CMD_EFIDEBUG (merging v4's patch#8 into patch#1) * change "_"-prefixed function names * change some internal variables' names * not print an efi driver's name at "efidebug drivers", yet showing a device path * change protocol name strings from char to u16 at "efidebug dh" * add a helper function to print efi memory attributes at "efidebug memmap" Changes in v4 (Jan 15, 2019) * rename the command name from efishell to efitool * use efi_uintn_t for "size" if appropriate * correct a help text for "boot add" sub-command * "boot" sub-command always takes a hexadecimal number * use systab.boottime directly instead of a local variable, bs * fix a bug in "setvar" sub-command * fix a bug in "devices" and "dh" sub-command * fix a bug in "memmap" sub-command * add "boot next" sub-command to set BootNext variable * "drivers" sub-command prints more useful info, including a driver's name which originates from a corresponding u-boot efi driver * "dh" sub-commands prints more useful info, including a list of protocols which are bound to a given handle Changes in v3 (Dec 18, 2018) * split v2 into two separate patch series * add CONFIG_CMD_EFISHELL to enable/disable efishell command * add missing free() at several places in efishell command Changes in v2 (Nov 5, 2018) * modify efi_dp_from_name() for use in efishell * rename efi_marshal_load_option() to efi_serialize_load_option(), taking a "struct efi_load_option" as an argument * improve a format in dumping uefi variables * enhance a setvar syntax as efi's shell does * change a syntax from "bootefi bootmgr -2" to "bootefi bootmgr - 2" * add -e option to run command * add -e option to env command * add more sub-commands AKASHI Takahiro (7): cmd: env: add "-e" option for handling UEFI variables cmd: add efidebug command cmd: efidebug: add devices command cmd: efidebug: add drivers command cmd: efidebug: add dh command cmd: efidebug: add images command cmd: efidebug: add memmap command MAINTAINERS | 2 + cmd/Kconfig | 20 + cmd/Makefile | 2 + cmd/efidebug.c | 1038 +++++++++++++++++++++++++++++++++++++++++++++ cmd/nvedit.c | 28 +- cmd/nvedit_efi.c | 395 +++++++++++++++++ include/command.h | 8 + 7 files changed, 1492 insertions(+), 1 deletion(-) create mode 100644 cmd/efidebug.c create mode 100644 cmd/nvedit_efi.c -- 2.20.1

3 22

[U-Boot] [PATCH] configs: Migrate USB_MUSB_DISABLE_BULK_COMBINE_SPLIT to Kconfig
by Alex Kiernan 24 Feb '19

24 Feb '19

Migrate support for disable MUSB bulk split/combine to Kconfig Green Travis build: https://travis-ci.org/akiernan/u-boot/builds/497722366 Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- drivers/usb/musb-new/Kconfig | 9 +++++++++ include/configs/am335x_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/brppt1.h | 3 --- include/configs/brxre1.h | 3 --- include/configs/chiliboard.h | 1 - include/configs/pengwyn.h | 1 - include/configs/siemens-am33x-common.h | 2 -- scripts/config_whitelist.txt | 1 - 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index f8f2205a62d3..fdf9ca61da06 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -54,6 +54,15 @@ config USB_MUSB_SUNXI Say y here to enable support for the sunxi OTG / DRC USB controller used on almost all sunxi boards. +config USB_MUSB_DISABLE_BULK_COMBINE_SPLIT + bool "Disable MUSB bulk split/combine" + default y + help + On TI AM335x devices, MUSB has bulk split/combine feature enabled + in the ConfigData register, but the current MUSB driver does not + support it yet. Select this option to disable the feature until the + driver adds the support. + endif config USB_MUSB_PIO_ONLY diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 3bd96b921b7d..b3c1279707e1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -240,7 +240,6 @@ * add mass storage support and for gadget we add both RNDIS ethernet * and DFU. */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index ccbdc0a33566..98ec0d626ea8 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -251,7 +251,6 @@ * add mass storage support and for gadget we add both RNDIS ethernet * and DFU. */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_HOST #define CONFIG_AM335X_USB1 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index df5d5bdc4a91..1fec50e48b7e 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -387,7 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \ * add mass storage support and for gadget we add both RNDIS ethernet * and DFU. */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 5badd2da8b6c..9e06cbafd1e2 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -182,9 +182,6 @@ NANDTGTS \ #define CONFIG_NAND_OMAP_GPMC_WSCFG 1 #endif /* CONFIG_NAND */ -/* USB configuration */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT - #if defined(CONFIG_SPI) /* SPI Flash */ #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 601b30dffd5f..7309e7d4831d 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -68,9 +68,6 @@ BUR_COMMON_ENV \ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -/* USB configuration */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT - /* Environment */ #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 4372280d2bbe..db990fcb2b47 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -148,7 +148,6 @@ /* USB configuration */ #define CONFIG_ARCH_MISC_INIT -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 48f1f7baccba..a535d0c2f2d0 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -157,7 +157,6 @@ * board schematic and physical port wired to each. Then for host we * add mass storage support. */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d8ed02bf7955..570bc2a8c5fc 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -152,8 +152,6 @@ /* * USB configuration */ -#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT - #define CONFIG_AM335X_USB0 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL #define CONFIG_AM335X_USB1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 346c388d206d..23df23cb9bae 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4554,7 +4554,6 @@ CONFIG_USB_GADGET_SUPERH CONFIG_USB_INVENTRA_DMA CONFIG_USB_ISP1301_I2C_ADDR CONFIG_USB_MAX_CONTROLLER_COUNT -CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT CONFIG_USB_MUSB_TIMEOUT CONFIG_USB_MUSB_TUSB6010 CONFIG_USB_OHCI_EP93XX -- 2.17.1

1 0

[U-Boot] [PATCH 1/1] efi_loader: do not add \ in efi_fs_from_name()
by Heinrich Schuchardt 24 Feb '19

24 Feb '19

In the `efidebug boot add` command we do not want a unsollicitated leading backslash added to the file name. There is no good reason to mark a loaded file with a backslash as absolute. Anyway when reading files the file name will be interpreted as relative to root directory of the device. So let's get rid of this backslash. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_device_path.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 98c36e798f5..53b40c8c3c2 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -985,12 +985,7 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr, if (!path) return EFI_SUCCESS; - if (!is_net) { - /* Add leading / to fs paths, because they're absolute */ - snprintf(filename, sizeof(filename), "/%s", path); - } else { - snprintf(filename, sizeof(filename), "%s", path); - } + snprintf(filename, sizeof(filename), "%s", path); /* DOS style file path: */ s = filename; while ((s = strchr(s, '/'))) -- 2.20.1

2 3

[U-Boot] [RFC 00/22] Add support for Cavium Octeon-TX CN80XX/CN81XX
by Tim Harvey 24 Feb '19

24 Feb '19

The Cavium Octeon-TX 64-bit ARM based SoCs include the CN80XX and CN81XX. These SoC's have peripheral drivers based on PCI ECAM. This series has been tested on the the following Gateworks SBC's: - GW6100 - CN8021 dual A53 800MHz - GW6104 - CN8031 quad A53 1500MHz - GW6300 - CN8020 dual A53 800MHz - GW6304 - CN8030 quad A53 1500MHz These patches all came originally from Cavium's SDK based on a 2017 version of U-Boot and have been refactored a bit to strip out things that didn't make sense that I saw in the original code. These patches apply on top of U-Boot 2018.11 and if needed I can do minor cleanup and rebase on top of master but I can't be the maintainer. I'm also looking for comments on the PCI related patches as I am by far not a PCI expert and am not sure what I've done here is correct for this SoC and the others some of the changes would affect. I'm looking for a maintainer for this - I only have boards with the above SoC's and can't test anything else. I also don't have the resources to be a maintainer of this arch - I'm looking at you Cavium/Marvell as your SDK's use old forks of U-Boot with a slew of patches and there is no reason to not mainline this code. I've added all the cavium/marvell contacts I could find from previous threads about OcteonTX support in U-Boot. The way I'm using this on the above boards is to build u-boot-nodtb.bin and package it into a FIP image that the ATF loads. I can document this process if needed. You can find this series on github [1] Best Regards, Tim [1] https://github.com/Gateworks/uboot-newport/tree/v2018.11-newport-rc1 Tim Harvey (22): arm: introduce ARCH_THUNDERX arm: add thunderx_81xx thunderx: add FDT support thunderx: add thunderx register definitions and misc functions thunderx: move DRAM prints to debug dm: pci: add PCI SR-IOV EA support fdt: add fdtdec_get_pci_bus_range pci: add thunderx pci/ecam driver pci: fix pce enumeration on thunderx arm: include 64bit io accessors gpio: add thunderx gpio driver i2c: add thunderx I2C driver spi: add thunderx SPI driver xhci: add support for cavium thunderx XHCI thunderx_81xx: add support for XHCI thunderx_81xx: enable usb mass storage and usb ethernet ahci: support 64bit systems ahci: set n_ports from host caps ahci: add support for ThunderX AHCI thunderx_81xx: add AHCI support net: add thunderx vnic drivers pci: auto probe thunderx NIC devices arch/arm/Kconfig | 6 +- arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 3 +- arch/arm/dts/thunderx-81xx.dts | 36 + arch/arm/dts/thunderx-81xx.dtsi | 440 +++++ .../arm/include/asm/arch-thunderx}/atf.h | 2 +- .../arm/include/asm/arch-thunderx}/atf_part.h | 0 arch/arm/include/asm/arch-thunderx/fdt.h | 12 + arch/arm/include/asm/arch-thunderx/thunderx.h | 300 ++++ .../include/asm/arch-thunderx}/thunderx_svc.h | 0 .../include/asm/arch-thunderx/thunderx_vnic.h | 15 + arch/arm/include/asm/gpio.h | 2 +- arch/arm/include/asm/io.h | 8 + arch/arm/mach-thunderx/Makefile | 2 + .../thunderx => arch/arm/mach-thunderx}/atf.c | 6 +- arch/arm/mach-thunderx/fdt.c | 218 +++ arch/arm/mach-thunderx/lowlevel_init.S | 31 + arch/arm/mach-thunderx/misc.c | 33 + arch/x86/cpu/baytrail/cpu.c | 3 +- board/cavium/thunderx/Kconfig | 23 +- board/cavium/thunderx/Makefile | 2 +- board/cavium/thunderx/thunderx.c | 60 +- configs/thunderx_81xx_defconfig | 65 + configs/thunderx_88xx_defconfig | 9 +- drivers/ata/ahci.c | 46 +- drivers/gpio/Kconfig | 7 + drivers/gpio/Makefile | 1 + drivers/gpio/thunderx_gpio.c | 189 ++ drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/designware_i2c.c | 4 +- drivers/i2c/intel_i2c.c | 3 +- drivers/i2c/thunderx_i2c.c | 878 ++++++++++ drivers/mmc/pci_mmc.c | 3 +- drivers/net/Kconfig | 34 + drivers/net/Makefile | 1 + drivers/net/cavium/Makefile | 8 + drivers/net/cavium/nic.h | 569 ++++++ drivers/net/cavium/nic_main.c | 795 +++++++++ drivers/net/cavium/nic_reg.h | 228 +++ drivers/net/cavium/nicvf_main.c | 553 ++++++ drivers/net/cavium/nicvf_queues.c | 1123 ++++++++++++ drivers/net/cavium/nicvf_queues.h | 364 ++++ drivers/net/cavium/q_struct.h | 692 ++++++++ drivers/net/cavium/thunder_bgx.c | 1529 +++++++++++++++++ drivers/net/cavium/thunder_bgx.h | 259 +++ drivers/net/cavium/thunder_xcv.c | 190 ++ drivers/net/cavium/thunderx_smi.c | 388 +++++ drivers/net/e1000.c | 5 +- drivers/net/pch_gbe.c | 3 +- drivers/nvme/nvme.c | 3 +- drivers/pci/Kconfig | 9 + drivers/pci/Makefile | 1 + drivers/pci/pci-uclass.c | 316 +++- drivers/pci/pci_auto.c | 18 + drivers/pci/pci_thunderx.c | 160 ++ drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/thunderx_spi.c | 448 +++++ drivers/usb/host/ehci-pci.c | 3 +- drivers/usb/host/xhci-pci.c | 10 +- include/ahci.h | 3 + include/configs/thunderx_81xx.h | 82 + include/fdtdec.h | 11 + include/pci.h | 58 +- include/pci_ids.h | 15 + lib/fdtdec.c | 13 + net/eth_legacy.c | 3 + 68 files changed, 10248 insertions(+), 69 deletions(-) create mode 100644 arch/arm/dts/thunderx-81xx.dts create mode 100644 arch/arm/dts/thunderx-81xx.dtsi rename {include/cavium => arch/arm/include/asm/arch-thunderx}/atf.h (96%) rename {include/cavium => arch/arm/include/asm/arch-thunderx}/atf_part.h (100%) create mode 100644 arch/arm/include/asm/arch-thunderx/fdt.h create mode 100644 arch/arm/include/asm/arch-thunderx/thunderx.h rename {include/cavium => arch/arm/include/asm/arch-thunderx}/thunderx_svc.h (100%) create mode 100644 arch/arm/include/asm/arch-thunderx/thunderx_vnic.h create mode 100644 arch/arm/mach-thunderx/Makefile rename {board/cavium/thunderx => arch/arm/mach-thunderx}/atf.c (98%) create mode 100644 arch/arm/mach-thunderx/fdt.c create mode 100644 arch/arm/mach-thunderx/lowlevel_init.S create mode 100644 arch/arm/mach-thunderx/misc.c create mode 100644 configs/thunderx_81xx_defconfig create mode 100644 drivers/gpio/thunderx_gpio.c create mode 100644 drivers/i2c/thunderx_i2c.c create mode 100644 drivers/net/cavium/Makefile create mode 100644 drivers/net/cavium/nic.h create mode 100644 drivers/net/cavium/nic_main.c create mode 100644 drivers/net/cavium/nic_reg.h create mode 100644 drivers/net/cavium/nicvf_main.c create mode 100644 drivers/net/cavium/nicvf_queues.c create mode 100644 drivers/net/cavium/nicvf_queues.h create mode 100644 drivers/net/cavium/q_struct.h create mode 100644 drivers/net/cavium/thunder_bgx.c create mode 100644 drivers/net/cavium/thunder_bgx.h create mode 100644 drivers/net/cavium/thunder_xcv.c create mode 100644 drivers/net/cavium/thunderx_smi.c create mode 100644 drivers/pci/pci_thunderx.c create mode 100755 drivers/spi/thunderx_spi.c create mode 100644 include/configs/thunderx_81xx.h -- 2.17.1

2 27

[U-Boot] [PATCH 01/10] pinctrl: imx8: add i.MX8QM compatible
by Peng Fan 24 Feb '19

24 Feb '19

Add i.MX8QM compatible Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/pinctrl/nxp/pinctrl-imx8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pinctrl/nxp/pinctrl-imx8.c b/drivers/pinctrl/nxp/pinctrl-imx8.c index 0738da0ebe..c1b0ca438a 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx8.c +++ b/drivers/pinctrl/nxp/pinctrl-imx8.c @@ -25,6 +25,7 @@ static int imx8_pinctrl_probe(struct udevice *dev) static const struct udevice_id imx8_pinctrl_match[] = { { .compatible = "fsl,imx8qxp-iomuxc", .data = (ulong)&imx8_pinctrl_soc_info }, + { .compatible = "fsl,imx8qm-iomuxc", .data = (ulong)&imx8_pinctrl_soc_info }, { /* sentinel */ } }; -- 2.14.1

3 15

[U-Boot] FEC and EFI Simple Network
by Patrick Wildt 24 Feb '19

24 Feb '19

Hi, I have been debugging network issues when running an EFI Application that uses the EFI Simple Network protocol on an i.MX6 machine (FEC). The symptom is that u-boot's (FEC) internal RX ring index is reset to 0, while the controller is still at idx 3 (or something else). This is caused by the following circumstances: The Simple Network protocol offers methods like Start(), Stop(), Initialize(), Shutdown(), Reset(). Also the protocol has a state. The states are Stopped, Started, Initialized. The transition is as follows: Stopped ---Start()---> Started ---Initialize()--> Initialized Start() does some initialization, Initialize() allocates the TX/RX descriptors and actually kicks off the network engine. So far, only Initialize() is implemented in our u-boot interface, and it calls eth_init() which in the end calls fec_init(). Our network state is _always_ Started. This means that EFI Applications see that that the state is Started and then call Initialize() to start the actual network traffic. There is no call to Stop()/Shutdown()/Reset() as it's supposed to be in a sane state. In my case the FEC is already initialized since I booted using network and the RX desc index is already non-zero. Now the EFI Application sees that the state is Started, calls Initialize() which makes u-boot call eth_init() which then calls fec_init(). fec_init() does not reset the controller so that the controller-internal RX desc index is not reset to zero. fec_init() calls fec_open() which then resets the driver-internal RX desc index to zero. Now they are out of sync, boom. This means that fec_init() without a previous fec_halt() breaks the whole network if it was already running. The Designware driver as used by some sunxi platforms does a reset of the controller in the init function. Maybe calling fec_halt() at the start of fec_init() could be a possible solution? Patrick diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index ff7ad91116..ba8bd9920d 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -522,6 +522,12 @@ static int fec_open(struct eth_device *edev) return 0; } +#ifdef CONFIG_DM_ETH +static void fecmxc_halt(struct udevice *dev); +#else +static void fec_halt(struct eth_device *dev); +#endif + #ifdef CONFIG_DM_ETH static int fecmxc_init(struct udevice *dev) #else @@ -537,6 +543,15 @@ static int fec_init(struct eth_device *dev, bd_t *bd) u8 *i; ulong addr; +#ifdef CONFIG_DM_ETH + fecmxc_halt(dev); +#else + fec_halt(dev); +#endif + + writel(~FEC_TCNTRL_GTS & readl(&fec->eth->x_cntrl), + &fec->eth->x_cntrl); + /* Initialize MAC address */ #ifdef CONFIG_DM_ETH fecmxc_set_hwaddr(dev); @@ -825,19 +840,12 @@ static int fec_recv(struct eth_device *dev) } if (ievent & FEC_IEVENT_HBERR) { /* Heartbeat error */ - writel(0x00000001 | readl(&fec->eth->x_cntrl), + writel(FEC_TCNTRL_GTS | readl(&fec->eth->x_cntrl), &fec->eth->x_cntrl); } if (ievent & FEC_IEVENT_GRA) { /* Graceful stop complete */ - if (readl(&fec->eth->x_cntrl) & 0x00000001) { -#ifdef CONFIG_DM_ETH - fecmxc_halt(dev); -#else - fec_halt(dev); -#endif - writel(~0x00000001 & readl(&fec->eth->x_cntrl), - &fec->eth->x_cntrl); + if (readl(&fec->eth->x_cntrl) & FEC_TCNTRL_GTS) { #ifdef CONFIG_DM_ETH fecmxc_init(dev); #else

5 5

[U-Boot] [PATCH 1/1] efi_loader: fix entry count in bootmgr
by Heinrich Schuchardt 24 Feb '19

24 Feb '19

Since commit 914df75b0c97 ("efi_loader: fix EFI entry counting") entry_count is already set to 1 before efi_bootmgr_load() is called. So we should not increment it when entering the function. Without the patch an assert error occurs in efi_get_variable() if DEBUG is defined. Fixes: 914df75b0c97 ("efi_loader: fix EFI entry counting") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_bootmgr.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 15a06085364..417016102b4 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -174,8 +174,6 @@ void *efi_bootmgr_load(struct efi_device_path **device_path, void *image = NULL; int i, num; - __efi_entry_check(); - bs = systab.boottime; rs = systab.runtime; @@ -196,7 +194,5 @@ void *efi_bootmgr_load(struct efi_device_path **device_path, free(bootorder); error: - __efi_exit_check(); - return image; } -- 2.20.1

1 0