March 2015 - U-Boot

Re: [U-Boot] Driver model Ethernet issue
by Simon Glass 07 Apr '15

07 Apr '15

+mailing list which got dropped off at some point Hi Joe, On 30 March 2015 at 11:50, Joe Hershberger <joe.hershberger(a)gmail.com> wrote: > Hi Simon, > > On Thu, Mar 26, 2015 at 3:11 AM, Joe Hershberger <joe.hershberger(a)gmail.com> > wrote: >> >> Hi Simon, >> >> On Wed, Mar 25, 2015 at 10:10 PM, Simon Glass <sjg(a)chromium.org> wrote: >> > >> > Hi Joe, >> > >> > I think moving the packet processing into the uclass was a good idea, >> > but I did not think it through. >> > >> > If you look at the designware driver, when it receives a packet it >> > processes it and then retires that buffer for later reuse. The few >> > others I have looked at are similar. >> > >> > We can't retire it in the recv() method since the packet is still >> > needed at that point, and may be overwritten by a new packet if we >> > retire its buffer space. >> > >> > I am wondering if we should have a new method, like: >> > >> > int free_pkt(struct udevice *dev, uchar *packet, int len) >> > >> > which is called by the uclass after the packet is processed (assuming >> > that recv() returns a packet). It would pass the packet pointer and >> > length to the driver. >> >> In light of this behavior that I also did not realize some drivers were >> exhibiting, it is not simpler to revert the change? It seems that we are >> adding complexity overall by having two functions to be implemented bu >> drivers instead of one function to be called by the driver. Perhaps you can >> convince me that the two functions are a better design, but I'd like to hear >> the argument. > > What is your preference here? I can push the change either way. I can > certainly see how it's a bit unusual to have a driver call back into the > stack. Do you think two ops makes the driver cleaner than having the drivers > call one function to process a packet? Sorry for not coming back on this earlier. I was planning on doing another spin of the sunxi Ethernet series but I have not got to it. I do have a preference for keeping the control flow out of the driver. It worries me that the driver calls a packet reception function, and then the driver sits in the call stack for a while while it is processed. Seems wrong to me. Also you can argue that buffer management is a reasonable thing to provide a method for. Using a buffer to receive a packet, sending that packet for processing, and retiring the buffer are all conceptually separate things. We could even consider (in the future!) supporting a buffer ring in the uclass since all of the drivers I have looked at have one. So yes I think a new method is the best way to handle this situation. > >> > This would allow the driver to do what it needs to do. >> > >> > What do you think? I'd like to figure this out and send v2 of the >> > sunxi Ethernet conversion. >> >> One comment about new driver-model network drivers is I'd like to see new >> driver header files (if needed) live in include/net. I figure DM is a good >> excuse to enforce that these headers get organized a bit. Sounds good. > > Thanks, > -Joe Regards, Simon

4 9

[U-Boot] [PATCH] ahci: Fix a wrong parameter pass
by Yuantian.Tang＠freescale.com 07 Apr '15

07 Apr '15

From: Tang Yuantian <Yuantian.Tang(a)freescale.com> In stead of user_buffer_size, transfer_size should be used to pass to ahci_device_data_io(). transfer_size is the length that we want the low level function to transfer each time. If we use user_buffer_size which is the totally data length as parameter, low level function will actually create many SGs to transfer as many data as possible each time. That will produce many redundant data transfer. Signed-off-by: Tang Yuantian <Yuantian.Tang(a)freescale.com> --- drivers/block/ahci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index c908fab..88b90e0 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -785,7 +785,7 @@ static int ata_scsiop_read_write(ccb *pccb, u8 is_write) /* Read/Write from ahci */ if (ahci_device_data_io(pccb->target, (u8 *) &fis, sizeof(fis), - user_buffer, user_buffer_size, + user_buffer, transfer_size, is_write)) { debug("scsi_ahci: SCSI %s10 command failure.\n", is_write ? "WRITE" : "READ"); -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH] env_sf: Fix recovery default
by Mario Schuknecht 07 Apr '15

07 Apr '15

The u-boot environment is redundantly stored in a NOR flash on our boards. Redundant means that there are two places to store the environment. But only one of the two is active. I discovered that on one board the u-boot (env_sf) uses the environment from the second place and the Kernel (fw_printenv) uses the environment from the first place. To decide which is the active environment there is a byte inside the environment. 1 means active and 0 means obsolete. But on that board both environments had have a 1. This can happen if a power loss or reset occurs during writing the environment. In this situation the u-boot (env_sf) implementation uses the second environment as default. But the Kernel (fw_printenv) implementation uses the first environment as default. This commit corrects the default in the u-boot env_sf implementation when a problem was detected. Now the recovery default is the same like in all other environment implementations. E.g. fw_printenv and env_flash. This ensures that u-boot and Kernel use the same environment. Signed-off-by: Mario Schuknecht <mario.schuknecht(a)dresearch-fe.de> --- common/env_sf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/env_sf.c b/common/env_sf.c index 5e3729c..e928f57 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -188,15 +188,17 @@ void env_relocate_spec(void) tmp_env2->flags == ACTIVE_FLAG) { gd->env_valid = 2; } else if (tmp_env1->flags == tmp_env2->flags) { - gd->env_valid = 2; + gd->env_valid = 1; } else if (tmp_env1->flags == 0xFF) { + gd->env_valid = 1; + } else if (tmp_env2->flags == 0xFF) { gd->env_valid = 2; } else { /* * this differs from code in env_flash.c, but I think a sane * default path is desirable. */ - gd->env_valid = 2; + gd->env_valid = 1; } if (gd->env_valid == 1) -- 2.1.4

2 2

[U-Boot] Pull request: u-boot-spi/master
by Jagannadha Sutradharudu Teki 07 Apr '15

07 Apr '15

Hi Tom, Please pull this PR. thanks! Jagan. The following changes since commit 662e2acb46250881ec26bc8366fc9eb1856cb7c2: sunxi: UTOO_P66: Add missing MAINTAINERS entry (2015-03-29 14:56:48 +0200) are available in the git repository at: git://git.denx.de/u-boot-spi.git master for you to fetch changes up to 52091ad146d766cdc5ccd65430b2a4e5cb7aec32: spi: designware_spi: revisit FIFO size detection again (2015-03-30 01:42:49 +0530) ---------------------------------------------------------------- Axel Lin (6): spi: cf_qspi: Fixup to_cf_qspi_slave macro spi: davinci: Remove duplicate code to set bus and cs for slave spi: ftssp010_spi: Use to_ftssp010_spi() to ensure free correct address spi: cf_spi: Use to_cf_spi_slave to resolve cfslave from slave spi: cf_spi: Staticize local functions spi: designware_spi: revisit FIFO size detection again Ravi Babu (1): qspi: dra7x: enable quad mode read for ti-qspi driver drivers/spi/cf_qspi.c | 2 +- drivers/spi/cf_spi.c | 31 ++++++++++++++++--------------- drivers/spi/davinci_spi.c | 3 --- drivers/spi/designware_spi.c | 4 ++-- drivers/spi/ftssp010_spi.c | 4 +++- drivers/spi/ti_qspi.c | 7 +++++++ include/configs/dra7xx_evm.h | 1 + 7 files changed, 30 insertions(+), 22 deletions(-)

2 1

[U-Boot] [PATCH v2] MAKEALL: fix get_target_arch() to adjust to '-' in Status field
by Masahiro Yamada 07 Apr '15

07 Apr '15

Since the Kconfig conversion, boards.cfg scanned by MAKEALL is generated by tools/genboardscfg.py. Every board is supposed to have its own MAINTAINERS that contains maintainer and status information, but, in fact, MAINTAINERS is missing from some boards. For such boards, the first field, Status, is filled with '-'. It causes a problem for "set" command, which ignores '-' in its arguments. Consequently, get_target_arch() returns a wrong field and MAKEALL fails to get a correct toolchain. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> - Improve git description --- MAKEALL | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/MAKEALL b/MAKEALL index cd3b6c7..3808a59 100755 --- a/MAKEALL +++ b/MAKEALL @@ -551,13 +551,7 @@ get_target_maintainers() { get_target_arch() { local target=$1 - # Automatic mode - local line=`awk '\$7 == "'"$target"'" { print \$0 }' boards.cfg` - - if [ -z "${line}" ] ; then echo "" ; return ; fi - - set ${line} - echo "$2" + awk '$7 == "'$target'" { print $2 }' boards.cfg } list_target() { -- 1.9.1

3 6

[U-Boot] [PATCH] drivers:usb:fsl: Implement Erratum A-009116 for XHCI controller
by Nikhil Badola 06 Apr '15

06 Apr '15

This adjusts (micro)frame length to appropriate value thus avoiding USB devices to time out over a longer run Signed-off-by: Nikhil Badola <nikhil.badola(a)freescale.com> --- Depends on fsl/usb: Add USB XHCI support http://patchwork.ozlabs.org/patch/373593/ drivers/usb/host/xhci-fsl.c | 9 +++++++++ include/linux/usb/dwc3.h | 19 +++++++++++++------ include/linux/usb/xhci-fsl.h | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/usb/host/xhci-fsl.c b/drivers/usb/host/xhci-fsl.c index 1d25084..981cf17 100644 --- a/drivers/usb/host/xhci-fsl.c +++ b/drivers/usb/host/xhci-fsl.c @@ -29,6 +29,12 @@ inline int __board_usb_init(int index, enum usb_init_type init) int board_usb_init(int index, enum usb_init_type init) __attribute__((weak, alias("__board_usb_init"))); +static void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val) +{ + setbits_le32(&dwc3_reg->g_fladj, GFLADJ_30MHZ_REG_SEL | + GFLADJ_30MHZ(val)); +} + static void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode) { clrsetbits_le32(&dwc3_reg->g_ctl, @@ -100,6 +106,9 @@ static int fsl_xhci_core_init(struct fsl_xhci *fsl_xhci) /* We are hard-coding DWC3 core to Host Mode */ dwc3_set_mode(fsl_xhci->dwc3_reg, DWC3_GCTL_PRTCAP_HOST); + /* Set GFLADJ_30MHZ value as per Erratum A009116 */ + dwc3_set_fladj(fsl_xhci->dwc3_reg, GFLADJ_30MHZ_DEFAULT); + return ret; } diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h index 7edc760..13d58e9 100644 --- a/include/linux/usb/dwc3.h +++ b/include/linux/usb/dwc3.h @@ -109,7 +109,11 @@ struct dwc3 { /* offset: 0xC100 */ u32 g_hwparams8; - u32 reserved4[63]; + u32 reserved4[11]; + + u32 g_fladj; + + u32 reserved5[51]; u32 d_cfg; u32 d_ctl; @@ -118,15 +122,15 @@ struct dwc3 { /* offset: 0xC100 */ u32 d_gcmdpar; u32 d_gcmd; - u32 reserved5[2]; + u32 reserved6[2]; u32 d_alepena; - u32 reserved6[55]; + u32 reserved7[55]; struct d_physical_endpoint d_phy_ep_cmd[32]; - u32 reserved7[128]; + u32 reserved8[128]; u32 o_cfg; u32 o_ctl; @@ -134,7 +138,7 @@ struct dwc3 { /* offset: 0xC100 */ u32 o_evten; u32 o_sts; - u32 reserved8[3]; + u32 reserved9[3]; u32 adp_cfg; u32 adp_ctl; @@ -143,7 +147,7 @@ struct dwc3 { /* offset: 0xC100 */ u32 bc_cfg; - u32 reserved9; + u32 reserved10; u32 bc_evt; u32 bc_evten; @@ -191,4 +195,7 @@ struct dwc3 { /* offset: 0xC100 */ #define DWC3_DCTL_CSFTRST (1 << 30) #define DWC3_DCTL_LSFTRST (1 << 29) +/* Global Frame Length Adjustment Register */ +#define GFLADJ_30MHZ_REG_SEL (1 << 7) +#define GFLADJ_30MHZ(n) ((n) & 0x3f) #endif /* __DWC3_H_ */ diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 54b7e8b..22a65e9 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -10,6 +10,8 @@ #ifndef _ASM_ARCH_XHCI_FSL_H_ #define _ASM_ARCH_XHCI_FSL_H_ +#define GFLADJ_30MHZ_DEFAULT 0x20 + /* USBOTGSS_WRAPPER definitions */ #define USBOTGSS_WRAPRESET (1 << 17) #define USBOTGSS_DMADISABLE (1 << 16) -- 1.7.11.7

3 3

[U-Boot] Basic A33 support including dram init available in my personal repo
by Vishnu Patekar 06 Apr '15

06 Apr '15

Allwinner A33 tablets comes with the libdram binary, fortunately I've found the libdram code at https://github.com/realthunder/a33_bootloader/tree/master/basic_loader/bsp/…. I've integrated it with mainline u-boot, still lot to do to post it to upstream Basic A33 support including dram init available in my personal repo https://github.com/vishnupatekar/u-boot-sunxi/tree/a33-dram I could able to boot u-boot over fel, and get u-boot command prompt on microSD pins which are multiplexed with UART0. The device page for A33 tablet which I've is here: http://linux-sunxi.org/Softwinner_astar-rda Regards, Vishnu Patekar

5 15

[U-Boot] [PATCH V3 0/8] peach_pi: Add support for FIMD and DP
by Ajay Kumar 06 Apr '15

06 Apr '15

Add support for the eDP panel supported on peach_pi. Changes since V1: -- Address comments for clock changes -- Remove the use of GPIO enums, and use DT to specify GPIOs. Changes since V2: -- Address comments for clock patch and modify GPIO usage as specified by Simon. Ajay Kumar (8): [PATCH V3 1/8] arm: exynos: add display clocks for Exynos5800 [PATCH V3 2/8] Exynos5: Fix rpll_sdiv to support both peach-pit and peach-pi panels [PATCH V3 3/8] video: exynos_fb: configure backlight GPIOs if specified in DT [PATCH V3 4/8] video: parade: configure SLP and RST GPIOs if specified in DT [PATCH V3 5/8] dts: exynos54xx: Add samsung,pwm-out-gpio property to FIMD node [PATCH V3 6/8] dts: peach_pit: Add SLP and RST GPIO properties in parade DT node [PATCH V3 7/8] dts: peach_pi: Add DT properties needed for display [PATCH V3 8/8] smdk5420: Remove GPIO enums arch/arm/cpu/armv7/exynos/clock.c | 65 ++++++++++++++++++++++-- arch/arm/cpu/armv7/exynos/clock_init_exynos5.c | 4 +- arch/arm/dts/exynos5420-peach-pit.dts | 2 + arch/arm/dts/exynos54xx.dtsi | 1 + arch/arm/dts/exynos5800-peach-pi.dts | 3 ++ arch/arm/include/asm/arch-exynos/clk.h | 3 ++ board/samsung/smdk5420/smdk5420.c | 15 ------ doc/device-tree-bindings/video/exynos-fb.txt | 2 + drivers/video/exynos_fb.c | 21 ++++++++ drivers/video/parade.c | 11 ++++ 10 files changed, 107 insertions(+), 20 deletions(-) -- 1.7.9.5

2 9

[U-Boot] [PATCH] config: peach: Correct memory layout environment settings
by Sjoerd Simons 06 Apr '15

06 Apr '15

The peach boards have their SDRAM start address at 0x20000000 instead of 0x40000000 which seems common for all other exynos5 based boards. This means the layout set in exynos5-common.h causes the kernel be loaded more then 128MB (at 0x42000000) away from memory start which breaks booting kernels with CONFIG_AUTO_ZRELADDR Define a custom MEM_LAYOUT_ENV_SETTINGS for both peach boards which uses the same offsets from start of memory as the common exynos5 settings. This fixes booting via bootz and PXE Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- include/configs/peach-pi.h | 8 ++++++++ include/configs/peach-pit.h | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/include/configs/peach-pi.h b/include/configs/peach-pi.h index f04f061..e3cb09e 100644 --- a/include/configs/peach-pi.h +++ b/include/configs/peach-pi.h @@ -16,6 +16,14 @@ #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) #define CONFIG_SPI_BOOTING +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + "kernel_addr_r=0x22000000\0" \ + "fdt_addr_r=0x23000000\0" \ + "ramdisk_addr_r=0x23300000\0" \ + "scriptaddr=0x30000000\0" \ + "pxefile_addr_r=0x31000000\0" + #include <configs/exynos5420-common.h> #include <configs/exynos5-dt-common.h> diff --git a/include/configs/peach-pit.h b/include/configs/peach-pit.h index b5efbdc..3ee42ef 100644 --- a/include/configs/peach-pit.h +++ b/include/configs/peach-pit.h @@ -16,6 +16,14 @@ #define CONFIG_ENV_OFFSET (FLASH_SIZE - CONFIG_BL2_SIZE) #define CONFIG_SPI_BOOTING +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + "kernel_addr_r=0x22000000\0" \ + "fdt_addr_r=0x23000000\0" \ + "ramdisk_addr_r=0x23300000\0" \ + "scriptaddr=0x30000000\0" \ + "pxefile_addr_r=0x31000000\0" + #include <configs/exynos5420-common.h> #include <configs/exynos5-dt-common.h> -- 2.1.4

4 10

[U-Boot] [PATCH] Exynos: Clock: Fix exynos5_get_periph_rate for I2C.
by Guillaume GARDET 06 Apr '15

06 Apr '15

Commit 2e82e9252695a612ab0cbf40fa0c7368515f6506 'Exynos: Clock: Cleanup soc_get_periph_rate' introduced a bug in I2C config. This patch makes cros_ec keyboard working again on Samsung Chromebook (snow). Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Akshay Saraswat <akshay.s(a)samsung.com> Cc: Minkyu Kang <mk7.kang(a)samsung.com> Cc: Joonyoung Shim <jy0922.shim(a)samsung.com> --- arch/arm/cpu/armv7/exynos/clock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index c6455c2..7f47d4d 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -423,8 +423,8 @@ static unsigned long exynos5_get_periph_rate(int peripheral) case PERIPH_ID_I2C6: case PERIPH_ID_I2C7: src = EXYNOS_SRC_MPLL; - div = readl(&clk->div_top0); - sub_div = readl(&clk->div_top1); + sub_div = readl(&clk->div_top0); + div = readl(&clk->div_top1); break; default: debug("%s: invalid peripheral %d", __func__, peripheral); -- 1.8.4.5

6 10