June 2019 - U-Boot

[U-Boot] [PATCH 1/1] efi_loader: fix EnableCursor()
by Heinrich Schuchardt 02 Jun '19

02 Jun '19

The EnableCursor() service of the simple text output protocol must update the the CursorVisible field of the output mode. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_console.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index b2cb18e6d6..3b7578f3aa 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -430,6 +430,7 @@ static efi_status_t EFIAPI efi_cout_enable_cursor( EFI_ENTRY("%p, %d", this, enable); printf(ESC"[?25%c", enable ? 'h' : 'l'); + efi_con_mode.cursor_visible = !!enable; return EFI_EXIT(EFI_SUCCESS); } -- 2.20.1

1 0

[U-Boot] Pull request: u-boot-net.git master
by Joe Hershberger 02 Jun '19

02 Jun '19

Hi Tom, Tested on Jenkins at https://travis-ci.org/jhershbe/u-boot/builds/540178505 Basic bug fixes and minor features for 2019.07. The following changes since commit 8a802a2eefd36865eaa3d927d1db7af63bb2d922: Merge tag 'rockchip-for-v2019.07-rc3' of git://git.denx.de/u-boot-rockchip (2019-05-31 07:17:09 -0400) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to b4c20f20adad8d246b95be5bebacb730462c8c01: cmd: mdio: Fix access to arbitrary PHY addresses (2019-06-01 13:33:17 -0500) ---------------------------------------------------------------- Bin Meng (4): clk: sifive: Add clock driver for GEMGXL MGMT dm: net: macb: Update macb_linkspd_cb() signature dm: net: macb: Implement link speed change callback riscv: sifive: fu540: Enable GEMGXL MGMT driver Thierry Reding (2): net: eth-uclass: Write MAC address to hardware after probe net: eth-uclass: Support device tree MAC addresses Vladimir Oltean (1): cmd: mdio: Fix access to arbitrary PHY addresses Documentation/devicetree/bindings/net/ethernet.txt | 66 ++++++++++++++++++++++ board/sifive/fu540/Kconfig | 1 + cmd/mdio.c | 9 ++- drivers/clk/sifive/Kconfig | 7 +++ drivers/clk/sifive/Makefile | 2 + drivers/clk/sifive/gemgxl-mgmt.c | 60 ++++++++++++++++++++ drivers/net/macb.c | 57 ++++++++++++++++++- net/eth-uclass.c | 32 ++++++++++- 8 files changed, 228 insertions(+), 6 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/ethernet.txt create mode 100644 drivers/clk/sifive/gemgxl-mgmt.c Thanks! -Joe

2 1

[U-Boot] [PATCH 0/2] efi_loader: check timer events in Stall()
by Heinrich Schuchardt 02 Jun '19

02 Jun '19

During a call to Stall() we should periodically check for timer events. This requires exporting function usec_to_tick(). *** BLURB HERE *** Heinrich Schuchardt (2): lib: time: export usec_to_tick() efi_loader: check timer events in Stall() include/time.h | 9 +++++++++ lib/efi_loader/efi_boottime.c | 8 +++++++- lib/time.c | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) -- 2.20.1

1 2

[U-Boot] [PATCH 1/1] efi_loader: close protocols in UnloadImage()
by Heinrich Schuchardt 02 Jun '19

02 Jun '19

When UnloadImage() is called all protocols opened by the image have to be closed. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 5714deca70..f4e3186ffc 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2873,12 +2873,41 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, * @image_obj: handle of the loaded image * @loaded_image_protocol: loaded image protocol */ -static void efi_delete_image(struct efi_loaded_image_obj *image_obj, - struct efi_loaded_image *loaded_image_protocol) -{ +static efi_status_t efi_delete_image + (struct efi_loaded_image_obj *image_obj, + struct efi_loaded_image *loaded_image_protocol) +{ + struct efi_object *efiobj, *posobj; + efi_status_t r, ret = EFI_SUCCESS; + + list_for_each_entry_safe(efiobj, posobj, &efi_obj_list, link) { + struct efi_handler *prot, *protpos; + + list_for_each_entry_safe(prot, protpos, &efiobj->protocols, + link) { + struct efi_open_protocol_info_item *info, *infopos; + + list_for_each_entry_safe(info, infopos, + &prot->open_infos, link) { + if (info->info.agent_handle != + (efi_handle_t)image_obj) + continue; + r = EFI_CALL(efi_close_protocol + (efiobj, prot->guid, + info->info.agent_handle, + info->info.controller_handle + )); + if (r != EFI_SUCCESS) + ret = r; + } + } + } + efi_free_pages((uintptr_t)loaded_image_protocol->image_base, efi_size_in_pages(loaded_image_protocol->image_size)); efi_delete_handle(&image_obj->header); + + return ret; } /** -- 2.20.1

1 0

[U-Boot] [PATCH 1/1] efi_loader: DisconnectController() with no driver
by Heinrich Schuchardt 02 Jun '19

02 Jun '19

If DisconnectController() is called and no driver is managing ControllerHandle, return EFI_SUCCESS. UEFI SCT II 2017, 3.3.12 DisconnectController(), 5.1.3.12.4 - 5.1.3.12.6 Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 5c6bc691a5..5714deca70 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1153,11 +1153,15 @@ static efi_status_t efi_get_drivers(efi_handle_t handle, ++count; } } + *number_of_drivers = 0; + if (!count) { + *driver_handle_buffer = NULL; + return EFI_SUCCESS; + } /* * Create buffer. In case of duplicate driver assignments the buffer * will be too large. But that does not harm. */ - *number_of_drivers = 0; *driver_handle_buffer = calloc(count, sizeof(efi_handle_t)); if (!*driver_handle_buffer) return EFI_OUT_OF_RESOURCES; @@ -1213,7 +1217,8 @@ static efi_status_t efi_disconnect_all_drivers &driver_handle_buffer); if (ret != EFI_SUCCESS) return ret; - + if (!number_of_drivers) + return EFI_SUCCESS; ret = EFI_NOT_FOUND; while (number_of_drivers) { r = EFI_CALL(efi_disconnect_controller( -- 2.20.1

1 0

[U-Boot] [PATCH] cmd: mdio: Fix access to arbitrary PHY addresses
by Vladimir Oltean 02 Jun '19

02 Jun '19

Alex reported the following: " I'm doing some MDIO work on a freescale/NXP platform and I bumped into errors with this command: => mdio r emdio#3 5 3 Reading from bus emdio#3 "Synchronous Abort" handler, esr 0x8600000e elr: ffffffff862b8000 lr : 000000008200cce4 (reloc) ... mdio list does not list any PHYs currently because ethernet is using DM and the interfaces are not probed at this time. The PHY does exist on the bus though. The above scenario works with this commit reverted: e55047ec51a662c12ed53ff543ec7cdf158b2137 cmd: mdio: Switch to generic helpers when accessing the registers The current code using generic helpers only works for PHYs that have been registered and show up in bus->phymap and crashes for arbitrary IDs. I find it useful to allow reading from other addresses over MDIO too, certainly helpful for people debugging MDIO on various boards. " Fix this by reverting to use the raw MDIO bus operations in case there is no PHY probed based on DT at the specified address. This restores the old behavior for these PHYs, which means that the newly introduced MMD-over-C22 helpers won't be available for them, but at least they will be accessible again without crashing the system. Fixes: e55047ec51a6 ("cmd: mdio: Switch to generic helpers when accessing the registers") Reported-by: Alex Marginean <alexm.osslist(a)gmail.com> Signed-off-by: Vladimir Oltean <olteanv(a)gmail.com> --- cmd/mdio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmd/mdio.c b/cmd/mdio.c index efe8c9ef0954..5e219f699d8d 100644 --- a/cmd/mdio.c +++ b/cmd/mdio.c @@ -54,7 +54,10 @@ static int mdio_write_ranges(struct mii_dev *bus, for (devad = devadlo; devad <= devadhi; devad++) { for (reg = reglo; reg <= reghi; reg++) { - if (!extended) + if (!phydev) + err = bus->write(bus, addr, devad, + reg, data); + else if (!extended) err = phy_write_mmd(phydev, devad, reg, data); else @@ -88,7 +91,9 @@ static int mdio_read_ranges(struct mii_dev *bus, for (reg = reglo; reg <= reghi; reg++) { int val; - if (!extended) + if (!phydev) + val = bus->read(bus, addr, devad, reg); + else if (!extended) val = phy_read_mmd(phydev, devad, reg); else val = phydev->drv->readext(phydev, addr, -- 2.17.1

3 3

[U-Boot] [PATCH v2 0/4] At present the GEM ethernet on SiFive Unleashed board can only work
by Bin Meng 02 Jun '19

02 Jun '19

in 1000 Mbps mode. With a 10/100 Mbps connection it just fails to do any network communication. This adds a new GEMGXL clock driver to adjust the clock settings per the connection speed so that 10/100 Mbps works. Changes in v2: - rename driver name to "sifive-gemgxl-mgmt" - add a comment for getting "tx_clk" via clk_get_by_name() - does not change anything in the default case - check the return value of clk_set_rate() Bin Meng (4): clk: sifive: Add clock driver for GEMGXL MGMT dm: net: macb: Update macb_linkspd_cb() signature dm: net: macb: Implement link speed change callback riscv: sifive: fu540: Enable GEMGXL MGMT driver board/sifive/fu540/Kconfig | 1 + drivers/clk/sifive/Kconfig | 7 +++++ drivers/clk/sifive/Makefile | 2 ++ drivers/clk/sifive/gemgxl-mgmt.c | 60 ++++++++++++++++++++++++++++++++++++++++ drivers/net/macb.c | 57 +++++++++++++++++++++++++++++++++++++- 5 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/sifive/gemgxl-mgmt.c -- 2.7.4

3 12

[U-Boot] [PATCH v4 1/2] net: eth-uclass: Write MAC address to hardware after probe
by Thierry Reding 02 Jun '19

02 Jun '19

From: Thierry Reding <treding(a)nvidia.com> In order for the device to use the proper MAC address, which can have been configured in the environment prior to the device being registered, ensure that the MAC address is written after the device has been probed. For devices that are registered before the network stack is initialized, this is already done during eth_initialize(). If the Ethernet device is on a bus that is not initialized on early boot, such as PCI, the device is not available at the time eth_initialize() is called, so we need the MAC address programming to also happen after probe. Acked-by: Joe Hershberger <joe.hershberger(a)ni.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- net/eth-uclass.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index 2ef20df19203..4225aabf1fa1 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -524,6 +524,8 @@ static int eth_post_probe(struct udevice *dev) #endif } + eth_write_hwaddr(dev); + return 0; } -- 2.21.0

3 6

[U-Boot] [PATCH 1/1] efi_selftest: unit test for OpenProtocolInformation()
by Heinrich Schuchardt 01 Jun '19

01 Jun '19

Provide a unit test that checks that the open protocol information is correctly updated when opening and closing protocols. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_selftest/Makefile | 1 + lib/efi_selftest/efi_selftest_open_protocol.c | 205 ++++++++++++++++++ 2 files changed, 206 insertions(+) create mode 100644 lib/efi_selftest/efi_selftest_open_protocol.c diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index b032154147..3bebd0f573 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -26,6 +26,7 @@ efi_selftest_gop.o \ efi_selftest_loaded_image.o \ efi_selftest_manageprotocols.o \ efi_selftest_memory.o \ +efi_selftest_open_protocol.o \ efi_selftest_register_notify.o \ efi_selftest_snp.o \ efi_selftest_textinput.o \ diff --git a/lib/efi_selftest/efi_selftest_open_protocol.c b/lib/efi_selftest/efi_selftest_open_protocol.c new file mode 100644 index 0000000000..e3f351df72 --- /dev/null +++ b/lib/efi_selftest/efi_selftest_open_protocol.c @@ -0,0 +1,205 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * efi_selftest_open_protocol + * + * Copyright (c) 2019 Heinrich Schuchardt <xypron.glpk(a)gmx.de> + * + * This unit test checks that open protocol information is correctly updated + * when calling: + * HandleProtocol, OpenProtocol, OpenProtocolInformation, CloseProtocol. + */ + +#include <efi_selftest.h> + +/* + * The test currently does not actually call the interface function. + * So this is just a dummy structure. + */ +struct interface { + void (EFIAPI *inc)(void); +}; + +static struct efi_boot_services *boottime; +static efi_guid_t guid1 = + EFI_GUID(0x492a0e38, 0x1442, 0xf819, + 0x14, 0xaa, 0x4b, 0x8d, 0x09, 0xfe, 0x5a, 0xb9); +static efi_handle_t handle1; +static struct interface interface1; + +/* + * Setup unit test. + * + * Create a handle and install a protocol interface on it. + * + * @handle: handle of the loaded image + * @systable: system table + */ +static int setup(const efi_handle_t img_handle, + const struct efi_system_table *systable) +{ + efi_status_t ret; + + boottime = systable->boottime; + + ret = boottime->install_protocol_interface(&handle1, &guid1, + EFI_NATIVE_INTERFACE, + &interface1); + if (ret != EFI_SUCCESS) { + efi_st_error("InstallProtocolInterface failed\n"); + return EFI_ST_FAILURE; + } + if (!handle1) { + efi_st_error + ("InstallProtocolInterface failed to create handle\n"); + return EFI_ST_FAILURE; + } + return EFI_ST_SUCCESS; +} + +/* + * Tear down unit test. + * + */ +static int teardown(void) +{ + efi_status_t ret; + + if (handle1) { + ret = boottime->uninstall_protocol_interface(handle1, &guid1, + &interface1); + if (ret != EFI_SUCCESS) { + efi_st_error("UninstallProtocolInterface failed\n"); + return EFI_ST_FAILURE; + } + } + return EFI_ST_SUCCESS; +} + +/* + * Execute unit test. + * + * Open the installed protocol twice via HandleProtocol() and once via + * OpenProtocol(EFI_OPEN_PROTOCOL_GET_PROTOCOL). Read the open protocol + * information and check the open counts. Finally close the protocol and + * check again. + */ +static int execute(void) +{ + void *interface; + struct efi_open_protocol_info_entry *entry_buffer; + efi_uintn_t entry_count; + efi_handle_t firmware_handle; + efi_status_t ret; + + ret = boottime->handle_protocol(handle1, &guid1, &interface); + if (ret != EFI_SUCCESS) { + efi_st_error("HandleProtocol failed\n"); + return EFI_ST_FAILURE; + } + if (interface != &interface1) { + efi_st_error("HandleProtocol returned wrong interface\n"); + return EFI_ST_FAILURE; + } + ret = boottime->open_protocol_information(handle1, &guid1, + &entry_buffer, &entry_count); + if (ret != EFI_SUCCESS) { + efi_st_error("OpenProtocolInformation failed\n"); + return EFI_ST_FAILURE; + } + if (entry_count != 1) { + efi_st_error("Incorrect OpenProtocolInformation count\n"); + efi_st_printf("Expected 1, got %u\n", + (unsigned int)entry_count); + return EFI_ST_FAILURE; + } + ret = boottime->free_pool(entry_buffer); + if (ret != EFI_SUCCESS) { + efi_st_error("FreePool failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->handle_protocol(handle1, &guid1, &interface); + if (ret != EFI_SUCCESS) { + efi_st_error("HandleProtocol failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->open_protocol_information(handle1, &guid1, + &entry_buffer, &entry_count); + if (ret != EFI_SUCCESS) { + efi_st_error("OpenProtocolInformation failed\n"); + return EFI_ST_FAILURE; + } + if (entry_count != 1) { + efi_st_error("Incorrect OpenProtocolInformation count\n"); + efi_st_printf("Expected 1, got %u\n", + (unsigned int)entry_count); + return EFI_ST_FAILURE; + } + if (entry_buffer[0].open_count != 2) { + efi_st_error("Incorrect open count: expected 2 got %u\n", + entry_buffer[0].open_count); + return EFI_ST_FAILURE; + } + firmware_handle = entry_buffer[0].agent_handle; + ret = boottime->free_pool(entry_buffer); + if (ret != EFI_SUCCESS) { + efi_st_error("FreePool failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->open_protocol(handle1, &guid1, &interface, + firmware_handle, NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL); + if (ret != EFI_SUCCESS) { + efi_st_error("OpenProtocol failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->open_protocol_information(handle1, &guid1, + &entry_buffer, &entry_count); + if (ret != EFI_SUCCESS) { + efi_st_error("OpenProtocolInformation failed\n"); + return EFI_ST_FAILURE; + } + if (entry_count != 2) { + efi_st_error("Incorrect OpenProtocolInformation count\n"); + efi_st_printf("Expected 2, got %u\n", + (unsigned int)entry_count); + return EFI_ST_FAILURE; + } + if (entry_buffer[0].open_count + entry_buffer[1].open_count != 3) { + efi_st_error("Incorrect open count: expected 3 got %u\n", + entry_buffer[0].open_count + + entry_buffer[1].open_count); + return EFI_ST_FAILURE; + } + ret = boottime->free_pool(entry_buffer); + if (ret != EFI_SUCCESS) { + efi_st_error("FreePool failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->close_protocol(handle1, &guid1, firmware_handle, NULL); + if (ret != EFI_SUCCESS) { + efi_st_error("CloseProtocol failed\n"); + return EFI_ST_FAILURE; + } + ret = boottime->open_protocol_information(handle1, &guid1, + &entry_buffer, &entry_count); + if (ret != EFI_SUCCESS) { + efi_st_error("OpenProtocolInformation failed\n"); + return EFI_ST_FAILURE; + } + if (entry_count) { + efi_st_error("Incorrect OpenProtocolInformation count\n"); + efi_st_printf("Expected 0, got %u\n", + (unsigned int)entry_count); + return EFI_ST_FAILURE; + } + + return EFI_ST_SUCCESS; +} + +EFI_UNIT_TEST(openprot) = { + .name = "open protocol", + .phase = EFI_EXECUTE_BEFORE_BOOTTIME_EXIT, + .setup = setup, + .execute = execute, + .teardown = teardown, +}; -- 2.20.1

1 0

[U-Boot] [PATCH 1/1] efi_loader: CloseProtocol() fix open protocol information
by Heinrich Schuchardt 01 Jun '19

01 Jun '19

CloseProtocol() must delete all open protocol information records relating to import parameters not only one. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1a0e09807a..5c6bc691a5 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2056,7 +2056,6 @@ static efi_status_t EFIAPI efi_close_protocol(efi_handle_t handle, item->info.controller_handle == controller_handle) { efi_delete_open_info(item); r = EFI_SUCCESS; - break; } } out: -- 2.20.1

1 0