January 2020 - U-Boot

[PATCH] usbtty: fix possible alignment issues
by Seung-Woo Kim 30 Jan '20

30 Jan '20

With gcc9, below warnings are shown: drivers/serial/usbtty.c: In function 'usbtty_init_strings': drivers/serial/usbtty.c:590:44: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 590 | str2wide (CONFIG_USBD_MANUFACTURER, string->wData); | ~~~~~~^~~~~~~ drivers/serial/usbtty.c:596:44: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 597 | str2wide (CONFIG_USBD_PRODUCT_NAME, string->wData); | ~~~~~~^~~~~~~ drivers/serial/usbtty.c:603:33: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 604 | str2wide (serial_number, string->wData); | ~~~~~~^~~~~~~ drivers/serial/usbtty.c:610:49: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 611 | str2wide (CONFIG_USBD_CONFIGURATION_STR, string->wData); | ~~~~~~^~~~~~~ drivers/serial/usbtty.c:617:50: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 618 | str2wide (CONFIG_USBD_DATA_INTERFACE_STR, string->wData); | ~~~~~~^~~~~~~ drivers/serial/usbtty.c:623:50: warning: taking address of packed member of 'struct usb_string_descriptor' may result in an unaligned pointer value [-Waddress-of-packed-member] 624 | str2wide (CONFIG_USBD_CTRL_INTERFACE_STR, string->wData); | ~~~~~~^~~~~~~ Fix the issues by using packed structure. Ref: commit 616ebd8b9cb4 ("usb: composite: fix possible alignment issues") Signed-off-by: Seung-Woo Kim <sw0312.kim(a)samsung.com> --- drivers/serial/usbtty.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index f1c1a260da..54e67dd0d1 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -48,6 +48,8 @@ #define CONFIG_USBD_DATA_INTERFACE_STR "Bulk Data Interface" #define CONFIG_USBD_CTRL_INTERFACE_STR "Control Interface" +typedef struct { __le16 val; } __attribute__((aligned(16))) __le16_packed; + /* * Buffers to hold input and output data */ @@ -372,14 +374,15 @@ static int fill_buffer (circbuf_t * buf); void usbtty_poll (void); /* utility function for converting char* to wide string used by USB */ -static void str2wide (char *str, u16 * wide) +static void str2wide (char *str, void *wide) { int i; + __le16_packed *tmp = wide; for (i = 0; i < strlen (str) && str[i]; i++){ #if defined(__LITTLE_ENDIAN) - wide[i] = (u16) str[i]; + tmp[i].val = (u16) str[i]; #elif defined(__BIG_ENDIAN) - wide[i] = ((u16)(str[i])<<8); + tmp[i].val = ((u16)(str[i])<<8); #else #error "__LITTLE_ENDIAN or __BIG_ENDIAN undefined" #endif -- 2.19.2

2 1

Apollo Lake GPIO driver with Coreboot/U-Boot
by Wolfgang Wallner 30 Jan '20

30 Jan '20

Hello Simon, Bin, all, I have an Apollo Lake based device, where U-Boot is booted as a Coreboot payload. I would like to utilize the Apollo Lake GPIO driver (drivers/gpio/intel_gpio.c), but I struggle with the dependencies. For my use case, I face 2 obstacles: 1) Some required drivers are not built The Apollo Lake GPIO driver requires the P2SB and ITSS drivers, but those are located in arch/x86/cpu/apollolake. Drivers in this directory are not included in my build as it builds for Coreboot, not for Apollo Lake. 2) Some header files are not found The header files gpio.h and itss.h are located in arch/x86/include/asm/arch-apollolake, but as I build for Coreboot the symlink arch/x86/include/asm/arch points to arch-coreboot instead of arch-apollolake, so those header files are not found. Does anyone have recommendations on how to solve those issues? Would it be possible to move the drivers for P2SB and ITSS out of arch/x86/cpu/apollolake to the generic drivers/ directory? regards, Wolfgang PS: Thanks Simon for providing the initial support for Apollo Lake!

2 5

[PATCH] [FS] Print error message for unknown device type
by Wolfgang Denk 30 Jan '20

30 Jan '20

File system commands like "ls" etc. require a device type parameter. If an unknown type is specified, they return an error code but no visible feedback to the user: -> ls FOOBAR 1:1 / -> Add an error message to make clear what happens, and why. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- disk/part.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/disk/part.c b/disk/part.c index 8982ef3bae..14000835c8 100644 --- a/disk/part.c +++ b/disk/part.c @@ -512,8 +512,10 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, /* Look up the device */ dev = blk_get_device_by_str(ifname, dev_str, dev_desc); - if (dev < 0) + if (dev < 0) { + printf("** Unknown device type %s **\n", ifname); goto cleanup; + } /* Convert partition ID string to number */ if (!part_str || !*part_str) { -- 2.23.0

4 5

[PATCH] ddr: marvell: a38x: llow boards to specify CK_DELAY parameter
by Chris Packham 30 Jan '20

30 Jan '20

For some layouts it is necessary to adjust the CK_DELAY parameter to successfully complete DDR training. Add the ability to specify the CK_DELAY in the mv_ddr_topology_map. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- board/alliedtelesis/x530/x530.c | 6 +++++- drivers/ddr/marvell/a38x/ddr3_init.c | 5 +++++ drivers/ddr/marvell/a38x/ddr_topology_def.h | 3 +++ drivers/ddr/marvell/a38x/mv_ddr_topology.c | 10 ++++++++++ drivers/ddr/marvell/a38x/mv_ddr_topology.h | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index e0fa8067c1c5..04b053dc20e4 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -66,7 +66,11 @@ static struct mv_ddr_topology_map board_topology_map = { BUS_MASK_32BIT_ECC, /* subphys mask */ MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ { {0} }, /* raw spd data */ - {0} /* timing parameters */ + {0}, /* timing parameters */ + { {0} }, /* electrical configuration */ + {0}, /* electrical parameters */ + 0, /* Clock enable mask */ + 160 /* Clock delay */ }; struct mv_ddr_topology_map *mv_ddr_topology_map_get(void) diff --git a/drivers/ddr/marvell/a38x/ddr3_init.c b/drivers/ddr/marvell/a38x/ddr3_init.c index 22c8f9ca54e5..a971cc155a01 100644 --- a/drivers/ddr/marvell/a38x/ddr3_init.c +++ b/drivers/ddr/marvell/a38x/ddr3_init.c @@ -106,8 +106,10 @@ static int mv_ddr_training_params_set(u8 dev_num) struct tune_train_params params; int status; u32 cs_num; + int ck_delay; cs_num = mv_ddr_cs_num_get(); + ck_delay = mv_ddr_ck_delay_get(); /* NOTE: do not remove any field initilization */ params.ck_delay = TUNE_TRAINING_PARAMS_CK_DELAY; @@ -131,6 +133,9 @@ static int mv_ddr_training_params_set(u8 dev_num) params.g_odt_config = TUNE_TRAINING_PARAMS_ODT_CONFIG_2CS; } + if (ck_delay > 0) + params.ck_delay = ck_delay; + status = ddr3_tip_tune_training_params(dev_num, &params); if (MV_OK != status) { printf("%s Training Sequence - FAILED\n", ddr_type); diff --git a/drivers/ddr/marvell/a38x/ddr_topology_def.h b/drivers/ddr/marvell/a38x/ddr_topology_def.h index 950f296ff984..34196b166287 100644 --- a/drivers/ddr/marvell/a38x/ddr_topology_def.h +++ b/drivers/ddr/marvell/a38x/ddr_topology_def.h @@ -127,6 +127,9 @@ struct mv_ddr_topology_map { /* Clock enable mask */ u32 clk_enable; + + /* Clock delay */ + int ck_delay; }; enum mv_ddr_iface_mode { diff --git a/drivers/ddr/marvell/a38x/mv_ddr_topology.c b/drivers/ddr/marvell/a38x/mv_ddr_topology.c index ef3b658a7899..09840b1e70f1 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_topology.c +++ b/drivers/ddr/marvell/a38x/mv_ddr_topology.c @@ -229,6 +229,16 @@ int mv_ddr_is_ecc_ena(void) return 0; } +int mv_ddr_ck_delay_get(void) +{ + struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); + + if (tm->ck_delay) + return tm->ck_delay; + + return -1; +} + /* translate topology map definition to real memory size in bits */ static unsigned int mem_size[] = { ADDR_SIZE_512MB, diff --git a/drivers/ddr/marvell/a38x/mv_ddr_topology.h b/drivers/ddr/marvell/a38x/mv_ddr_topology.h index 766f25db5733..4fca47689f11 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_topology.h +++ b/drivers/ddr/marvell/a38x/mv_ddr_topology.h @@ -319,6 +319,7 @@ unsigned short mv_ddr_bus_bit_mask_get(void); unsigned int mv_ddr_if_bus_width_get(void); unsigned int mv_ddr_cs_num_get(void); int mv_ddr_is_ecc_ena(void); +int mv_ddr_ck_delay_get(void); unsigned long long mv_ddr_mem_sz_per_cs_get(void); unsigned long long mv_ddr_mem_sz_get(void); unsigned int mv_ddr_rtt_nom_get(void); -- 2.25.0

1 0

[PATCH 1/4] warp7: fix pmic probe
by Joris Offouga 29 Jan '20

29 Jan '20

Signed-off-by: Joris Offouga <offougajoris(a)gmail.com> --- board/warp7/warp7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 9efc62f2fb..1ebec93916 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -67,7 +67,7 @@ int power_init_board(void) struct udevice *dev; int ret, dev_id, rev_id; - ret = pmic_get("pfuze3000", &dev); + ret = pmic_get("pfuze3000@8", &dev); if (ret == -ENODEV) return 0; if (ret != 0) -- 2.20.1

2 10

[PATCH] gpio: Let DM_74X164 be built without CONFIG_SPL_GPIO
by Fabio Estevam 29 Jan '20

29 Jan '20

Since commit bcee8d6764f9 ("dm: gpio: Allow control of GPIO uclass in SPL") the CONFIG_DM_74X164 is no longer built for mx7dsabresd_defconfig, as this target does not use CONFIG_SPL_GPIO. Remove such dependency and let the the 74X164 GPIO driver be built again. This restores Ethernet functionality on the imx7-sdb board as the Ethernet reset PHY comes from a GPIO driven by a 74LV595PW I/O expander. Fixes: bcee8d6764f9 ("dm: gpio: Allow control of GPIO uclass in SPL") Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- drivers/gpio/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 449046b64c..aa41a24cd0 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -10,13 +10,11 @@ endif obj-$(CONFIG_$(SPL_TPL_)DM_GPIO) += gpio-uclass.o obj-$(CONFIG_$(SPL_)DM_PCA953X) += pca953x_gpio.o -ifdef CONFIG_$(SPL_TPL_)GPIO -obj-$(CONFIG_DM_74X164) += 74x164_gpio.o -endif obj-$(CONFIG_AT91_GPIO) += at91_gpio.o obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o obj-$(CONFIG_BCM6345_GPIO) += bcm6345_gpio.o +obj-$(CONFIG_DM_74X164) += 74x164_gpio.o obj-$(CONFIG_INTEL_GPIO) += intel_gpio.o obj-$(CONFIG_INTEL_ICH6_GPIO) += intel_ich6_gpio.o obj-$(CONFIG_INTEL_BROADWELL_GPIO) += intel_broadwell_gpio.o -- 2.17.1

3 7

[PATCH] configs: db820c: set bootm_size
by Jorge Ramirez-Ortiz 29 Jan '20

29 Jan '20

set bootm_size to the memory available to safely contain a kernel, device tree and initrd for relocation. Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- include/configs/dragonboard820c.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 4256e6f060..d7bfb7a100 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -48,6 +48,7 @@ "ramdisk_addr_r=0x91000000\0"\ "scriptaddr=0x90000000\0"\ "pxefile_addr_r=0x90100000\0"\ + "bootm_size=0x8000000"\ BOOTENV /* Size of malloc() pool */ -- 2.17.1

2 1

Removing "fdt_high=0xffffffff" from board environments
by Tom Rini 29 Jan '20

29 Jan '20

Hey all, Relatively recently it's been highlighted that a number of boards are disabling relocation of the device tree image in memory and this in turn leading to various difficult to resolve bugs. At heart, disabling device tree relocation at boot is something that should be used in rare circumstances (and more generally fdt_high / initrd_high set to where they are already residing in memory, as a known, correct and aligned address). I would like to ask everyone to update their board config file to use the bootm_size (or set CONFIG_SYS_BOOTMAPSZ) to the amount of memory (size, not location) available to safely contain a kernel, device tree and initrd for relocation. Thanks all! -- Tom

1 1

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 29 Jan '20

29 Jan '20

Hello Tom, please pull from u-boot-i2c master branch: The following changes since commit c05b38df477a50c3918b50c5f986592411785859: common: fix regression on block cache init (2020-01-26 13:36:14 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-i2c.git tags/for-v2020.04 for you to fetch changes up to 2034f6c27fc91407fe8bbd36670714b77d9ef1dc: i2c: designware_i2c: Do more in the probe() method (2020-01-27 07:25:00 +0100) ---------------------------------------------------------------- i2c changes for 2020.04 - updates the Designware I2C driver - get timings from device tree - handle units in nanoseconds - make sure that the requested bus speed is not exceeded - few smaller clean-ups - adds enums for i2c speed and update drivers which use them - global_data: remove unused mxc_i2c specific field ---------------------------------------------------------------- Baruch Siach (1): global_data: remove unused mxc_i2c specific field Simon Glass (23): i2c: designware_i2c: Add more registers i2c: designware_i2c: Don't allow changing IC_CLK i2c: designware_i2c: Include clk.h in the header file i2c: designware_i2c: Rename 'max' speed to 'high' speed i2c: designware_i2c: Use an enum for selected speed mode i2c: designware_i2c: Use an accurate bus clock instead of MHz i2c: designware_i2c: Bring in the binding file i2c: designware_i2c: Read device-tree properties i2c: designware_i2c: Drop scl_sda_cfg parameter i2c: designware_i2c: Put hold config in a struct i2c: designware_i2c: Rewrite timing calculation i2c: designware_i2c: Add spike supression i2c: Add enums for i2c speed and address size i2c: ast_i2c: Update to use standard enums for speed i2c: designware_i2c: Update to use standard enums for speed i2c: kona_i2c: Update to use standard enums for speed i2c: omap: Update to use standard enums for speed i2c: stm32: Update to use standard enums for speed i2c: Update drivers to use enum for speed i2c: designware_i2c: Add support for fast-plus speed i2c: designware_i2c: Move dw_i2c_speed_config to header i2c: designware_i2c: Separate out the speed calculation i2c: designware_i2c: Do more in the probe() method doc/device-tree-bindings/i2c/i2c-designware.txt | 73 ++++++++++++++++++++++++++++ drivers/i2c/ast_i2c.c | 2 +- drivers/i2c/ast_i2c.h | 2 - drivers/i2c/designware_i2c.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------- drivers/i2c/designware_i2c.h | 73 +++++++++++++++++++++------- drivers/i2c/designware_i2c_pci.c | 4 +- drivers/i2c/exynos_hs_i2c.c | 5 +- drivers/i2c/fsl_i2c.c | 3 +- drivers/i2c/i2c-cdns.c | 2 +- drivers/i2c/i2c-uclass.c | 12 ++--- drivers/i2c/i2c-uniphier-f.c | 2 +- drivers/i2c/i2c-uniphier.c | 2 +- drivers/i2c/imx_lpi2c.c | 8 ++-- drivers/i2c/kona_i2c.c | 28 +++++------ drivers/i2c/mv_i2c.c | 4 +- drivers/i2c/mvtwsi.c | 5 +- drivers/i2c/omap24xx_i2c.c | 5 +- drivers/i2c/omap24xx_i2c.h | 4 -- drivers/i2c/rcar_i2c.c | 2 +- drivers/i2c/rcar_iic.c | 2 +- drivers/i2c/s3c24x0_i2c.c | 5 +- drivers/i2c/sandbox_i2c.c | 3 +- drivers/i2c/stm32f7_i2c.c | 43 +++++++---------- include/asm-generic/global_data.h | 3 -- include/i2c.h | 26 ++++++++++ 25 files changed, 454 insertions(+), 164 deletions(-) create mode 100644 doc/device-tree-bindings/i2c/i2c-designware.txt Travis build: https://travis-ci.org/hsdenx/u-boot-i2c/builds/642382247 bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

Pull request: u-boot-samsung master
by Minkyu Kang 29 Jan '20

29 Jan '20

Dear Tom, The following changes since commit 052170c6a043eec4e73fad80955876cf1ba5e4f2: configs: Resync with savedefconfig (2020-01-22 13:38:00 -0500) are available in the git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-samsung.git master for you to fetch changes up to 51521e43603d37e6be2ffd1ad2607361650500e9: arm: exynos: odroid: Change autoboot script to use ${mmcbootdev} (2020-01-28 09:54:49 +0900) ---------------------------------------------------------------- Marek Szyprowski (8): arm: dts: exynos: Extend board description arm: exynos: Use proper ADC device name arm: exynos: Use proper PMIC device names mmc: s5p_sdhci: Read generic MMC properties from DT arm: dts: exynos: Fix card-detect polarity for SD card on Odroid U3/X2 arm: dts: exynos: Use common alias for Odroid U3/X2 MMC2 (SD-card) arm: exynos: Read default MMC device from XOM[7:5] pins arm: exynos: odroid: Change autoboot script to use ${mmcbootdev} arch/arm/dts/exynos4412-odroid.dts | 3 ++- arch/arm/dts/exynos5422-odroidxu3.dts | 2 +- arch/arm/mach-exynos/include/mach/cpu.h | 1 + board/samsung/common/board.c | 28 ++++++++++++++++++++++++++++ board/samsung/common/exynos5-dt-types.c | 8 ++++---- board/samsung/common/exynos5-dt.c | 6 +++--- configs/odroid-xu3_defconfig | 1 + configs/odroid_defconfig | 1 + drivers/mmc/s5p_sdhci.c | 5 +++++ include/configs/odroid.h | 10 +++++----- 10 files changed, 51 insertions(+), 14 deletions(-) -- Thanks, Minkyu Kang.

2 1