July 2017 - U-Boot

[U-Boot] [PATCH v3 0/3] x86: Introduce Intel Tangier SoC and Edison board
by Andy Shevchenko 22 Jul '17

22 Jul '17

This brings support for Intel Tangier SoC and Intel Edison board which is using U-Boot as a main bootloader. The series has implicit dependency to watchdog driver, v3 of which [1] had been sent earlier. [1] https://lists.denx.de/pipermail/u-boot/2017-July/297224.html Since v2: - address misc comments (Bin) - add Bin's tag to patch 1 and 2 - USB OTG enumeration is left the same (Felipe) Since v1: - split patch 1 to two (Bin) - move enum to sfi.h (Bin) - remove unnecessary headers (Bin) - add comment to SFI system table search (Bin) - append and update copyright notices: sdram.c and tangier.c are almost done by Intel (Simon) - disable SD card slot (Simon) - add Simon's tag to patch 1 and 2 (changes are basically technical) - add Edison support Andy Shevchenko (2): x86: Add dma-mapping.h to architectural code x86: Add Intel Edison board files Felipe Balbi (1): x86: Add Intel Tangier support arch/x86/Kconfig | 1 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/tangier/Kconfig | 24 +++++ arch/x86/cpu/tangier/Makefile | 7 ++ arch/x86/cpu/tangier/car.S | 13 +++ arch/x86/cpu/tangier/sdram.c | 206 +++++++++++++++++++++++++++++++++++++ arch/x86/cpu/tangier/tangier.c | 34 ++++++ arch/x86/dts/Makefile | 1 + arch/x86/dts/edison.dts | 89 ++++++++++++++++ arch/x86/include/asm/dma-mapping.h | 41 ++++++++ arch/x86/include/asm/sfi.h | 19 ++++ board/intel/Kconfig | 8 ++ board/intel/edison/Kconfig | 26 +++++ board/intel/edison/Makefile | 7 ++ board/intel/edison/config.mk | 18 ++++ board/intel/edison/edison.c | 104 +++++++++++++++++++ board/intel/edison/start.S | 13 +++ configs/edison_defconfig | 53 ++++++++++ doc/README.x86 | 39 +++++++ include/configs/edison.h | 61 +++++++++++ 20 files changed, 765 insertions(+) create mode 100644 arch/x86/cpu/tangier/Kconfig create mode 100644 arch/x86/cpu/tangier/Makefile create mode 100644 arch/x86/cpu/tangier/car.S create mode 100644 arch/x86/cpu/tangier/sdram.c create mode 100644 arch/x86/cpu/tangier/tangier.c create mode 100644 arch/x86/dts/edison.dts create mode 100644 arch/x86/include/asm/dma-mapping.h create mode 100644 board/intel/edison/Kconfig create mode 100644 board/intel/edison/Makefile create mode 100644 board/intel/edison/config.mk create mode 100644 board/intel/edison/edison.c create mode 100644 board/intel/edison/start.S create mode 100644 configs/edison_defconfig create mode 100644 include/configs/edison.h -- 2.11.0

3 7

[U-Boot] [PATCH v2 0/3] x86: Introduce Intel Tangier SoC and Edison board
by Andy Shevchenko 22 Jul '17

22 Jul '17

This brings support for Intel Tangier SoC and Intel Edison board which is using U-Boot as a main bootloader. The series has implicit dependency to watchdog driver (V3 of which had been sent earlier today). Since v1: - split patch 1 to 2 (Bin) - move enum to sfi.h (Bin) - remove unnecessary headers (Bin) - add comment to SFI system table search (Bin) - append and update copyright notices: sdram.c and tangier.c are almost done by Intel (Simon) - disable SD card slot (Simon) - add Simon's tag to patch 1 and 2 (changes basically technical) - add Edison support Andy Shevchenko (2): x86: Add dma-mapping.h to architectural code x86: Add Intel Edison board files Felipe Balbi (1): x86: Add Intel Tangier support arch/x86/Kconfig | 1 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/tangier/Kconfig | 24 +++++ arch/x86/cpu/tangier/Makefile | 7 ++ arch/x86/cpu/tangier/car.S | 13 +++ arch/x86/cpu/tangier/sdram.c | 206 +++++++++++++++++++++++++++++++++++++ arch/x86/cpu/tangier/tangier.c | 34 ++++++ arch/x86/dts/Makefile | 1 + arch/x86/dts/edison.dts | 89 ++++++++++++++++ arch/x86/include/asm/dma-mapping.h | 41 ++++++++ arch/x86/include/asm/sfi.h | 19 ++++ board/intel/Kconfig | 8 ++ board/intel/edison/Kconfig | 26 +++++ board/intel/edison/Makefile | 1 + board/intel/edison/config.mk | 18 ++++ board/intel/edison/edison.c | 104 +++++++++++++++++++ board/intel/edison/edison_start.S | 13 +++ configs/edison_defconfig | 53 ++++++++++ doc/README.x86 | 39 +++++++ include/configs/edison.h | 78 ++++++++++++++ 20 files changed, 776 insertions(+) create mode 100644 arch/x86/cpu/tangier/Kconfig create mode 100644 arch/x86/cpu/tangier/Makefile create mode 100644 arch/x86/cpu/tangier/car.S create mode 100644 arch/x86/cpu/tangier/sdram.c create mode 100644 arch/x86/cpu/tangier/tangier.c create mode 100644 arch/x86/dts/edison.dts create mode 100644 arch/x86/include/asm/dma-mapping.h create mode 100644 board/intel/edison/Kconfig create mode 100644 board/intel/edison/Makefile create mode 100644 board/intel/edison/config.mk create mode 100644 board/intel/edison/edison.c create mode 100644 board/intel/edison/edison_start.S create mode 100644 configs/edison_defconfig create mode 100644 include/configs/edison.h -- 2.11.0

4 13

[U-Boot] [PATCH v3] watchdog: Introduce watchdog driver for Intel Tangier
by Andy Shevchenko 22 Jul '17

22 Jul '17

From: Felipe Balbi <felipe.balbi(a)linux.intel.com> Add watchdog driver for Intel Tangier based platforms. Signed-off-by: Vincent Tinelli <vincent.tinelli(a)intel.com> Signed-off-by: Felipe Balbi <felipe.balbi(a)linux.intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- In v3: - protect against overflow in hw_watchdog_reset() drivers/watchdog/Kconfig | 11 ++++++- drivers/watchdog/Makefile | 1 + drivers/watchdog/tangier_wdt.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 drivers/watchdog/tangier_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b911233db3..6cbc450b3c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -19,7 +19,16 @@ config OMAP_WATCHDOG default y if AM33XX help Say Y here to enable the OMAP3+ watchdog driver. - + +config TANGIER_WATCHDOG + bool "Intel Tangier watchdog" + depends on INTEL_MID + select HW_WATCHDOG + help + This enables support for watchdog controller available on + Intel Tangier SoC. If you're using a board with Intel Tangier + SoC, say Y here. + config ULP_WATCHDOG bool "i.MX7ULP watchdog" help diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 4b19e4ccf6..8a3fa1da67 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_S5P) += s5p_wdt.o obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o +obj-$(CONFIG_TANGIER_WATCHDOG) += tangier_wdt.o obj-$(CONFIG_ULP_WATCHDOG) += ulp_wdog.o obj-$(CONFIG_WDT) += wdt-uclass.o obj-$(CONFIG_WDT_SANDBOX) += sandbox_wdt.o diff --git a/drivers/watchdog/tangier_wdt.c b/drivers/watchdog/tangier_wdt.c new file mode 100644 index 0000000000..9cf4bafa92 --- /dev/null +++ b/drivers/watchdog/tangier_wdt.c @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2017 Intel Corporation + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include <common.h> +#include <watchdog.h> +#include <asm/scu.h> + +/* Hardware timeout in seconds */ +#define WDT_PRETIMEOUT 15 +#define WDT_TIMEOUT_MIN (1 + WDT_PRETIMEOUT) +#define WDT_TIMEOUT_MAX 170 +#define WDT_DEFAULT_TIMEOUT 90 + +#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +#define WATCHDOG_HEARTBEAT 60000 +#else +#define WATCHDOG_HEARTBEAT CONFIG_WATCHDOG_TIMEOUT_MSECS +#endif + +enum { + SCU_WATCHDOG_START = 0, + SCU_WATCHDOG_STOP = 1, + SCU_WATCHDOG_KEEPALIVE = 2, + SCU_WATCHDOG_SET_ACTION_ON_TIMEOUT = 3, +}; + +void hw_watchdog_reset(void) +{ + static unsigned long last; + unsigned long now; + + if (gd->timer) + now = timer_get_us(); + else + now = rdtsc() / 1000; + + /* Do not flood SCU */ + if (last > now) + last = 0; + + if (unlikely((now - last) > (WDT_PRETIMEOUT / 2) * 1000000)) { + last = now; + scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_KEEPALIVE); + } +} + +int hw_watchdog_disable(void) +{ + return scu_ipc_simple_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_STOP); +} + +void hw_watchdog_init(void) +{ + u32 timeout = WATCHDOG_HEARTBEAT / 1000; + int in_size; + struct ipc_wd_start { + u32 pretimeout; + u32 timeout; + } ipc_wd_start = { timeout - WDT_PRETIMEOUT, timeout }; + + /* + * SCU expects the input size for watchdog IPC + * to be based on 4 bytes + */ + in_size = DIV_ROUND_UP(sizeof(ipc_wd_start), 4); + + scu_ipc_command(IPCMSG_WATCHDOG_TIMER, SCU_WATCHDOG_START, + (u32 *)&ipc_wd_start, in_size, NULL, 0); +} -- 2.11.0

2 4

[U-Boot] [PATCH v1] arch/x86: Select USB before selecting host driver
by Andy Shevchenko 22 Jul '17

22 Jul '17

Kbuild complains if USB is not selected before any of host driver. warning: (X86) selects USB_EHCI_HCD which has unmet direct dependencies (USB) warning: (X86) selects USB_EHCI_HCD which has unmet direct dependencies (USB) Select it for X86. Fixes: 64d6ac5bc4a9 ("Kconfig: USB: Migrate CONFIG_USB_EHCI_HCD users to Kconfig") Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/Kconfig b/arch/Kconfig index d04ab9f177..48a267d314 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -95,6 +95,7 @@ config X86 select DM_GPIO select DM_SPI select DM_SPI_FLASH + select USB select USB_EHCI_HCD imply CMD_FPGA_LOADMK imply CMD_GETTIME -- 2.11.0

4 7

[U-Boot] [PATCH] db410c: enable r8152 usb eth
by Rob Clark 21 Jul '17

21 Jul '17

Signed-off-by: Rob Clark <robdclark(a)gmail.com> --- I figured out why I was having no luck getting my usb ethernet dongle to work ;-) include/configs/dragonboard410c.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 8e742d82ce..47fcc5471b 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -44,6 +44,7 @@ #define CONFIG_USB_ETHER_ASIX88179 #define CONFIG_USB_ETHER_MCS7830 #define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_ETHER_RTL8152 /* Extra Commands */ /* Enable that for switching of boot partitions */ -- 2.13.0

1 0

[U-Boot] [PATCH] net: Mark the ip_udp_hdr struct as packed
by Maxime Ripard 21 Jul '17

21 Jul '17

The -mno-unaligned-access flag used on ARM to prevent GCC from generating unaligned accesses (obviously) will only do so on packed structures. It seems like gcc 7.1 is a bit stricter than previous gcc versions on this, and using it lead to data abort for unaligned accesses when generating network traffic. Fix this by adding the packed attribute to the ip_udp_hdr structure in order to let GCC do its job. Signed-off-by: Maxime Ripard <maxime.ripard(a)free-electrons.com> --- include/net.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net.h b/include/net.h index 997db9210a8f..7b815afffafa 100644 --- a/include/net.h +++ b/include/net.h @@ -390,7 +390,7 @@ struct ip_udp_hdr { u16 udp_dst; /* UDP destination port */ u16 udp_len; /* Length of UDP packet */ u16 udp_xsum; /* Checksum */ -}; +} __attribute__ ((packed)); #define IP_UDP_HDR_SIZE (sizeof(struct ip_udp_hdr)) #define UDP_HDR_SIZE (IP_UDP_HDR_SIZE - IP_HDR_SIZE) -- 2.13.0

4 5

[U-Boot] [PATCH 0/3] video patches
by Rob Clark 21 Jul '17

21 Jul '17

1/3 unchanged, 2/3 updated to use fdtdec_get_addr_size_auto_parent() to properly parse reg node based on #address-cells and #size-cells, and 3/3 updated to change kconfig name and slight cleanup. Rob Clark (3): dm: core: also parse chosen node video: simplefb video: add config option to skip framebuffer clear drivers/core/root.c | 22 +++++++++++++- drivers/video/Kconfig | 18 +++++++++++ drivers/video/Makefile | 2 +- drivers/video/cfb_console.c | 3 +- drivers/video/simplefb.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ drivers/video/video-uclass.c | 4 ++- 6 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 drivers/video/simplefb.c -- 2.13.0

1 3

[U-Boot] [PATCH 0/5] db410c: updates for grub + gfxterm
by Rob Clark 21 Jul '17

21 Jul '17

In particular, support for display setup by lk. This introduces a simplefb display driver that uses the framebuffer fdt node populated by the firmware[1] for u-boot display support (and, at least for what I am working on, more interestingly, EFI GOP support). In general, most snapdragon devices have a lk firmware which can light up the display. And mdp5 is a rather complex display controller block (not to mention different mdp4 block for older generations, and hdmi vs dsi blocks). So rather than duplicate all of that in u-boot, add a video driver similar to linux's simplefb, which simply takes over a display setup by an earlier boot stage. The simplefb video driver is so far only used on snapdragon, but the implementation is totally generic so probably useful on other devices in the future. A few related patches so that on db410c we actually use the fdt passed by lk (and so that dm/core is clever enough to notice fdt nodes under "chosen"), config updates, and related fixes. [1] https://github.com/robclark/lk/commits/db410c-display Rob Clark (5): board/db410c: use fdt passed from lk dm: core: also parse chosen node video: simplefb efi_loader: gop: fixes for CONFIG_DM_VIDEO without CONFIG_LCD configs: db410c: config updates arch/arm/Kconfig | 2 +- board/qualcomm/dragonboard410c/dragonboard410c.c | 16 ++++++ cmd/bootefi.c | 2 +- configs/dragonboard410c_defconfig | 7 +++ drivers/core/root.c | 22 +++++++- drivers/video/Kconfig | 10 ++++ drivers/video/Makefile | 2 +- drivers/video/simplefb.c | 68 ++++++++++++++++++++++++ lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_gop.c | 7 ++- 10 files changed, 132 insertions(+), 5 deletions(-) create mode 100644 drivers/video/simplefb.c -- 2.9.4

6 21

[U-Boot] [PATCH v3 1/1] efi_loader: implement ConvertDeviceNodeToText
by Heinrich Schuchardt 21 Jul '17

21 Jul '17

Move the logic for converting a node to text from efi_convert_device_path_to_text to convert_device_node_to_text. Provide a wrapper function convert_device_node_to_text_ext. As we use only shallow device paths so we can call directly call efi_device_node_to_text from efi_device_path_to_text. Add output for MAC addresses. Add output for not yet supported types/subtypes. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v4 Remove superfluous EFI_ENTRY. v3 This patch replaces the patch series starting at https://patchwork.ozlabs.org/patch/787983/ https://lists.denx.de/pipermail/u-boot/2017-July/298142.html --- lib/efi_loader/efi_device_path_to_text.c | 126 +++++++++++++++++++++++-------- 1 file changed, 96 insertions(+), 30 deletions(-) diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index a7a513047f..57e00bf777 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -6,62 +6,123 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <efi_loader.h> -#define MEDIA_DEVICE_PATH 4 -#define FILE_PATH_MEDIA_DEVICE_PATH 4 +#define MAC_OUTPUT_LEN 22 +#define UNKNOWN_OUTPUT_LEN 23 const efi_guid_t efi_guid_device_path_to_text_protocol = EFI_DEVICE_PATH_TO_TEXT_PROTOCOL_GUID; -uint16_t *efi_convert_device_node_to_text( +static uint16_t *efi_convert_device_node_to_text( struct efi_device_path_protocol *device_node, bool display_only, bool allow_shortcuts) { - EFI_ENTRY("%p, %d, %d", device_node, display_only, allow_shortcuts); - - EFI_EXIT(EFI_UNSUPPORTED); - return NULL; -} - -uint16_t *efi_convert_device_path_to_text( - struct efi_device_path_protocol *device_path, - bool display_only, - bool allow_shortcuts) -{ - EFI_ENTRY("%p, %d, %d", device_path, display_only, allow_shortcuts); - unsigned long buffer_size; efi_status_t r; uint16_t *buffer = NULL; + int i; + + switch (device_node->type) { + case DEVICE_PATH_TYPE_END: + return NULL; + case DEVICE_PATH_TYPE_MESSAGING_DEVICE: + switch (device_node->sub_type) { + case DEVICE_PATH_SUB_TYPE_MSG_MAC_ADDR: { + struct efi_device_path_mac_addr *dp = + (struct efi_device_path_mac_addr *)device_node; - switch (device_path->type) { - case MEDIA_DEVICE_PATH: - switch (device_path->sub_type) { - case FILE_PATH_MEDIA_DEVICE_PATH: - buffer_size = device_path->length - 4; + if (dp->if_type != 0 && dp->if_type != 1) + break; + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, + 2 * MAC_OUTPUT_LEN, + (void **)&buffer); + if (r != EFI_SUCCESS) + return NULL; + sprintf((char *)buffer, + "MAC(%02x%02x%02x%02x%02x%02x,0x%1x)", + dp->mac.addr[0], dp->mac.addr[1], + dp->mac.addr[2], dp->mac.addr[3], + dp->mac.addr[4], dp->mac.addr[5], + dp->if_type); + for (i = MAC_OUTPUT_LEN - 1; i >= 0; --i) + buffer[i] = ((uint8_t *)buffer)[i]; + break; + } + } + case DEVICE_PATH_TYPE_MEDIA_DEVICE: + switch (device_node->sub_type) { + case DEVICE_PATH_SUB_TYPE_FILE_PATH: + buffer_size = device_node->length - 4; r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, buffer_size, (void **) &buffer); - if (r == EFI_SUCCESS) - memcpy(buffer, device_path->data, buffer_size); + if (r != EFI_SUCCESS) + return NULL; + memcpy(buffer, device_node->data, buffer_size); break; } } - if (buffer) { - EFI_EXIT(EFI_SUCCESS); - } else { - debug("type %d, subtype %d\n", - device_path->type, device_path->sub_type); - EFI_EXIT(EFI_UNSUPPORTED); + /* + * For all node types that we do not yet support return + * 'UNKNOWN(type,subtype)'. + */ + if (!buffer) { + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, + 2 * UNKNOWN_OUTPUT_LEN, + (void **)&buffer); + if (r != EFI_SUCCESS) + return NULL; + sprintf((char *)buffer, + "UNKNOWN(%04x,%04x)", + device_node->type, + device_node->sub_type); + for (i = UNKNOWN_OUTPUT_LEN - 1; i >= 0; --i) + buffer[i] = ((uint8_t *)buffer)[i]; } return buffer; } +static uint16_t EFIAPI *efi_convert_device_node_to_text_ext( + struct efi_device_path_protocol *device_node, + bool display_only, + bool allow_shortcuts) +{ + uint16_t *buffer; + + EFI_ENTRY("%p, %d, %d", device_node, display_only, allow_shortcuts); + + buffer = efi_convert_device_node_to_text(device_node, display_only, + allow_shortcuts); + + EFI_EXIT(EFI_SUCCESS); + return buffer; +} + +static uint16_t EFIAPI *efi_convert_device_path_to_text( + struct efi_device_path_protocol *device_path, + bool display_only, + bool allow_shortcuts) +{ + uint16_t *buffer; + + EFI_ENTRY("%p, %d, %d", device_path, display_only, allow_shortcuts); + + /* + * Our device paths are all of depth one. So its is sufficient to + * to convert the first node. + */ + buffer = efi_convert_device_node_to_text(device_path, display_only, + allow_shortcuts); + + EFI_EXIT(EFI_SUCCESS); + return buffer; +} + const struct efi_device_path_to_text_protocol efi_device_path_to_text = { - .convert_device_node_to_text = efi_convert_device_node_to_text, + .convert_device_node_to_text = efi_convert_device_node_to_text_ext, .convert_device_path_to_text = efi_convert_device_path_to_text, }; -- 2.11.0

1 0

[U-Boot] [PATCH 1/1] efi_memory: return MapKey
by Heinrich Schuchardt 21 Jul '17

21 Jul '17

efi_get_memory_map should set a defined value for map_key. We later can introduce the test against this value in efi_exit_boot_services as required by the UEFI standard. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index c56653f497..f59e3ea327 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -431,6 +431,8 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, } } + *map_key = 0; + return EFI_SUCCESS; } -- 2.13.2

1 0