May 2014 - U-Boot

[U-Boot] [RFC] Two sets of experimental Kconfig patches
by Masahiro Yamada 24 Jun '14

24 Jun '14

Hi. I've posted two sets of Kconfig RFC patches: "RFCv2a" and "RFCv2b" The difference from v1 is that Full U-boot image, SPL and TPL share a single defconfig and "make config" is done in one-shot. This approach dates back to Simon's following comments: On Thu, 20 Mar 2014 19:15:30 -0700 Simon Glass <sjg(a)chromium.org> wrote: > > But, our situation is a little more complicated. > > We need to generate 3 images at most: main image, SPL and TPL. > > And each of them can have a different set of CONFIGs. > > > > For example, we can describe a board header file like this: > > > > #if defined(CONFIG_TPL_BUILD) > > # define CONFIG_FOO 100 > > #elif defined(CONFIG_SPL_BUILD) > > # define CONFIG_FOO 50 > > #else > > # define CONFIG_FOO 10 > > # define CONFIG_BAR > > #endif > > I wonder if we should drop this, and require that all have the same > options? That would involve requiring that board config files are not > permitted to use #ifdef CONFIG_SPL or #ifdef CONFIG_TPL. > > Does that seem like a bad restriction? The advantage is that we only > need one defconfig for each board. It seems to me that things are > going to get really painful if we have three different configs. > > Of course, this doesn't preclude #ifdefs in the Makefiles or actual > source code, but we already have SPL-specific feature options. > > I'm not 100% clear on the constraints here. In my opition, this approach might work, but will be painful. Anyway I just wanted to see what would happen if multiple binary images had a single defconfig in common. We will have to duplicate many configs with CONFIG_SPL_ and CONFIG_TPL_ prefixes. For example, - CONFIG_SYS_TEXT_BASE (text base for the full image) - CONFIG_SPL_TEXT_BASE (text base for SPL) - CONFIG_TPL_TEXT_BASE (text base for TPL) - CONFIG_OF_CONTROL (enables OF control for the full image) - CONFIG_SPL_OF_CONTROL (enables OF control for SPL) - CONFIG_TPL_OF_CONTROL (enables OF control for TPL) Probably I will not adopt this approach, but your comments are welcome. The difference between RFCv2a and RFCv2b is how ARCH should be passed to the build system. In RFCv2a, ARCH is determined by Kconfig. We don't have to give it from the command line. All defconfig files are stored in configs/ directory. In RFCv2b, ARCH should be given from the command line as in Linux Kernel: make ARCH=<arch> <board_name>_defconfig make ARCH=<arch> CROSS_COMPILE=<gcc_prefix> Defconfig files are stored in arch/${ARCH}/configs/ directory. I just tried Linux's way implementation because Stephen mentioned so. On Thu, 24 Apr 2014 14:36:33 -0600 Stephen Warren <swarren(a)wwwdotorg.org> wrote: > > But in U-Boot, ARCH is not given from the command line. > > Which means we cannot know ARCH before the board configuration. > > That is why "*_defconfig" files over all architectures should be > > gathered into one directory ./configs/. > > (The problem is configs/ directory contains about 1200 files!) > > Perhaps we can change the command-line used to build U-Boot, rather than > shoe-horning U-Boot's Kconfig usage to fit that current limitation. But I am not sure if other users are comfortable with giving ARCH=<arch> for every configuration and build. Your comments are welcome. If you want to easily try and compare them, you can also use my GitHub repository: git clone git://github.com/masahir0y/u-boot-kbuild.git There are some branches. kconfig_rfc: RFC kconfig_v1: Version1 kconfig_rfc2a: RFCv2a kconfig_rfc2b: RFCv2b Best Regards Masahiro Yamada

3 4

[U-Boot] [PATCH] ARM: imx6: nitrogen6x: Enable CONFIG_SYS_GENERIC_BOARD
by Eric Nelson 22 Jun '14

22 Jun '14

Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> --- Note that this seems a bit premature until we have some infrastructure around DTB files in place, but we certainly don't want big hairy warning messages on our boards. Is anyone planning on pulling in at least the pinfunc and .dtsi files for i.MX? I'm not sure how much else will be useful in U-Boot. include/configs/nitrogen6x.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f7e7315..895f36f 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -24,6 +24,7 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG +#define CONFIG_SYS_GENERIC_BOARD /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -- 1.9.1

4 5

[U-Boot] [RFC PATCH 0/22] Introduce driver model serial uclass
by Simon Glass 21 Jun '14

21 Jun '14

This series adds support for a serial uclass, enabling serial drivers to be converted to use driver model. Unfortunately this is quite a complicated process for a number of reasons: - serial is used before relocation, but driver model does not support this - stdio member functions are not passed a device pointer, but driver model requires this (so does serial, but it uses an ugly work-around) - driver model requires malloc() but this is not available before relocation - for sandbox, if something goes wrong with the console, we still need to get an error message out through the fallback console So this series includes quite a few patches to address the above, as well as the serial uclass and an implementation for sandbox. The early malloc() implementation uses a very simple region of memory which it doles out as needed. This means that driver model can start up with very little memory usage, and no overhead for malloc() itself except for space wasted due to alignment. With a 32-bit machine and just a serial port set as a pre-reloc device (plus the mandatory root device), the usage is 176 bytes. If you have limited time, please take a look at least at the uclass patch which is 'dm: Add a uclass for serial devices' (see include/serial.h). The series is based on the Tegra GPIO series v3. You can get this tree in a rough unfinished form from u-boot-x86.git branch us-gpioe. Note: This series is for comments only as there are some build errors for certain boards. Simon Glass (22): stdio: Remove redundant code around stdio_register() calls stdio: Pass device pointer to stdio methods dm: Make sure that the root device is probed dm: Provide a way to shut down driver model sandbox: Remove all drivers before exit dm: Tidy up four minor code nits dm: Allow drivers to be marked 'before relocation' dm: Use '*' to indicate a device is activated Remove form-feeds from dlmalloc.c Add a simple malloc() implementation for pre-relocation sandbox: config: Enable pre-relocation malloc() dm: Support driver model prior to relocation stdio: Provide functions to add/remove devices using stdio_dev console: Remove vprintf() optimisation for sandbox Add a flag indicating when the serial console is ready dm: Add a way to indicate a preferred device within a uclass dm: Expand and improve the device lifecycle docs dm: Add a uclass for serial devices Set up stdio earlier when using driver model sandbox: Convert serial driver to use driver model sandbox: serial: Support a coloured console sandbox: dts: Add a serial console node README | 16 +++ arch/blackfin/cpu/jtag-console.c | 10 +- arch/powerpc/cpu/mpc512x/serial.c | 10 +- arch/powerpc/cpu/mpc8xx/video.c | 6 +- arch/sandbox/cpu/cpu.c | 4 + arch/sandbox/dts/sandbox.dts | 11 ++ arch/x86/lib/video.c | 8 +- board/bf527-ezkit/video.c | 10 -- board/bf548-ezkit/video.c | 10 -- board/cm-bf548/video.c | 10 -- board/mpl/common/kbd.c | 6 +- board/mpl/common/kbd.h | 6 +- board/mpl/pati/pati.c | 8 +- board/netphone/phone_console.c | 16 +-- board/nokia/rx51/rx51.c | 6 +- board/rbc823/kbd.c | 8 +- common/board_f.c | 42 ++++++++ common/board_r.c | 28 +++-- common/cmd_log.c | 11 +- common/console.c | 24 ++--- common/dlmalloc.c | 81 ++++++++++---- common/lcd.c | 14 ++- common/stdio.c | 63 ++++++++--- common/usb_kbd.c | 6 +- doc/driver-model/README.txt | 220 +++++++++++++++++++++++++++++++++++--- drivers/core/device.c | 11 +- drivers/core/lists.c | 6 +- drivers/core/root.c | 22 +++- drivers/core/uclass.c | 15 ++- drivers/input/cros_ec_keyb.c | 6 +- drivers/input/i8042.c | 4 +- drivers/input/keyboard.c | 6 +- drivers/input/tegra-kbc.c | 6 +- drivers/misc/cbmem_console.c | 6 +- drivers/net/netconsole.c | 10 +- drivers/serial/Makefile | 4 + drivers/serial/sandbox.c | 140 +++++++++++++++++++----- drivers/serial/serial-uclass.c | 161 ++++++++++++++++++++++++++++ drivers/serial/serial.c | 55 ++++++++-- drivers/serial/usbtty.c | 8 +- drivers/video/cfb_console.c | 8 +- include/asm-generic/global_data.h | 7 ++ include/common.h | 5 + include/configs/ELPPC.h | 4 +- include/configs/MHPC.h | 4 +- include/configs/jadecpu.h | 4 +- include/configs/nokia_rx51.h | 5 +- include/configs/sandbox.h | 7 ++ include/dm/device-internal.h | 6 +- include/dm/device.h | 10 +- include/dm/lists.h | 22 +++- include/dm/root.h | 18 +++- include/dm/uclass-id.h | 1 + include/dm/uclass-internal.h | 3 +- include/dm/uclass.h | 21 +++- include/i8042.h | 6 +- include/serial.h | 90 ++++++++++++++++ include/stdio_dev.h | 17 +-- include/video.h | 8 +- test/dm/cmd_dm.c | 11 +- test/dm/core.c | 49 +++++++-- test/dm/test-driver.c | 11 ++ test/dm/test-fdt.c | 34 +++++- test/dm/test-main.c | 4 +- test/dm/test.dts | 12 +++ 65 files changed, 1186 insertions(+), 275 deletions(-) create mode 100644 drivers/serial/serial-uclass.c -- 1.9.1.423.g4596e3a

3 45

[U-Boot] [U-boot] [Patch 0/2] keystone: nand: add additional nand ecclayout
by Ivan Khoronzhuk 20 Jun '14

20 Jun '14

This series adds a nand ecclayout command to davinci nand that allows the ecclayout of the current nand device to be changed during run time. This feature is useful when using u-boot to write something to nand flash that will be read by other applications, such as ROM bootloader, that expects a different ECC layout. In that case, change the current nand device ecclayout using the "nand ecclayout set" command before writing the data to nand flash. Based on u-boot.git/master WingMan Kwok (2): common: cmd_nand: add nand ecclayout command mtd: nand: davinci: allow to change ecclayout by ecclayout command common/cmd_nand.c | 115 +++++++++++++++++++++++++++++++++++++++- drivers/mtd/nand/davinci_nand.c | 101 +++++++++++++++++++++++++++++++++++ include/nand.h | 10 ++++ 3 files changed, 225 insertions(+), 1 deletion(-) -- 1.8.3.2

3 13

[U-Boot] [PATCH] dfu: fix some issues with reads/uploads
by Stephen Warren 20 Jun '14

20 Jun '14

From: Stephen Warren <swarren(a)nvidia.com> DFU read support appears to rely upon dfu->read_medium() updating the passed-by-reference len parameter to indicate the remaining size available for reading. dfu_read_medium_mmc() never does this, and the implementation of dfu_read_medium_nand() will only work if called just once; it hard-codes the value to the total size of the NAND device irrespective of read offset. I believe that overloading dfu->read_medium() is confusing. As such, this patch introduces a new function dfu->get_medium_size() which can be used to explicitly find out the medium size, and nothing else. dfu_read() is modified to use this function to set the initial value for dfu->r_left, rather than attempting to use the side-effects of dfu->read_medium() for this purpose. Due to this change, dfu_read() must initially set dfu->b_left to 0, since no data has been read. dfu_read_buffer_fill() must also be modified not to adjust dfu->r_left when simply copying data from dfu->i_buf_start to the upload request buffer. r_left represents the amount of data left to be read from HW. That value is not affected by the memcpy(), but only by calls to dfu->read_medium(). After this change, I can read from either a 4MB or 1.5MB chunk of a 4MB eMMC boot partion with CONFIG_SYS_DFU_DATA_BUF_SIZE==1MB. Without this change, attempting to do that would result in DFU read returning no data at all due to r_left never being set. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- drivers/dfu/dfu.c | 9 ++------- drivers/dfu/dfu_mmc.c | 6 ++++++ drivers/dfu/dfu_nand.c | 7 ++++++- drivers/dfu/dfu_ram.c | 11 ++++++----- include/dfu.h | 2 ++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index a93810934ac9..af97234390c7 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -241,7 +241,6 @@ static int dfu_read_buffer_fill(struct dfu_entity *dfu, void *buf, int size) dfu->crc = crc32(dfu->crc, buf, chunk); dfu->i_buf += chunk; dfu->b_left -= chunk; - dfu->r_left -= chunk; size -= chunk; buf += chunk; readn += chunk; @@ -287,11 +286,7 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) if (dfu->i_buf_start == NULL) return -ENOMEM; - ret = dfu->read_medium(dfu, 0, dfu->i_buf_start, &dfu->r_left); - if (ret != 0) { - debug("%s: failed to get r_left\n", __func__); - return ret; - } + dfu->r_left = dfu->get_medium_size(dfu); debug("%s: %s %ld [B]\n", __func__, dfu->name, dfu->r_left); @@ -300,7 +295,7 @@ int dfu_read(struct dfu_entity *dfu, void *buf, int size, int blk_seq_num) dfu->offset = 0; dfu->i_buf_end = dfu_get_buf() + dfu_buf_size; dfu->i_buf = dfu->i_buf_start; - dfu->b_left = min(dfu_buf_size, dfu->r_left); + dfu->b_left = 0; dfu->bad_skip = 0; diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index 63cc876612c9..aa077c052f39 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -196,6 +196,11 @@ int dfu_flush_medium_mmc(struct dfu_entity *dfu) return ret; } +long dfu_get_medium_size_mmc(struct dfu_entity *dfu) +{ + return dfu->data.mmc.lba_size * dfu->data.mmc.lba_blk_size; +} + int dfu_read_medium_mmc(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { @@ -316,6 +321,7 @@ int dfu_fill_entity_mmc(struct dfu_entity *dfu, char *s) } dfu->dev_type = DFU_DEV_MMC; + dfu->get_medium_size = dfu_get_medium_size_mmc; dfu->read_medium = dfu_read_medium_mmc; dfu->write_medium = dfu_write_medium_mmc; dfu->flush_medium = dfu_flush_medium_mmc; diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c index ccdbef6b75f2..e1c9a8849246 100644 --- a/drivers/dfu/dfu_nand.c +++ b/drivers/dfu/dfu_nand.c @@ -114,6 +114,11 @@ static int dfu_write_medium_nand(struct dfu_entity *dfu, return ret; } +long dfu_get_medium_size_nand(struct dfu_entity *dfu) +{ + return dfu->data.nand.size; +} + static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { @@ -121,7 +126,6 @@ static int dfu_read_medium_nand(struct dfu_entity *dfu, u64 offset, void *buf, switch (dfu->layout) { case DFU_RAW_ADDR: - *len = dfu->data.nand.size; ret = nand_block_read(dfu, offset, buf, len); break; default: @@ -220,6 +224,7 @@ int dfu_fill_entity_nand(struct dfu_entity *dfu, char *s) return -1; } + dfu->get_medium_size = dfu_get_medium_size_nand; dfu->read_medium = dfu_read_medium_nand; dfu->write_medium = dfu_write_medium_nand; dfu->flush_medium = dfu_flush_medium_nand; diff --git a/drivers/dfu/dfu_ram.c b/drivers/dfu/dfu_ram.c index 335a8e1f2491..b6c6e60c443c 100644 --- a/drivers/dfu/dfu_ram.c +++ b/drivers/dfu/dfu_ram.c @@ -41,14 +41,14 @@ static int dfu_write_medium_ram(struct dfu_entity *dfu, u64 offset, return dfu_transfer_medium_ram(DFU_OP_WRITE, dfu, offset, buf, len); } +long dfu_get_medium_size_ram(struct dfu_entity *dfu) +{ + return dfu->data.ram.size; +} + static int dfu_read_medium_ram(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { - if (!*len) { - *len = dfu->data.ram.size; - return 0; - } - return dfu_transfer_medium_ram(DFU_OP_READ, dfu, offset, buf, len); } @@ -69,6 +69,7 @@ int dfu_fill_entity_ram(struct dfu_entity *dfu, char *s) dfu->data.ram.size = simple_strtoul(s, &s, 16); dfu->write_medium = dfu_write_medium_ram; + dfu->get_medium_size = dfu_get_medium_size_ram; dfu->read_medium = dfu_read_medium_ram; dfu->inited = 0; diff --git a/include/dfu.h b/include/dfu.h index 26ffbc8e81d2..0cca601d47af 100644 --- a/include/dfu.h +++ b/include/dfu.h @@ -96,6 +96,8 @@ struct dfu_entity { struct ram_internal_data ram; } data; + long (*get_medium_size)(struct dfu_entity *dfu); + int (*read_medium)(struct dfu_entity *dfu, u64 offset, void *buf, long *len); -- 1.8.1.5

2 11

[U-Boot] [PATCH] test:dfu: Add test script for testing DFU regression
by Lukasz Majewski 20 Jun '14

20 Jun '14

This commit adds test script for testing if any commit has introduced regression to the DFU. It uses md5 to test if sent and received file is correct. The test detailed description is available at DESCRIPTION.TXT file. Signed-off-by: Lukasz Majewski <l.majewski(a)samsung.com> --- test/dfu/DESCRIPTION.TXT | 27 ++++++++++++++ test/dfu/dfu_gadget_test.sh | 86 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 test/dfu/DESCRIPTION.TXT create mode 100755 test/dfu/dfu_gadget_test.sh diff --git a/test/dfu/DESCRIPTION.TXT b/test/dfu/DESCRIPTION.TXT new file mode 100644 index 0000000..48da06b --- /dev/null +++ b/test/dfu/DESCRIPTION.TXT @@ -0,0 +1,27 @@ +DFU TEST CASE DESCRIPTION: + +For running test script one needs to create: +./log and ./bkp + +One also need to generate with dd following files: + +dat_* + +(e.g. dat_127B.img dat_128B.img dat_129B.img dat_33M.img dat_4095B.img +dat_4096B.img dat_4097B.img dat_63B.img dat_64B.img dat_65B.img +dat_960.img dat_97M.img) + +The size is only important (so if=/dev/urandom), especially corner cases of +DFU EP0's size of packet (64B). This is very helpful for fixing UDC driver +regressions. + +Moreover on a target device the "dfu_alt_info" env variable should be extended +to have "dfu_test.bin fat 0 6;" \ entry [1]. +One can use fat, ext4 or any other supported file system. + +As a prerequisite one must also create proper partition with file system on it. + +Example usage: +./dfu_gadget_test.sh 11 + +where 11 is the mumber of alt setting corresponding to entry [1]. \ No newline at end of file diff --git a/test/dfu/dfu_gadget_test.sh b/test/dfu/dfu_gadget_test.sh new file mode 100755 index 0000000..ebde2ff --- /dev/null +++ b/test/dfu/dfu_gadget_test.sh @@ -0,0 +1,86 @@ +#! /bin/bash +set -e # any command return not equal to zero +clear + +DIR=./ +SUFFIX=img +RCV_DIR=rcv/ +LOG_FILE=./log/log-`date +%d-%m-%Y_%H-%M-%S` + +cleanup () { + rm -rf $RCV_DIR +} + +die () { + printf " \33[31m FAILED \33[0m \n" + cleanup + exit 1 +} + +calculate_md5sum () { + MD5SUM=`md5sum $1` + MD5SUM=`echo $MD5SUM | cut -d ' ' -f1` + echo "md5sum:"$MD5SUM +} + +dfu_test_file () { + printf "\33[32m========================================================================================= \33[0m\n" + printf "File:\33[32m %s \33[0m\n" $1 + + # dfu-util -D $1 -a $TARGET_ALT_SETTING > /dev/null 2>&1 + dfu-util -D $1 -a $TARGET_ALT_SETTING >> $LOG_FILE 2>&1 || die $? + + echo -n "TX: " + calculate_md5sum $1 + + MD5_TX=$MD5SUM + + N_FILE=$DIR$RCV_DIR${1:2}"_rcv" + + # dfu-util -U $N_FILE -a $TARGET_ALT_SETTING > /dev/null 2>&1 + dfu-util -U $N_FILE -a $TARGET_ALT_SETTING >> $LOG_FILE 2>&1 || die $? + + echo -n "RX: " + calculate_md5sum $N_FILE + MD5_RX=$MD5SUM + + if [ "$MD5_TX" == "$MD5_RX" ] + then + printf " \33[32m -------> OK \33[0m \n" + else + printf " \33[31m -------> FAILED \33[0m \n" + cleanup + exit 1 + fi + +# echo $N_FILE +} + +printf "\33[32m========================================================================================= \33[0m\n" +echo "DFU EP0 transmission test program" +echo "Trouble shoot -> disable DBG (even the KERN_DEBUG) in the UDC driver" +echo "@ -> TRATS # dfu mmc 0" +mkdir -p $RCV_DIR +touch $LOG_FILE + +if [ $# -eq 0 ] +then + printf " \33[31m Please pass alt setting number!! \33[0m \n" + exit 0 +fi + +TARGET_ALT_SETTING=$1 + +if [ -n "$2" ] +then + dfu_test_file $2 +else + for file in $DIR*.$SUFFIX + do + dfu_test_file $file + done +fi + +cleanup + +exit 0 \ No newline at end of file -- 1.7.10.4

3 12

[U-Boot] [PATCH v2] mtd: nand: Fix address cycle problem with NAND_CMD_RNDOUT
by Stefan Roese 20 Jun '14

20 Jun '14

From: Marek Belisko <marek.belisko(a)gmail.com> From: Marek Belisko <marek.belisko(a)gmail.com> On some NAND devices (e.g. Hynix H27U2G8F2CTR-BI on Siemens DXR2 / Draco boards) the NAND subsystem (SPL & U-Boot drivers) issues the following bit-flip error messages: nand: bit-flip corrected @oob=0 ... NAND_CMD_RNDOUT (05h-E0h) needs only two cycles of column address to access data from different column within the same page. So expected sequence on NAND data-bus is <05h> <column-addr-byte1> <column-address-byte2> <E0h> References in datasheets of parts from different NAND vendors +--------+------------------------+--------------------------------------------- |Vendor | Datasheet/Part# | Reference +--------+------------------------+--------------------------------------------- |Spansion| S34ML{01|02|04}G2 | Figure 6.12 Random Data Output In a Page |Micron | MT29F{16|32|64|128}G08A| Figure 47: CHANGE READ COLUMN (05h-E0h) Operation |Macronix| MX30LF1G08AA | Figure 10. AC Waveforms for Random Data Output |Toshiba | TC58NVG1S3ETAI0 | Figure Column Address Change in Read Cycle Timing | | | Diagram (2/2) +--------+------------------------+--------------------------------------------- Though most NAND Devices mentioned above tend to work even if extra cycles of page-address is issued between <05h> .... <E0h> command. But Spansion devices break on this non-compliance. This patch fixes chip->cmdfunc() for all devices, as datasheet of all mentioned vendor expect same sequence. The same issue has been reported by Bacem Daassi: http://e2e.ti.com/support/arm/sitara_arm/f/791/t/259699.aspx " The issue is mainly due to a NAND protocol violation in the omap driver since the Random Data Output command (05h-E0h) expects to see only the column address that should be addressed within the already loaded read page into the read buffer. Only 2 address cycles with ALE active should be provided between the 05h and E0h commands. The Page read command expects the full address footprint (2bytes for column address + 3bytes for row address), but once the page is loaded into the read buffer, Random Data Output should be used with only 2bytes for column address. " Signed-off-by: Marek Belisko <marek.belisko(a)gmail.com> Signed-off-by: Stefan Roese <sr(a)denx.de> Tested-by: Samuel Egli <samuel.egli(a)siemens.com> Cc: Pekon Gupta <pekon(a)ti.com> Cc: Scott Wood <scottwood(a)freescale.com> --- v2: - Marek as author - Added additional comment / datasheet reference to the commit text from Pekon (thanks) - Added fix to nand_spl_simple.c - Squashed all three drivers fixes into one patch drivers/mtd/nand/am335x_spl_bch.c | 12 ++++++++---- drivers/mtd/nand/nand_base.c | 2 +- drivers/mtd/nand/nand_spl_simple.c | 12 ++++++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/am335x_spl_bch.c b/drivers/mtd/nand/am335x_spl_bch.c index c84851b..9b547ce 100644 --- a/drivers/mtd/nand/am335x_spl_bch.c +++ b/drivers/mtd/nand/am335x_spl_bch.c @@ -63,15 +63,19 @@ static int nand_command(int block, int page, uint32_t offs, hwctrl(&mtd, offs & 0xff, NAND_CTRL_ALE | NAND_CTRL_CHANGE); /* A[7:0] */ hwctrl(&mtd, (offs >> 8) & 0xff, NAND_CTRL_ALE); /* A[11:9] */ + /* Row address */ - hwctrl(&mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */ - hwctrl(&mtd, ((page_addr >> 8) & 0xff), + if (cmd != NAND_CMD_RNDOUT) { + hwctrl(&mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */ + hwctrl(&mtd, ((page_addr >> 8) & 0xff), NAND_CTRL_ALE); /* A[27:20] */ #ifdef CONFIG_SYS_NAND_5_ADDR_CYCLE - /* One more address cycle for devices > 128MiB */ - hwctrl(&mtd, (page_addr >> 16) & 0x0f, + /* One more address cycle for devices > 128MiB */ + hwctrl(&mtd, (page_addr >> 16) & 0x0f, NAND_CTRL_ALE); /* A[31:28] */ #endif + } + hwctrl(&mtd, NAND_CMD_NONE, NAND_NCE | NAND_CTRL_CHANGE); if (cmd == NAND_CMD_READ0) { diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 1ce55fd..f11fce4 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -674,7 +674,7 @@ static void nand_command_lp(struct mtd_info *mtd, unsigned int command, ctrl &= ~NAND_CTRL_CHANGE; chip->cmd_ctrl(mtd, column >> 8, ctrl); } - if (page_addr != -1) { + if (page_addr != -1 && command != NAND_CMD_RNDOUT) { chip->cmd_ctrl(mtd, page_addr, ctrl); chip->cmd_ctrl(mtd, page_addr >> 8, NAND_NCE | NAND_ALE); diff --git a/drivers/mtd/nand/nand_spl_simple.c b/drivers/mtd/nand/nand_spl_simple.c index cead4b5..f45aa21 100644 --- a/drivers/mtd/nand/nand_spl_simple.c +++ b/drivers/mtd/nand/nand_spl_simple.c @@ -88,15 +88,19 @@ static int nand_command(int block, int page, uint32_t offs, hwctrl(&mtd, offs & 0xff, NAND_CTRL_ALE | NAND_CTRL_CHANGE); /* A[7:0] */ hwctrl(&mtd, (offs >> 8) & 0xff, NAND_CTRL_ALE); /* A[11:9] */ + /* Row address */ - hwctrl(&mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */ - hwctrl(&mtd, ((page_addr >> 8) & 0xff), + if (cmd != NAND_CMD_RNDOUT) { + hwctrl(&mtd, (page_addr & 0xff), NAND_CTRL_ALE); /* A[19:12] */ + hwctrl(&mtd, ((page_addr >> 8) & 0xff), NAND_CTRL_ALE); /* A[27:20] */ #ifdef CONFIG_SYS_NAND_5_ADDR_CYCLE - /* One more address cycle for devices > 128MiB */ - hwctrl(&mtd, (page_addr >> 16) & 0x0f, + /* One more address cycle for devices > 128MiB */ + hwctrl(&mtd, (page_addr >> 16) & 0x0f, NAND_CTRL_ALE); /* A[31:28] */ #endif + } + /* Latch in address */ hwctrl(&mtd, NAND_CMD_READSTART, NAND_CTRL_CLE | NAND_CTRL_CHANGE); -- 1.9.2

3 3

[U-Boot] U-boot hangs on imx6 pci driver
by Fabio Estevam 20 Jun '14

20 Jun '14

Hi, Working on a mx6solo board with PCIe driver enabled in U-boot, I notice that after doing several reboots a hang is seen on the PCIe driver: PCI Autoconfig: Bus Memory region: [0x1100000-0x1efffff], Physical Memory [1100000-1efffffx] PCI Autoconfig: Bus I/O region: [0x1000000-0x10fffff], Physical Memory: [1000000-10fffff] ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc00c ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc000 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc000 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc008 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config 00:01.0 - 16c3:abcd - Bridge device ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc008 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc004 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc010 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config PCI Autoconfig: BAR 0, I/O, size=0xfff4, address=0x1000000 bus_lower=0x100fff4### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc014 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc004 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc00c ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc00c ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config PCI Autoconfig: Found P2P bridge, device 1 ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc004 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc018 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc018 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc018 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc020 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc024 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc024 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc01c ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc030 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1ffc004 ### 5 -> imx_pcie_read_config ### OUT -> imx_pcie_read_config ### IN -> imx_pcie_write_config ### OUT -> imx_pcie_write_config ### IN -> imx_pcie_read_config ### 1 -> imx_pcie_read_config ### 2 -> imx_pcie_read_config ### 3 -> imx_pcie_read_config ### 4 -> imx_pcie_read_config - va_address = 0x 1f0000c (Hang) As a quick workaround I tried the following: --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -385,7 +385,8 @@ static int imx_pcie_read_config(struct pci_controller *hose, */ imx_pcie_fix_dabt_handler(true); writel(0xffffffff, val); - *val = readl(va_address); + if (0x01ffc000 <= va_address && va_address <= 0x01ffffff) + *val = readl(va_address); imx_pcie_fix_dabt_handler(false); and the hang does not happen. However, not all devices connected to the PCI switch can be discovered. Any suggestions? Thanks, Fabio Estevam

4 21

[U-Boot] [PATCH v2 0/9] Refactoring and Endian bug fixes of fdt_support
by Masahiro Yamada 19 Jun '14

19 Jun '14

Masahiro Yamada (9): fdt_support: delete unnecessary DECLARE_GLOBAL_DATA_PTR fdt_support: refactor with fdt_find_or_add_subnode helper func fdt_support: delete force argument of fdt_initrd() fdt_support: delete force argument of fdt_chosen() fdt_support: refactor fdt_fixup_stdout() function fdt_support: add 'const' qualifier for unchanged argument fdt_support: fix an endian bug of fdt_fixup_memory_banks fdt_support: fix an endian bug of fdt_initrd() fdt_support: correct the return condition of fdt_initrd() arch/microblaze/lib/bootm.c | 2 +- common/cmd_fdt.c | 4 +- common/fdt_support.c | 295 +++++++++++++++++++++----------------------- common/image-fdt.c | 4 +- include/fdt_support.h | 4 +- 5 files changed, 151 insertions(+), 158 deletions(-) -- 1.8.3.2

3 29

[U-Boot] [PATCH] freescale: m5253demo: fix unused-but-set-variable warnings
by Masahiro Yamada 19 Jun '14

19 Jun '14

Fix the following warning messages: In function 'flash_erase': 180:21: warning: variable 'last' set but not used [-Wunused-but-set-variable] In function 'write_buff': 322:10: warning: variable 'port_width' set but not used [-Wunused-but-set-variable] Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: TsiChung Liew <Tsi-Chung.Liew(a)freescale.com> --- board/freescale/m5253demo/flash.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/board/freescale/m5253demo/flash.c b/board/freescale/m5253demo/flash.c index 387e454..16bba59 100644 --- a/board/freescale/m5253demo/flash.c +++ b/board/freescale/m5253demo/flash.c @@ -177,7 +177,7 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) { FPWV *addr; int flag, prot, sect, count; - ulong type, start, last; + ulong type, start; int rcode = 0, flashtype = 0; if ((s_first < 0) || (s_first > s_last)) { @@ -217,7 +217,6 @@ int flash_erase(flash_info_t * info, int s_first, int s_last) flag = disable_interrupts(); start = get_timer(0); - last = start; if ((s_last - s_first) == (CONFIG_SYS_SST_SECT - 1)) { if (prot == 0) { @@ -319,14 +318,13 @@ int write_buff(flash_info_t * info, uchar * src, ulong addr, ulong cnt) { ulong wp, count; u16 data; - int rc, port_width; + int rc; if (info->flash_id == FLASH_UNKNOWN) return 4; /* get lower word aligned address */ wp = addr; - port_width = sizeof(FPW); /* handle unaligned start bytes */ if (wp & 1) { -- 1.8.3.2

2 1