May 2019 - U-Boot

[U-Boot] Pull request: u-boot-imx u-boot-imx-20190426
by Stefano Babic 01 May '19

01 May '19

Hi Tom, next chunk of patches, another big chunk will follow. Please pull from u-boot-imx, thanks ! Travis: ------- https://travis-ci.org/sbabic/u-boot-imx/builds/524580462 The following changes since commit 3fbd2dce351ab5d40d3244f26bd713caa4f826e2: Merge branch '2019-04-22-master-imports' (2019-04-24 09:04:23 -0400) are available in the Git repository at: git://www.denx.de/git/u-boot-imx.git tags/u-boot-imx-20190426 for you to fetch changes up to 0d3912fcd41dc2a85891f78e8fc255a379323619: colibri_imx6: use UUID for rootfs (2019-04-25 19:21:40 +0200) ---------------------------------------------------------------- Porting to DM and i.MX8 ------------------------ - warp7 to DM - kp_imx53 to DM - Warnings in DT - MX8QM support - colibri-imx6ull to DM - imx7d-pico to DM - ocotp for MX8 ---------------------------------------------------------------- Adam Ford (3): ARM: imx6q_logic: Allow optional arguments to cmd line ARM: imx6q_logic: Allow storing environment in FAT on eMMC ARM: omap3_logic: Enable UUID Chris Packham (1): ARM: imx: Fix typo in select option for ZMX25 Filip Brozovic (1): dts: imx6ull: add USB aliases to support DM Gerard Salvatella (1): tdx-cfg-block: add support for new colibri iMX6ull skus Igor Opaniuk (1): colibri_imx6: use UUID for rootfs Joris Offouga (5): Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM pico-imx7d: defconfig: Add DT file hooks pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7 pico-imx7d: Convert DM MMC pico-imx7d: Increase u-boot size for dfu request Ludwig Zenz (2): ARM: imx6: update 1GB DDR3 calibration for DHCOM i.MX6qd PDK ARM: imx6: DHCOM i.MX6 PDK: use Kconfig for inclusion of DDR calibration Lukasz Majewski (14): ARM: Remove HSC|DDC ETH PHY reset code after switching to DM/DTS DTS: Add esdhc3 device tree description tuning for HSC|DDC boards ARM: Enable CONFIG_DM_MMC and CONFIG_DM_BLK on HSC and DDC boards ARM: defconfig: Move CONFIG_FSL_ESDHC to Kconfig ARM: Remove non DM/DTS esdhc3 code from HSC|DDC board related files ARM: kp_imx53: config: Do not use ${boardtype} to setup update wic file DTS: Provide USB host DTS description for i.MX53 devices DTS: Enable USB host support (including regulators) on HSC|DDC boards ARM: Remove EHCI specific code from HSC|DDC board file USB: DM: Convert i.MX5 ehci code to driver model ARM: defconfig: kp_imx53: Enable DM_USB support on HSC|DDC boards ARM: config: Remove not needed CONFIG_MXC_USB_PORT define Convert CONFIG_USB_EHCI_MX5 to Kconfig boot.src: Provide dsa_core.blacklist bootarg when booting via NFS Marcel Ziswiler (16): colibri_vf: fix ethernet by adding explicit phy node colibri_vf: fix tab vs. spaces colibri-imx6ull: fix ethernet phy power on colibri-imx6ull: configuration clean-up colibri-imx6ull: migrate pinctrl and regulators to dtb/dm colibri-imx6ull: migrate mmc to using driver model colibri-imx6ull: migrate usb to using driver model colibri-imx6ull: migrate fec to using driver model ARM: dts: colibri-imx6ull: fix uart-has-rtscts property misc: imx8: remove duplicates from scfw api arm: dts: imx8dx: add lpuart1, lpuart2, lpuart3 board: toradex: tdx-cfg-block: clean-up sku handling board: toradex: tdx-cfg-block: add new skus ARM: dts: i.MX6Q: fix avoid_unnecessary_addr_size warnings ARM: dts: colibri-imx6ull: add osc32k_32k_out pinctrl ARM: dts: colibri-imx6ull: update device tree Parthiban Nallathambi (1): imx: Add variscite DART-6UL Evaluation Kit Peng Fan (19): imx: sip: add call_imx_sip_ret2 imx8: fuse: add fuse driver imx8qxp: mek: Enable CMD_FUSE imx8: mek: move HUSH_PARSER to defconfig imx8qxp: mek: enable dm-spl for pm pinctrl: imx8: add i.MX8QM compatible dt-bindings: pinctrl: add i.MX8QM pads definition dt-bindings: clock: dt-bindings: pinctrl: add i.MX8QM clocks definition arm: dts: introduce dtsi for i.MX8QM imx8: add cpu support clk: imx8: split code into common and soc specific part clk: imx8: add i.MX8QM clk driver imx8: imx8-pins: add i.MX8QM misc: imx8: scu: add i.MX8QM support imx: support i.MX8QM MEK board imx: add lowlevel init for ARM64 imx: 8qxp_mek: fix fdt_file and console imx: i.MX8MQ: clear ocotp error bit ddr: imx8m: hide i.MX8M DDR options from device driver entry Philippe Schenker (1): board: imx6ull: Add disable PMIC_STBY_REQ Pierre-Jean Texier (3): warp7: Fix dfu_alt_info setting after DM conversion warp7: Switch to DM Serial warp7: Switch to DM USB Stefan Agner (3): tdx-cfg-block: simplify i.MX 6 module detection colibri-imx6ull: set module variant depending on config block apalis/colibri_imx6/imx6ull: make sure loadaddr does not collide Stefano Babic (1): imx8qxp_mek: drop warning due to unused variable Ye Li (2): mxc_ocotp: Update redundancy banks for mx7ulp B0 mxc_ocotp: Disable fuse sense for imx8mq B1 arch/arm/Kconfig | 1 + arch/arm/dts/Makefile | 10 +- arch/arm/dts/fsl-imx8dx.dtsi | 54 +++++++++ arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 112 +++++++++++++++++++ arch/arm/dts/fsl-imx8qm-mek.dts | 184 +++++++++++++++++++++++++++++++ arch/arm/dts/fsl-imx8qm.dtsi | 400 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 5 + arch/arm/dts/imx53-kp.dts | 59 +++++++++- arch/arm/dts/imx53.dtsi | 10 ++ arch/arm/dts/imx6q.dtsi | 5 + arch/arm/dts/imx6ull-colibri.dts | 170 ++++++++++++++++++---------- arch/arm/dts/imx6ull-dart-6ul.dts | 39 +++++++ arch/arm/dts/imx6ull-dart-6ul.dtsi | 261 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx6ull-pinfunc.h | 26 +++-- arch/arm/dts/imx6ull.dtsi | 2 + arch/arm/dts/imx7d-pico-hobbit.dts | 105 ++++++++++++++++++ arch/arm/dts/imx7d-pico-pi.dts | 93 ++++++++++++++++ arch/arm/dts/imx7d-pico.dtsi | 590 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/imx7s-warp.dts | 5 + arch/arm/dts/vf-colibri.dtsi | 13 +++ arch/arm/include/asm/arch-imx/cpu.h | 1 + arch/arm/include/asm/arch-imx8/imx8-pins.h | 2 + arch/arm/include/asm/arch-imx8/sci/sci.h | 4 - arch/arm/include/asm/mach-imx/sys_proto.h | 3 + arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/imx8/Kconfig | 11 ++ arch/arm/mach-imx/imx8/cpu.c | 3 + arch/arm/mach-imx/imx8m/soc.c | 7 ++ arch/arm/mach-imx/lowlevel.S | 22 ++++ arch/arm/mach-imx/mx2/Kconfig | 2 +- arch/arm/mach-imx/mx5/Kconfig | 4 + arch/arm/mach-imx/mx6/Kconfig | 12 ++ arch/arm/mach-imx/sip.c | 22 ++++ board/dhelectronics/dh_imx6/dh_imx6_spl.c | 56 +++++++--- board/freescale/imx8qm_mek/Kconfig | 14 +++ board/freescale/imx8qm_mek/MAINTAINERS | 6 + board/freescale/imx8qm_mek/Makefile | 8 ++ board/freescale/imx8qm_mek/README | 57 ++++++++++ board/freescale/imx8qm_mek/imx8qm_mek.c | 157 ++++++++++++++++++++++++++ board/freescale/imx8qm_mek/imximage.cfg | 19 ++++ board/freescale/imx8qm_mek/spl.c | 75 +++++++++++++ board/freescale/imx8qxp_mek/spl.c | 16 --- board/k+p/bootscripts/tpcboot.cmd | 7 ++ board/k+p/kp_imx53/kp_imx53.c | 70 ------------ board/technexion/pico-imx7d/pico-imx7d.c | 42 +------ board/technexion/pico-imx7d/spl.c | 38 +++++++ board/toradex/colibri-imx6ull/colibri-imx6ull.c | 225 +++++-------------------------------- board/toradex/colibri_vf/MAINTAINERS | 2 +- board/toradex/common/tdx-cfg-block.c | 89 +++++++++++---- board/toradex/common/tdx-cfg-block.h | 32 ++++-- board/variscite/dart_6ul/Kconfig | 12 ++ board/variscite/dart_6ul/MAINTAINERS | 8 ++ board/variscite/dart_6ul/Makefile | 4 + board/variscite/dart_6ul/README | 41 +++++++ board/variscite/dart_6ul/dart_6ul.c | 228 ++++++++++++++++++++++++++++++++++++++ board/variscite/dart_6ul/spl.c | 215 ++++++++++++++++++++++++++++++++++++ board/warp7/warp7.c | 6 - configs/colibri-imx6ull_defconfig | 18 +-- configs/colibri_imx6_defconfig | 1 + configs/imx6q_logic_defconfig | 4 +- configs/imx8qm_mek_defconfig | 75 +++++++++++++ configs/imx8qxp_mek_defconfig | 4 +- configs/kp_imx53_defconfig | 3 + configs/m53menlo_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/omap35_logic_defconfig | 1 + configs/omap35_logic_somlv_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_logic_somlv_defconfig | 1 + configs/pico-hobbit-imx7d_defconfig | 7 +- configs/pico-imx7d_defconfig | 7 +- configs/pico-pi-imx7d_defconfig | 7 +- configs/usbarmory_defconfig | 1 + configs/variscite_dart6ul_defconfig | 55 ++++++++++ configs/warp7_bl33_defconfig | 3 + configs/warp7_defconfig | 3 + drivers/clk/imx/Makefile | 5 + drivers/clk/imx/clk-imx8.c | 298 ++----------------------------------------------- drivers/clk/imx/clk-imx8.h | 19 ++++ drivers/clk/imx/clk-imx8qm.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/imx/clk-imx8qxp.c | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/ddr/imx/imx8m/Kconfig | 4 + drivers/misc/imx8/Makefile | 1 + drivers/misc/imx8/fuse.c | 86 +++++++++++++++ drivers/misc/imx8/scu.c | 16 ++- drivers/misc/mxc_ocotp.c | 23 ++-- drivers/pinctrl/nxp/pinctrl-imx8.c | 1 + drivers/usb/host/Kconfig | 7 ++ drivers/usb/host/ehci-mx5.c | 103 +++++++++++++++++ include/configs/apalis_imx6.h | 4 +- include/configs/colibri-imx6ull.h | 14 +-- include/configs/colibri_imx6.h | 62 +++++++---- include/configs/dart_6ul.h | 131 ++++++++++++++++++++++ include/configs/imx6_logic.h | 6 +- include/configs/imx8qm_mek.h | 176 +++++++++++++++++++++++++++++ include/configs/imx8qxp_mek.h | 5 +- include/configs/kp_imx53.h | 9 +- include/configs/m53menlo.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53cx9020.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/omap3_logic.h | 6 +- include/configs/pico-imx7d.h | 2 +- include/configs/usbarmory.h | 1 - include/configs/warp7.h | 4 +- include/dt-bindings/clock/imx8qm-clock.h | 846 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dt-bindings/pinctrl/pads-imx8qm.h | 961 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ scripts/config_whitelist.txt | 1 - 111 files changed, 6445 insertions(+), 831 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi create mode 100644 arch/arm/dts/fsl-imx8qm-mek.dts create mode 100644 arch/arm/dts/fsl-imx8qm.dtsi create mode 100644 arch/arm/dts/imx6ull-dart-6ul.dts create mode 100644 arch/arm/dts/imx6ull-dart-6ul.dtsi create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts create mode 100644 arch/arm/dts/imx7d-pico-pi.dts create mode 100644 arch/arm/dts/imx7d-pico.dtsi create mode 100644 arch/arm/mach-imx/lowlevel.S create mode 100644 board/freescale/imx8qm_mek/Kconfig create mode 100644 board/freescale/imx8qm_mek/MAINTAINERS create mode 100644 board/freescale/imx8qm_mek/Makefile create mode 100644 board/freescale/imx8qm_mek/README create mode 100644 board/freescale/imx8qm_mek/imx8qm_mek.c create mode 100644 board/freescale/imx8qm_mek/imximage.cfg create mode 100644 board/freescale/imx8qm_mek/spl.c create mode 100644 board/variscite/dart_6ul/Kconfig create mode 100644 board/variscite/dart_6ul/MAINTAINERS create mode 100644 board/variscite/dart_6ul/Makefile create mode 100644 board/variscite/dart_6ul/README create mode 100644 board/variscite/dart_6ul/dart_6ul.c create mode 100644 board/variscite/dart_6ul/spl.c create mode 100644 configs/imx8qm_mek_defconfig create mode 100644 configs/variscite_dart6ul_defconfig create mode 100644 drivers/clk/imx/clk-imx8.h create mode 100644 drivers/clk/imx/clk-imx8qm.c create mode 100644 drivers/clk/imx/clk-imx8qxp.c create mode 100644 drivers/misc/imx8/fuse.c create mode 100644 include/configs/dart_6ul.h create mode 100644 include/configs/imx8qm_mek.h create mode 100644 include/dt-bindings/clock/imx8qm-clock.h create mode 100644 include/dt-bindings/pinctrl/pads-imx8qm.h Regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [PATCH v2 0/4] Add watchdog support for STM32MP1
by Patrice Chotard 01 May '19

01 May '19

This series: - sorts Kconfig entries in alphabetical order - enable watchdog support in SPL for STM32MP1 - adds watchdog support to STM32MP1 boards Changes in v2: - Rename timeout variable in timeout_ms in stm32mp_wdt_start() Patrice Chotard (4): watchdog: Kconfig: Sort entry alphabetically ARM: dts: stm32mp: Add iwdg2 support for stm32mp157c watchdog: stm32mp: Add watchdog driver configs: stm32mp15: Enable WDT flags MAINTAINERS | 1 + arch/arm/dts/stm32mp157-u-boot.dtsi | 4 ++ arch/arm/mach-stm32mp/Kconfig | 1 + configs/stm32mp15_basic_defconfig | 2 + configs/stm32mp15_trusted_defconfig | 2 + drivers/watchdog/Kconfig | 91 +++++++++++++----------- drivers/watchdog/Makefile | 1 + drivers/watchdog/stm32mp_wdt.c | 135 ++++++++++++++++++++++++++++++++++++ 8 files changed, 196 insertions(+), 41 deletions(-) create mode 100644 drivers/watchdog/stm32mp_wdt.c -- 1.9.1

2 5

[U-Boot] [PATCH v2 1/1] efi_loader: description of efi_add_handle()
by Heinrich Schuchardt 01 May '19

01 May '19

Correct the comments describing function efi_add_handle(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 title should start with efi_loader --- lib/efi_loader/efi_boottime.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 601b0a2cb8..cbf912f72b 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -423,10 +423,12 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) } /** - * efi_add_handle() - add a new object to the object list - * @obj: object to be added + * efi_add_handle() - add a new handle to the object list * - * The protocols list is initialized. The object handle is set. + * @handle: handle to be added + * + * The protocols list is initialized. The handle is added to the list of known + * UEFI objects. */ void efi_add_handle(efi_handle_t handle) { -- 2.20.1

1 0

[U-Boot] [PATCH 1/1] efi_add_handle() - description of efi_add_handle()
by Heinrich Schuchardt 01 May '19

01 May '19

Correct the comments describing function efi_add_handle(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_boottime.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 601b0a2cb8..cbf912f72b 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -423,10 +423,12 @@ static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) } /** - * efi_add_handle() - add a new object to the object list - * @obj: object to be added + * efi_add_handle() - add a new handle to the object list * - * The protocols list is initialized. The object handle is set. + * @handle: handle to be added + * + * The protocols list is initialized. The handle is added to the list of known + * UEFI objects. */ void efi_add_handle(efi_handle_t handle) { -- 2.20.1

1 0

[U-Boot] cyclone5 reboot: warm or cold reset?
by Simon Goldschmidt 01 May '19

01 May '19

Hi all, I added some of those I think worth discussing this. I was chasing a reboot problem on one of our cyclone5 boards today. That board boots from a "n25q256a" qspi flash. Up to now, U-Boot configures the boot ROM to just jump to OCRAM when rebooting and hope that the SPL is still there and fully working (nothing's overwritten). For a long running production board, this is of course crap, as a pointer running wild could always overwrite the SRAM. But there was not much we could do about it as long as U-Boot and/or Linux were putting out 32 Mbyte chip into 4-byte mode: it's not accessible by the Boot ROM unless in 3-byte mode. And while Linux "reboot" could reset the chip into 3-byte mode, "reboot -f" and U-Boot "reset" can't. Now with U-Boot and Linux having everything in place to leave the spi-nor in 3-byte mode (as required for the Boot ROM) using 4-byte opcodes, I thought rebooting from Linux would now work with loading the SPL from qspi (by disabling the magic that tells the Boot ROM to jump to OCRAM). However, I found the Boot ROM still cannot load the SPL because it tries to load at 100 MHz (while on cold boot, it loads with 6.25 MHz). However, when triggering cold reset instead of warm reset in rstmgr ctrl register [1], it works fine (and qspi clock is 6.25 MHz). Now the question is: why do we trigger warm reset instead of cold reset? Isn't cold reset more stable, e.g. when rebooting watchdog-like? Linux also uses warm reset by default, but I'm tempted to send a patch for both U-Boot and Linux to use cold reset by default. Any insight on the consequences of using cold reset instead of warm reset would be really appreciated! Regards, Simon [1] https://www.intel.com/content/www/us/en/programmable/hps/cyclone-v/hps.html…

4 7

[U-Boot] [PATCH 1/2] smbios: add parsing API
by Christian Gmeiner 01 May '19

01 May '19

Add an very simple API to be able to access SMBIOS strings like vendor, model and bios version. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- include/smbios.h | 37 ++++++++++ lib/Kconfig | 6 ++ lib/Makefile | 1 + lib/smbios-parser.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 206 insertions(+) create mode 100644 lib/smbios-parser.c diff --git a/include/smbios.h b/include/smbios.h index 97b9ddce23..ad44e54245 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -237,4 +237,41 @@ typedef int (*smbios_write_type)(ulong *addr, int handle); */ ulong write_smbios_table(ulong addr); + +struct smbios_parser; + +/** + * smbios_parser_create() - Create smbios parser + * + * @addr: start address to search for SMBIOS structure + * @len: size of search area + * @return: NULL or valid pointer to a struct smbios_parser + */ +struct smbios_parser *smbios_parser_create(unsigned int addr, unsigned int len); + +/** + * smbios_parser_destroy() - Destroy smbios parser + * + * @p: pointer to a struct smbios_parser + */ +void smbios_parser_destroy(struct smbios_parser *p); + +/** + * smbios_header() - Search for SMBIOS header type + * + * @p: pointer to a struct smbios_parser + * @type: SMBIOS type + * @return: NULL or a valid pointer to a struct smbios_header + */ +struct smbios_header *smbios_header(const struct smbios_parser *p, int type); + +/** + * smbios_string() - Return string from SMBIOS + * + * @header: pointer to struct smbios_header + * @index: string index + * @return: NULL or a valid const char pointer + */ +const char *smbios_string(const struct smbios_header *header, int index); + #endif /* _SMBIOS_H_ */ diff --git a/lib/Kconfig b/lib/Kconfig index 2120216593..59aafc63a7 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -432,6 +432,12 @@ config SMBIOS_PRODUCT_NAME endmenu +config SMBIOS_PARSER + bool "SMBIOS parser" + default n + help + A simple parser for SMBIOS data. + source lib/efi/Kconfig source lib/efi_loader/Kconfig source lib/optee/Kconfig diff --git a/lib/Makefile b/lib/Makefile index 47829bfed5..f095bd420a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -34,6 +34,7 @@ obj-$(CONFIG_FIT) += fdtdec_common.o obj-$(CONFIG_TEST_FDTDEC) += fdtdec_test.o obj-$(CONFIG_GZIP_COMPRESSED) += gzip.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += smbios.o +obj-$(CONFIG_SMBIOS_PARSER) += smbios-parser.o obj-$(CONFIG_IMAGE_SPARSE) += image-sparse.o obj-y += ldiv.o obj-$(CONFIG_MD5) += md5.o diff --git a/lib/smbios-parser.c b/lib/smbios-parser.c new file mode 100644 index 0000000000..b24fd7210c --- /dev/null +++ b/lib/smbios-parser.c @@ -0,0 +1,162 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019, Bachmann electronic GmbH + */ + +#include <common.h> +#include <malloc.h> +#include <mapmem.h> +#include <smbios.h> + +struct smbios_parser { + void *search_area; + unsigned int search_area_len; + struct smbios_entry *entry; + void *data; +}; + +static inline int verify_checksum(const struct smbios_entry *e) +{ + /* + * Checksums for SMBIOS tables are calculated to have a value, so that + * the sum over all bytes yields zero (using unsigned 8 bit arithmetic). + */ + u8 *byte = (u8 *)e; + u8 sum = 0; + + for (int i = 0; i < e->length; i++) + sum += byte[i]; + + return sum; +} + +static struct smbios_entry *find_smbios_entry(const struct smbios_parser *p) +{ + static const char sm_sig[] = "_SM_"; + u8 *buf = (u8 *)p->search_area; + const u8 *end = (u8 *)p->search_area + p->search_area_len; + struct smbios_entry *entry = NULL; + + /* look for smbios entry */ + while (buf < end) { + if (memcmp(sm_sig, buf, 4) == 0) { + entry = (struct smbios_entry *)buf; + + if (verify_checksum(entry)) { + entry = NULL; + buf++; + continue; + } + + break; + } + + buf++; + } + + return entry; +} + +void smbios_parser_destroy(struct smbios_parser *p) +{ + if (!p) + return; + + unmap_sysmem(p->data); + unmap_sysmem(p->search_area); + + free(p); +} + +struct smbios_parser *smbios_parser_create(unsigned int addr, unsigned int len) +{ + struct smbios_parser *p = malloc(sizeof(struct smbios_parser)); + + if (!p) + return NULL; + + p->search_area_len = len; + p->search_area = map_sysmem(addr, len); + + if (!p->search_area) + goto fail; + + /* find main entry smbios table */ + p->entry = find_smbios_entry(p); + + if (!p->entry) + goto fail; + + /* map smbios data area */ + p->data = map_sysmem(p->entry->struct_table_address, + p->entry->struct_table_length); + + if (!p->data) + goto fail; + + return p; + +fail: + smbios_parser_destroy(p); + + return NULL; +} + +static struct smbios_header *next_header(const struct smbios_header *curr) +{ + u8 *pos = ((u8 *)curr) + curr->length; + + /* search for _double_ NULL bytes */ + while (!((*pos == 0) && (*(pos + 1) == 0))) + pos++; + + /* step behind the double NULL bytes */ + pos += 2; + + return (struct smbios_header *)pos; +} + +struct smbios_header *smbios_header(const struct smbios_parser *p, int type) +{ + const struct smbios_entry *entry = p->entry; + const unsigned int num_header = entry->struct_count; + struct smbios_header *header = (struct smbios_header *)p->data; + + for (unsigned int i = 0; i < num_header; i++) { + if (header->type == type) + return header; + + header = next_header(header); + } + + return NULL; +} + +static const char *string_from_smbios_table(const struct smbios_header *header, + int idx) +{ + unsigned int i = 1; + u8 *pos; + + if (!header) + return NULL; + + pos = ((u8 *)header) + header->length; + + while (i < idx) { + if (*pos == 0x0) + i++; + + pos++; + } + + return (const char *)pos; +} + +const char *smbios_string(const struct smbios_header *header, int index) +{ + if (!header) + return NULL; + + return string_from_smbios_table(header, index); +} -- 2.20.1

3 9

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

01 May '19

Hi Tom, These patches passed the CI build here: https://travis-ci.org/jhershbe/u-boot/builds/501807294 The following changes since commit 2e8092d94f40a5692baf3ec768ce3216a7bf032a: Merge branch 'master' of git://git.denx.de/u-boot-sunxi (2019-03-11 15:48:57 -0400) are available in the git repository at: git://git.denx.de/u-boot-net.git master for you to fetch changes up to 85f05f72bacc2d047731fc648055551e4f6b34cf: net: phy: aquantia: Set only autoneg on in register 4.c441 (2019-03-12 13:13:37 -0500) ---------------------------------------------------------------- Andrejs Cainikovs (2): net: dm: fec: Support phy-reset-post-delay property dts: imx8qxp-mek: Add PHY post reset delay Carlo Caione (4): net: phy: realtek: Introduce quirk to mark RXC not stoppable net: phy: Add generic helpers to access MMD PHY registers net: phy: ti: use generic helpers to access MMD registers cmd: mdio: Switch to generic helpers when accessing the registers James Byrne (2): net: phy: micrel: Use correct skew values on KSZ9021 net: phy: micrel: Find Micrel PHY node correctly Meenakshi Aggarwal (1): mc : Reduce MC memory size to 128M Murali Karicheri (7): ARM: k2g-gp-evm: update to rgmii pinmux configuration ARM: k2g-ice: Add pinmux support for rgmii interface net: netcp: add support for phy with rgmii ids ARM: k2g: add a workaround to reset the phy ARM: dts: k2g-evm: remove unused phy-mode property from phy node k2g: config enable ti phy dp83867 for k2g ARM: dts: k2g-ice: add dt node for netcp Pankaj Bansal (1): drivers: net: ldpaa_eth: fix resource leak Siva Durga Prasad Paladugu (2): net: phy: Reloc next and prev pointers inside phy_drivers net: phy: Fix return value check phy_probe Valentin-catalin Neacsu (1): net: phy: aquantia: Set only autoneg on in register 4.c441 Vladimir Oltean (6): net: phy: ar803x: Address packet drops at low traffic rate due to SmartEEE feature net: phy: ar803x: Make RGMII Tx delays actually configurable for AR8035 net: phy: ar803x: Use common functions for RGMII internal delays net: phy: ar803x: Clarify the configuration of the CLK_25M output pin net: phy: ar803x: Explicitly disable RGMII delays net: phy: ar803x: Clarify the intention of ar8021_config arch/arm/dts/fsl-imx8qxp-mek.dts | 1 + arch/arm/dts/keystone-k2g-evm.dts | 1 - arch/arm/dts/keystone-k2g-ice.dts | 35 ++++++ arch/arm/dts/sama5d3xcm.dtsi | 32 ++--- arch/arm/dts/sama5d3xcm_cmp.dtsi | 32 ++--- arch/arm/dts/socfpga_arria5_socdk.dts | 4 +- arch/arm/dts/socfpga_cyclone5_is1.dts | 4 +- arch/arm/dts/socfpga_cyclone5_socdk.dts | 4 +- arch/arm/dts/socfpga_cyclone5_sockit.dts | 4 +- arch/arm/dts/socfpga_cyclone5_vining_fpga.dts | 4 +- arch/arm/mach-keystone/include/mach/hardware-k2g.h | 3 + arch/arm/mach-keystone/include/mach/mux-k2g.h | 5 + board/ti/ks2_evm/board_k2g.c | 15 +++ board/ti/ks2_evm/mux-k2g.h | 51 +++++--- cmd/mdio.c | 27 +++-- configs/k2g_evm_defconfig | 1 + doc/device-tree-bindings/net/micrel-ksz90x1.txt | 27 +++++ drivers/net/fec_mxc.c | 11 ++ drivers/net/fec_mxc.h | 1 + drivers/net/fsl-mc/mc.c | 22 +++- drivers/net/ldpaa_eth/ldpaa_eth.c | 1 + drivers/net/phy/Kconfig | 41 +++++++ drivers/net/phy/aquantia.c | 7 +- drivers/net/phy/atheros.c | 128 ++++++++++++++------ drivers/net/phy/micrel_ksz90x1.c | 24 +++- drivers/net/phy/phy.c | 21 +++- drivers/net/phy/realtek.c | 19 +++ drivers/net/phy/ti.c | 130 ++++----------------- drivers/net/ti/keystone_net.c | 22 +++- include/configs/ls1088a_common.h | 2 +- include/configs/ls2080a_common.h | 2 +- include/configs/lx2160a_common.h | 2 +- include/phy.h | 70 +++++++++++ 33 files changed, 526 insertions(+), 227 deletions(-) Thanks! -Joe

2 5