November 2015 - U-Boot

[U-Boot] [PATCH] spi: sf_ops: Check the return value from spi_flash_cmd_read_status()
by Fabio Estevam 17 Nov '15

17 Nov '15

We should check the return value from spi_flash_cmd_read_status() and propagate it in the case of error. This fixes a defect caught by Coverity. Reported-by: Tom Rini <trini(a)konsulko.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/mtd/spi/sf_ops.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 384224d..6cc2d31 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -663,8 +663,11 @@ int stm_lock(struct spi_flash *flash, u32 ofs, size_t len) u8 status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 shift = ffs(mask) - 1, pow, val; + int ret; - spi_flash_cmd_read_status(flash, &status_old); + ret = spi_flash_cmd_read_status(flash, &status_old); + if (ret) + return ret; /* SPI NOR always locks to the end */ if (ofs + len != flash->size) { @@ -714,8 +717,11 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len) uint8_t status_old, status_new; u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 shift = ffs(mask) - 1, pow, val; + int ret; - spi_flash_cmd_read_status(flash, &status_old); + ret = spi_flash_cmd_read_status(flash, &status_old); + if (ret) + return ret; /* Cannot unlock; would unlock larger region than requested */ if (stm_is_locked_sr(flash, status_old, ofs - flash->erase_size, -- 1.9.1

2 1

[U-Boot] [PATCH] sf: Remove eeprom_m95xxx test driver
by Jagan Teki 17 Nov '15

17 Nov '15

The relevent boards which used this driver got zapped in previous release and the driver is never used in the code and also it doesn't use/do any spi-flash operations. Commit details for relevent removed boards: "ARM: at91: remove non-generic boards" (sha1: f6b42c140387589ded24749781ce565571092eac) Cc: Tom Rini <trini(a)konsulko.com> Cc: Albin Tonnerre <albin.tonnerre(a)free-electrons.com> Signed-off-by: Jagan Teki <jteki(a)openedev.com> --- drivers/mtd/spi/Makefile | 1 - drivers/mtd/spi/eeprom_m95xxx.c | 111 ---------------------------------------- 2 files changed, 112 deletions(-) delete mode 100644 drivers/mtd/spi/eeprom_m95xxx.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index ff48b25..cf4e7e1 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -20,4 +20,3 @@ obj-$(CONFIG_SPI_FLASH) += sf_ops.o sf_params.o obj-$(CONFIG_SPI_FLASH_DATAFLASH) += sf_dataflash.o obj-$(CONFIG_SPI_FLASH_MTD) += sf_mtd.o obj-$(CONFIG_SPI_FLASH_SANDBOX) += sandbox.o -obj-$(CONFIG_SPI_M95XXX) += eeprom_m95xxx.o diff --git a/drivers/mtd/spi/eeprom_m95xxx.c b/drivers/mtd/spi/eeprom_m95xxx.c deleted file mode 100644 index a019939..0000000 --- a/drivers/mtd/spi/eeprom_m95xxx.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (C) 2009 - * Albin Tonnerre, Free Electrons <albin.tonnerre(a)free-electrons.com> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> -#include <spi.h> - -#define SPI_EEPROM_WREN 0x06 -#define SPI_EEPROM_RDSR 0x05 -#define SPI_EEPROM_READ 0x03 -#define SPI_EEPROM_WRITE 0x02 - -#ifndef CONFIG_DEFAULT_SPI_BUS -#define CONFIG_DEFAULT_SPI_BUS 0 -#endif - -#ifndef CONFIG_DEFAULT_SPI_MODE -#define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0 -#endif - -#ifndef CONFIG_SYS_SPI_WRITE_TOUT -#define CONFIG_SYS_SPI_WRITE_TOUT (5 * CONFIG_SYS_HZ) -#endif - -ssize_t spi_read(uchar *addr, int alen, uchar *buffer, int len) -{ - struct spi_slave *slave; - u8 cmd = SPI_EEPROM_READ; - - slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000, - CONFIG_DEFAULT_SPI_MODE); - if (!slave) - return 0; - - spi_claim_bus(slave); - - /* command */ - if (spi_xfer(slave, 8, &cmd, NULL, SPI_XFER_BEGIN)) - return -1; - - /* - * if alen == 3, addr[0] is the block number, we never use it here. - * All we need are the lower 16 bits. - */ - if (alen == 3) - addr++; - - /* address, and data */ - if (spi_xfer(slave, 16, addr, NULL, 0)) - return -1; - if (spi_xfer(slave, 8 * len, NULL, buffer, SPI_XFER_END)) - return -1; - - spi_release_bus(slave); - spi_free_slave(slave); - return len; -} - -ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len) -{ - struct spi_slave *slave; - char buf[3]; - ulong start; - - slave = spi_setup_slave(CONFIG_DEFAULT_SPI_BUS, 1, 1000000, - CONFIG_DEFAULT_SPI_MODE); - if (!slave) - return 0; - - spi_claim_bus(slave); - - buf[0] = SPI_EEPROM_WREN; - if (spi_xfer(slave, 8, buf, NULL, SPI_XFER_BEGIN | SPI_XFER_END)) - return -1; - - buf[0] = SPI_EEPROM_WRITE; - - /* As for reading, drop addr[0] if alen is 3 */ - if (alen == 3) { - alen--; - addr++; - } - - memcpy(buf + 1, addr, alen); - /* command + addr, then data */ - if (spi_xfer(slave, 24, buf, NULL, SPI_XFER_BEGIN)) - return -1; - if (spi_xfer(slave, len * 8, buffer, NULL, SPI_XFER_END)) - return -1; - - start = get_timer(0); - do { - buf[0] = SPI_EEPROM_RDSR; - buf[1] = 0; - spi_xfer(slave, 16, buf, buf, SPI_XFER_BEGIN | SPI_XFER_END); - - if (!(buf[1] & 1)) - break; - - } while (get_timer(start) < CONFIG_SYS_SPI_WRITE_TOUT); - - if (buf[1] & 1) - printf("*** spi_write: Timeout while writing!\n"); - - spi_release_bus(slave); - spi_free_slave(slave); - return len; -} -- 1.9.1

1 1

[U-Boot] [PATCH v2] sf_probe: Add lock ops for SST SPI NOR flash
by Fabio Estevam 17 Nov '15

17 Nov '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> SST SPI NOR flash has the same locking programming bits as ST Micro. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v1: - Also add SST defined in sf_ops (Jagan) drivers/mtd/spi/sf_internal.h | 1 + drivers/mtd/spi/sf_ops.c | 4 ++-- drivers/mtd/spi/sf_probe.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/spi/sf_internal.h b/drivers/mtd/spi/sf_internal.h index 8793f18..85c8a89 100644 --- a/drivers/mtd/spi/sf_internal.h +++ b/drivers/mtd/spi/sf_internal.h @@ -64,6 +64,7 @@ enum spi_nor_option_flags { #define SPI_FLASH_CFI_MFR_SPANSION 0x01 #define SPI_FLASH_CFI_MFR_STMICRO 0x20 #define SPI_FLASH_CFI_MFR_MACRONIX 0xc2 +#define SPI_FLASH_CFI_MFR_SST 0xbf #define SPI_FLASH_CFI_MFR_WINBOND 0xef /* Erase commands */ diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c index 6cc2d31..f045471 100644 --- a/drivers/mtd/spi/sf_ops.c +++ b/drivers/mtd/spi/sf_ops.c @@ -583,7 +583,7 @@ int sst_write_bp(struct spi_flash *flash, u32 offset, size_t len, } #endif -#ifdef CONFIG_SPI_FLASH_STMICRO +#if defined CONFIG_SPI_FLASH_STMICRO || defined CONFIG_SPI_FLASH_SST static void stm_get_locked_range(struct spi_flash *flash, u8 sr, loff_t *ofs, u32 *len) { @@ -756,4 +756,4 @@ int stm_unlock(struct spi_flash *flash, u32 ofs, size_t len) return 0; } -#endif /* CONFIG_SPI_FLASH_STMICRO */ +#endif diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index bc05d30..fea6c24 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -184,8 +184,9 @@ static int spi_flash_validate_params(struct spi_slave *spi, u8 *idcode, /* lock hooks are flash specific - assign them based on idcode0 */ switch (idcode[0]) { -#ifdef CONFIG_SPI_FLASH_STMICRO +#if defined CONFIG_SPI_FLASH_STMICRO || defined CONFIG_SPI_FLASH_SST case SPI_FLASH_CFI_MFR_STMICRO: + case SPI_FLASH_CFI_MFR_SST: flash->flash_lock = stm_lock; flash->flash_unlock = stm_unlock; flash->flash_is_locked = stm_is_locked; -- 1.9.1

2 1

[U-Boot] how to load u-boot environment from nand while spl is loading
by Francesco Lucconi 17 Nov '15

17 Nov '15

I'm working with imx28evk reference board with u-boot 2011.12 and for my specific purposes I have to load u-boot nand environment during spl binary is loading. I'm working with a static environment but this is not so useful because I need to initialize some drivers (such as serial console) with the current values stored within nand flash environment (such as baudrate variable). Comparing my u-boot version with more recent ones (u-boot 2015.10) I've found out that the enviroment loading has been applied during ram bootstrapping...can't we do this operation before u-boot.bin has been loaded in ddr memory? Could you send me any tips to solve this issue? -- Francesco Lucconi SW Design Dept. Via 1° Maggio, 26 60131 Ancona - Zona Baraccola (Italy) T: +39 071 2506590 F: +39 071 2506518 Email: francesco.lucconi(a)aethra.com <mailto:francesco.lucconi@aethra.com> Website: www.aethra.com <http://www.aethra.com> ------------------------------------------------------------------------ NOTA BENE: Le informazioni contenute in questo messaggio sono riservate e sono destinate esclusivamente alle persone indicate in indirizzo o a chi sia stato da quelle autorizzato. La confidenzialità e la riservatezza non vengono in alcun modo meno neanche nel caso in cui il messaggio sia stato per errore trasmesso a persona o soggetto diverso dal destinatario e, in ogni caso, la circolazione e la riproduzione di questo messaggio è strettamente proibita. Se avete ricevuto questo messaggio per errore, vi preghiamo di contattarci immediatamente (Legge 196/03). PLEASE NOTE: The information contained in this message is privileged and confidential and is intended only for use of the addressee(s) or of those responsible to deliver it to the addressee(s). Neither the confidentiality nor any privilege attaching to this message is waived, lost or destroyed by reason that it has been mistakenly transmitted to a person or entity other than the addressee(s). Please note that any distribution, dissemination or copying of this message is strictly prohibited. In case you have received this message in error, please notify us immediately (Law 196/03).

3 2

[U-Boot] [PATCH 0/2] am43xx: Enable QUAD mode and DMA support for QSPI
by Vignesh R 17 Nov '15

17 Nov '15

This patchset enables QUAD mode and DMA support for qspi read on am437x. This increases the througput to 4 MB/s. Tested on am437x-sk and am437x-idk evm. Vignesh R (2): spi: ti_qspi: Add dummy readl for bus sync ARM: am437xx: Enable QUAD read and EDMA support for ti_qspi arch/arm/include/asm/arch-am33xx/hardware_am43xx.h | 3 +++ drivers/spi/ti_qspi.c | 2 ++ include/configs/am43xx_evm.h | 2 ++ 3 files changed, 7 insertions(+) -- 2.6.3

3 11

[U-Boot] [PATCH 1/2] spi_flash: Add error message when lock operations are not supported
by Fabio Estevam 17 Nov '15

17 Nov '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> In the case of lock operations not being supported, we should better let the user know instead of failing silently. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/spi_flash.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/spi_flash.h b/include/spi_flash.h index 0ae0062..ff51c50 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -237,8 +237,10 @@ static inline int spi_flash_erase(struct spi_flash *flash, u32 offset, static inline int spi_flash_protect(struct spi_flash *flash, u32 ofs, u32 len, bool prot) { - if (!flash->flash_lock) + if (!flash->flash_lock) { + printf("Protect operation not supported for this flash\n"); return -EOPNOTSUPP; + } if (prot) return flash->flash_lock(flash, ofs, len); -- 1.9.1

2 4

[U-Boot] [PATCH] vexpress64: compile Juno PCIe conditionally
by Linus Walleij 17 Nov '15

17 Nov '15

Only compile in PCIe support if the board really uses it. Provide a stub for the init function if e.g. FVP is being built. Cc: Liviu Dudau <Liviu.Dudau(a)foss.arm.com> Cc: Ryan Harkin <ryan.harkin(a)linaro.org> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- board/armltd/vexpress64/Makefile | 3 ++- board/armltd/vexpress64/pcie.c | 2 -- board/armltd/vexpress64/pcie.h | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/board/armltd/vexpress64/Makefile b/board/armltd/vexpress64/Makefile index a35db401b684..b4391a71249a 100644 --- a/board/armltd/vexpress64/Makefile +++ b/board/armltd/vexpress64/Makefile @@ -5,4 +5,5 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := vexpress64.o pcie.o +obj-y := vexpress64.o +obj-$(CONFIG_TARGET_VEXPRESS64_JUNO) += pcie.o diff --git a/board/armltd/vexpress64/pcie.c b/board/armltd/vexpress64/pcie.c index 7b999e8ef40b..311c4500e3ff 100644 --- a/board/armltd/vexpress64/pcie.c +++ b/board/armltd/vexpress64/pcie.c @@ -191,7 +191,5 @@ void xr3pci_init(void) void vexpress64_pcie_init(void) { -#ifdef CONFIG_TARGET_VEXPRESS64_JUNO xr3pci_init(); -#endif } diff --git a/board/armltd/vexpress64/pcie.h b/board/armltd/vexpress64/pcie.h index 14642f4f5c43..55b276d6af11 100644 --- a/board/armltd/vexpress64/pcie.h +++ b/board/armltd/vexpress64/pcie.h @@ -1,6 +1,10 @@ #ifndef __VEXPRESS64_PCIE_H__ #define __VEXPRESS64_PCIE_H__ +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO void vexpress64_pcie_init(void); +#else +static inline void vexpress64_pcie_init(void) {} +#endif #endif /* __VEXPRESS64_PCIE_H__ */ -- 2.4.3

3 12

[U-Boot] [PATCH 0/3] vexpress64 flash support
by Ryan Harkin 17 Nov '15

17 Nov '15

Whilst adding NOR support for Juno and FVP models, I encountered a problem in cfi_flash.c. It is using "unsigned long" to represent a 32-bit value. This does not work on 64-bit systems such as vexpress64. I fixed it up in patch 1/3, however, I'm not convinced that my mod is the correct one. I'd appreciate some help with that one and will respin after feedback. Patch 2/3 may also be unsuitable. Once I'd added the CFI flash support, the build failed because tools/envcrc.c includes include/config.h, which in turn includes include/configs/vexpress_aemv8a.h, but without a board defined. Perhaps there is something missing from the global config that means the #errors should not be triggered? Again, feedback would be appreciated here. The last patch relies on the two previous ones to build and work successfully. I believe it to be the correct approach but welcome suggested improvements. I tested it on Juno R0, R1 and FVP AEMv8 models version "Fast Models [0.8.6302 (Feb 4 2015)]". I also tested on Foundation Model version "ARM V8 Foundation Model r0p0 (model build 9.2.28)", where it failed gracefully. [PATCH 1/3] cfi_flash: use specific length types for cword [PATCH 2/3] vexpress64: remove #error [PATCH 3/3] vexpress64: store env in flash configs/vexpress_aemv8a_dram_defconfig | 1 + configs/vexpress_aemv8a_semi_defconfig | 1 + drivers/mtd/cfi_flash.c | 4 ++-- include/configs/vexpress_aemv8a.h | 43 +++++++++++++++++++++++-------------------- include/mtd/cfi_flash.h | 8 ++++---- 5 files changed, 31 insertions(+), 26 deletions(-) This series is also available in a public GIT tree: https://git.linaro.org/landing-teams/working/arm/u-boot.git/shortlog/refs/t…

4 23

Re: [U-Boot] Needed Changes for updating to u-boot-2015.10 from u-boot-1.1.6
by Ravi Koganti 17 Nov '15

17 Nov '15

Hello, I have ARM9 processor board with uboot version u-boot-1.1.6. Now I want to change it to u-boot-2015.10. But the whole uboot structure got changed from version 1.1.6 to 2015.10. Please guide me to do it or share any link contain the details. Thanks, Ravi

1 0

[U-Boot] u-boot device model SPI + SPI Flash
by Hoefle Marco 17 Nov '15

17 Nov '15

Hello, I saw that here is also a mailing list dedicated to device model issues but it looks obsolete (last post February 2014) so I am using this forum. I have a problem nearly identically to http://lists.denx.de/pipermail/u-boot/2015-April/210754.html The SPI initialization does not work: Invalid bus 0 (err=-19) *** Warning - spi_flash_probe() failed, using default environment This is the device tree compiled into u-boot: U-Boot> fdt addr 0x8FEB8A7C U-Boot> fdt print / { #address-cells = <0x00000001>; #size-cells = <0x00000001>; aliases { serial0 = "serial@40600000"; spi0 = "/axi_quad_spi@44a00000"; }; memory { device_type = "memory"; reg = <0x80000000 0x10000000>; }; axi_quad_spi@44a00000 { compatible = "xlnx,xps-spi-2.00.a"; reg = <0x44a00000 0x00010000>; spi-max-frequency = <0x423a35c7>; #address-cells = <0x00000001>; #size-cells = <0x00000000>; status = "okay"; is-dual = <0x00000000>; num-cs = <0x00000001>; flash@0 { compatible = "n25q128a11"; reg = <0x00000000>; spi-tx-bus-width = <0x00000001>; spi-rx-bus-width = <0x00000004>; spi-max-frequency = <0x0d3ed78e>; #address-cells = <0x00000001>; #size-cells = <0x00000001>; partition@qspi-fsbl-uboot { label = "qspi-fsbl-uboot"; reg = <0x00000000 0x00100000>; }; partition@qspi-linux { label = "qspi-linux"; reg = <0x00100000 0x00500000>; }; partition@qspi-device-tree { label = "qspi-device-tree"; reg = <0x00600000 0x00020000>; }; partition@qspi-rootfs { label = "qspi-rootfs"; reg = <0x00620000 0x005e0000>; }; partition@qspi-bitstream { label = "qspi-bitstream"; reg = <0x00c00000 0x00400000>; }; }; }; }; Has anybody an idea how to debug this further? Thanks, Marco

3 20