May 2018 - U-Boot

[U-Boot] [PATCH] arm: armv7m: Clean up some thumb / compiler flag options
by Tom Rini 24 May '18

24 May '18

- The correct way to build with thumb mode is to select SYS_THUMB_BUILD - We should be setting -march=armv7-m in arch/arm/Makefile not the sub-config.mk file. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/Kconfig | 1 + arch/arm/Makefile | 1 + arch/arm/cpu/armv7m/config.mk | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2bbb86c462dd..efc9108a5a3a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -221,6 +221,7 @@ config CPU_V7M select THUMB2_KERNEL select SYS_CACHE_SHIFT_5 select SYS_ARM_MPU + select SYS_THUMB_BUILD config CPU_V7R bool diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 3b1dd85716de..913d23048f1f 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -16,6 +16,7 @@ arch-$(CONFIG_CPU_ARM1136) =-march=armv5 arch-$(CONFIG_CPU_ARM1176) =-march=armv5t arch-$(CONFIG_CPU_V7A) =$(call cc-option, -march=armv7-a, \ $(call cc-option, -march=armv7, -march=armv5)) +arch-$(CONFIG_CPU_V7M) =-march=armv7-m arch-$(CONFIG_CPU_V7R) =-march=armv7-r arch-$(CONFIG_ARM64) =-march=armv8-a diff --git a/arch/arm/cpu/armv7m/config.mk b/arch/arm/cpu/armv7m/config.mk index 4e46df5a2844..f50964cfb92e 100644 --- a/arch/arm/cpu/armv7m/config.mk +++ b/arch/arm/cpu/armv7m/config.mk @@ -3,4 +3,4 @@ # (C) Copyright 2015 # Kamil Lulko, <kamil.lulko(a)gmail.com> -PLATFORM_CPPFLAGS += -march=armv7-m -mthumb -mno-unaligned-access +PLATFORM_CPPFLAGS += -mno-unaligned-access -- 2.7.4

1 1

[U-Boot] [PATCH v2 1/1] arm: print instructions pointed to by pc
by Heinrich Schuchardt 24 May '18

24 May '18

If an exception occurs in a loaded image and the relocation offset is unknown, it is helful to know the instructions pointed to by the program counter. This patch adds the missing output. A possible output is: *pc: fb de f7 e7 1e ff 2f e1 01 00 50 e3 f0 4d 2d e9 01 80 a0 e1 The output can be disassembled with xxd -pc -r - > a.out $(CROSS_COMPILE)objdump -D -marm -b binary a.out Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 print bytes not halfwords --- arch/arm/lib/interrupts.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 28ba3f14f36..25489e34462 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -59,6 +59,9 @@ static void show_efi_loaded_images(struct pt_regs *regs) void show_regs (struct pt_regs *regs) { unsigned long __maybe_unused flags; + /* The least significant bit chooses thumb, remove it. */ + u8 *pc = (u8 *)(instruction_pointer(regs) & ~1); + int i; const char __maybe_unused *processor_modes[] = { "USER_26", "FIQ_26", "IRQ_26", "SVC_26", "UK4_26", "UK5_26", "UK6_26", "UK7_26", @@ -96,6 +99,10 @@ void show_regs (struct pt_regs *regs) fast_interrupts_enabled (regs) ? "on" : "off", processor_modes[processor_mode (regs)], thumb_mode (regs) ? " (T)" : ""); + printf("*pc:"); + for (i = 0; i < 24; ++i) + printf(" %02x", pc[i]); + printf("\n"); } /* fixup PC to point to the instruction leading to the exception */ -- 2.14.2

4 4

[U-Boot] [PATCH v2] sunxi: add support for Banana Pi M2 Zero board
by Jun Nie 24 May '18

24 May '18

Banana Pi M2 Zero is a board by Sinovoip with Allwinner H2+ SoC, 16-bit 512MiB DDR3 memory, a MicroSD slot, two MicroUSB ports (one OTG and one powering-only) and a miniHDMI port. DTS file is from Linux kernel with removing some nodes that are not needed in u-boot or not merged into u-boot yet. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 68 +++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/bananapi_m2_zero_defconfig | 15 ++++++ 4 files changed, 89 insertions(+) create mode 100644 arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts create mode 100644 configs/bananapi_m2_zero_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 20a4c37..8d6fab2 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -338,6 +338,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-cubietruck-plus.dtb \ sun8i-a83t-tbs-a711.dts dtb-$(CONFIG_MACH_SUN8I_H3) += \ + sun8i-h2-plus-bananapi-m2-zero.dtb \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ sun8i-h3-libretech-all-h3-cc.dtb \ diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts new file mode 100644 index 0000000..92e8cf4 --- /dev/null +++ b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts @@ -0,0 +1,68 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (C) 2017 Icenowy Zheng <icenowy(a)aosc.io> + * + * Based on sun8i-h3-bananapi-m2-plus.dts, which is: + * Copyright (C) 2016 Chen-Yu Tsai <wens(a)csie.org> + */ + +/dts-v1/; +#include "sun8i-h3.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> + +/ { + model = "Banana Pi BPI-M2-Zero"; + compatible = "sinovoip,bpi-m2-zero", "allwinner,sun8i-h2-plus"; + + aliases { + serial0 = &uart0; + serial1 = &uart1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + pwr_led { + label = "bananapi-m2-zero:red:pwr"; + gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ + default-state = "on"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + + sw4 { + label = "power"; + linux,code = <BTN_0>; + gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; + }; + }; +}; + +&mmc0 { + vmmc-supply = <&reg_vcc3v3>; + bus-width = <4>; + /* + * On the production batch of this board the card detect GPIO is + * high active (card inserted), although on the early samples it's + * low active. + */ + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */ + status = "okay"; +}; + +&uart0 { + status = "okay"; +}; + +&uart1 { + status = "okay"; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 5eb8bbe..0d904d9 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -363,6 +363,11 @@ M: Icenowy Zheng <icenowy(a)aosc.io> S: Maintained F: configs/Sinovoip_BPI_M2_Plus_defconfig +SINOVOIP BPI M2 ZERO BOARD +M: Icenowy Zheng <icenowy(a)aosc.io> +S: Maintained +F: configs/Sinovoip_BPI_M2_Zero_defconfig + SINOVOIP BPI M3 A83T BOARD M: VishnuPatekar <vishnupatekar0510(a)gmail.com> S: Maintained diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig new file mode 100644 index 0000000..b919d8b --- /dev/null +++ b/configs/bananapi_m2_zero_defconfig @@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SYS_TEXT_BASE=0x4a000000 +CONFIG_MACH_SUN8I_H3=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_ZQ=3881979 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC0_CD_PIN="" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-bananapi-m2-zero" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set -- 2.7.4

2 3

[U-Boot] [PATCH 1/4] usb: xhci: Set accurate add context flags when updating hub attributes
by Bin Meng 24 May '18

24 May '18

If a USB 3.0 hub is plugged into the root port of the xHC, the xHCI driver will issue a 'Configure Endpoint' command to the xHC for it to update its internal data structure for this hub device. The hub attributes are in the slot context so we need tell xHC to update the slot context by setting the add context flags of the input control context to only cover the slot context. At present the add context flags is or'ed with the slot context bit, but it should really be accurately set to the slot context, as the variable that holds the value of the add context flags comes from whatever was set in the last command execution, which may contain additional contexts that 'Configure Endpoint' command should not touch. Some xHC implementations like x86 don't complain such, but it was observed on Renesas RCar Gen3 platform that the RCar xHC complains with a 'TRB error' completion codes as the response. Reported-by: Marek Vasut <marek.vasut(a)gmail.com> Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Tested-by: Marek Vasut <marek.vasut(a)gmail.com> Tested-by: Matthias Blankertz <matthias.blankertz(a)cetitec.com> --- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 3adb002..565948c 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1424,7 +1424,7 @@ static int xhci_update_hub_device(struct udevice *dev, struct usb_device *udev) ctrl_ctx = xhci_get_input_control_ctx(in_ctx); /* Initialize the input context control */ - ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG); + ctrl_ctx->add_flags = cpu_to_le32(SLOT_FLAG); ctrl_ctx->drop_flags = 0; xhci_inval_cache((uintptr_t)out_ctx->bytes, out_ctx->size); -- 2.7.4

2 4

[U-Boot] [PATCH] mmc: Unirqify bcm2835_sdhost and fix writes
by Alexander Graf 24 May '18

24 May '18

The bcm2835 sdhost driver has a problem with "write multiple" commands. It seems to boil down to the fact that the controller dislikes its FIFO to get drained at the end of a block when a write multiple blocks command is in flight. The easy fix is to simply get rid of all the IRQ driven logic and make the driver push as much data into the FIFO as it can. That way we never drain and we never run into the problem. Reported-by: Jan Leonhardt <jan(a)cyberdesigner.net> Signed-off-by: Alexander Graf <agraf(a)suse.de> --- drivers/mmc/bcm2835_sdhost.c | 265 ++++++++----------------------------------- 1 file changed, 47 insertions(+), 218 deletions(-) diff --git a/drivers/mmc/bcm2835_sdhost.c b/drivers/mmc/bcm2835_sdhost.c index 96428333b0..1ce019af57 100644 --- a/drivers/mmc/bcm2835_sdhost.c +++ b/drivers/mmc/bcm2835_sdhost.c @@ -163,7 +163,6 @@ struct bcm2835_host { int clock; /* Current clock speed */ unsigned int max_clk; /* Max possible freq */ unsigned int blocks; /* remaining PIO blocks */ - int irq; /* Device IRQ */ u32 ns_per_fifo_word; @@ -173,14 +172,7 @@ struct bcm2835_host { struct mmc_cmd *cmd; /* Current command */ struct mmc_data *data; /* Current data request */ - bool data_complete:1;/* Data finished before cmd */ bool use_busy:1; /* Wait for busy interrupt */ - bool wait_data_complete:1; /* Wait for data */ - - /* for threaded irq handler */ - bool irq_block; - bool irq_busy; - bool irq_data; struct udevice *dev; struct mmc *mmc; @@ -240,17 +232,9 @@ static void bcm2835_reset_internal(struct bcm2835_host *host) writel(host->cdiv, host->ioaddr + SDCDIV); } -static int bcm2835_finish_command(struct bcm2835_host *host); - -static void bcm2835_wait_transfer_complete(struct bcm2835_host *host) +static int bcm2835_wait_transfer_complete(struct bcm2835_host *host) { - int timediff; - u32 alternate_idle; - - alternate_idle = (host->data->flags & MMC_DATA_READ) ? - SDEDM_FSM_READWAIT : SDEDM_FSM_WRITESTART1; - - timediff = 0; + int timediff = 0; while (1) { u32 edm, fsm; @@ -261,7 +245,10 @@ static void bcm2835_wait_transfer_complete(struct bcm2835_host *host) if ((fsm == SDEDM_FSM_IDENTMODE) || (fsm == SDEDM_FSM_DATAMODE)) break; - if (fsm == alternate_idle) { + + if ((fsm == SDEDM_FSM_READWAIT) || + (fsm == SDEDM_FSM_WRITESTART1) || + (fsm == SDEDM_FSM_READDATA)) { writel(edm | SDEDM_FORCE_DATA_MODE, host->ioaddr + SDEDM); break; @@ -273,9 +260,11 @@ static void bcm2835_wait_transfer_complete(struct bcm2835_host *host) "wait_transfer_complete - still waiting after %d retries\n", timediff); bcm2835_dumpregs(host); - return; + return -ETIMEDOUT; } } + + return 0; } static int bcm2835_transfer_block_pio(struct bcm2835_host *host, bool is_read) @@ -322,6 +311,9 @@ static int bcm2835_transfer_block_pio(struct bcm2835_host *host, bool is_read) fsm_state != SDEDM_FSM_READCRC)) || (!is_read && (fsm_state != SDEDM_FSM_WRITEDATA && + fsm_state != SDEDM_FSM_WRITEWAIT1 && + fsm_state != SDEDM_FSM_WRITEWAIT2 && + fsm_state != SDEDM_FSM_WRITECRC && fsm_state != SDEDM_FSM_WRITESTART1 && fsm_state != SDEDM_FSM_WRITESTART2))) { hsts = readl(host->ioaddr + SDHSTS); @@ -358,9 +350,8 @@ static int bcm2835_transfer_pio(struct bcm2835_host *host) is_read = (host->data->flags & MMC_DATA_READ) != 0; ret = bcm2835_transfer_block_pio(host, is_read); - - if (host->wait_data_complete) - bcm2835_wait_transfer_complete(host); + if (ret) + return ret; sdhsts = readl(host->ioaddr + SDHSTS); if (sdhsts & (SDHSTS_CRC16_ERROR | @@ -379,21 +370,8 @@ static int bcm2835_transfer_pio(struct bcm2835_host *host) return ret; } -static void bcm2835_set_transfer_irqs(struct bcm2835_host *host) -{ - u32 all_irqs = SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN | - SDHCFG_BUSY_IRPT_EN; - - host->hcfg = (host->hcfg & ~all_irqs) | - SDHCFG_DATA_IRPT_EN | - SDHCFG_BUSY_IRPT_EN; - - writel(host->hcfg, host->ioaddr + SDHCFG); -} - -static -void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd, - struct mmc_data *data) +static void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd, + struct mmc_data *data) { WARN_ON(host->data); @@ -401,14 +379,9 @@ void bcm2835_prepare_data(struct bcm2835_host *host, struct mmc_cmd *cmd, if (!data) return; - host->wait_data_complete = cmd->cmdidx != MMC_CMD_READ_MULTIPLE_BLOCK; - host->data_complete = false; - /* Use PIO */ host->blocks = data->blocks; - bcm2835_set_transfer_irqs(host); - writel(data->blocksize, host->ioaddr + SDHBCT); writel(data->blocks, host->ioaddr + SDHBLC); } @@ -483,36 +456,6 @@ static int bcm2835_send_command(struct bcm2835_host *host, struct mmc_cmd *cmd, return 0; } -static int bcm2835_transfer_complete(struct bcm2835_host *host) -{ - int ret = 0; - - WARN_ON(!host->data_complete); - - host->data = NULL; - - return ret; -} - -static void bcm2835_finish_data(struct bcm2835_host *host) -{ - host->hcfg &= ~(SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN); - writel(host->hcfg, host->ioaddr + SDHCFG); - - host->data_complete = true; - - if (host->cmd) { - /* Data managed to finish before the - * command completed. Make sure we do - * things in the proper order. - */ - dev_dbg(dev, "Finished early - HSTS %08x\n", - readl(host->ioaddr + SDHSTS)); - } else { - bcm2835_transfer_complete(host); - } -} - static int bcm2835_finish_command(struct bcm2835_host *host) { struct mmc_cmd *cmd = host->cmd; @@ -562,8 +505,6 @@ static int bcm2835_finish_command(struct bcm2835_host *host) /* Processed actual command. */ host->cmd = NULL; - if (host->data && host->data_complete) - ret = bcm2835_transfer_complete(host); return ret; } @@ -608,159 +549,44 @@ static int bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask) return ret; } -static void bcm2835_busy_irq(struct bcm2835_host *host) -{ - if (WARN_ON(!host->cmd)) { - bcm2835_dumpregs(host); - return; - } - - if (WARN_ON(!host->use_busy)) { - bcm2835_dumpregs(host); - return; - } - host->use_busy = false; - - bcm2835_finish_command(host); -} - -static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask) +static int bcm2835_transmit(struct bcm2835_host *host) { + u32 intmask = readl(host->ioaddr + SDHSTS); int ret; - /* - * There are no dedicated data/space available interrupt - * status bits, so it is necessary to use the single shared - * data/space available FIFO status bits. It is therefore not - * an error to get here when there is no data transfer in - * progress. - */ - if (!host->data) - return; - + /* Check for errors */ ret = bcm2835_check_data_error(host, intmask); if (ret) - goto finished; - - if (host->data->flags & MMC_DATA_WRITE) { - /* Use the block interrupt for writes after the first block */ - host->hcfg &= ~(SDHCFG_DATA_IRPT_EN); - host->hcfg |= SDHCFG_BLOCK_IRPT_EN; - writel(host->hcfg, host->ioaddr + SDHCFG); - bcm2835_transfer_pio(host); - } else { - bcm2835_transfer_pio(host); - host->blocks--; - if ((host->blocks == 0)) - goto finished; - } - return; + return ret; -finished: - host->hcfg &= ~(SDHCFG_DATA_IRPT_EN | SDHCFG_BLOCK_IRPT_EN); - writel(host->hcfg, host->ioaddr + SDHCFG); -} - -static void bcm2835_data_threaded_irq(struct bcm2835_host *host) -{ - if (!host->data) - return; - if ((host->blocks == 0)) - bcm2835_finish_data(host); -} - -static void bcm2835_block_irq(struct bcm2835_host *host) -{ - if (WARN_ON(!host->data)) { - bcm2835_dumpregs(host); - return; - } - - WARN_ON(!host->blocks); - if ((--host->blocks == 0)) - bcm2835_finish_data(host); - else - bcm2835_transfer_pio(host); -} + ret = bcm2835_check_cmd_error(host, intmask); + if (ret) + return ret; -static irqreturn_t bcm2835_irq(int irq, void *dev_id) -{ - irqreturn_t result = IRQ_NONE; - struct bcm2835_host *host = dev_id; - u32 intmask; - - intmask = readl(host->ioaddr + SDHSTS); - - writel(SDHSTS_BUSY_IRPT | - SDHSTS_BLOCK_IRPT | - SDHSTS_SDIO_IRPT | - SDHSTS_DATA_FLAG, - host->ioaddr + SDHSTS); - - if (intmask & SDHSTS_BLOCK_IRPT) { - bcm2835_check_data_error(host, intmask); - host->irq_block = true; - result = IRQ_WAKE_THREAD; + /* Handle wait for busy end */ + if (host->use_busy && (intmask & SDHSTS_BUSY_IRPT)) { + writel(SDHSTS_BUSY_IRPT, host->ioaddr + SDHSTS); + host->use_busy = false; + bcm2835_finish_command(host); } - if (intmask & SDHSTS_BUSY_IRPT) { - if (!bcm2835_check_cmd_error(host, intmask)) { - host->irq_busy = true; - result = IRQ_WAKE_THREAD; - } else { - result = IRQ_HANDLED; + /* Handle PIO data transfer */ + if (host->data) { + ret = bcm2835_transfer_pio(host); + if (ret) + return ret; + host->blocks--; + if (host->blocks == 0) { + /* Wait for command to complete for real */ + ret = bcm2835_wait_transfer_complete(host); + if (ret) + return ret; + /* Transfer complete */ + host->data = NULL; } } - /* There is no true data interrupt status bit, so it is - * necessary to qualify the data flag with the interrupt - * enable bit. - */ - if ((intmask & SDHSTS_DATA_FLAG) && - (host->hcfg & SDHCFG_DATA_IRPT_EN)) { - bcm2835_data_irq(host, intmask); - host->irq_data = true; - result = IRQ_WAKE_THREAD; - } - - return result; -} - -static irqreturn_t bcm2835_threaded_irq(int irq, void *dev_id) -{ - struct bcm2835_host *host = dev_id; - - if (host->irq_block) { - host->irq_block = false; - bcm2835_block_irq(host); - } - - if (host->irq_busy) { - host->irq_busy = false; - bcm2835_busy_irq(host); - } - - if (host->irq_data) { - host->irq_data = false; - bcm2835_data_threaded_irq(host); - } - - return IRQ_HANDLED; -} - -static void bcm2835_irq_poll(struct bcm2835_host *host) -{ - u32 intmask; - - while (1) { - intmask = readl(host->ioaddr + SDHSTS); - if (intmask & (SDHSTS_BUSY_IRPT | SDHSTS_BLOCK_IRPT | - SDHSTS_SDIO_IRPT | SDHSTS_DATA_FLAG)) { - bcm2835_irq(0, host); - bcm2835_threaded_irq(0, host); - return; - } - } + return 0; } static void bcm2835_set_clock(struct bcm2835_host *host, unsigned int clock) @@ -864,8 +690,11 @@ static int bcm2835_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, } /* Wait for completion of busy signal or data transfer */ - while (host->use_busy || host->data) - bcm2835_irq_poll(host); + while (host->use_busy || host->data) { + ret = bcm2835_transmit(host); + if (ret) + break; + } return ret; } -- 2.12.3

1 1

[U-Boot] initialization to TI AM335x MII connected to Marvell's 88e6341 switch
by Avner Flesch 24 May '18

24 May '18

Hi, I have costume board based on Beagle Bone Black board except the networking - instead of Ethernet PHY, we put a Marvell switch 88e6341 (The CPU port connected with MII). So, I need the u-boot source modification for it (c/h files and dts files) If someone can point me to a reference or send me the files, I will really appreciate it Thanks Avner

1 0

[U-Boot] [PATCH] menu: fix timeout duration
by Masahiro Yamada 24 May '18

24 May '18

menu_interactive_choice() divides the timeout value by 10 before passing it to cli_readline_into_buffer(). For distro-boot, the "timeout" variable in the boot script should specify the time in _seconds_ to wait for keyboard input before booting the default menu entry. Due to the division, "timeout 50" actually wait for only 5 seconds instead of 50. What is worse, "timeout 5" never breaks because "m->timeout / 10" is zero, which means no timeout. For CONFIG_MENU_SHOW case, menu_show() should also take the timeout value in seconds because its default comes from CONFIG_BOOTDELAY. The "division by 10" was introduced by commit 8594753ba0a7 ("menu: only timeout when menu is displayed"). Its log claimed "fixed", but to me, it rather looks the root cause of the problem. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Rob, I know commit 8594753ba0a7 is already 6 years ago. If you remember something about "/ 10", please comment. common/menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/menu.c b/common/menu.c index bf2b471..bf23194 100644 --- a/common/menu.c +++ b/common/menu.c @@ -194,8 +194,7 @@ static inline int menu_interactive_choice(struct menu *m, void **choice) if (!m->item_choice) { readret = cli_readline_into_buffer("Enter choice: ", - cbuf, - m->timeout / 10); + cbuf, timeout); if (readret >= 0) { choice_item = menu_item_by_key(m, cbuf); -- 2.7.4

1 1

[U-Boot] mtd: spi-nor: new NXP FlexSPI driver location & framework to use ?
by Prabhakar Kushwaha 24 May '18

24 May '18

Dear Jagan, NXP is coming up with new FlexSPI controller. It is similar to existing QSPI with enhanced feature-set. We have the driver ready as per existing framework i.e. driver/spi. >From recend discussion, we go to know about framework change. Migration of qspi drivers in u-boot-spi/drivers/mtd/spi-nor/ git://git.denx.de/u-boot-spi.git branch mtd-spinor-working. We are in dilemma for sending FlexSPI driver upstream. Do we follow existing framework i.e. driver/spi or new proposed framework i.e. u-boot-spi/drivers/mtd/spi-nor/ Also, do we have any timeline of u-boot-spi/drivers/mtd/spi-nor/ to become default. We have sent RFC version in Linux upstream for review. Please refer below Regards, Prabhakar -----Original Message----- From: linux-mtd [mailto:linux-mtd-bounces@lists.infradead.org] On Behalf Of Yogesh Gaur Sent: Wednesday, April 4, 2018 3:36 PM To: linux-mtd(a)lists.infradead.org Cc: boris.brezillon(a)free-electrons.com; Yogesh Narayan Gaur <yogeshnarayan.gaur(a)nxp.com>; marek.vasut(a)gmail.com; frieder.schrempf(a)exceet.de; Suresh Gupta <suresh.gupta(a)nxp.com>; cyrille.pitchen(a)wedev4u.fr; Han Xu <han.xu(a)nxp.com>; computersforpeace(a)gmail.com; festevam(a)gmail.com Subject: [RFC PATCH 0/4] mtd: spi-nor: Add NXP FlexSPI driver Add NXP FlexSPI driver NXP uses FlexSPI controller. The FlexSPI(Flex Serial Peripheral controller) acts as an interface to external serial flash devices, maximum 4, each with upto 8 bidirectional data lines. (1) The FlexSPI controller is driven by the LUT(Look-up Table) registers. The LUT registers are a look-up-table for sequences of instructions. A valid sequence consists of four LUT registers. (2) The definition of the LUT register shows below: --------------------------------------------------- | INSTR1 | PAD1 | OPRND1 | INSTR0 | PAD0 | OPRND0 | --------------------------------------------------- There are several types of INSTRx, such as: CMD : the SPI NOR command. ADDR : the address for the SPI NOR command. DUMMY : the dummy cycles needed by the SPI NOR command. .... There are several types of PADx, such as: PAD1 : use single I/O line. PAD2 : use dual I/O lines. PAD4 : use quad I/O lines. PAD8 : use octal I/O lines. .... (3) LUTs are being created at run-time based on the commands passed from the spi-nor framework. (4) Mode [single, dual, quad or octal] bit information derived from device tree by parsing spi-rx-bus-width and spi-tx-bus-width property. (5) Tested this driver with the mtd_debug utility on NXP LX2160 emulator platform. This series added below patches: - Added entry for mt35xu512aba NOR flash in spi_nor_ids table - Add flags for Octal I/O data transfer in spi/spi.h - Add binding file for NXP FlexSPI driver - Add NXP FlexSPI driver in mtd interface Yogesh Gaur (4): mtd: spi-nor: Add entry for mt35xu512aba flash spi: add flags for octal I/O data transfer dt-bindings: Add binding file for NXP FlexSPI driver mtd: spi-nor: Add NXP FlexSPI driver .../devicetree/bindings/mtd/nxp-flexspi.txt | 40 + MAINTAINERS | 7 + drivers/mtd/spi-nor/Kconfig | 7 + drivers/mtd/spi-nor/Makefile | 1 + drivers/mtd/spi-nor/nxp-flexspi.c | 1508 ++++++++++++++++++++ drivers/mtd/spi-nor/spi-nor.c | 7 +- include/linux/mtd/cfi.h | 1 + include/linux/mtd/spi-nor.h | 1 + include/linux/spi/spi.h | 2 + 9 files changed, 1573 insertions(+), 1 deletion(-) create mode 100644 Documentation/devicetree/bindings/mtd/nxp-flexspi.txt create mode 100644 drivers/mtd/spi-nor/nxp-flexspi.c -- 1.9.1 ______________________________________________________ Linux MTD discussion mailing list https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.inf…

4 13

Re: [U-Boot] [PATCH 1/2] ARM: dts: exynos5: remove the duplicated nodes
by Minkyu Kang 24 May '18

24 May '18

Hi, 2018년 5월 16일 (수) 11:30, Minkyu Kang <promsoft(a)gmail.com>님이 작성: > > > 2018년 5월 9일 (수) 12:53, Anand Moon <linux.amoon(a)gmail.com>님이 작성: > >> Hi Jaehoon, >> >> On 12 January 2018 at 16:37, Jaehoon Chung <jh80.chung(a)samsung.com> >> wrote: >> > Remove the duplicated gic and combiner nodes in exynos5.dtsi. >> > >> > Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> >> > --- >> > arch/arm/dts/exynos5.dtsi | 27 --------------------------- >> > 1 file changed, 27 deletions(-) >> > >> > diff --git a/arch/arm/dts/exynos5.dtsi b/arch/arm/dts/exynos5.dtsi >> > index 8650800f52..8b725c0ddc 100644 >> > --- a/arch/arm/dts/exynos5.dtsi >> > +++ b/arch/arm/dts/exynos5.dtsi >> > @@ -45,33 +45,6 @@ >> > #size-cells = <0>; >> > }; >> > >> > - combiner: interrupt-controller@10440000 { >> > - compatible = "samsung,exynos4210-combiner"; >> > - #interrupt-cells = <2>; >> > - interrupt-controller; >> > - samsung,combiner-nr = <32>; >> > - reg = <0x10440000 0x1000>; >> > - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, >> > - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, >> > - <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, >> > - <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, >> > - <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>, >> > - <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>, >> > - <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>, >> > - <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; >> > - }; >> > - >> > - gic: interrupt-controller@10481000 { >> > - compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic"; >> > - #interrupt-cells = <3>; >> > - interrupt-controller; >> > - reg = <0x10481000 0x1000>, >> > - <0x10482000 0x1000>, >> > - <0x10484000 0x2000>, >> > - <0x10486000 0x2000>; >> > - interrupts = <1 9 0xf04>; >> > - }; >> > - >> > i2c_0: i2c@12C60000 { >> > compatible = "samsung,s3c2440-i2c"; >> > reg = <0x12C60000 0x100>; >> > -- >> > 2.15.1 >> > >> > _______________________________________________ >> > U-Boot mailing list >> > U-Boot(a)lists.denx.de >> > https://lists.denx.de/listinfo/u-boot >> >> Looks like this series of patch is missing in u-boot git repository. >> >> Best Regards >> -Anand >> _______________________________________________ >> U-Boot mailing list >> U-Boot(a)lists.denx.de >> https://lists.denx.de/listinfo/u-boot > > > > applied to u-boot-samsung. > I accepted this patch series, but I cannot push now since network problem in my office. So please wait few days more. > Thanks, > Minkyu Kang. >

1 1

[U-Boot] [PATCH 4/4] mtd: ftsmc020: Drop unsed code
by Andes 24 May '18

24 May '18

From: Rick Chen <rick(a)andestech.com> ftsmc020_init is not used anymore. So it can be removed. Signed-off-by: Rick Chen <rick(a)andestech.com> Signed-off-by: Rick Chen <rickchen36(a)gmail.com> Cc: Greentime Hu <green.hu(a)gmail.com> --- drivers/mtd/Makefile | 1 - drivers/mtd/ftsmc020.c | 38 -------------------------------------- 2 files changed, 39 deletions(-) mode change 100644 => 100755 drivers/mtd/Makefile delete mode 100644 drivers/mtd/ftsmc020.c diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile old mode 100644 new mode 100755 index 20c0d0a..c4ffbe3 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -14,7 +14,6 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o obj-$(CONFIG_ALTERA_QSPI) += altera_qspi.o obj-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o obj-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o -obj-$(CONFIG_FTSMC020) += ftsmc020.o obj-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o obj-$(CONFIG_MW_EEPROM) += mw_eeprom.o obj-$(CONFIG_FLASH_PIC32) += pic32_flash.o diff --git a/drivers/mtd/ftsmc020.c b/drivers/mtd/ftsmc020.c deleted file mode 100644 index e2e8082..0000000 --- a/drivers/mtd/ftsmc020.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * (C) Copyright 2009 Faraday Technology - * Po-Yu Chuang <ratbert(a)faraday-tech.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <config.h> -#include <common.h> -#include <asm/io.h> -#include <faraday/ftsmc020.h> - -struct ftsmc020_config { - unsigned int config; - unsigned int timing; -}; - -static void ftsmc020_setup_bank(unsigned int bank, struct ftsmc020_config *cfg) -{ - struct ftsmc020 *smc = (struct ftsmc020 *)CONFIG_FTSMC020_BASE; - - if (bank > 3) { - printf("bank # %u invalid\n", bank); - return; - } - - writel(cfg->config, &smc->bank[bank].cr); - writel(cfg->timing, &smc->bank[bank].tpr); -} - -void ftsmc020_init(void) -{ - struct ftsmc020_config config[] = CONFIG_SYS_FTSMC020_CONFIGS; - int i; - - for (i = 0; i < ARRAY_SIZE(config); i++) - ftsmc020_setup_bank(i, &config[i]); -} -- 2.7.4

1 0