January 2021 - U-Boot

[PATCH 1/1] doc: describe loady command
by Heinrich Schuchardt 24 Jan '21

24 Jan '21

Create a man-page for the loady command. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/usage/index.rst | 1 + doc/usage/loady.rst | 67 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 doc/usage/loady.rst diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 317db3b449..1304b59aad 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -20,6 +20,7 @@ Shell commands echo exit for + loady mbr pstore sbi diff --git a/doc/usage/loady.rst b/doc/usage/loady.rst new file mode 100644 index 0000000000..2819cc72ae --- /dev/null +++ b/doc/usage/loady.rst @@ -0,0 +1,67 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +loady command +============= + +Synopsis +-------- + +:: + + loady [addr [baud]] + +Description +----------- + +The loady command is used to transfer a file to the device via the serial line +using the YMODEM protocol. + +The number of transferred bytes is saved in environment variable filesize. + +addr + load address, defaults to environment variable loadaddr or if loadaddr is + not set to configuration variable CONFIG_SYS_LOAD_ADDR + +baud + baud rate for the ymodem transmission. After the transmission the baud + rate is reset to the original value. + +Example +------- + +In the example below the terminal emulation program picocom was used to +transfer a file to the device. + +After entering the loady command the key sequence <CTRL-A><CTRL-S> is used to +let picocom prompt for the file name. Picocom invokes the program sz for the +file transfer. + +:: + + => loady 80064000 115200 + ## Ready for binary (ymodem) download to 0x80064000 at 115200 bps... + C + *** file: BOOTRISCV64.EFI + $ sz -b -vv BOOTRISCV64.EFI + Sending: BOOTRISCV64.EFI + Bytes Sent: 398976 BPS:7883 + Sending: + Ymodem sectors/kbytes sent: 0/ 0k + Transfer complete + + *** exit status: 0 *** + /1(CAN) packets, 4 retries + ## Total Size = 0x0006165f = 398943 Bytes + => echo ${filesize} + 6165f + => + +Configuration +------------- + +The command is only available if CONFIG_CMD_LOADB=y. + +Return value +------------ + +The return value $? is always 0 (true). -- 2.29.2

2 1

[PATCH 1/1] doc: document echo command
by Heinrich Schuchardt 24 Jan '21

24 Jan '21

Provide a man-page for the echo command. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/usage/echo.rst | 65 +++++++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 66 insertions(+) create mode 100644 doc/usage/echo.rst diff --git a/doc/usage/echo.rst b/doc/usage/echo.rst new file mode 100644 index 0000000000..e11c35c2a9 --- /dev/null +++ b/doc/usage/echo.rst @@ -0,0 +1,65 @@ +echo command +============ + +Synopsis +-------- + +:: + + echo [-n] [args ...] + +Description +----------- + +The echo command prints its arguments to the console separated by spaces. + +-n + Do not print a line feed after the last argument. + +args + Arguments to be printed. The arguments are evaluated before being passed to + the command. + +Examples +-------- + +Strings are parsed before the arguments are passed to the echo command: + +:: + + => echo "a" 'b' c + a b c + => + +Observe how variables included in strings are handled: + +:: + + => setenv var X; echo "a)" ${var} 'b)' '${var}' c) ${var} + a) X b) ${var} c) X + => + + +-n suppresses the line feed: + +:: + + => echo -n 1 2 3; echo a b c + 1 2 3a b c + => echo -n 1 2 3 + 1 2 3=> + +A more complex example: + +:: + + => for i in a b c; do for j in 1 2 3; do echo -n "${i}${j}, "; done; echo; done; + a1, a2, a3, + b1, b2, b3, + c1, c2, c3, + => + +Return value +------------ + +The return value $? is always set to 0 (true). diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 6f49652758..317db3b449 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -17,6 +17,7 @@ Shell commands bootefi bootmenu button + echo exit for mbr -- 2.29.2

2 1

[PATCH] test: unit test for echo command
by Heinrich Schuchardt 24 Jan '21

24 Jan '21

Provide a unit test for the unit command Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/cmd/Makefile | 3 +++ test/cmd/test_echo.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 test/cmd/test_echo.c diff --git a/test/cmd/Makefile b/test/cmd/Makefile index 758bc14273..5451e9ea90 100644 --- a/test/cmd/Makefile +++ b/test/cmd/Makefile @@ -2,6 +2,9 @@ # # Copyright (c) 2013 Google, Inc +ifdef CONFIG_HUSH_PARSER +obj-$(CONFIG_CONSOLE_RECORD) += test_echo.o +endif obj-y += mem.o obj-$(CONFIG_CMD_MEM_SEARCH) += mem_search.o obj-$(CONFIG_CMD_PWM) += pwm.o diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c new file mode 100644 index 0000000000..4183cf75bb --- /dev/null +++ b/test/cmd/test_echo.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Tests for echo command + * + * Copyright 2020, Heinrich Schuchadt <xypron.glpk(a)gmx.de> + */ + +#include <common.h> +#include <command.h> +#include <display_options.h> +#include <test/lib.h> +#include <test/test.h> +#include <test/ut.h> + +DECLARE_GLOBAL_DATA_PTR; + +struct test_data { + char *cmd; + char *expected; +}; + +static struct test_data echo_data[] = { + {"echo 1 2 3", + "1 2 3"}, + /* Test new line handling */ + {"echo -n 1 2 3; echo a b c", + "1 2 3a b c"}, + /* + * Test handling of environment variables. + * + * j, q, x are among the least frequent letters in English. + * Hence no collision for the variable name jQx is expected. + */ + {"setenv jQx X; echo \"a)\" ${jQx} 'b)' '${jQx}' c) ${jQx}; setenv jQx", + "a) X b) ${jQx} c) X"}, + /* Test handling of shell variables. */ + {"setenv jQx; for jQx in 1 2 3; do echo -n \"${jQx}, \"; done; echo;", + "1, 2, 3, "}, +}; + +static int lib_test_hush_echo(struct unit_test_state *uts) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(echo_data); ++i) { + console_record_reset_enable(); + ut_assertok(run_command(echo_data[i].cmd, 0)); + gd->flags &= ~GD_FLG_RECORD; + console_record_readline(uts->actual_str, + sizeof(uts->actual_str)); + ut_asserteq_str(echo_data[i].expected, uts->actual_str); + ut_assertok(ut_check_console_end(uts)); + } + return 0; +} + +LIB_TEST(lib_test_hush_echo, 0); -- 2.29.2

2 1

Booting on PX30
by Piotr Lobacz 24 Jan '21

24 Jan '21

Hi all, In our company we have a board which was made for us by Liteon with PX30 chip on it. It boots with miniloader and uboot.img along with trust.img. The problem is that i wanted to boot it up using TPL/SPL images and it doesn't boot. With uboot source code which was given to us it prints for me just these lines: U-Boot TPL 2017.09-g05c644bda3-dirty (Jan 23 2021 - 00:13:09) DDR V1.15 dll en dbg D3,1024MB,333MHz bw col bk row cs dbw 32 10 8 15 1 16 OUT The same is with the newest one U-Boot TPL board init DDR3, 333MHz BW=32 Col=10 Bk=8 CS0 Row=15 CS=1 Die BW=16 Size=1024MB out And nothing else happens. Am i something missing? I'm sorry for a newbie question, but i have not a big experience in this matter. Thanks for any help you can provide. Regards, Peter -- Sent from: http://u-boot.10912.n7.nabble.com/

1 0

Sync include/linux/*.h from kernel
by Peng Fan (OSS) 24 Jan '21

24 Jan '21

All, Do we need to sync the header files under include/linux/*.h from Linux Kernel? Seems many files are out of date and Linux Kernel changed a lot, such as linkage.h. Thanks, Peng.

2 1

[PATCH 0/4] usbtty/musb: Fix file transfers
by Pali Rohár 23 Jan '21

23 Jan '21

This is second usbtty patch series which is fixing stability of musb code and allows usage of file transfers via Kermit protocol on Nokia N900. Kermit file transfer via U-Boot loadb command is stable on Nokia N900 and gives about 52kB/s transfer rate. This patch series depends on previous patch series: "Nokia RX-51: Fix USB TTY console and enable it" Pali Rohár (4): serial: usbtty: Send urb data in correct order usb: musb: Fix receiving of bigger buffers usb: musb: Fix handling interrupts for EP0 and SET ADDRESS commmand usb: musb: Ensure that we set musb dynamic FIFO buffer for every endpoint drivers/serial/usbtty.c | 12 +++-------- drivers/usb/musb/musb_udc.c | 42 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 30 deletions(-) -- 2.20.1

2 8

[U-Boot] Question: PCIe enumeration of PEX switch
by Ramakrishna Maladi (rmaladi) 23 Jan '21

23 Jan '21

Hi U-boot is unable to enumerate pericom PCIe switch and subsequent end point devices on our board (arm v8.2, 64-bit) When booted to linux, we see the same enumerated with endpoints Have any one come ever come across this issue and found a workaround to it? I hope we no need to have a special driver in u-boot for it? U-boot rommon> dm tree Class Index Probed Driver Name ----------------------------------------------------------- pci_generi 25 [ ] pci_generic_drv | | `-- pci_15:0.0 PCIe debug logs pci_auto_config_devices: done pci_uclass_pre_probe, bus=25/pci@8e0000000000, parent=soc@0 decode_regions: len=28, cells_per_record=7 decode_regions: region 0, pci_addr=0, addr=886000000000, size=100000, space_code=1 - type=1, pos=0 decode_regions: region 1, pci_addr=1000000, addr=882001000000, size=1000000000, space_code=3 - type=0, pos=1 decode_regions: region 2, pci_addr=1000000000, addr=884000000000, size=1000000000, space_code=3 - type=8, pos=2 decode_regions: region 3, pci_addr=8e0000000000, addr=8e0000000000, size=1000000000, space_code=3 - type=0, pos=3 pci_uclass_post_probe: probing bus 25 bdf 190000 01.00.00: u1 0 (100000) 01.00.00: u1 0 (878030100000) 0 word 878030100000 01.00.00: u1 0 (878030100000) -> 12d8 bdf 190000 01.00.00: u0 e (100000) 01.00.00: u0 e (878030100000) pci_find_and_bind_driver: Searching for driver: vendor=12d8, device=8619 pci_find_and_bind_driver: No match found: bound generic driver instead bdf 190000 01.00.00: u2 100 (100000) 01.00.00: u2 100 (878030100000) 19ff00 long 878030100100 01.00.00: u2 100 (878030100000) -> fb410003 bdf 190000 01.00.00: u2 fb4 (100000) 01.00.00: u2 fb4 (878030100000) fb410003 long 878030100fb4 01.00.00: u2 fb4 (878030100000) -> 13810001 bdf 190000 01.00.00: u2 138 (100000) 01.00.00: u2 138 (878030100000) 13810001 long 878030100138 01.00.00: u2 138 (878030100000) -> 14810004 bdf 190000 01.00.00: u2 148 (100000) 01.00.00: u2 148 (878030100000) 14810004 long 878030100148 01.00.00: u2 148 (878030100000) -> 27010002 bdf 190000 01.00.00: u2 270 (100000) 01.00.00: u2 270 (878030100000) 27010002 long 878030100270 01.00.00: u2 270 (878030100000) -> 9001001e bdf 190000 01.00.00: u2 900 (100000) 01.00.00: u2 900 (878030100000) 9001001e long 878030100900 01.00.00: u2 900 (878030100000) -> 10012 bdf 190100 01.00.01: u1 0 (101000) 01.00.01: u1 0 (878030101000) 12d8 word 878030101000 01.00.01: u1 0 (878030101000) -> 12d8 bdf 190100 01.00.01: u0 e (101000) 01.00.01: u0 e (878030101000) 81 byte 87803010100e 01.00.01: u0 e (878030101000) -> 80 pci_bind_bus_devices: bus 25/pci@8e0000000000: found device 0, function 1 bdf 190100 01.00.01: u1 2 (101000) 01.00.01: u1 2 (878030101000) 8619 word 878030101002 01.00.01: u1 2 (878030101000) -> 8619 bdf 190100 01.00.01: u2 8 (101000) ---- pci_uclass_pre_probe, bus=57/pci_19:1f.0, parent=pci@8e0000000000 pci_uclass_post_probe: probing bus 57 bdf 390000 21.00.00: u1 0 (2100000) 21.00.00: u1 0 (878032100000) 0 word 878032100000 21.00.00: u1 0 (878032100000) -> ffff bdf 390800 21.01.00: u1 0 (2108000) 21.01.00: u1 0 (878032108000) ffff word 878032108000 21.01.00: u1 0 (878032108000) -> ffff bdf 391000 21.02.00: u1 0 (2110000) 21.02.00: u1 0 (878032110000) ffff word 878032110000 21.02.00: u1 0 (878032110000) -> ffff bdf 391800 21.03.00: u1 0 (2118000) 21.03.00: u1 0 (878032118000) ffff word 878032118000 21.03.00: u1 0 (878032118000) -> ffff bdf 392000 21.04.00: u1 0 (2120000) 21.04.00: u1 0 (878032120000) ffff word 878032120000 21.04.00: u1 0 (878032120000) -> ffff bdf 392800 21.05.00: u1 0 (2128000) 21.05.00: u1 0 (878032128000) ffff word 878032128000 21.05.00: u1 0 (878032128000) -> ffff bdf 393000 21.06.00: u1 0 (2130000) 21.06.00: u1 0 (878032130000) ffff word 878032130000 21.06.00: u1 0 (878032130000) -> ffff bdf 393800 21.07.00: u1 0 (2138000) 21.07.00: u1 0 (878032138000) ffff word 878032138000 21.07.00: u1 0 (878032138000) -> ffff bdf 394000 21.08.00: u1 0 (2140000) 21.08.00: u1 0 (878032140000) ffff word 878032140000 21.08.00: u1 0 (878032140000) -> ffff bdf 394800 21.09.00: u1 0 (2148000) 21.09.00: u1 0 (878032148000) ffff word 878032148000 21.09.00: u1 0 (878032148000) -> ffff bdf 395000 21.0a.00: u1 0 (2150000) 21.0a.00: u1 0 (878032150000) ffff word 878032150000 21.0a.00: u1 0 (878032150000) -> ffff bdf 395800 21.0b.00: u1 0 (2158000) 21.0b.00: u1 0 (878032158000) ffff word 878032158000 21.0b.00: u1 0 (878032158000) -> ffff bdf 396000 21.0c.00: u1 0 (2160000) 21.0c.00: u1 0 (878032160000) ffff word 878032160000 21.0c.00: u1 0 (878032160000) -> ffff bdf 396800 21.0d.00: u1 0 (2168000) 21.0d.00: u1 0 (878032168000) ffff word 878032168000 21.0d.00: u1 0 (878032168000) -> ffff bdf 397000 21.0e.00: u1 0 (2170000) 21.0e.00: u1 0 (878032170000) ffff word 878032170000 21.0e.00: u1 0 (878032170000) -> ffff bdf 397800 21.0f.00: u1 0 (2178000) 21.0f.00: u1 0 (878032178000) ffff word 878032178000 21.0f.00: u1 0 (878032178000) -> ffff bdf 398000 21.10.00: u1 0 (2180000) 21.10.00: u1 0 (878032180000) ffff word 878032180000 21.10.00: u1 0 (878032180000) -> ffff bdf 398800 21.11.00: u1 0 (2188000) 21.11.00: u1 0 (878032188000) ffff word 878032188000 21.11.00: u1 0 (878032188000) -> ffff bdf 399000 21.12.00: u1 0 (2190000) 21.12.00: u1 0 (878032190000) ffff word 878032190000 21.12.00: u1 0 (878032190000) -> ffff bdf 399800 21.13.00: u321c8000) ffff word 8780321c8000 21.19.00: u1 0 (8780321c8000) -> ffff bdf 39d000 21.1a.00: u1 0 (21d0000) 21.1a.00: u1 0 (8780321d0000) ffff word 8780321d0000 21.1a.00: u1 0 (8780321d0000) -> ffff bdf 39d800 21.1b.00: u1 0 (21d8000) 21.1b.00: u1 0 (8780321d8000) ffff word 8780321d8000 21.1b.00: u1 0 (8780321d8000) -> ffff bdf 39e000 21.1c.00: u1 0 (21e0000) 21.1c.00: u1 0 (8780321e0000) ffff word 8780321e0000 21.1c.00: u1 0 (8780321e0000) -> ffff bdf 39e800 21.1d.00: u1 0 (21e8000) 21.1d.00: u1 0 (8780321e8000) ffff word 8780321e8000 21.1d.00: u1 0 (8780321e8000) -> ffff bdf 39f000 21.1e.00: u1 0 (21f0000) 21.1e.00: u1 0 (8780321f0000) ffff word 8780321f0000 21.1e.00: u1 0 (8780321f0000) -> ffff bdf 39f800 21.1f.00: u1 0 (21f8000) 21.1f.00: u1 0 (8780321f8000) ffff word 8780321f8000 21.1f.00: u1 0 (8780321f8000) -> ffff pci_auto_config_devices: start pci_auto_config_devices: done pci_get_bus_max: ret=57 bdf 19f800 01.1f.00: u0 1a (1f8000) 01.1f.00: u0 1a (8780301f8000) 20 tmp 8 long 8780301f8018 ff2000 tmp long 8780301f8018 202000 long 8780301f8018 202000 01.1f.00: u2 1a (8780301f8018) <- 202000 bdf 19f800 01.1f.00: u1 22 (1f8000) 01.1f.00: u1 22 (8780301f8000) 2ff tmp 16 long 8780301f8020 fff0 tmp long 8780301f8020 2fffff0 long 8780301f8020 2fffff0 01.1f.00: u2 22 (8780301f8020) <- 2fffff0 bdf 19f800 01.1f.00: u1 26 (1f8000) 01.1f.00: u1 26 (8780301f8000) 3f5e8e430 word 8780301f8026 01.1f.00: u1 26 (8780301f8000) -> 1 bdf 19f800 01.1f.00: u1 26 (1f8000f.01: u2 30 (8780301f9000) -> 0 bdf 19f900 01.1f.01: u1 a (1f9000) 01.1f.01: u1 a (8780301f9000) 0 word 8780301f900a 01.1f.01: u1 a (8780301f9000) -> 880 bdf 19f900 01.1f.01: u1 4 (1f9000) 01.1f.01: u1 4 (8780301f9000) 6 tmp 16 long 8780301f9004 100006 tmp long 8780301f9004 6 long 8780301f9004 6 01.1f.01: u2 4 (8780301f9004) <- 6 bdf 19f900 01.1f.01: u0 c (1f9000) 01.1f.01: u0 c (8780301f9000) 8 tmp 8 long 8780301f900c 800008 tmp long 8780301f900c 800008 long 8780301f900c 800008 01.1f.01: u2 c (8780301f900c) <- 800008 bdf 19f900 01.1f.01: u0 d (1f9000) 01.1f.01: u0 d (8780301f9000) 80 tmp 8 long 8780301f900c 800008 tmp long 8780301f900c 808008 long 8780301f900c 808008 01.1f.01: u2 d (8780301f900c) <- 808008 pci_auto_config_devices: done … Linux logs ~# lspci -tv -+-[0003:00]---00.0-[01]--+-00.0-[02-08]--+-01.0-[03]-- | | +-02.0-[04]-- | | +-03.0-[05]----00.0 Intel Corporation I211 Gigabit Network Connection | | +-07.0-[06]----00.0 | | +-08.0-[07]-- | | \-09.0-[08]----00.0 | \-00.1 Pericom Semiconductor Device 8619 Thanks, Ram

1 0

[PATCH 1/1] efi_loader: correct block IO alignment check
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

If the field Media->IoAlign of the EFI block IO protocol is zero, no alignment is required. Our code required 4 GiB alignment in this case. Don't check buffer alignment if Media->IoAlign == 0. Fixes: f59f0825e8b9 ("efi_loader: parameter checks BLOCK_IO_PROTOCOL") Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_disk.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index c0804effde..d0aad0252a 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -142,8 +142,9 @@ static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this, return EFI_MEDIA_CHANGED; if (!this->media->media_present) return EFI_NO_MEDIA; - /* media->io_align is a power of 2 */ - if ((uintptr_t)buffer & (this->media->io_align - 1)) + /* media->io_align is a power of 2 or 0 */ + if (this->media->io_align && + (uintptr_t)buffer & (this->media->io_align - 1)) return EFI_INVALID_PARAMETER; if (lba * this->media->block_size + buffer_size > this->media->last_block * this->media->block_size) @@ -209,8 +210,9 @@ static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this, return EFI_MEDIA_CHANGED; if (!this->media->media_present) return EFI_NO_MEDIA; - /* media->io_align is a power of 2 */ - if ((uintptr_t)buffer & (this->media->io_align - 1)) + /* media->io_align is a power of 2 or 0 */ + if (this->media->io_align && + (uintptr_t)buffer & (this->media->io_align - 1)) return EFI_INVALID_PARAMETER; if (lba * this->media->block_size + buffer_size > this->media->last_block * this->media->block_size) -- 2.29.2

1 0

[PATCH 1/1] efi_selftest: test EFI_BLOCK_IO_PROTOCOL.Media->LastBlock
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

The field Media->LastBlock of the EFI_BLOCK_IO_PROTOCOL must be filled with the index of the last logical block (LBA) for the block device that our test driver provides. After calling ConnectController() U-Boot exposes the block IO protocol for the partition check that the value of Media->LastBlock equals the partition size minus one. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/efi_selftest_block_device.c | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/efi_selftest/efi_selftest_block_device.c b/lib/efi_selftest/efi_selftest_block_device.c index 5eb297d285..15f03751ac 100644 --- a/lib/efi_selftest/efi_selftest_block_device.c +++ b/lib/efi_selftest/efi_selftest_block_device.c @@ -194,7 +194,7 @@ static int setup(const efi_handle_t handle, decompress(&image); block_io.media->block_size = 1 << LB_BLOCK_SIZE; - block_io.media->last_block = img.length >> LB_BLOCK_SIZE; + block_io.media->last_block = (img.length >> LB_BLOCK_SIZE) - 1; ret = boottime->install_protocol_interface( &disk_handle, &block_io_protocol_guid, @@ -301,6 +301,7 @@ static int execute(void) efi_handle_t *handles; efi_handle_t handle_partition = NULL; struct efi_device_path *dp_partition; + struct efi_block_io *block_io_protocol; struct efi_simple_file_system_protocol *file_system; struct efi_file_handle *root, *file; struct { @@ -309,6 +310,7 @@ static int execute(void) } system_info; efi_uintn_t buf_size; char buf[16] __aligned(ARCH_DMA_MINALIGN); + u32 part1_size; u64 pos; /* Connect controller to virtual disk */ @@ -353,6 +355,23 @@ static int execute(void) return EFI_ST_FAILURE; } + /* Open the block_io_protocol */ + ret = boottime->open_protocol(handle_partition, + &block_io_protocol_guid, + (void **)&block_io_protocol, NULL, NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (ret != EFI_SUCCESS) { + efi_st_error("Failed to open block IO protocol\n"); + return EFI_ST_FAILURE; + } + /* Get size of first MBR partition */ + memcpy(&part1_size, image + 0x1ca, sizeof(u32)); + if (block_io_protocol->media->last_block != part1_size - 1) { + efi_st_error("Last LBA of partition %x, expected %x\n", + (unsigned int)block_io_protocol->media->last_block, + part1_size - 1); + return EFI_ST_FAILURE; + } /* Open the simple file system protocol */ ret = boottime->open_protocol(handle_partition, &guid_simple_file_system_protocol, -- 2.29.2

1 0

[PATCH v4 00/59] dm: Add programatic generation of ACPI tables (part D)
by Simon Glass 23 Jan '21

23 Jan '21

Note: This is part D of this effort. With this, Coral includes all required ACPI tables. At present on x86 U-Boot supports creating ACPI (Advanced Configuration and Power Interface) tables using the Intel ACPI Source Language (ASL) compiler. This is good enough for basic operation but some devices need to add their information dynamically at runtime. An example is a device that needs to report its enable GPIO. This is described in the device tree, so we want to add code in the driver to convert that device-tree description into an ACPI description for use on Linux. This series adds support for generation of ACPI tables and fragments by devices. The core support is built into driver model. Several files are brought over from coreboot to do the actual generation. As an example of using this new feature, chromebook_coral is updated to write out a wide array of ACPI tables including DSDT and SSDT. This initial version of the series lays out the general approach. More work is needed to figure out the difference between CONFIG_ACPIGEN and CONFIG_GENERATE_ACPI_TABLE with respect to what is built. Changes in v4: - Add Andy's documentation to struct acpi_gpio - Add logging when writinge NHLT - Add new patch to use I2cSerialBusV2() instead of I2cSerialBus() - Change table version to 3 - Correct DPTF enable property - Correct comment for dm_test_acpi_write_prw() - Correct compatible string for gma device Drop extra acpi_align() in apl_acpi_hb_write_tables() Changes in v3: - Rebase to master Changes in v2: - Add new patch to allow more space for U-Boot on link - Add new patch to move include of bitops out of ACPI region - Fix incorrect space in enable-off-delay-ms - Rebase to master - add new patch to fix polarity type in acpi_dp_add_gpio() Changes in v1: - Add NHLT audio support - Add NHLT information - Add comments - Add more comments and rename cpu_get_bus_clock to cpu_get_bus_clock_khz() - Add new patch with coral audio descriptor files - Add support for NHLT table - Adjust implementation to match new ACPI GPIO generation - Capitalise ACPI_OPS_PTR - Don't build for SPL - Drop unnecessary callbacks - Fix i2c PCI addresses - Handle table generation without callbacks - Move ASL_REVISION define into this patch - Move acpi_create_dbg2() into generic code - Move the acpi.h header file to this commit - Move this code into an x86-specific file - Put this code in an x86-specific place and update commit message - Rename acpi-probed to linux,probed - Rename cpi,hid-desc-reg-offset to hid-desc-addr - Split PCT and PTC tables into a separate patch - Support hid-over-i2c separately as well - UIse hid-over-i2 compatible string - Update ACPI ordering to include multiple CPUs - Update commit message - Update commit message with a comma - Update for acpi_device_write_i2c_dev() return-value change - Use OEM_TABLE_ID instead of ACPI_TABLE_CREATOR - Use SHIFT and MASK for defines - Use acpi,ddn instead of acpi,desc - Use this file in APL - Use updated acpi_device_write_dsm_i2c_hid() function Simon Glass (59): x86: acpi: Add cros_ec tables x86: acpi: Add base asl files for common x86 devices x86: acpi: apl: Add asl files for Apollo Lake x86: acpi: Add DPTF asl files x86: apl: Correct PCIE_ECAM_BASE x86: Add a config for the systemagent PCIEX regions size x86: Add a common global NVS structure x86: acpi: Support external GNVS tables x86: acpi: Expand the GNVS x86: coral: Add ACPI tables for coral acpi: Add support for writing a _PRW acpi: Add support for conditions and return values acpi: Support generating a multi-function _DSM for devices dm: acpi: Use correct GPIO polarity type in acpi_dp_add_gpio() x86: link: Allow more space for U-Boot i2c: Add a generic driver to generate ACPI info x86: Add wake sources for the acpi_gpe driver x86: apl: Support writing the IntelGraphicsMem table x86: acpi: Add a common routine to write WiFi info x86: Add some definitions for SMM x86: apl: Add power-management definitions x86: apl: Update iomap for ACPI x86: Add a few common Intel CPU functions x86: acpi: Support generation of the HPET table x86: acpi: Support generation of the DBG2 table acpi: Add support for generating processor tables x86: acpi: Add PCT and PTC tables acpi: Add more support for generating processor tables x86: acpi: Add common Intel ACPI tables x86: Support Atom SoCs using SWSMISCI rather than the SWSCI x86: acpi: Add support for additional Intel tables x86: apl: Allow reading hostbridge base addresses p2sb: Add some definitions used for ACPI x86: apl: Generate required ACPI tables x86: apl: Add support for hostbridge ACPI generation x86: apl: Generate CPU tables x86: apl: Generate ACPI table for LPC x86: apl: Drop unnecessary code in PMC driver tpm: cr50: Add ACPI support x86: fsp: Update the FSP API with the end-firmware method x86: cpu: Report address width from cpu_get_info() x86: Sort the MTRR table x86: Notify the FSP of the 'end firmware' event x86: Correct the assembly guard in e820.h x86: Add a header guard to asm/acpi_table.h x86: Correct handling of MADT table CPUs acpi: tpm: Add a TPM2 table acpi: tpm: Add a TPM1 table x86: acpi: Set the log category for x86 table generation x86: coral: Add audio descriptor files x86: apl: Check low-level init in FSP-S pre-init x86: fsp: Add more debugging for silicon init x86: fsp: Show FSP-S or FSP-M address in fsp_get_header() acpi: Use defines for field lengths x86: Add a way to add to the e820 memory table x86: Move include of bitops out of ACPI region x86: coral: Update config and device tree for ACPI acpi: Add more documentation for struct acpi_gpio acpi: Use I2cSerialBusV2() instead of I2cSerialBus() arch/x86/Kconfig | 47 ++ arch/x86/cpu/apollolake/Kconfig | 4 + arch/x86/cpu/apollolake/Makefile | 1 + arch/x86/cpu/apollolake/acpi.c | 211 ++++++ arch/x86/cpu/apollolake/cpu.c | 77 +++ arch/x86/cpu/apollolake/fsp_s.c | 2 + arch/x86/cpu/apollolake/hostbridge.c | 243 ++++++- arch/x86/cpu/apollolake/lpc.c | 18 + arch/x86/cpu/apollolake/pmc.c | 8 +- arch/x86/cpu/cpu.c | 15 + arch/x86/cpu/i386/cpu.c | 23 + arch/x86/cpu/intel_common/Makefile | 7 + arch/x86/cpu/intel_common/acpi.c | 377 ++++++++++ arch/x86/cpu/intel_common/cpu.c | 79 +++ arch/x86/cpu/intel_common/generic_wifi.c | 120 ++++ arch/x86/cpu/intel_common/intel_opregion.c | 168 +++++ arch/x86/cpu/mtrr.c | 12 + arch/x86/cpu/x86_64/cpu.c | 5 + arch/x86/dts/chromebook_coral.dts | 226 +++++- arch/x86/include/asm/acpi/chromeos.asl | 108 +++ arch/x86/include/asm/acpi/cpu.asl | 25 + arch/x86/include/asm/acpi/cros_ec/ac.asl | 22 + arch/x86/include/asm/acpi/cros_ec/als.asl | 56 ++ arch/x86/include/asm/acpi/cros_ec/battery.asl | 411 +++++++++++ arch/x86/include/asm/acpi/cros_ec/cros_ec.asl | 57 ++ arch/x86/include/asm/acpi/cros_ec/ec.asl | 557 +++++++++++++++ arch/x86/include/asm/acpi/cros_ec/emem.asl | 53 ++ .../asm/acpi/cros_ec/keyboard_backlight.asl | 52 ++ arch/x86/include/asm/acpi/cros_ec/pd.asl | 15 + arch/x86/include/asm/acpi/cros_ec/superio.asl | 159 +++++ arch/x86/include/asm/acpi/cros_ec/tbmc.asl | 23 + arch/x86/include/asm/acpi/cros_gnvs.asl | 29 + arch/x86/include/asm/acpi/dptf/charger.asl | 65 ++ arch/x86/include/asm/acpi/dptf/cpu.asl | 186 +++++ arch/x86/include/asm/acpi/dptf/dptf.asl | 121 ++++ arch/x86/include/asm/acpi/dptf/fan.asl | 57 ++ arch/x86/include/asm/acpi/dptf/thermal.asl | 521 ++++++++++++++ arch/x86/include/asm/acpi/global_nvs.h | 5 +- arch/x86/include/asm/acpi/lpc.asl | 141 ++++ arch/x86/include/asm/acpi/pci_osc.asl | 21 + arch/x86/include/asm/acpi/pcr.asl | 80 +++ arch/x86/include/asm/acpi/ramoops.asl | 32 + arch/x86/include/asm/acpi/sleepstates.asl | 12 +- arch/x86/include/asm/acpi_table.h | 162 +++++ arch/x86/include/asm/acpigen.h | 35 + arch/x86/include/asm/arch-apollolake/acpi.h | 18 + .../include/asm/arch-apollolake/acpi/dptf.asl | 35 + .../asm/arch-apollolake/acpi/globalnvs.asl | 41 ++ .../include/asm/arch-apollolake/acpi/gpio.asl | 191 ++++++ .../asm/arch-apollolake/acpi/gpiolib.asl | 109 +++ .../include/asm/arch-apollolake/acpi/lpss.asl | 105 +++ .../asm/arch-apollolake/acpi/northbridge.asl | 120 ++++ .../asm/arch-apollolake/acpi/pch_hda.asl | 77 +++ .../asm/arch-apollolake/acpi/pci_irqs.asl | 52 ++ .../include/asm/arch-apollolake/acpi/pcie.asl | 22 + .../asm/arch-apollolake/acpi/pcie_port.asl | 113 +++ .../asm/arch-apollolake/acpi/platform.asl | 10 + .../asm/arch-apollolake/acpi/pmc_ipc.asl | 49 ++ .../include/asm/arch-apollolake/acpi/scs.asl | 173 +++++ .../asm/arch-apollolake/acpi/soc_int.asl | 50 ++ .../asm/arch-apollolake/acpi/southbridge.asl | 34 + .../include/asm/arch-apollolake/acpi/xhci.asl | 33 + .../arch-apollolake/acpi/xhci_apl_ports.asl | 23 + .../arch-apollolake/acpi/xhci_glk_ports.asl | 24 + .../include/asm/arch-apollolake/global_nvs.h | 23 +- arch/x86/include/asm/arch-apollolake/gpe.h | 135 ++++ arch/x86/include/asm/arch-apollolake/gpio.h | 3 + arch/x86/include/asm/arch-apollolake/iomap.h | 16 + arch/x86/include/asm/arch-apollolake/pm.h | 40 +- .../include/asm/arch-apollolake/systemagent.h | 31 + arch/x86/include/asm/cpu.h | 9 + arch/x86/include/asm/cpu_common.h | 56 ++ arch/x86/include/asm/e820.h | 3 +- arch/x86/include/asm/fsp/fsp_api.h | 15 +- arch/x86/include/asm/intel_acpi.h | 52 ++ arch/x86/include/asm/intel_gnvs.h | 44 ++ arch/x86/include/asm/intel_opregion.h | 247 +++++++ arch/x86/include/asm/smm.h | 27 + arch/x86/lib/Makefile | 1 + arch/x86/lib/acpi_table.c | 383 ++++++++++- arch/x86/lib/acpigen.c | 96 +++ arch/x86/lib/fsp/fsp_common.c | 16 + arch/x86/lib/fsp/fsp_dram.c | 17 + arch/x86/lib/fsp/fsp_graphics.c | 32 + arch/x86/lib/fsp2/fsp_silicon_init.c | 4 +- arch/x86/lib/fsp2/fsp_support.c | 22 +- board/google/chromebook_coral/Kconfig | 2 +- board/google/chromebook_coral/Makefile | 1 + .../chromebook_coral/baseboard_dptf.asl | 71 ++ board/google/chromebook_coral/coral.c | 136 ++++ .../chromebook_coral/dialog-2ch-48khz-24b.dat | Bin 0 -> 100 bytes .../chromebook_coral/dmic-1ch-48khz-16b.dat | Bin 0 -> 3048 bytes .../chromebook_coral/dmic-2ch-48khz-16b.dat | Bin 0 -> 3048 bytes .../chromebook_coral/dmic-4ch-48khz-16b.dat | Bin 0 -> 3048 bytes board/google/chromebook_coral/dsdt.asl | 60 ++ .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes .../google/chromebook_coral/variant_dptf.asl | 6 + board/google/chromebook_coral/variant_ec.h | 75 ++ board/google/chromebook_coral/variant_gpio.h | 63 ++ configs/chromebook_coral_defconfig | 13 +- configs/chromebook_link_defconfig | 2 +- doc/device-tree-bindings/chosen.txt | 18 + doc/device-tree-bindings/device.txt | 3 + doc/device-tree-bindings/i2c/generic-acpi.txt | 42 ++ drivers/core/Kconfig | 9 + drivers/i2c/Makefile | 3 + drivers/i2c/acpi_i2c.c | 226 ++++++ drivers/i2c/acpi_i2c.h | 15 + drivers/i2c/i2c-uclass.c | 17 + drivers/sound/max98357a.c | 2 +- drivers/tpm/cr50_i2c.c | 55 ++ include/acpi/acpi_device.h | 93 ++- include/acpi/acpi_dp.h | 2 +- include/acpi/acpi_s3.h | 4 + include/acpi/acpi_table.h | 140 +++- include/acpi/acpigen.h | 415 +++++++++++ include/bloblist.h | 8 + include/i2c.h | 23 + include/p2sb.h | 8 + include/power/acpi_pmc.h | 4 +- lib/acpi/acpi_device.c | 45 +- lib/acpi/acpi_dp.c | 4 +- lib/acpi/acpi_table.c | 64 ++ lib/acpi/acpigen.c | 354 ++++++++++ test/dm/acpi_dp.c | 4 +- test/dm/acpigen.c | 647 ++++++++++++++++++ 126 files changed, 9722 insertions(+), 111 deletions(-) create mode 100644 arch/x86/cpu/apollolake/acpi.c create mode 100644 arch/x86/cpu/intel_common/acpi.c create mode 100644 arch/x86/cpu/intel_common/generic_wifi.c create mode 100644 arch/x86/cpu/intel_common/intel_opregion.c create mode 100644 arch/x86/include/asm/acpi/chromeos.asl create mode 100644 arch/x86/include/asm/acpi/cpu.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/ac.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/als.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/battery.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/cros_ec.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/ec.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/emem.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/keyboard_backlight.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/pd.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/superio.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/tbmc.asl create mode 100644 arch/x86/include/asm/acpi/cros_gnvs.asl create mode 100644 arch/x86/include/asm/acpi/dptf/charger.asl create mode 100644 arch/x86/include/asm/acpi/dptf/cpu.asl create mode 100644 arch/x86/include/asm/acpi/dptf/dptf.asl create mode 100644 arch/x86/include/asm/acpi/dptf/fan.asl create mode 100644 arch/x86/include/asm/acpi/dptf/thermal.asl create mode 100644 arch/x86/include/asm/acpi/lpc.asl create mode 100644 arch/x86/include/asm/acpi/pci_osc.asl create mode 100644 arch/x86/include/asm/acpi/pcr.asl create mode 100644 arch/x86/include/asm/acpi/ramoops.asl create mode 100644 arch/x86/include/asm/acpigen.h create mode 100644 arch/x86/include/asm/arch-apollolake/acpi.h create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/dptf.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpio.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpiolib.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/lpss.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pch_hda.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie_port.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/platform.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pmc_ipc.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/scs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl create mode 100644 arch/x86/include/asm/arch-apollolake/gpe.h create mode 100644 arch/x86/include/asm/intel_acpi.h create mode 100644 arch/x86/include/asm/intel_gnvs.h create mode 100644 arch/x86/include/asm/intel_opregion.h create mode 100644 arch/x86/include/asm/smm.h create mode 100644 arch/x86/lib/acpigen.c create mode 100644 board/google/chromebook_coral/baseboard_dptf.asl create mode 100644 board/google/chromebook_coral/dialog-2ch-48khz-24b.dat create mode 100644 board/google/chromebook_coral/dmic-1ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dmic-2ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dmic-4ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dsdt.asl create mode 100644 board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat create mode 100644 board/google/chromebook_coral/variant_dptf.asl create mode 100644 board/google/chromebook_coral/variant_ec.h create mode 100644 board/google/chromebook_coral/variant_gpio.h create mode 100644 doc/device-tree-bindings/i2c/generic-acpi.txt create mode 100644 drivers/i2c/acpi_i2c.c create mode 100644 drivers/i2c/acpi_i2c.h -- 2.28.0.681.g6f77f65b4e-goog

3 62