August 2016 - U-Boot

[U-Boot] [PATCH] drivers: usb: xhci-fsl: Change burst beat and outstanding pipelined transfers requests
by Sriram Dash 22 Aug '16

22 Aug '16

This is required for better performance, and performs below tuning: 1. Enable burst length set, and define it as 4/8/16. 2. Set burst request limit to 16 requests. Signed-off-by: Rajesh Bhagat <rajesh.bhagat(a)nxp.com> Signed-off-by: Sriram Dash <sriram.dash(a)nxp.com> --- drivers/usb/host/xhci-fsl.c | 13 +++++++++++++ include/linux/usb/xhci-fsl.h | 3 +++ 2 files changed, 16 insertions(+) diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index bdcd4f1..082924f 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -58,6 +58,16 @@ static void fsl_apply_xhci_errata(void) } } +static void fsl_xhci_set_beat_burst_length(struct dwc3 *dwc3_reg) +{ + int val = readl(&dwc3_reg->g_sbuscfg0); + + val &= ~USB3_ENABLE_BEAT_BURST_MASK; + writel(val | USB3_ENABLE_BEAT_BURST, &dwc3_reg->g_sbuscfg0); + val = readl(&dwc3_reg->g_sbuscfg1); + writel(val | USB3_SET_BEAT_BURST_LIMIT, &dwc3_reg->g_sbuscfg1); +} + static int fsl_xhci_core_init(struct fsl_xhci *fsl_xhci) { int ret = 0; @@ -74,6 +84,9 @@ static int fsl_xhci_core_init(struct fsl_xhci *fsl_xhci) /* Set GFLADJ_30MHZ as 20h as per XHCI spec default value */ dwc3_set_fladj(fsl_xhci->dwc3_reg, GFLADJ_30MHZ_DEFAULT); + /* Change beat burst and outstanding pipelined transfers requests */ + fsl_xhci_set_beat_burst_length(fsl_xhci->dwc3_reg); + return ret; } diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 199f366..1032763 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -20,6 +20,9 @@ #define USB3_PHY_TX_RX_POWERON (USB3_PHY_RX_POWERON | USB3_PHY_TX_POWERON) #define USB3_PWRCTL_CLK_CMD_SHIFT 14 #define USB3_PWRCTL_CLK_FREQ_SHIFT 22 +#define USB3_ENABLE_BEAT_BURST 0xF +#define USB3_ENABLE_BEAT_BURST_MASK 0xFF +#define USB3_SET_BEAT_BURST_LIMIT 0xF00 /* USBOTGSS_WRAPPER definitions */ #define USBOTGSS_WRAPRESET BIT(17) -- 2.1.0

2 4

[U-Boot] [x86] Error building for qemu-x86 as EFI payload
by Yan Phenix 22 Aug '16

22 Aug '16

Hi, I want to build u-boot for qemu-x86 as an 32-bit EFI payload. What I have done is below: step 1: make qemu-x86_defconfig step 2: make menuconfig Library routines ---> [*] Support running U-Boot from EFI (X) Support running as an EFI payload (X) Produce a stub for running with 32-bit EFI step 3: make But finally, it fails: lib/efi/efi_stub.o: In function `efi_main': /opt/u-boot-2016.07/obj/../lib/efi/efi_stub.c:357: undefined reference to `_binary_u_boot_dtb_bin_start' /opt/u-boot-2016.07/obj/../lib/efi/efi_stub.c:357: undefined reference to `_binary_u_boot_dtb_bin_end' /opt/u-boot-2016.07/Makefile:1117: recipe for target 'u-boot-payload' failed make[1]: *** [u-boot-payload] Error 1 make[1]: Leaving directory '/opt/u-boot-2016.07/obj' Makefile:150: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Can anybody tell me what mistakes I made? Thanks. Best Regards! Phenix

2 1

[U-Boot] UMS - maintain connection
by John Tobias 22 Aug '16

22 Aug '16

Hello All, I am using ums (USB Mass Storage) in u-boot to expose the storage of my device into my host machine. Everything works okay except when the host machine wakeup from the sleep - my device got disconnect from host after it received an resume signal. I tried the g_mass_storage driver in the kernel and it works fine. It never disconnect when the host machine goes to sleep and wake it up. Does anyone have encountered the said issue?. How did you fix it?. Regards, John

3 4

[U-Boot] [PATCH] mmc: sdhci: Add the programmable clock mode support
by Wenyou Yang 22 Aug '16

22 Aug '16

Add the programmable clock mode for the clock generator. Signed-off-by: Wenyou Yang <wenyou.yang(a)atmel.com> --- drivers/mmc/sdhci.c | 49 +++++++++++++++++++++++++++++++++++++++---------- include/sdhci.h | 15 +++++++++++++++ 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 5c71ab8..ee6d4a1 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -286,7 +286,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) { struct sdhci_host *host = mmc->priv; - unsigned int div, clk, timeout, reg; + unsigned int div, clk = 0, timeout, reg; /* Wait max 20 ms */ timeout = 200; @@ -310,14 +310,35 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) return 0; if (SDHCI_GET_VERSION(host) >= SDHCI_SPEC_300) { - /* Version 3.00 divisors must be a multiple of 2. */ - if (mmc->cfg->f_max <= clock) - div = 1; - else { - for (div = 2; div < SDHCI_MAX_DIV_SPEC_300; div += 2) { - if ((mmc->cfg->f_max / div) <= clock) + /* + * Check if the Host Controller supports Programmable Clock + * Mode. + */ + if (host->clk_mul) { + for (div = 1; div <= 1024; div++) { + if ((mmc->cfg->f_max * host->clk_mul / div) + <= clock) break; } + + /* + * Set Programmable Clock Mode in the Clock + * Control register. + */ + clk = SDHCI_PROG_CLOCK_MODE; + div--; + } else { + /* Version 3.00 divisors must be a multiple of 2. */ + if (mmc->cfg->f_max <= clock) { + div = 1; + } else { + for (div = 2; + div < SDHCI_MAX_DIV_SPEC_300; div += 2) { + if ((mmc->cfg->f_max / div) <= clock) + break; + } + } + div >>= 1; } } else { /* Version 2.00 divisors must be a power of 2. */ @@ -325,13 +346,13 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock) if ((mmc->cfg->f_max / div) <= clock) break; } + div >>= 1; } - div >>= 1; if (host->set_clock) host->set_clock(host->index, div); - clk = (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; + clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT; clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN) << SDHCI_DIVIDER_HI_SHIFT; clk |= SDHCI_CLOCK_INT_EN; @@ -480,7 +501,7 @@ static const struct mmc_ops sdhci_ops = { int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) { - unsigned int caps; + unsigned int caps, caps_1; host->cfg.name = host->name; host->cfg.ops = &sdhci_ops; @@ -546,6 +567,14 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk) host->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; + /* + * In case of Host Controller v3.00, find out whether clock + * multiplier is supported. + */ + caps_1 = sdhci_readl(host, SDHCI_CAPABILITIES_1); + host->clk_mul = (caps_1 & SDHCI_CLOCK_MUL_MASK) >> + SDHCI_CLOCK_MUL_SHIFT; + sdhci_reset(host, SDHCI_RESET_ALL); host->mmc = mmc_create(&host->cfg, host); diff --git a/include/sdhci.h b/include/sdhci.h index e0f6667..5abe0a2 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -97,6 +97,7 @@ #define SDHCI_DIV_MASK 0xFF #define SDHCI_DIV_MASK_LEN 8 #define SDHCI_DIV_HI_MASK 0x300 +#define SDHCI_PROG_CLOCK_MODE 0x0020 #define SDHCI_CLOCK_CARD_EN 0x0004 #define SDHCI_CLOCK_INT_STABLE 0x0002 #define SDHCI_CLOCK_INT_EN 0x0001 @@ -166,6 +167,19 @@ #define SDHCI_CAN_64BIT 0x10000000 #define SDHCI_CAPABILITIES_1 0x44 +#define SDHCI_SUPPORT_SDR50 0x00000001 +#define SDHCI_SUPPORT_SDR104 0x00000002 +#define SDHCI_SUPPORT_DDR50 0x00000004 +#define SDHCI_DRIVER_TYPE_A 0x00000010 +#define SDHCI_DRIVER_TYPE_C 0x00000020 +#define SDHCI_DRIVER_TYPE_D 0x00000040 +#define SDHCI_RETUNING_TIMER_COUNT_MASK 0x00000F00 +#define SDHCI_RETUNING_TIMER_COUNT_SHIFT 8 +#define SDHCI_USE_SDR50_TUNING 0x00002000 +#define SDHCI_RETUNING_MODE_MASK 0x0000C000 +#define SDHCI_RETUNING_MODE_SHIFT 14 +#define SDHCI_CLOCK_MUL_MASK 0x00FF0000 +#define SDHCI_CLOCK_MUL_SHIFT 16 #define SDHCI_MAX_CURRENT 0x48 @@ -240,6 +254,7 @@ struct sdhci_host { unsigned int quirks; unsigned int host_caps; unsigned int version; + unsigned int clk_mul; /* Clock Muliplier value */ unsigned int clock; struct mmc *mmc; const struct sdhci_ops *ops; -- 2.7.4

3 3

[U-Boot] [PATCH] pinctrl: fix typos in comment blocks of pinconfig_post_bind()
by Masahiro Yamada 21 Aug '16

21 Aug '16

'-' is never used in function names. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/pinctrl/pinctrl-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index fd04b26..7397de2 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -113,7 +113,7 @@ static int pinctrl_select_state_full(struct udevice *dev, const char *statename) } /** - * pinconfig_post-bind() - post binding for PINCONFIG uclass + * pinconfig_post_bind() - post binding for PINCONFIG uclass * Recursively bind its children as pinconfig devices. * * @dev: pinconfig device @@ -257,7 +257,7 @@ int pinctrl_get_gpio_mux(struct udevice *dev, int banknum, int index) } /** - * pinconfig_post-bind() - post binding for PINCTRL uclass + * pinconfig_post_bind() - post binding for PINCTRL uclass * Recursively bind child nodes as pinconfig devices in case of full pinctrl. * * @dev: pinctrl device -- 1.9.1

3 2

[U-Boot] [PATCH] efi_loader: Fix relocations above 64kb image size
by Alexander Graf 21 Aug '16

21 Aug '16

We were truncating the image offset within the target image to 16 bits which again meant that we were potentially overwriting random memory in the lower 16 bits of the image. This patch casts the offset to a more reasonable 32bits. With this applied, I can successfully see Shell.efi assert because it can't find a protocol it expects to be available. Signed-off-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_image_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 574b204..5165377 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -37,7 +37,7 @@ static void efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, const uint16_t *relocs = (const uint16_t *)(rel + 1); i = (rel->SizeOfBlock - sizeof(*rel)) / sizeof(uint16_t); while (i--) { - uint16_t offset = (*relocs & 0xfff) + + uint32_t offset = (uint32_t)(*relocs & 0xfff) + rel->VirtualAddress; int type = *relocs >> EFI_PAGE_SHIFT; unsigned long delta = (unsigned long)efi_reloc; -- 2.6.6

2 1

[U-Boot] [PATCH RESEND] Makefile: Remove tags file on mrproper
by Vignesh R 21 Aug '16

21 Aug '16

make tags creates a symbolic link called tags to ctags. Remove this file on make mrproper or make distclean. Signed-off-by: Vignesh R <vigneshr(a)ti.com> Reviewed-by: Tom Rini <trini(a)konsulko.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a2f5569b9c14..ac132a926db3 100644 --- a/Makefile +++ b/Makefile @@ -1426,7 +1426,7 @@ CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h include/license.h \ MRPROPER_DIRS += include/config include/generated spl tpl \ .tmp_objdiff MRPROPER_FILES += .config .config.old include/autoconf.mk* include/config.h \ - ctags etags TAGS cscope* GPATH GTAGS GRTAGS GSYMS + ctags etags tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS # clean - Delete most, but leave enough to build external modules # -- 2.9.2

2 1

[U-Boot] [PATCH 0/2] tools/env: minor fixes plus resend
by Andreas Fenkart 21 Aug '16

21 Aug '16

The redundant environment patch was already submitted once, but not applied due to a merge conflict. The second patch is an addon to 183923d3e as suggested by Stefan Agner Andreas Fenkart (2): tools/env: return with error if redundant environments have unequal size tools/env: soften warning about erase block alignment tools/env/fw_env.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.8.1

2 6

[U-Boot] [PATCH 0/2] ARM: OMAP4+: vcores: Make scale_vcores common
by Lokesh Vutla 21 Aug '16

21 Aug '16

This series removes the unnecessary #ifdes and make the scale_vcores code common to all OMAP4+ platforms. Build tested on all omaps using buildman. Boot tested on: DRA72-evm, DRA74-evm, AM57xx-evm, OMAP5-uevm, Lokesh Vutla (2): ARM: OMAP5+: vcores: Drop unnecessary #ifndefs ARM: OMAP4+: vcores: Remove duplicated code arch/arm/cpu/armv7/omap-common/clocks-common.c | 69 ++++---------------------- arch/arm/cpu/armv7/omap5/hw_data.c | 2 + 2 files changed, 13 insertions(+), 58 deletions(-) -- 2.9.3

2 6

[U-Boot] [PATCH] test/py: match prompt only at line boundaries
by Stephen Warren 21 Aug '16

21 Aug '16

This prevents capture of command output from terminating early on boards that use a simple prompt (e.g. "=> ") that appears in the middle of command output (e.g. crc32's "... ==> 2fa737e0"). Reported-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- test/py/u_boot_console_base.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index ee9b928756fa..b1f474236e4e 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -106,7 +106,7 @@ class ConsoleBase(object): # Array slice removes leading/trailing quotes self.prompt = self.config.buildconfig['config_sys_prompt'][1:-1] - self.prompt_escaped = re.escape(self.prompt) + self.prompt_compiled = re.compile('^' + re.escape(self.prompt), re.MULTILINE) self.p = None self.disable_check_count = {pat[PAT_ID]: 0 for pat in bad_pattern_defs} self.eval_bad_patterns() @@ -201,7 +201,7 @@ class ConsoleBase(object): self.bad_pattern_ids[m - 1]) if not wait_for_prompt: return - m = self.p.expect([self.prompt_escaped] + self.bad_patterns) + m = self.p.expect([self.prompt_compiled] + self.bad_patterns) if m != 0: self.at_prompt = False raise Exception('Bad pattern found on console: ' + @@ -354,7 +354,7 @@ class ConsoleBase(object): self.bad_pattern_ids[m - 1]) self.u_boot_version_string = self.p.after while True: - m = self.p.expect([self.prompt_escaped, + m = self.p.expect([self.prompt_compiled, pattern_stop_autoboot_prompt] + self.bad_patterns) if m == 0: break -- 2.9.3

3 3