June 2017 - U-Boot

[U-Boot] [PATCH v4 0/4] rk3399: enable dwc3 gadget and fastboot
by Kever Yang 12 Sep '17

12 Sep '17

This patch set enable rk3399 dwc3 controller and gadget driver for fastboot. Changes in v4: - parse DT for quirk, base address and maximum speed - use 1 bit for usb2_phyif_utmi_width instead of 5bit Changes in v3: - remove utmi width DT parse from borad init - Parse the DT for utmi+ interface width in dwc3 driver - move the config into Kconfig file. Changes in v2: - parse dt for utmi width - use a variable to identify utmi+ bus width instead of CONFIG MACRO - remove config for USB2PHY UTMI BITS Kever Yang (4): rk3399: add a empty "sys_proto.h" header file board: evb-rk3399: add api to support dwc3 gadget usb: dwc3: add support for 16 bit UTMI+ interface config: rk3399: add support for dwc3 gadget arch/arm/include/asm/arch-rockchip/sys_proto.h | 10 +++++ board/rockchip/evb_rk3399/evb-rk3399.c | 51 ++++++++++++++++++++++++++ configs/evb-rk3399_defconfig | 17 +++++++++ drivers/usb/dwc3/core.c | 19 ++++++++++ drivers/usb/dwc3/core.h | 12 ++++++ 5 files changed, 109 insertions(+) create mode 100644 arch/arm/include/asm/arch-rockchip/sys_proto.h -- 1.9.1

5 15

[U-Boot] [PATCH] cmd: usb: check usb_stor_curr_dev in usb dev with no parameter
by Patrick Delaunay 12 Sep '17

12 Sep '17

If 'usb start' does not find devices, the command 'usb dev' without parameter will lead to error= USB device -1: data abort A check on usb_stor_curr_dev avoid the issue Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- cmd/usb.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/usb.c b/cmd/usb.c index 4fa456e..bc90553 100644 --- a/cmd/usb.c +++ b/cmd/usb.c @@ -803,6 +803,10 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("... is now current device\n"); return 0; } else { + if (usb_stor_curr_dev < 0) { + printf("no current device selected\n"); + return 1; + } printf("\nUSB device %d: ", usb_stor_curr_dev); stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev); -- 1.9.1

3 3

[U-Boot] [PATCH] video: ipu_common: fix build error
by Peng Fan 07 Sep '17

07 Sep '17

Some toolchains fail to build "clk->rate = (u64)(clk->parent->rate * 16) / div;" And the cast usage is wrong. Use the following code to fix the issue, " do_div(parent_rate, div); clk->rate = parent_rate; " Reported-by: Peter Robinson <pbrobinson(a)gmail.com> Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Peter Robinson <pbrobinson(a)gmail.com> --- Hi Peter, Please help test this patch to see whether this fix your issue or not. Thanks for pointing out this issue. Thanks, Peng. drivers/video/ipu_common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 36d4b23..5676a0f 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -352,7 +352,9 @@ static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate) */ __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); - clk->rate = (u64)(clk->parent->rate * 16) / div; + do_div(parent_rate, div); + + clk->rate = parent_rate; return 0; } -- 2.6.2

9 12

[U-Boot] [PATCH 1/3] video: ipu: avoid overflow issue
by Peng Fan 06 Sep '17

06 Sep '17

Multiplication, as "clk->parent->rate * 16" may overflow. So use do_div to avoid such issue. Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Signed-off-by: Sandor Yu <sandor.yu(a)nxp.com> Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> --- drivers/video/ipu_common.c | 73 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 19 deletions(-) diff --git a/drivers/video/ipu_common.c b/drivers/video/ipu_common.c index 9f85102..36d4b23 100644 --- a/drivers/video/ipu_common.c +++ b/drivers/video/ipu_common.c @@ -19,6 +19,7 @@ #include <asm/errno.h> #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h> +#include <div64.h> #include "ipu.h" #include "ipu_regs.h" @@ -275,50 +276,84 @@ static inline void ipu_ch_param_set_buffer(uint32_t ch, int bufNum, static void ipu_pixel_clk_recalc(struct clk *clk) { - u32 div = __raw_readl(DI_BS_CLKGEN0(clk->id)); - if (div == 0) - clk->rate = 0; - else - clk->rate = (clk->parent->rate * 16) / div; + u32 div; + u64 final_rate = (unsigned long long)clk->parent->rate * 16; + + div = __raw_readl(DI_BS_CLKGEN0(clk->id)); + debug("read BS_CLKGEN0 div:%d, final_rate:%lld, prate:%ld\n", + div, final_rate, clk->parent->rate); + + clk->rate = 0; + if (div != 0) { + do_div(final_rate, div); + clk->rate = final_rate; + } } static unsigned long ipu_pixel_clk_round_rate(struct clk *clk, unsigned long rate) { - u32 div, div1; - u32 tmp; + u64 div, final_rate; + u32 remainder; + u64 parent_rate = (unsigned long long)clk->parent->rate * 16; + /* * Calculate divider * Fractional part is 4 bits, * so simply multiply by 2^4 to get fractional part. */ - tmp = (clk->parent->rate * 16); - div = tmp / rate; - + div = parent_rate; + remainder = do_div(div, rate); + /* Round the divider value */ + if (remainder > (rate / 2)) + div++; if (div < 0x10) /* Min DI disp clock divider is 1 */ div = 0x10; if (div & ~0xFEF) div &= 0xFF8; else { - div1 = div & 0xFE0; - if ((tmp/div1 - tmp/div) < rate / 4) - div = div1; - else - div &= 0xFF8; + /* Round up divider if it gets us closer to desired pix clk */ + if ((div & 0xC) == 0xC) { + div += 0x10; + div &= ~0xF; + } } - return (clk->parent->rate * 16) / div; + final_rate = parent_rate; + do_div(final_rate, div); + + return final_rate; } static int ipu_pixel_clk_set_rate(struct clk *clk, unsigned long rate) { - u32 div = (clk->parent->rate * 16) / rate; + u64 div, parent_rate; + u32 remainder; + + parent_rate = (unsigned long long)clk->parent->rate * 16; + div = parent_rate; + remainder = do_div(div, rate); + /* Round the divider value */ + if (remainder > (rate / 2)) + div++; + + /* Round up divider if it gets us closer to desired pix clk */ + if ((div & 0xC) == 0xC) { + div += 0x10; + div &= ~0xF; + } + if (div > 0x1000) + debug("Overflow, DI_BS_CLKGEN0 div:0x%x\n", (u32)div); __raw_writel(div, DI_BS_CLKGEN0(clk->id)); - /* Setup pixel clock timing */ + /* + * Setup pixel clock timing + * Down time is half of period + */ __raw_writel((div / 16) << 16, DI_BS_CLKGEN1(clk->id)); - clk->rate = (clk->parent->rate * 16) / div; + clk->rate = (u64)(clk->parent->rate * 16) / div; + return 0; } -- 2.6.2

7 14

[U-Boot] [PATCH] arm64: ls1043ardb: Add distro secure boot support
by Sumit Garg 01 Sep '17

01 Sep '17

Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Disable fall back option to nor/qspi boot in case of secure boot. Also enable "secureboot=y" flag in environment for ARM based platforms instead of bootcmd. Signed-off-by: Sumit Garg <sumit.garg(a)nxp.com> Tested-by: Vinitha Pillai <vinitha.pillai(a)nxp.com> --- board/freescale/common/fsl_chain_of_trust.c | 6 ++++++ configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + include/configs/ls1043a_common.h | 23 +++++++++++++++++++++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 438e781..609e2b2 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -80,7 +80,13 @@ int fsl_setenv_chain_of_trust(void) * bootcmd = CONFIG_CHAIN_BOOT_CMD (Validate and execute Boot script) */ setenv("bootdelay", "0"); + +#ifdef CONFIG_ARM + setenv("secureboot", "y"); +#else setenv("bootcmd", CONFIG_CHAIN_BOOT_CMD); +#endif + return 0; } #endif diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index 861d49b..3f535cc 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -40,3 +40,4 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index 5f9b21d..2d57e79 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -56,3 +56,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index e8a756f..6e30427 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -282,6 +282,7 @@ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernel_addr_r=0x81000000\0" \ @@ -292,6 +293,7 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ BOOTENV \ "boot_scripts=ls1043ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1043ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -302,6 +304,21 @@ "run scan_dev_for_boot; " \ "fi; " \ "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;" \ + "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ "/flex_installer_arm64.itb; " \ "bootm $load_addr#ls1043ardb\0" \ @@ -315,9 +332,11 @@ #undef CONFIG_BOOTCOMMAND #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run qspi_bootcmd;" #else -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run nor_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run nor_bootcmd;" #endif #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0 " \ -- 1.9.1

2 6

[U-Boot] [PATCH 0/5] QSPI: Falcon or single stage boot mode support
by Ravi Babu 29 Aug '17

29 Aug '17

This patch series fixes the Falcon or single stage boot mode for dra7xx platform. FDT fixup is added to update the memory DT node based DDR configuration for specific platform. Test verfied on dra7xx paltforms. Lokesh Vutla (2): spl: reorder the assignment of board info to global data arch: arm: omap: Declare size of ddr very early Ravi Babu (3): qspi: dra7xx: enable qspi-boot for dra7x paltform spl: fdt: support for fdt fixup for falcon boot boot: fdt: fixup the memory dt nodes falcon boot arch/arm/lib/Makefile | 1 + arch/arm/lib/bootm-fdt.c | 7 ++++++- arch/arm/mach-omap2/am33xx/board.c | 4 ++++ arch/arm/mach-omap2/hwinit-common.c | 1 + common/Makefile | 2 +- common/spl/spl.c | 42 ++++++++++++++++++++++++++++++++++++- configs/dra7xx_evm_defconfig | 6 ++++++ 7 files changed, 60 insertions(+), 3 deletions(-) -- 1.9.1

7 27

[U-Boot] [PATCH 0/3] add support for GPT partition name manipulation
by alison＠peloton-tech.com 28 Aug '17

28 Aug '17

From: Alison Chaiken <alison(a)she-devel.com> One way for userspace and the bootloader to exchange information about dynamic image selection is via the storage device partition table, as described at https://source.android.com/devices/tech/ota/ab_updates The scheme described there relies on setting partitions' "boot" flag. When no partition on a device is bootable since the kernel and U-Boot are stored elsewhere, the name field in the GPT partition table offers another logical place to store information. These patches allow users to easily modify GPT partition names via bootscripts that can select different images based on a boot-failure counter, or when userspace installs a software update. These patches have been tested on a TI DRA7xx-based SOM with U-Boot 2015.07. The storage device is an eMMC. Alison Chaiken (3): GPT: add accessor function for disk GUID GPT: read partition table from device into a data structure rename GPT partitions to detect boot failure cmd/gpt.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- disk/part_efi.c | 31 ++++++ include/part.h | 24 ++++ 3 files changed, 392 insertions(+), 2 deletions(-) -- 2.1.4

11 115

[U-Boot] [PATCH 00/14] dm: sata: mmc: Convert a sunxi board to driver model for MMC, SATA
by Simon Glass 22 Aug '17

22 Aug '17

At present SCSI support for driver model works only with PCI controllers. This series makes the following changes: - Adjusts SATA/AHCI support to work with non-PCI controllers - Allows driver model to be used for MMC in U-Boot proper without requiring it to be used in SPL - Adjusts sunxi MMC and SATA drivers to support driver model - Enables this on a single board (Linksprite_pcDuino3) Even with this series the AHCI uclass still does not have any operations. This will be needed for drivers which do not use SCSI. Further work is needed to complete this. Simon Glass (14): ahci: Support non-PCI controllers dm: mmc: Allow disabling driver model in SPL fdt: Correct fdt_get_base_address() dm: scsi: Drop duplicate SCSI and DM_SCSI options dm: ahci: Correct uclass private data dm: mmc: sunxi: Rename struct sunxi_mmc_host to sunxi_mmc_priv dm: mmc: sunxi: Rename mmchost to priv dm: mmc: sunxi: Pass private data around explicitly dm: mmc: sunxi: Drop mmc_clk_io_on() dm: mmc: sunxi: Add support for driver model dm: scsi: Don't scan the SCSI bus when probing dm: sunxi: sata: Don't build sata support into SPL dm: sata: sunxi: Add support for driver model dm: sunxi: Move Linksprite_pcDuino3 to use DM for MMC, SATA arch/arm/dts/sun7i-a20-pcduino3.dts | 1 - arch/x86/cpu/ivybridge/sata.c | 2 +- board/sunxi/Makefile | 2 + board/sunxi/ahci.c | 61 +++++- common/fdt_support.c | 7 +- common/spl/spl_mmc.c | 4 +- configs/Linksprite_pcDuino3_defconfig | 7 +- drivers/ata/Kconfig | 18 -- drivers/ata/ahci-uclass.c | 2 + drivers/ata/ahci.c | 33 ++-- drivers/block/Kconfig | 12 ++ drivers/block/Makefile | 4 +- drivers/mmc/Kconfig | 21 ++ drivers/mmc/Makefile | 4 +- drivers/mmc/mmc-uclass.c | 6 +- drivers/mmc/mmc.c | 28 +-- drivers/mmc/mmc_legacy.c | 2 +- drivers/mmc/mmc_private.h | 6 +- drivers/mmc/omap_hsmmc.c | 20 +- drivers/mmc/sunxi_mmc.c | 360 +++++++++++++++++++++++----------- drivers/scsi/scsi.c | 2 +- include/ahci.h | 14 +- include/blk.h | 4 +- include/mmc.h | 12 +- 24 files changed, 431 insertions(+), 201 deletions(-) -- 2.13.1.518.g3df882009-goog

4 35

[U-Boot] [PATCH v2 0/7] spl: add xip booting support
by Vikas Manocha 19 Aug '17

19 Aug '17

This patchset adds support for XIP (execute in place) of U-Boot or kernel image and enables it for stm32f7. Changed in v2: - added patch to move v7m thumb mode just before next image boot - removed extra blank line. Vikas Manocha (7): spl: armv7m: to keep ARM v7M in thumb mode before booting next image stm32f7: remove duplicate configs stm32: stm32f7: add spl build support SPL: Add XIP booting support serial: stm32f7: disable overrun spl: stm32f7: add kernel boot support spl: stm32f7: configure for xip booting arch/arm/include/asm/spl.h | 1 + arch/arm/mach-stm32/Kconfig | 1 + arch/arm/mach-stm32/stm32f7/Kconfig | 24 ++++++++++++++++++++ board/st/stm32f746-disco/stm32f746-disco.c | 36 +++++++++++++++++++++++++++++- common/spl/Kconfig | 9 ++++++++ common/spl/Makefile | 1 + common/spl/spl.c | 6 ++--- common/spl/spl_xip.c | 28 +++++++++++++++++++++++ configs/stm32f746-disco_defconfig | 5 ----- drivers/serial/serial_stm32x7.c | 3 +++ drivers/serial/serial_stm32x7.h | 2 ++ include/configs/stm32f746-disco.h | 31 ++++++++++++++++++++++--- 12 files changed, 135 insertions(+), 12 deletions(-) create mode 100644 common/spl/spl_xip.c -- 1.9.1

6 26

[U-Boot] [PATCH v2] driver: net: ldpaa: Update priv->phydev after free()
by Ashish Kumar 14 Aug '17

14 Aug '17

From: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> Even after memory free of phydev, priv is still pointing to the obsolete address. So update priv->phydev as NULL after memory free. Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- v2: Add signoff drivers/net/ldpaa_eth/ldpaa_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 4e61700..f235b62 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -587,8 +587,10 @@ static void ldpaa_eth_stop(struct eth_device *net_dev) #ifdef CONFIG_PHYLIB if (priv->phydev && bus != NULL) phy_shutdown(priv->phydev); - else + else { free(priv->phydev); + priv->phydev = NULL; + } #endif ldpaa_dpbp_free(); -- 1.9.1

5 8