June 2019 - U-Boot

[U-Boot] [PATCH v3] gpio: add gpio-hog support
by Heiko Schocher 04 Jun '19

04 Jun '19

add gpio-hog support. GPIO hogging is a mechanism providing automatic GPIO request and configuration as part of the gpio-controller's driver probe function. for more infos see: doc/device-tree-bindings/gpio/gpio.txt Signed-off-by: Heiko Schocher <hs(a)denx.de> --- clean travis build, see result: https://travis-ci.org/hsdenx/u-boot-test/builds/538734780 Changes in v3: - probe now all gpio devices with gpio-hogs from board_r before board_late_init() call or if someone wants to access gpio-hog based gpios with gpio_hog_lookup_name() This is needed, because we cannot be sure, if a gpio device which contains gpio-hogs is probed. - add line-name property as Michal recommended - renamed gpio_priv_one into gpio_priv_one_hog and protected through CONFIG_DM_GPIO_HOG Changes in v2: - move gpio_hog() call from post_probe() to post_bind() call. Check if current gpio device has gpio-hog definitions, if so, probe it. common/board_r.c | 6 + doc/device-tree-bindings/gpio/gpio.txt | 55 +++++++ drivers/gpio/Kconfig | 10 ++ drivers/gpio/gpio-uclass.c | 217 ++++++++++++++++++++++--- include/asm-generic/gpio.h | 32 ++++ 5 files changed, 301 insertions(+), 19 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 150e8cd424..507da4c74a 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -49,6 +49,9 @@ #include <linux/err.h> #include <efi_loader.h> #include <wdt.h> +#if defined(CONFIG_DM_GPIO_HOG) +#include <asm/gpio.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -796,6 +799,9 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_NET initr_ethaddr, #endif +#if defined(CONFIG_DM_GPIO_HOG) + gpio_hog_probe_all, +#endif #ifdef CONFIG_BOARD_LATE_INIT board_late_init, #endif diff --git a/doc/device-tree-bindings/gpio/gpio.txt b/doc/device-tree-bindings/gpio/gpio.txt index f7a158d858..e774439369 100644 --- a/doc/device-tree-bindings/gpio/gpio.txt +++ b/doc/device-tree-bindings/gpio/gpio.txt @@ -210,3 +210,58 @@ Example 2: Here, three GPIO ranges are defined wrt. two pin controllers. pinctrl1 GPIO ranges are defined using pin numbers whereas the GPIO ranges wrt. pinctrl2 are named "foo" and "bar". + +3) GPIO hog definitions +----------------------- + +The GPIO chip may contain GPIO hog definitions. GPIO hogging is a mechanism +providing automatic GPIO request and configuration as part of the +gpio-controller's driver probe function. + +Each GPIO hog definition is represented as a child node of the GPIO controller. +Required properties: +- gpio-hog: A property specifying that this child node represents a GPIO hog. +- gpios: Store the GPIO information (id, flags) for the GPIO to + affect. + + ! Not yet support more than one gpio ! + +Only one of the following properties scanned in the order shown below. +- input: A property specifying to set the GPIO direction as input. +- output-low A property specifying to set the GPIO direction as output with + the value low. +- output-high A property specifying to set the GPIO direction as output with + the value high. + +Optional properties: +- line-name: The GPIO label name. If not present the node name is used. + +Example: + + tca6416@20 { + compatible = "ti,tca6416"; + reg = <0x20>; + #gpio-cells = <2>; + gpio-controller; + + env_reset { + gpio-hog; + input; + gpios = <6 GPIO_ACTIVE_LOW>; + }; + boot_rescue { + gpio-hog; + input; + gpios = <7 GPIO_ACTIVE_LOW>; + }; + }; + +For the above Example you can than access the gpio in your boardcode +with: + + desc = gpio_hog_lookup_name("boot_rescue.gpio-hog"); + if (desc) { + if (dm_gpio_get_value(desc)) + printf("\nBooting into Rescue System\n"); + else + printf("\nBoot normal\n"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index e36a8abc42..fa1c99700f 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -14,6 +14,16 @@ config DM_GPIO particular GPIOs that they provide. The uclass interface is defined in include/asm-generic/gpio.h. +config DM_GPIO_HOG + bool "Enable GPIO hog support" + depends on DM_GPIO + default n + help + Enable gpio hog support + The GPIO chip may contain GPIO hog definitions. GPIO hogging + is a mechanism providing automatic GPIO request and config- + uration as part of the gpio-controller's driver probe function. + config ALTERA_PIO bool "Altera PIO driver" depends on DM_GPIO diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c index da5e9ba6e5..4ecff115f1 100644 --- a/drivers/gpio/gpio-uclass.c +++ b/drivers/gpio/gpio-uclass.c @@ -5,6 +5,7 @@ #include <common.h> #include <dm.h> +#include <dm/device-internal.h> #include <dt-bindings/gpio/gpio.h> #include <errno.h> #include <fdtdec.h> @@ -15,6 +16,18 @@ DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_DM_GPIO_HOG) +struct gpio_priv_one_hog { + struct list_head list; + char *name; + struct gpio_desc gpiod; +}; + +static struct list_head hogs; +static int list_init; +static int gpio_hogs_probed; +#endif + /** * gpio_to_device() - Convert global GPIO number to device, number * @@ -141,6 +154,147 @@ static int gpio_find_and_xlate(struct gpio_desc *desc, return gpio_xlate_offs_flags(desc->dev, desc, args); } +#if defined(CONFIG_DM_GPIO_HOG) +int gpio_hog_probe_all(void) +{ + struct udevice *dev; + ofnode node; + int ret; + + /* + * We need to probe all gpio-hog devices + * at some point, as we cannot be sure, + * that all gpio devices, which contain a + * gpio-hog definition are probed. + * + */ + if (gpio_hogs_probed) + return 0; + + for (uclass_first_device(UCLASS_GPIO, &dev); + dev; + uclass_next_device(&dev)) { + dev_for_each_subnode(node, dev) { + if (ofnode_read_bool(node, "gpio-hog")) { + ret = device_probe(dev); + if (ret) + return ret; + break; + } + } + } + gpio_hogs_probed = 1; + + return 0; +} + +struct gpio_desc *gpio_hog_lookup_name(const char *name) +{ + struct list_head *entry; + struct gpio_priv_one_hog *cur; + + /* be sure, all gpio devices with gpio-hogs are probed */ + gpio_hog_probe_all(); + list_for_each(entry, &hogs) { + cur = list_entry(entry, struct gpio_priv_one_hog, list); + if (strcmp(cur->name, name) == 0) + return &cur->gpiod; + } + + return NULL; +} + +static int gpio_hog(struct udevice *dev) +{ + ofnode node; + int found = 0; + int ret; + struct gpio_dev_priv *uc_priv = NULL; + + if (!list_init) { + INIT_LIST_HEAD(&hogs); + list_init = 1; + } + dev_for_each_subnode(node, dev) { + if (ofnode_read_bool(node, "gpio-hog")) { + found = 1; + break; + } + } + + if (!found) + return 0; + + uc_priv = dev_get_uclass_priv(dev); + if (!uc_priv) { + printf("%s: missing private data.\n", __func__); + return 0; + } + + /* scan for gpio-hog subnodes */ + dev_for_each_subnode(node, dev) { + u32 val[2]; + int value = 0; + int gpiod_flags; + struct gpio_priv_one_hog *new; + const char *nodename; + + if (!ofnode_read_bool(node, "gpio-hog")) + continue; + + if (ofnode_read_bool(node, "input")) { + gpiod_flags = GPIOD_IS_IN; + } else if (ofnode_read_bool(node, "output-high")) { + value = 1; + gpiod_flags = GPIOD_IS_OUT; + } else if (ofnode_read_bool(node, "output-low")) { + gpiod_flags = GPIOD_IS_OUT; + } else { + printf("%s: missing gpio-hog state.\n", __func__); + return -EINVAL; + } + + ret = ofnode_read_u32_array(node, "gpios", val, 2); + if (ret) { + printf("%s: wrong gpios property, 2 values needed, ret: %d\n", __func__, ret); + return ret; + } + + new = calloc(1, sizeof(struct gpio_priv_one_hog)); + nodename = ofnode_read_string(node, "line-name"); + if (!nodename) + nodename = ofnode_get_name(node); + ret = gpio_dev_request_index(dev, nodename, "gpio-hog", + val[0], gpiod_flags, val[1], + &new->gpiod); + if (ret < 0) { + debug("%s: node %s could not get gpio.\n", __func__, + ofnode_get_name(node)); + free(new); + return ret; + } + + new->name = uc_priv->name[new->gpiod.offset]; + list_add_tail(&new->list, &hogs); + dm_gpio_set_dir(&new->gpiod); + if (gpiod_flags == GPIOD_IS_OUT) + dm_gpio_set_value(&new->gpiod, value); + } + + return 0; +} +#else +static int gpio_hog(struct udevice *dev) +{ + return 0; +} + +struct gpio_desc *gpio_hog_lookup_name(const char *name) +{ + return NULL; +} +#endif + int dm_gpio_request(struct gpio_desc *desc, const char *label) { struct udevice *dev = desc->dev; @@ -149,8 +303,9 @@ int dm_gpio_request(struct gpio_desc *desc, const char *label) int ret; uc_priv = dev_get_uclass_priv(dev); - if (uc_priv->name[desc->offset]) - return -EBUSY; + if (uc_priv) + if (uc_priv->name[desc->offset]) + return -EBUSY; str = strdup(label); if (!str) return -ENOMEM; @@ -640,22 +795,25 @@ int dm_gpio_get_values_as_int(const struct gpio_desc *desc_list, int count) return vector; } -static int gpio_request_tail(int ret, ofnode node, +static int gpio_request_tail(int ret, const char *nodename, struct ofnode_phandle_args *args, const char *list_name, int index, - struct gpio_desc *desc, int flags, bool add_index) + struct gpio_desc *desc, int flags, + bool add_index, struct udevice *dev) { - desc->dev = NULL; + desc->dev = dev; desc->offset = 0; desc->flags = 0; if (ret) goto err; - ret = uclass_get_device_by_ofnode(UCLASS_GPIO, args->node, - &desc->dev); - if (ret) { - debug("%s: uclass_get_device_by_ofnode failed\n", __func__); - goto err; + if (!desc->dev) { + ret = uclass_get_device_by_ofnode(UCLASS_GPIO, args->node, + &desc->dev); + if (ret) { + debug("%s: uclass_get_device_by_ofnode failed\n", __func__); + goto err; + } } ret = gpio_find_and_xlate(desc, args); if (ret) { @@ -663,8 +821,7 @@ static int gpio_request_tail(int ret, ofnode node, goto err; } ret = dm_gpio_requestf(desc, add_index ? "%s.%s%d" : "%s.%s", - ofnode_get_name(node), - list_name, index); + nodename, list_name, index); if (ret) { debug("%s: dm_gpio_requestf failed\n", __func__); goto err; @@ -678,7 +835,7 @@ static int gpio_request_tail(int ret, ofnode node, return 0; err: debug("%s: Node '%s', property '%s', failed to request GPIO index %d: %d\n", - __func__, ofnode_get_name(node), list_name, index, ret); + __func__, nodename, list_name, index, ret); return ret; } @@ -692,8 +849,8 @@ static int _gpio_request_by_name_nodev(ofnode node, const char *list_name, ret = ofnode_parse_phandle_with_args(node, list_name, "#gpio-cells", 0, index, &args); - return gpio_request_tail(ret, node, &args, list_name, index, desc, - flags, add_index); + return gpio_request_tail(ret, ofnode_get_name(node), &args, list_name, + index, desc, flags, add_index, NULL); } int gpio_request_by_name_nodev(ofnode node, const char *list_name, int index, @@ -707,13 +864,14 @@ int gpio_request_by_name(struct udevice *dev, const char *list_name, int index, struct gpio_desc *desc, int flags) { struct ofnode_phandle_args args; + ofnode node; int ret; ret = dev_read_phandle_with_args(dev, list_name, "#gpio-cells", 0, index, &args); - - return gpio_request_tail(ret, dev_ofnode(dev), &args, list_name, - index, desc, flags, index > 0); + node = dev_ofnode(dev); + return gpio_request_tail(ret, ofnode_get_name(node), &args, list_name, + index, desc, flags, index > 0, NULL); } int gpio_request_list_by_name_nodev(ofnode node, const char *list_name, @@ -832,12 +990,17 @@ int gpio_get_number(const struct gpio_desc *desc) static int gpio_post_probe(struct udevice *dev) { struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev); + int ret; uc_priv->name = calloc(uc_priv->gpio_count, sizeof(char *)); if (!uc_priv->name) return -ENOMEM; - return gpio_renumber(NULL); + ret = gpio_renumber(NULL); + if (ret) + return ret; + + return gpio_hog(dev); } static int gpio_pre_remove(struct udevice *dev) @@ -854,6 +1017,21 @@ static int gpio_pre_remove(struct udevice *dev) return gpio_renumber(dev); } +int gpio_dev_request_index(struct udevice *dev, const char *nodename, + char *list_name, int index, int flags, + int dtflags, struct gpio_desc *desc) +{ + struct ofnode_phandle_args args; + + args.node = ofnode_null(); + args.args_count = 2; + args.args[0] = index; + args.args[1] = dtflags; + + return gpio_request_tail(0, nodename, &args, list_name, index, desc, + flags, 0, dev); +} + static int gpio_post_bind(struct udevice *dev) { #if defined(CONFIG_NEEDS_MANUAL_RELOC) @@ -885,6 +1063,7 @@ static int gpio_post_bind(struct udevice *dev) reloc_done++; } #endif + return 0; } diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index d03602696f..37f71e5708 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h @@ -348,6 +348,22 @@ const char *gpio_get_bank_info(struct udevice *dev, int *offset_count); */ int dm_gpio_lookup_name(const char *name, struct gpio_desc *desc); +/** + * gpio_hog_lookup_name() - Look up a named GPIO and return the gpio descr. + * + * @name: Name to look up + * @return: Returns gpio_desc for gpio + */ +struct gpio_desc *gpio_hog_lookup_name(const char *name); + +/** + * gpio_hog_probe_all() - probe all gpio devices with + * gpio-hog subnodes. + * + * @return: Returns return value from device_probe() + */ +int gpio_hog_probe_all(void); + /** * gpio_lookup_name - Look up a GPIO name and return its details * @@ -503,6 +519,22 @@ int gpio_request_list_by_name_nodev(ofnode node, const char *list_name, struct gpio_desc *desc_list, int max_count, int flags); +/** + * gpio_dev_request_index() - request single GPIO from gpio device + * + * @dev: GPIO device + * @nodename: Name of node + * @list_name: Name of GPIO list (e.g. "board-id-gpios") + * @index: Index number of the GPIO in that list use request (0=first) + * @flags: GPIOD_* flags + * @dtflags: GPIO flags read from DT + * @desc: GPIO descriotor filled from this function + * @return: return value from gpio_request_tail() + */ +int gpio_dev_request_index(struct udevice *dev, const char *nodename, + char *list_name, int index, int flags, + int dtflags, struct gpio_desc *desc); + /** * dm_gpio_free() - Free a single GPIO * -- 2.21.0

2 2

[U-Boot] ZynqMP multiple cores loading kernel in EL1
by Kevin Peeters 04 Jun '19

04 Jun '19

Dear U-boot mailing list, We are currently trying to boot a linux kernel on a custom Zynq Ultrascale+ based board. Our goal is to run a 32-bit linux kernel on the 64-bit FPGA. In order to do this, we want to boot all (4) the CPU's in Exception Level 1 (EL1). We already found a flag called CONFIG_ARMV8_SWITCH_TO_EL1 in include/configs/xilinx_zynqmp.h (which is normally commented out). When we enable this flag, it successfully switches one CPU (the one running U-boot) to EL1, but it leaves the others untouched. Is there anything else we need to set so all of the CPU's will switch to EL1? Met vriendelijke groet / Kind regards, Kevin Peeters Designer [Prodrive B.V.]<http://www.prodrive-technologies.com/> Mobile +31 62 57 28 374 Phone +31 40 26 76 200 Address Science Park Eindhoven 5501 5692 EM SON, The Netherlands www.prodrive-technologies.com<http://www.prodrive-technologies.com> [cid:image002.png@01D51AF0.B18982B0] Disclaimer: The content of this e-mail is intended solely for the use of the Individual or entity to whom it is addressed. If you have received this communication in error, be aware that forwarding it, copying it, or in any way disclosing its content to any other person, is strictly prohibited. If you have received this communication in error, please notify the author by replying to this e-mail immediately.

1 0

[U-Boot] [PATCH v5 00/15] Add Support for eMMC in Am65x-evm
by Faiz Abbas 04 Jun '19

04 Jun '19

Add Support for eMMC in TI's AM65x-evm. The series starts by syncing the sdhci0 node from the kernel. Then it adds APIs and changes to the driver required for handling the driver's integrated phy. The current maximum supported speed is DDR52. Higher speeds and tuning support will be added in a subsequent series. Changes in v5: Patches were tested with Andreas's system firmware patches[1] but can now be independently merged cleanly on latest U-boot. Changes in v4: 1. Dropped the patch including regmap_read_poll_timeout() because that support was already added by someone else 2. Fixed a NULL pointer exception in patch 8. 3. Rebased on top of latest master 4. Added extra patches to support GPT partitions in user partition 5. Added Support for environment in eMMC by default Changes in v3: Patch 9: Got rid of variable ret Changes in v2: Patch 9: Fixed return value Patch 12: Fixed spacing [1] https://www.mail-archive.com/u-boot@lists.denx.de/msg325811.html Faiz Abbas (15): arm64: dts: k3: Sync sdhci0 node from kernel and change driver name mmc: am654_sdhci: Remove quirks regmap: Add API regmap_init_mem_index() mmc: sdhci: Add support for sdhci-caps-mask mmc: sdhci: Make sdhci_set_clock() non static arm: dts: k3: Add phy specific properties to SD card node mmc: sdhci: Make set_ios_post() return int mmc: am654_sdhci: Add Support for PHY configs: am65x_evm: Enable CONFIG_REGMAP mmc: am654_sdhci: Use f_max in mmc_config mmc: sdhci: Add support for HOST_CONTROL2 and setting UHS timings mmc: am654_sdhci: Add a platform specific set_control_reg() callback configs: am65x: Add configs to support environment in eMMC am65x_evm: Add Support for creating a filesystem GPT partition in eMMC configs: am65x_evm_a53: Add Support for creating GPT partitions arch/arm/dts/k3-am65-main.dtsi | 22 ++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 30 +- arch/arm/dts/k3-am654-base-board.dts | 28 ++ arch/arm/dts/k3-am654-r5-base-board.dts | 32 ++ configs/am65x_evm_a53_defconfig | 11 +- configs/am65x_evm_r5_defconfig | 4 +- drivers/core/regmap.c | 42 +++ drivers/mmc/Kconfig | 9 +- drivers/mmc/Makefile | 2 +- drivers/mmc/am654_sdhci.c | 339 +++++++++++++++++++ drivers/mmc/k3_arsan_sdhci.c | 109 ------ drivers/mmc/sdhci.c | 47 ++- drivers/mmc/xenon_sdhci.c | 4 +- drivers/mmc/zynq_sdhci.c | 31 +- include/configs/am65x_evm.h | 19 +- include/regmap.h | 2 + include/sdhci.h | 22 +- 17 files changed, 568 insertions(+), 185 deletions(-) create mode 100644 drivers/mmc/am654_sdhci.c delete mode 100644 drivers/mmc/k3_arsan_sdhci.c -- 2.19.2

2 17

[U-Boot] Pull request for UEFI sub-system for v2019.07-rc4
by Heinrich Schuchardt 04 Jun '19

04 Jun '19

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-efi.git tags/efi-2019-07-rc4 for you to fetch changes up to 7950e8e2ebcd0f733ae2b00dbefefe1b742514bc: efi_selftest: unit test for OpenProtocolInformation() (2019-06-01 22:40:24 +0200) ---------------------------------------------------------------- Pull request for UEFI sub-system for v2019.07-rc4 Corrections for boottime services for protocols and for the SetTime() service are provided. Error messages for the 'setenv -e' and 'bootefi bootmgr' commands are added. Travis CI shows no errors: https://travis-ci.org/xypron2/u-boot/builds/540203844 Primary key fingerprint: 6DC4 F9C7 1F29 A6FA 06B7 6D33 C481 DBBC 2C05 1AC4 This is the overall status of the UEFE SCT tests for boot services: Service\Protocol Name Total Failed Passed ------------------------------------------------------ EventTimerandPriorityServicesTest 34 8 26 MemoryAllocationServicesTest 102 0 102 ProtocolHandlerServicesTest 1214 21 1193 ImageServicesTest 123 16 107 MiscBootServicesTest 132 9 123 ------------------------------------------------------ Total 1605 54 1551 For details see: https://raw.githubusercontent.com/U-Boot-EFI/u-boot-sct-results/master/boot… I have created this bug report for the UEFI SCT: https://bugzilla.tianocore.org/show_bug.cgi?id=1869 ---------------------------------------------------------------- AKASHI Takahiro (2): cmd: env: print a message when setting UEFI variable failed efi_loader: bootmgr: print a message when loading from BootNext failed Heinrich Schuchardt (15): efi_loader: correct notification of protocol installation efi_loader: factor out efi_check_register_notify_event() efi_loader: registration key in LocateProtocol() efi_loader: correct OpenProtocol() efi_loader: avoid crash in OpenProtocol() efi_loader: correct UninstallProtocolInterface() rtc: export rtc_month_days() efi_loader: check time in SetTime() efi_loader: export efi_set_time() efi_loader: handling of daylight saving time efi_loader: Kconfig entries for GetTime(), SetTime() efi_loader: correct HandleProtocol() efi_loader: open protocol information efi_loader: CloseProtocol() fix open protocol information efi_selftest: unit test for OpenProtocolInformation() cmd/nvedit_efi.c | 10 +- drivers/rtc/rtc-lib.c | 2 +- include/efi_loader.h | 28 +++- include/rtc.h | 8 + lib/efi_loader/Kconfig | 16 ++ lib/efi_loader/efi_bootmgr.c | 6 +- lib/efi_loader/efi_boottime.c | 188 ++++++++++++++++------ lib/efi_loader/efi_runtime.c | 39 ++++- lib/efi_selftest/Makefile | 3 +- lib/efi_selftest/efi_selftest_open_protocol.c | 205 ++++++++++++++++++++++++ lib/efi_selftest/efi_selftest_register_notify.c | 21 ++- lib/efi_selftest/efi_selftest_rtc.c | 17 +- 12 files changed, 459 insertions(+), 84 deletions(-) create mode 100644 lib/efi_selftest/efi_selftest_open_protocol.c

2 1

[U-Boot] [PATCH 1/1] efi_loader: avoid lost network packages
by Heinrich Schuchardt 04 Jun '19

04 Jun '19

Prior to the patch booting an OrangePi PC via iPXE failed due to poor network connection. After receiving a packet immediately check if another packet is available. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_net.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index d71c663068..3a598067db 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -517,6 +517,7 @@ static efi_status_t EFIAPI efi_net_receive memcpy(buffer, net_rx_packet, net_rx_packet_len); *buffer_size = net_rx_packet_len; new_rx_packet = false; + efi_timer_check(); out: return EFI_EXIT(ret); } -- 2.20.1

1 0

[U-Boot] [PATCH] Revert "drivers/crypto/fsl: assign job-rings to non-TrustZone"
by Breno Matheus Lima 04 Jun '19

04 Jun '19

Commit 22191ac35344 ("drivers/crypto/fsl: assign job-rings to non-TrustZone") breaks HABv4 encrypted boot support in the following i.MX devices: - i.MX6UL - i.MX7S - i.MX7D - i.MX7ULP For preparing a HABv4 encrypted boot image it's necessary to encapsulate the generated DEK in a blob. In devices listed above the blob generation function takes into consideration the Job Ring TrustZone ownership configuration (JROWN_NS) and can be only decapsulated by the same configuration. The ROM code expects DEK blobs encapsulated by the Secure World environments which commonly have JROWN_NS = 0. As U-Boot is running in Secure World we must have JROWN_NS = 0 so the blobs generated by dek_blob tool can be decapsulated by the ROM code. Job-rings assignment is now handled in OP-TEE OS, this commit can be safely reverted. https://github.com/OP-TEE/optee_os/pull/2986 This reverts commit 22191ac353445ad8fafc5a78aefcd94e78963041. Signed-off-by: Breno Lima <breno.lima(a)nxp.com> --- drivers/crypto/fsl/jr.c | 9 --------- drivers/crypto/fsl/jr.h | 2 -- 2 files changed, 11 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index cc8d3b02a5..3121762364 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -578,8 +578,6 @@ int sec_init_idx(uint8_t sec_idx) { ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); uint32_t mcr = sec_in32(&sec->mcfgr); - uint32_t jrown_ns; - int i; int ret = 0; #ifdef CONFIG_FSL_CORENET @@ -635,13 +633,6 @@ int sec_init_idx(uint8_t sec_idx) #endif #endif - /* Set ownership of job rings to non-TrustZone mode by default */ - for (i = 0; i < ARRAY_SIZE(sec->jrliodnr); i++) { - jrown_ns = sec_in32(&sec->jrliodnr[i].ms); - jrown_ns |= JROWN_NS | JRMID_NS; - sec_out32(&sec->jrliodnr[i].ms, jrown_ns); - } - ret = jr_init(sec_idx); if (ret < 0) { printf("SEC initialization failed\n"); diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index f6fbb44383..ffd3a19273 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -33,8 +33,6 @@ #define JRNSLIODN_MASK 0x0fff0000 #define JRSLIODN_SHIFT 0 #define JRSLIODN_MASK 0x00000fff -#define JROWN_NS 0x00000008 -#define JRMID_NS 0x00000001 #define JQ_DEQ_ERR -1 #define JQ_DEQ_TO_ERR -2 -- 2.17.1

3 2

[U-Boot] [PATCH 1/3] armv8: ls2088aqds: Add bootcmd for TFA boot
by Wasim Khan 04 Jun '19

04 Jun '19

Add bootcmd for IFC NOR boot and SD boot. Signed-off-by: Wasim Khan <wasim.khan(a)nxp.com> --- include/configs/ls2080aqds.h | 45 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 74c7dc4..85f12d4 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2017 NXP + * Copyright 2018-2019 NXP * Copyright 2015 Freescale Semiconductor */ @@ -378,8 +378,8 @@ unsigned long get_board_ddr_clk(void); "hwconfig=fsl_ddr:bank_intlv=auto\0" \ "loadaddr=0x80100000\0" \ "loadaddr_sd=0x90100000\0" \ - "kernel_addr=0x100000\0" \ - "kernel_addr_sd=0x800\0" \ + "kernel_addr=0x581000000\0" \ + "kernel_addr_sd=0x8000\0" \ "ramdisk_addr=0x800000\0" \ "ramdisk_size=0x2000000\0" \ "fdt_high=0xa0000000\0" \ @@ -389,9 +389,23 @@ unsigned long get_board_ddr_clk(void); "kernel_load=0xa0000000\0" \ "kernel_size=0x2800000\0" \ "kernel_size_sd=0x14000\0" \ - "mcinitcmd=fsl_mc start mc 0x580a00000" \ - " 0x580e00000 \0" \ - "mcmemsize=0x70000000 \0" + "load_addr=0xa0000000\0" \ + "kernelheader_addr=0x580800000\0" \ + "kernelheader_addr_r=0x80200000\0" \ + "kernelheader_size=0x40000\0" \ + "BOARD=ls2088aqds\0" \ + "mcmemsize=0x70000000 \0" \ + IFC_MC_INIT_CMD \ + "nor_bootcmd=echo Trying load from nor..;" \ + "cp.b $kernel_addr $load_addr " \ + "$kernel_size ; env exists secureboot && " \ + "cp.b $kernelheader_addr $kernelheader_addr_r " \ + "$kernelheader_size && esbc_validate ${kernelheader_addr_r}; "\ + "bootm $load_addr#$BOARD\0" \ + "sd_bootcmd=echo Trying load from SD ..;" \ + "mmcinfo; mmc read $load_addr " \ + "$kernel_addr_sd $kernel_size_sd && " \ + "bootm $load_addr#$BOARD\0" #elif defined(CONFIG_SD_BOOT) #define CONFIG_EXTRA_ENV_SETTINGS \ "hwconfig=fsl_ddr:bank_intlv=auto\0" \ @@ -426,6 +440,25 @@ unsigned long get_board_ddr_clk(void); #endif /* CONFIG_TFABOOT */ #endif /* CONFIG_SECURE_BOOT */ +#ifdef CONFIG_TFABOOT +#define SD_BOOTCOMMAND \ + "env exists mcinitcmd && env exists secureboot "\ + "&& mmcinfo && mmc read $load_addr 0x3c00 0x800 " \ + "&& esbc_validate $load_addr; " \ + "env exists mcinitcmd && run mcinitcmd " \ + "&& mmc read 0x88000000 0x6800 0x800 " \ + "&& fsl_mc lazyapply dpl 0x88000000; " \ + "run sd_bootcmd; " \ + "env exists secureboot && esbc_halt;" + +#define IFC_NOR_BOOTCOMMAND \ + "env exists mcinitcmd && env exists secureboot "\ + "&& esbc_validate 0x580780000; env exists mcinitcmd "\ + "&& fsl_mc lazyapply dpl 0x580d00000;" \ + "run nor_bootcmd; " \ + "env exists secureboot && esbc_halt;" +#endif + #if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD) #define CONFIG_FSL_MEMAC #define CONFIG_PHYLIB_10G -- 2.7.4

1 2

[U-Boot] [PATCH] arm: mvebu: helios4: add MMC to SPL DT
by dgilmore＠redhat.com 04 Jun '19

04 Jun '19

From: Dennis Gilmore <dennis(a)ausil.us> This allows SPL to load the main U-Boot image from MMC once DM_MMC is enabled. Signed-off-by: Dennis Gilmore <dennis(a)ausil.us> --- arch/arm/dts/armada-388-helios4-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/armada-388-helios4-u-boot.dtsi b/arch/arm/dts/armada-388-helios4-u-boot.dtsi index 4b20610d83..f0da9f42de 100644 --- a/arch/arm/dts/armada-388-helios4-u-boot.dtsi +++ b/arch/arm/dts/armada-388-helios4-u-boot.dtsi @@ -20,3 +20,7 @@ status = "okay"; u-boot,dm-spl; }; + +&sdhci { + u-boot,dm-spl; +}; -- 2.21.0

2 2

[U-Boot] [PATCH 0/7] Add PCIe root complex support for AM654x SoC
by Sekhar Nori 04 Jun '19

04 Jun '19

Hi, This patch series adds PCIe root complex support for AM654x SoC. The device-tree files are based on bindings accepted in linux. See files Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt and Documentation/devicetree/bindings/pci/pci-keystone.txt in latest mainline master. I have not posted the actual board-specific device-tree bits yet. The reason is that PCIe slot is on a daughter card on the AM65x EVM. I want to see how we can support that as an overlay in U-Boot. That needs some more attention. Meanwhile I have tested this using a patch that simply enables PCIe in the baseboard device-tree file itself. Sekhar Nori (7): clk: add support for clk_is_match() dm: core: add support for getting register address and size pcie: ti: add driver for AM65x PCIe RC phy: add support for AM654x SERDES configs: am65x_evm_a53: enable PCIe support arm: dts: k3-am65: add support for PCIe and SERDES configs: am65x_evm_a53: enable support for PCIe ethernet cards arch/arm/dts/k3-am65-main.dtsi | 108 +++++ arch/arm/dts/k3-am65.dtsi | 1 + configs/am65x_evm_a53_defconfig | 9 + drivers/clk/clk-uclass.c | 13 + drivers/core/fdtaddr.c | 17 + drivers/core/read.c | 20 + drivers/pci/Kconfig | 6 + drivers/pci/Makefile | 1 + drivers/pci/pcie_dw_ti.c | 725 +++++++++++++++++++++++++++++ drivers/phy/Kconfig | 9 + drivers/phy/Makefile | 1 + drivers/phy/phy-ti-am654.c | 411 ++++++++++++++++ include/clk.h | 13 + include/dm/fdtaddr.h | 18 + include/dm/read.h | 41 ++ include/dt-bindings/phy/phy-am654-serdes.h | 13 + 16 files changed, 1406 insertions(+) create mode 100644 drivers/pci/pcie_dw_ti.c create mode 100644 drivers/phy/phy-ti-am654.c create mode 100644 include/dt-bindings/phy/phy-am654-serdes.h -- 2.16.2

2 10

Re: [U-Boot] [RFC PATCH 1/1] riscv: increase the environment size for the qemu-riscv platform to 128kB
by Rick Chen 04 Jun '19

04 Jun '19

> From: U-Boot [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Bin Meng > Sent: Wednesday, May 08, 2019 9:39 PM > To: Karsten Merker > Cc: U-Boot Mailing List > Subject: Re: [U-Boot] [RFC PATCH 1/1] riscv: increase the environment size for > the qemu-riscv platform to 128kB > > On Mon, May 6, 2019 at 5:49 AM Karsten Merker <merker(a)debian.org> wrote: > > > > The existing default size of 4kB is too small as the default > > environment has already nearly that size and defining a single > > additional environment variable can exceed the available space. > > > > Signed-off-by: Karsten Merker <merker(a)debian.org> > > --- > > include/configs/qemu-riscv.h | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> Applied to u-boot-riscv/master, thanks! > _______________________________________________ > U-Boot mailing list > U-Boot(a)lists.denx.de > https://lists.denx.de/listinfo/u-boot

1 0