December 2016 - U-Boot

[U-Boot] Rockchip RK3288 regulator device table problem
by Rick Bronson 11 Dec '16

11 Dec '16

Hi All, How do I enable a particular regulator upon boot? I have two identically set LDO entries: vccio_en: LDO_REG1 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vccio_en"; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; }; }; vcc33_mic: LDO_REG2 { regulator-always-on; regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33_mic"; regulator-state-mem { regulator-on-in-suspend; regulator-suspend-microvolt = <3300000>; }; }; Yet one is enabled, the other disabled, any idea why?: => regulator status Name Enabled uV mA Mode ... vccio_en enabled 3300000 - - vcc33_mic disabled 3300000 - - And oddly, the uV values actually don't come from the DT but from the rk808_ldo table in drivers/power/regulator/rk808.c Any ideas? Thanks for any help. Rick

2 1

[U-Boot] [PATCH 1/2] common: miiphyutil: Add helper function for mdio bus name
by Michal Simek 11 Dec '16

11 Dec '16

The most of ethernet drivers are using this mdio registration sequence. strcpy(priv->bus->name, "emac"); mdio_register(priv->bus); Where driver can be used only with one MDIO bus because only unique name should be used. Other drivers are using unique device name for MDIO registration to support multiple instances. snprintf(priv->bus->name, sizeof(bus->name), "%s", name); With DM dev->seq is used more even in logs (like random MAC address generation: printf("\nWarning: %s (eth%d) using random MAC address - %pM\n", dev->name, dev->seq, pdata->enetaddr); ) where eth%d prefix is used. Simplify driver code to register mdio device with dev->seq number to simplify mdio registration and reduce code duplication across all drivers. With DM_SEQ_ALIAS enabled dev->seq reflects alias setting. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- For example: Board: Xilinx Zynq Net: ZYNQ GEM: e000b000, phyaddr 7, interface rgmii-id Warning: ethernet@e000b000 (eth0) using random MAC address - 7a:fc:90:53:6a:41 eth0: ethernet@e000b000ZYNQ GEM: e000c000, phyaddr ffffffff, interface rgmii-id Warning: ethernet@e000c000 (eth3) using random MAC address - 1a:ff:d7:1a:a1:b2 , eth3: ethernet@e000c000 ** Bad device size - mmc 0 ** Checking if uenvcmd is set ... Hit any key to stop autoboot: 0 Zynq> mdio list eth0: 17 - Marvell 88E1111S <--> ethernet@e000b000 eth3: 17 - Marvell 88E1111S <--> ethernet@e000c000 Zynq> --- common/miiphyutil.c | 12 ++++++++++++ include/miiphy.h | 1 + 2 files changed, 13 insertions(+) diff --git a/common/miiphyutil.c b/common/miiphyutil.c index aca18db52a00..8eb0f761bb01 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -107,6 +107,18 @@ int mdio_register(struct mii_dev *bus) return 0; } +int mdio_register_seq(struct mii_dev *bus, int seq) +{ + int ret; + + /* Setup a unique name for each mdio bus */ + ret = snprintf(bus->name, MDIO_NAME_LEN, "eth%d", seq); + if (ret < 0) + return ret; + + return mdio_register(bus); +} + int mdio_unregister(struct mii_dev *bus) { if (!bus) diff --git a/include/miiphy.h b/include/miiphy.h index 83141b4a6ae1..df371425441d 100644 --- a/include/miiphy.h +++ b/include/miiphy.h @@ -48,6 +48,7 @@ void miiphy_listdev(void); struct mii_dev *mdio_alloc(void); void mdio_free(struct mii_dev *bus); int mdio_register(struct mii_dev *bus); +int mdio_register_seq(struct mii_dev *bus, int seq); int mdio_unregister(struct mii_dev *bus); void mdio_list_devices(void); -- 1.9.1

3 4

[U-Boot] [RFC v2 0/3] Add PL330 DMA support on SoCFPGA
by Dinh Nguyen 11 Dec '16

11 Dec '16

Hello, I'm seeking advice on debugging on what is happening when I use the PL330 DMA controller to transfer zero's to the SDRAM and the effect of memory barriers. Here are my current observations: 1) With commit "a78cd8613204 ARM: Rework and correct barrier definitions", the correct memory barrier calls are in place. With this patch in place, this version of the PL330 DMA driver can correctly transfer zero's to the SDRAM. However, after the transfer is done, I'm encountering this error on SPL boot up: Trying to boot from MMC1 spl: could not find mmc device. error: -19 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### The above error can be narrowed down to the list_emtpy(&uc->dev_head) in uclass_find_device() being true. A simple revert of patch a78cd8613204 make this error go away. 2) I've tried to replace all the readl/writel with raw_readl/raw_writel in the pl330 driver. Same error. 3) Removing the __iormb and __iowmb in readl/writel, effectively, removing the barriers. Error goes away. I don't know enough what affect the barriers are having on the DMA memory transfer, so any guidance would be greatly appreciated. Thanks, Dinh Dinh Nguyen (3): drivers: dma: Add the ARM PL330 DMA driver arm: socfpga: scrub the SDRAM to properly enable ECC support arm: socfpga: Add reset manager defines for reset status arch/arm/include/asm/pl330.h | 105 +++ arch/arm/mach-socfpga/include/mach/reset_manager.h | 21 + arch/arm/mach-socfpga/include/mach/sdram.h | 2 + arch/arm/mach-socfpga/spl.c | 8 + arch/arm/mach-socfpga/wrap_sdram_config.c | 32 + configs/socfpga_cyclone5_defconfig | 2 + drivers/dma/Kconfig | 4 + drivers/dma/Makefile | 1 + drivers/dma/pl330.c | 942 +++++++++++++++++++++ 9 files changed, 1117 insertions(+) create mode 100644 arch/arm/include/asm/pl330.h create mode 100644 drivers/dma/pl330.c -- 2.7.4

2 4

[U-Boot] [PATCH 2/2] fs/fat: merge readwrite get_fatent_value() with readonly get_fatent()
by Stefan Brüns 11 Dec '16

11 Dec '16

get_fatent_value(...) flushes changed FAT entries to disk when fetching the next FAT blocks, in every other aspect it is identical to get_fatent(...). Provide a stub implementation for flush_dirty_fat_buffer if CONFIG_FAT_WRITE is not set. Calling flush_dirty_fat_buffer during read only operation is fine as it checks if any buffers needs flushing. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/fat/fat.c | 19 +++++++++ fs/fat/fat_write.c | 118 +++-------------------------------------------------- 2 files changed, 24 insertions(+), 113 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 6319581406..554e811587 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -162,6 +162,16 @@ static void get_name(dir_entry *dirent, char *s_name) downcase(s_name); } +static int flush_dirty_fat_buffer(fsdata *mydata); +#if !defined(CONFIG_FAT_WRITE) +/* Stub for read only operation */ +int flush_dirty_fat_buffer(fsdata *mydata) +{ + (void)(mydata); + return 0; +} +#endif + /* * Get the entry at index 'entry' in a FAT (12/16/32) table. * On failure 0x00 is returned. @@ -173,6 +183,11 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) __u32 ret = 0x00; __u16 val1, val2; + if (CHECK_CLUST(entry, mydata->fatsize)) { + printf("Error: Invalid FAT entry: 0x%08x\n", entry); + return ret; + } + switch (mydata->fatsize) { case 32: bufnum = entry / FAT32BUFSIZE; @@ -208,6 +223,10 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) startblock += mydata->fat_sect; /* Offset from start of disk */ + /* Write back the fatbuf to the disk */ + if (flush_dirty_fat_buffer(mydata) < 0) + return -1; + if (disk_read(startblock, getsize, bufptr) < 0) { debug("Error reading FAT blocks\n"); return ret; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 0be60ecd99..c05fc7f099 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -143,114 +143,6 @@ static int flush_dirty_fat_buffer(fsdata *mydata) } /* - * Get the entry at index 'entry' in a FAT (12/16/32) table. - * On failure 0x00 is returned. - * When bufnum is changed, write back the previous fatbuf to the disk. - */ -static __u32 get_fatent_value(fsdata *mydata, __u32 entry) -{ - __u32 bufnum; - __u32 off16, offset; - __u32 ret = 0x00; - __u16 val1, val2; - - if (CHECK_CLUST(entry, mydata->fatsize)) { - printf("Error: Invalid FAT entry: 0x%08x\n", entry); - return ret; - } - - switch (mydata->fatsize) { - case 32: - bufnum = entry / FAT32BUFSIZE; - offset = entry - bufnum * FAT32BUFSIZE; - break; - case 16: - bufnum = entry / FAT16BUFSIZE; - offset = entry - bufnum * FAT16BUFSIZE; - break; - case 12: - bufnum = entry / FAT12BUFSIZE; - offset = entry - bufnum * FAT12BUFSIZE; - break; - - default: - /* Unsupported FAT size */ - return ret; - } - - debug("FAT%d: entry: 0x%04x = %d, offset: 0x%04x = %d\n", - mydata->fatsize, entry, entry, offset, offset); - - /* Read a new block of FAT entries into the cache. */ - if (bufnum != mydata->fatbufnum) { - int getsize = FATBUFBLOCKS; - __u8 *bufptr = mydata->fatbuf; - __u32 fatlength = mydata->fatlength; - __u32 startblock = bufnum * FATBUFBLOCKS; - - /* Cap length if fatlength is not a multiple of FATBUFBLOCKS */ - if (startblock + getsize > fatlength) - getsize = fatlength - startblock; - - startblock += mydata->fat_sect; /* Offset from start of disk */ - - /* Write back the fatbuf to the disk */ - if (flush_dirty_fat_buffer(mydata) < 0) - return -1; - - if (disk_read(startblock, getsize, bufptr) < 0) { - debug("Error reading FAT blocks\n"); - return ret; - } - mydata->fatbufnum = bufnum; - } - - /* Get the actual entry from the table */ - switch (mydata->fatsize) { - case 32: - ret = FAT2CPU32(((__u32 *) mydata->fatbuf)[offset]); - break; - case 16: - ret = FAT2CPU16(((__u16 *) mydata->fatbuf)[offset]); - break; - case 12: - off16 = (offset * 3) / 4; - - switch (offset & 0x3) { - case 0: - ret = FAT2CPU16(((__u16 *) mydata->fatbuf)[off16]); - ret &= 0xfff; - break; - case 1: - val1 = FAT2CPU16(((__u16 *)mydata->fatbuf)[off16]); - val1 &= 0xf000; - val2 = FAT2CPU16(((__u16 *)mydata->fatbuf)[off16 + 1]); - val2 &= 0x00ff; - ret = (val2 << 4) | (val1 >> 12); - break; - case 2: - val1 = FAT2CPU16(((__u16 *)mydata->fatbuf)[off16]); - val1 &= 0xff00; - val2 = FAT2CPU16(((__u16 *)mydata->fatbuf)[off16 + 1]); - val2 &= 0x000f; - ret = (val2 << 8) | (val1 >> 8); - break; - case 3: - ret = FAT2CPU16(((__u16 *)mydata->fatbuf)[off16]); - ret = (ret & 0xfff0) >> 4; - break; - default: - break; - } - break; - } - debug("FAT%d: ret: %08x, entry: %08x, offset: %04x\n", - mydata->fatsize, ret, entry, offset); - - return ret; -} - -/* * Set the file name information from 'name' into 'slotptr', */ static int str2slot(dir_slot *slotptr, const char *name, int *idx) @@ -407,7 +299,7 @@ get_long_file_name(fsdata *mydata, int curclust, __u8 *cluster, if ((__u8 *)slotptr >= buflimit) { if (curclust == 0) return -1; - curclust = get_fatent_value(mydata, dir_curclust); + curclust = get_fatent(mydata, dir_curclust); if (CHECK_CLUST(curclust, mydata->fatsize)) { debug("curclust: 0x%x\n", curclust); printf("Invalid FAT entry\n"); @@ -539,7 +431,7 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry) __u32 next_fat, next_entry = entry + 1; while (1) { - next_fat = get_fatent_value(mydata, next_entry); + next_fat = get_fatent(mydata, next_entry); if (next_fat == 0) { /* found free entry, link to entry */ set_fatent_value(mydata, entry, next_entry); @@ -625,7 +517,7 @@ static int find_empty_cluster(fsdata *mydata) __u32 fat_val, entry = 3; while (1) { - fat_val = get_fatent_value(mydata, entry); + fat_val = get_fatent(mydata, entry); if (fat_val == 0) break; entry++; @@ -673,7 +565,7 @@ static int clear_fatent(fsdata *mydata, __u32 entry) __u32 fat_val; while (1) { - fat_val = get_fatent_value(mydata, entry); + fat_val = get_fatent(mydata, entry); if (fat_val != 0) set_fatent_value(mydata, entry, 0); else @@ -951,7 +843,7 @@ static dir_entry *find_directory_entry(fsdata *mydata, int startsect, return NULL; } - curclust = get_fatent_value(mydata, dir_curclust); + curclust = get_fatent(mydata, dir_curclust); if (IS_LAST_CLUST(curclust, mydata->fatsize)) { empty_dentptr = dentptr; return NULL; -- 2.11.0

2 1

[U-Boot] [PATCH 1/2] fs/fat: Avoid corruption of sectors following the FAT
by Stefan Brüns 11 Dec '16

11 Dec '16

From: Stefan BrÃ¼ns <stefan.bruens(a)rwth-aachen.de> The FAT is read/flushed in segments of 6 (FATBUFBLOCKS) disk sectors. The last segment may be less than 6 sectors, cap the length. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/fat/fat.c | 1 + fs/fat/fat_write.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index df9f2b5656..6319581406 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -202,6 +202,7 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) __u32 fatlength = mydata->fatlength; __u32 startblock = bufnum * FATBUFBLOCKS; + /* Cap length if fatlength is not a multiple of FATBUFBLOCKS */ if (startblock + getsize > fatlength) getsize = fatlength - startblock; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 40a3860e47..0be60ecd99 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -117,10 +117,11 @@ static int flush_dirty_fat_buffer(fsdata *mydata) if ((!mydata->fat_dirty) || (mydata->fatbufnum == -1)) return 0; - startblock += mydata->fat_sect; + /* Cap length if fatlength is not a multiple of FATBUFBLOCKS */ + if (startblock + getsize > fatlength) + getsize = fatlength - startblock; - if (getsize > fatlength) - getsize = fatlength; + startblock += mydata->fat_sect; /* Write FAT buf */ if (disk_write(startblock, getsize, bufptr) < 0) { @@ -187,8 +188,9 @@ static __u32 get_fatent_value(fsdata *mydata, __u32 entry) __u32 fatlength = mydata->fatlength; __u32 startblock = bufnum * FATBUFBLOCKS; - if (getsize > fatlength) - getsize = fatlength; + /* Cap length if fatlength is not a multiple of FATBUFBLOCKS */ + if (startblock + getsize > fatlength) + getsize = fatlength - startblock; startblock += mydata->fat_sect; /* Offset from start of disk */ @@ -494,15 +496,15 @@ static int set_fatent_value(fsdata *mydata, __u32 entry, __u32 entry_value) __u32 fatlength = mydata->fatlength; __u32 startblock = bufnum * FATBUFBLOCKS; - fatlength *= mydata->sect_size; - startblock += mydata->fat_sect; - - if (getsize > fatlength) - getsize = fatlength; + /* Cap length if fatlength is not a multiple of FATBUFBLOCKS */ + if (startblock + getsize > fatlength) + getsize = fatlength - startblock; if (flush_dirty_fat_buffer(mydata) < 0) return -1; + startblock += mydata->fat_sect; + if (disk_read(startblock, getsize, bufptr) < 0) { debug("Error reading FAT blocks\n"); return -1; -- 2.11.0

2 1

[U-Boot] [PATCH v1] fat: fatwrite: fix the command for FAT12
by Philipp Skadorov 11 Dec '16

11 Dec '16

The u-boot command fatwrite empties FAT clusters from the beginning till the end of the file. Specifically for FAT12 it fails to detect the end of the file and goes beyond the file bounds thus corrupting the file system. The users normally workaround this by re-formatting the partition as FAT16/FAT32, like here: https://github.com/FEDEVEL/openrex-uboot-v2015.10/issues/1 The patch is to check file bounds by already-existing macro that accounts for FAT12. The command then works correctly for all types of FAT. Signed-off-by: Philipp Skadorov <philipp.skadorov(a)savoirfairelinux.com> Cc:Donggeun Kim <dg77.kim(a)samsung.com> --- fs/fat/fat_write.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 40a3860..e4f600e 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -670,16 +670,13 @@ static int clear_fatent(fsdata *mydata, __u32 entry) { __u32 fat_val; - while (1) { + while (!CHECK_CLUST(entry, mydata->fatsize)) { fat_val = get_fatent_value(mydata, entry); if (fat_val != 0) set_fatent_value(mydata, entry, 0); else break; - if (fat_val == 0xfffffff || fat_val == 0xffff) - break; - entry = fat_val; } -- 2.7.4

3 4

[U-Boot] [PATCH] ARM: uniphier: remove BLK select
by Masahiro Yamada 11 Dec '16

11 Dec '16

This is a user configurable option, but "select BLK" forces users to enable it. Even with this commit, BLK is still enabled by "default y if DM_MMC" for UniPhier SoCs; the difference is users can disable it if they do not need it. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7203d63..714dd8b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -829,7 +829,6 @@ config TARGET_COLIBRI_PXA270 config ARCH_UNIPHIER bool "Socionext UniPhier SoCs" - select BLK select CLK_UNIPHIER select DM select DM_GPIO -- 2.7.4

1 1

[U-Boot] [PATCH 0/4] ARM: uniphier: UniPhier updates for v2016.11-rc1
by Masahiro Yamada 11 Dec '16

11 Dec '16

Masahiro Yamada (4): ARM: uniphier: remove unneeded initializer ARM: uniphier: remove unneeded parentheses ARM: uniphier: disable CONFIG_ARCH_FIXUP_FDT_MEMORY ARM: dts: uniphier: sync Device Tree with Linux arch/arm/dts/uniphier-common32.dtsi | 177 ------ arch/arm/dts/uniphier-ld11.dtsi | 111 +++- arch/arm/dts/uniphier-ld20.dtsi | 188 +++++-- arch/arm/dts/uniphier-ld4.dtsi | 652 +++++++++++++--------- arch/arm/dts/uniphier-pro4-ref.dts | 10 +- arch/arm/dts/uniphier-pro4.dtsi | 903 +++++++++++++++++------------- arch/arm/dts/uniphier-pro5.dtsi | 925 +++++++++++++++++++------------ arch/arm/dts/uniphier-pxs2-gentil.dts | 2 +- arch/arm/dts/uniphier-pxs2-vodka.dts | 2 +- arch/arm/dts/uniphier-pxs2.dtsi | 878 +++++++++++++++++------------ arch/arm/dts/uniphier-sld3.dtsi | 37 +- arch/arm/dts/uniphier-sld8.dtsi | 650 +++++++++++++--------- arch/arm/mach-uniphier/dram/umc-ld20.c | 6 +- arch/arm/mach-uniphier/memconf/memconf.c | 2 +- configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + configs/uniphier_sld3_defconfig | 1 + 20 files changed, 2694 insertions(+), 1855 deletions(-) delete mode 100644 arch/arm/dts/uniphier-common32.dtsi -- 2.7.4

1 5

[U-Boot] [PATCH 0/2] fs/fat: more bugfixes, cleanups
by Stefan Brüns 11 Dec '16

11 Dec '16

Fix a possible filesystem corruption if the FS is almost full, and remove some duplicate code. Stefan Brüns (1): fs/fat: Avoid corruption of sectors following the FAT Stefan Brüns (1): fs/fat: merge readwrite get_fatent_value() with readonly get_fatent() fs/fat/fat.c | 20 ++++++++ fs/fat/fat_write.c | 134 ++++++----------------------------------------------- 2 files changed, 34 insertions(+), 120 deletions(-) -- 2.11.0

1 0

[U-Boot] build u-boot
by Zuoping Han 10 Dec '16

10 Dec '16

Hi, I want to build u-boot to boot from UART, but I have problem with it.Is there any special options I have to select to build it?My system is arm am3352. Thanks, Zuoping Han

1 0