September 2019 - U-Boot

[U-Boot] uboot 2014-04 + gcc7+ = crash in net_set_ip_header (ping/tftp)
by Frank Wunderlich 30 Sep '19

30 Sep '19

Hi, i'm facing a problem in older uboot-code which may be fixed on newer, but i did not found the fixing commit yet. Maybe you can point me to it. I need to use older code in this case because driver for mt7622 and other is not yet available for upstream uboot. I have temporary changed optimization from -Os to -O1 which "fixes" the issue, currently i don't know why. Maybe you know more about it I have found this Thread and tried to fix it with the packed-variant, but same crash happens again http://u-boot.10912.n7.nabble.com/Data-Abort-with-gcc-7-1-td298217.html my code (without last commit): https://github.com/frank-w/u-boot/tree/bpi-r64 my try to fix: diff --git a/Makefile b/Makefile index fa9cbd50df..6c62f921a9 100755 --- a/Makefile +++ b/Makefile @@ -546,7 +546,7 @@ else endif # $(dot-config) -KBUILD_CFLAGS += -Os #-fomit-frame-pointer +KBUILD_CFLAGS += -Os -mno-unaligned-access #-fomit-frame-pointer ifdef BUILD_TAG KBUILD_CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"' diff --git a/include/net.h b/include/net.h index 0802fad876..f16b44def6 100644 --- a/include/net.h +++ b/include/net.h @@ -273,7 +273,7 @@ struct ip_hdr { /* * Internet Protocol (IP) + UDP header. */ -struct ip_udp_hdr { +struct __attribute__((__packed__)) ip_udp_hdr { uchar ip_hl_v; /* header length and version */ uchar ip_tos; /* type of service */ ushort ip_len; /* total length */ board is Bananapi R64 v0.1 (with rtl8367), code works with gcc4.8, 5.5, 6.3, but not with 7.3 and 8.3 regards Frank

1 1

[U-Boot] [PATCH] cmd: memio: Add support functions to read/write data
by kameyama eiji 30 Sep '19

30 Sep '19

The existing source code (binop.c) includes read/write function to read/write data on DDR. To use these functions and avoid duplicate code, based on the existing functions, move and update the read/write function to a public file which is memio file. - New memio includes support functions to read/write data from/to DDR. - Update binop.c file to use read/write functions. Signed-off-by: Dao Van Trung <trungdv(a)vn.fujitsu.com> Signed-off-by: Pham Duc Tung <tungpd(a)vn.fujitsu.com> Signed-off-by: kameyama eiji <kameyama.eiji(a)fujitsu.com> --- cmd/Makefile | 1 + cmd/binop.c | 24 +++--------------------- cmd/memio.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/memio.h | 16 ++++++++++++++++ 4 files changed, 62 insertions(+), 21 deletions(-) create mode 100644 cmd/memio.c create mode 100644 include/memio.h diff --git a/cmd/Makefile b/cmd/Makefile index ac843b4b16..8c241b256e 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -86,6 +86,7 @@ obj-$(CONFIG_CMD_LOG) += log.o obj-$(CONFIG_ID_EEPROM) += mac.o obj-$(CONFIG_CMD_MD5SUM) += md5sum.o obj-$(CONFIG_CMD_MEMORY) += mem.o +obj-y += memio.o obj-$(CONFIG_CMD_IO) += io.o obj-$(CONFIG_CMD_MFSL) += mfsl.o obj-$(CONFIG_CMD_MII) += mii.o diff --git a/cmd/binop.c b/cmd/binop.c index 6d2df5f3dd..c14ca09fc3 100644 --- a/cmd/binop.c +++ b/cmd/binop.c @@ -7,6 +7,7 @@ #include <malloc.h> #include <mapmem.h> #include <linux/ctype.h> +#include <memio.h> enum { OP_ID_XOR, @@ -44,26 +45,6 @@ void read_from_env_var(char *varname, u8 *result) hex2bin(result, varname, strlen(varname) / 2); } -void read_from_mem(ulong addr, u8 *result, ulong len) -{ - u8 *src; - - src = map_sysmem(addr, len); - memcpy(result, src, len); - unmap_sysmem(src); -} - -void write_to_mem(char *varname, u8 *result, ulong len) -{ - ulong addr; - u8 *buf; - - addr = simple_strtoul(varname, NULL, 16); - buf = map_sysmem(addr, len); - memcpy(buf, result, len); - unmap_sysmem(buf); -} - static int do_binop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong len; @@ -134,7 +115,8 @@ static int do_binop(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) destarg = argv[5]; if (*destarg == '*') - write_to_mem(destarg + 1, result, len); /* Skip asterisk */ + write_to_mem(simple_strtoul(destarg + 1, NULL, 16), + result, len); /* Skip asterisk */ else write_to_env_var(destarg, result, len); exit: diff --git a/cmd/memio.c b/cmd/memio.c new file mode 100644 index 0000000000..b9da5e5294 --- /dev/null +++ b/cmd/memio.c @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * cmd/memio.c + * Support functions to read/write data from/to DDR + * physical address. + * + * Copyright (C) 2019 FUJITSU VIETNAM LIMITED and FUJITSU COMPUTER + * TECHNOLOGIES LIMITED. All rights reserved. + */ +#include <common.h> +#include <mapmem.h> +#include <memio.h> + +/** + * read_from_mem() - Read data from DDR + * @addr: Physical address on DDR + * @result: Buffer for read data + * @len: Data length + */ +void read_from_mem(ulong addr, u8 *result, ulong len) +{ + u8 *src; + + src = map_sysmem(addr, len); + memcpy(result, src, len); + unmap_sysmem(src); +} + +/** + * write_to_mem() - Write data to DDR + * @addr: Physical address on DDR + * @result: Buffer of write data + * @len: Data length + */ +void write_to_mem(ulong addr, u8 *result, ulong len) +{ + u8 *buf; + + buf = map_sysmem(addr, len); + memcpy(buf, result, len); + unmap_sysmem(buf); +} diff --git a/include/memio.h b/include/memio.h new file mode 100644 index 0000000000..c5f397393b --- /dev/null +++ b/include/memio.h @@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * include/memio.h + * This file declares support functions to read/write from/to + * DDR physical address. + * + * Copyright (C) 2019 FUJITSU VIETNAM LIMITED and FUJITSU COMPUTER + * TECHNOLOGIES LIMITED. All rights reserved. + */ +#ifndef _MEMIO_H_ +#define _MEMIO_H_ + +void read_from_mem(ulong addr, u8 *result, ulong len); +void write_to_mem(ulong addr, u8 *result, ulong len); + +#endif /* _MEMIO_H_ */ -- 2.20.1

1 0

[U-Boot] [PATCH] armv8: ls1028a: disable multimedia feature when not supported
by Yuantian Tang 30 Sep '19

30 Sep '19

Ls1028a has 4 personalities: ls1028a, ls1027a, ls1017a and ls1018a. Both ls1027a and ls1017a personalities are lower functionality version which doesn't support the multimedia subsystems, like LCD, GPU. To disable multimedia feature on non-multimedia version, set the status property to disabled in dts nodes. Signed-off-by: Tang Yuantian <andy.tang(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c index 19917b207a..ef0e2095a6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/fdt.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/fdt.c @@ -401,6 +401,24 @@ void fdt_fixup_remove_jr(void *blob) } #endif +static void fdt_disable_multimedia(void *blob, unsigned int svr) +{ + int off; + + if (!((svr >> 10) & 0x1)) + return; + + /* Disable eDP/LCD node */ + off = fdt_node_offset_by_compatible(blob, -1, "arm,mali-dp500"); + if (off != -FDT_ERR_NOTFOUND) + fdt_status_disabled(blob, off); + + /* Disable GPU node */ + off = fdt_node_offset_by_compatible(blob, -1, "fsl,ls1028a-gpu"); + if (off != -FDT_ERR_NOTFOUND) + fdt_status_disabled(blob, off); +} + void ft_cpu_setup(void *blob, bd_t *bd) { struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); @@ -462,4 +480,7 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CONFIG_HAS_FEATURE_ENHANCED_MSI fdt_fixup_msi(blob); #endif +#ifdef CONFIG_ARCH_LS1028A + fdt_disable_multimedia(blob, svr); +#endif } -- 2.17.1

2 1

[U-Boot] [PATCH] at91: configs: Drop duplication of defconfig macros
by Tudor.Ambarus＠microchip.com 30 Sep '19

30 Sep '19

From: Tudor Ambarus <tudor.ambarus(a)microchip.com> 'commit a9221f3ebd6d ("at91, omap2plus: configs: migrate CONFIG_ENV_ to defconfigs")' migrated CONFIG_ENV_ macros to defconfigs but did not remove the identical redefinition of these macros in include/configs/. Since the duplicated macros have the same value as the ones in defconfigs, no "redefined" warnings were raised. Remove duplicated macros for all sama5 and sam9x5ek boards. While verifying that the removal of the macros from include/configs did not change the same macros in defconfigs, overwrite the old defconfig by saving them with the output from "make arch=ARM savedefconfig". This resulted in the movement of some macros in the defconfig files. Signed-off-by: Tudor Ambarus <tudor.ambarus(a)microchip.com> --- configs/sama5d27_som1_ek_mmc1_defconfig | 2 +- configs/sama5d27_som1_ek_mmc_defconfig | 2 +- configs/sama5d27_som1_ek_qspiflash_defconfig | 2 +- configs/sama5d2_ptc_ek_mmc_defconfig | 1 - configs/sama5d2_ptc_ek_nandflash_defconfig | 1 - configs/sama5d2_xplained_emmc_defconfig | 2 +- configs/sama5d2_xplained_mmc_defconfig | 2 +- configs/sama5d2_xplained_qspiflash_defconfig | 2 +- configs/sama5d2_xplained_spiflash_defconfig | 2 +- configs/sama5d3_xplained_mmc_defconfig | 2 +- configs/sama5d3xek_mmc_defconfig | 2 +- configs/sama5d3xek_spiflash_defconfig | 2 +- configs/sama5d4_xplained_mmc_defconfig | 2 +- configs/sama5d4_xplained_spiflash_defconfig | 2 +- configs/sama5d4ek_mmc_defconfig | 2 +- configs/sama5d4ek_spiflash_defconfig | 2 +- include/configs/at91-sama5_common.h | 8 -------- include/configs/at91sam9x5ek.h | 11 ----------- include/configs/sama5d27_som1_ek.h | 2 -- include/configs/sama5d2_icp.h | 1 - 20 files changed, 14 insertions(+), 38 deletions(-) diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig index 29d364ce1778..3d877f77d8fd 100644 --- a/configs/sama5d27_som1_ek_mmc1_defconfig +++ b/configs/sama5d27_som1_ek_mmc1_defconfig @@ -18,6 +18,7 @@ CONFIG_DEBUG_UART_CLOCK=82000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" @@ -27,7 +28,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig index bb74c639939b..cadaa93355a4 100644 --- a/configs/sama5d27_som1_ek_mmc_defconfig +++ b/configs/sama5d27_som1_ek_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=82000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig index 50b7983850dc..97f1efc626ef 100644 --- a/configs/sama5d27_som1_ek_qspiflash_defconfig +++ b/configs/sama5d27_som1_ek_qspiflash_defconfig @@ -19,6 +19,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2" @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig index 17699dec52f9..e1ff84f3b4c9 100644 --- a/configs/sama5d2_ptc_ek_mmc_defconfig +++ b/configs/sama5d2_ptc_ek_mmc_defconfig @@ -36,7 +36,6 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_ptc_ek" CONFIG_ENV_IS_IN_FAT=y CONFIG_DM=y -CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y diff --git a/configs/sama5d2_ptc_ek_nandflash_defconfig b/configs/sama5d2_ptc_ek_nandflash_defconfig index 0b18bd41fc2c..4210a52a1319 100644 --- a/configs/sama5d2_ptc_ek_nandflash_defconfig +++ b/configs/sama5d2_ptc_ek_nandflash_defconfig @@ -35,7 +35,6 @@ CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d2_ptc_ek" CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y -CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_CLK=y CONFIG_CLK_AT91=y CONFIG_AT91_UTMI=y diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig index 92d7c5e9cf33..41c4ef197339 100644 --- a/configs/sama5d2_xplained_emmc_defconfig +++ b/configs/sama5d2_xplained_emmc_defconfig @@ -18,6 +18,7 @@ CONFIG_DEBUG_UART_CLOCK=83000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" @@ -26,7 +27,6 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 43990336faed..a0db2e4be827 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=83000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig index f24dac6c4fbd..0dff5d46a5c6 100644 --- a/configs/sama5d2_xplained_qspiflash_defconfig +++ b/configs/sama5d2_xplained_qspiflash_defconfig @@ -19,6 +19,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC" @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig index 6958621cdf89..1592e9375a6a 100644 --- a/configs/sama5d2_xplained_spiflash_defconfig +++ b/configs/sama5d2_xplained_spiflash_defconfig @@ -20,6 +20,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SPI_BOOT=y @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p1 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index ebd3a402ac9e..0270472f8f32 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SD_BOOT=y @@ -26,7 +27,6 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d3xek_mmc_defconfig b/configs/sama5d3xek_mmc_defconfig index 86b375f7cc83..934d020471c3 100644 --- a/configs/sama5d3xek_mmc_defconfig +++ b/configs/sama5d3xek_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=132000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SD_BOOT=y @@ -28,7 +29,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d3xek_spiflash_defconfig b/configs/sama5d3xek_spiflash_defconfig index b27a288b4ab0..ed9d80644581 100644 --- a/configs/sama5d3xek_spiflash_defconfig +++ b/configs/sama5d3xek_spiflash_defconfig @@ -20,6 +20,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SPI_BOOT=y @@ -27,7 +28,6 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig index f9d73896139b..58b4bd1fbfc5 100644 --- a/configs/sama5d4_xplained_mmc_defconfig +++ b/configs/sama5d4_xplained_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SD_BOOT=y @@ -27,7 +28,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig index a2e959508853..82458be7b93d 100644 --- a/configs/sama5d4_xplained_spiflash_defconfig +++ b/configs/sama5d4_xplained_spiflash_defconfig @@ -20,6 +20,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SPI_BOOT=y @@ -28,7 +29,6 @@ CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_HUSH_PARSER=y diff --git a/configs/sama5d4ek_mmc_defconfig b/configs/sama5d4ek_mmc_defconfig index 711de5572a73..48f9db44eaf3 100644 --- a/configs/sama5d4ek_mmc_defconfig +++ b/configs/sama5d4ek_mmc_defconfig @@ -19,6 +19,7 @@ CONFIG_DEBUG_UART_CLOCK=88000000 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SD_BOOT=y @@ -28,7 +29,6 @@ CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwai # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SEPARATE_BSS=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y diff --git a/configs/sama5d4ek_spiflash_defconfig b/configs/sama5d4ek_spiflash_defconfig index aa1a492997fa..e23d6cbd8e3b 100644 --- a/configs/sama5d4ek_spiflash_defconfig +++ b/configs/sama5d4ek_spiflash_defconfig @@ -20,6 +20,7 @@ CONFIG_ENV_SECT_SIZE=0x1000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y +CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_SPI_BOOT=y @@ -27,7 +28,6 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,768k(uboot)ro,256K(env_redundant),256k(env),512k(dtb),6M(kernel)ro,-(rootfs) rootfstype=ubifs ubi.mtd=6 root=ubi0:rootfs" # CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SPL_TEXT_BASE=0x200000 CONFIG_SPL_SPI_LOAD=y CONFIG_SYS_SPI_U_BOOT_OFFS=0x10000 CONFIG_HUSH_PARSER=y diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 7af6b8b84362..61312773671d 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -35,13 +35,7 @@ #ifdef CONFIG_SD_BOOT #ifdef CONFIG_ENV_IS_IN_MMC -/* Use raw reserved sectors to save environment */ -#define CONFIG_ENV_OFFSET 0x2000 -#define CONFIG_ENV_SIZE 0x1000 #define CONFIG_SYS_MMC_ENV_DEV 0 -#else -/* u-boot env in sd/mmc card */ -#define CONFIG_ENV_SIZE 0x4000 #endif #define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \ @@ -66,8 +60,6 @@ "sf read 0x22000000 0x6c000 0x394000; " \ "bootz 0x22000000 - 0x21000000" #elif CONFIG_QSPI_BOOT -#define CONFIG_ENV_OFFSET 0x140000 -#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x21000000 0x180000 0x80000; " \ "sf read 0x22000000 0x200000 0x600000; " \ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index ad7d281dd632..f9a100ba2462 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -72,32 +72,21 @@ #ifdef CONFIG_NAND_BOOT /* bootstrap + u-boot + env + linux in nandflash */ -#define CONFIG_ENV_OFFSET 0x140000 #define CONFIG_ENV_OFFSET_REDUND 0x100000 -#define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read " \ "0x22000000 0x200000 0x600000; " \ "nand read 0x21000000 0x180000 0x20000; " \ "bootz 0x22000000 - 0x21000000" #elif defined(CONFIG_SPI_BOOT) /* bootstrap + u-boot + env + linux in spi flash */ -#define CONFIG_ENV_OFFSET 0x5000 -#define CONFIG_ENV_SIZE 0x3000 -#define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x100000 0x300000; " \ "bootm 0x22000000" #elif defined(CONFIG_SYS_USE_DATAFLASH) /* bootstrap + u-boot + env + linux in data flash */ -#define CONFIG_ENV_OFFSET 0x4200 -#define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_ENV_SECT_SIZE 0x210 #define CONFIG_BOOTCOMMAND "sf probe 0; " \ "sf read 0x22000000 0x84000 0x294000; " \ "bootm 0x22000000" -#else /* CONFIG_SD_BOOT */ -/* bootstrap + u-boot + env + linux in mmc */ -#define CONFIG_ENV_SIZE 0x4000 #endif /* diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index 9b33acd40d27..73432010985a 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -34,8 +34,6 @@ #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_SD_BOOT -/* u-boot env in sd/mmc card */ -#define CONFIG_ENV_SIZE 0x4000 /* bootstrap + u-boot + env in sd card */ #define CONFIG_BOOTCOMMAND "fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x21000000 at91-sama5d27_som1_ek.dtb; " \ "fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x22000000 zImage; " \ diff --git a/include/configs/sama5d2_icp.h b/include/configs/sama5d2_icp.h index 5c54a9c0611e..17028ca1456c 100644 --- a/include/configs/sama5d2_icp.h +++ b/include/configs/sama5d2_icp.h @@ -41,7 +41,6 @@ #define FAT_ENV_INTERFACE "mmc" #define FAT_ENV_DEVICE_AND_PART "0" #define FAT_ENV_FILE "uboot.env" -#define CONFIG_ENV_SIZE 0x4000 /* bootstrap + u-boot + env in sd card */ #define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91-sama5d2_icp.dtb; " \ "fatload mmc 0:1 0x22000000 zImage; " \ -- 2.9.5

2 1

[U-Boot] [RFC 1/3] scsi: ata: Add DM SCSI interface to support None AHCI sata driver
by Peng Ma 30 Sep '19

30 Sep '19

In driver/ata. If the sata driver support AHCI mode, there will provides a complete set of SCSI interface. If the sata is not support AHCI mode(NONE_AHCI) there will not provides the SCSI interface. This patch is to support SCSI interface for None AHCI sata such as fsl_sata.c sil_sata.c etc. Signed-off-by: Peng Ma <peng.ma(a)nxp.com> --- drivers/ata/Kconfig | 17 +++- drivers/ata/Makefile | 2 + drivers/ata/ata-uclass.c | 16 ++++ drivers/ata/ata.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++ drivers/ata/sata.c | 2 +- drivers/ata/scsi_ata.h | 43 +++++++++ include/dm/uclass-id.h | 1 + 7 files changed, 323 insertions(+), 2 deletions(-) create mode 100644 drivers/ata/ata-uclass.c create mode 100644 drivers/ata/ata.c create mode 100644 drivers/ata/scsi_ata.h diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 87636ae..3d6db2e 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -7,6 +7,13 @@ config AHCI operations at present. The block device interface has not been converted to driver model. +config NONE_AHCI + bool "Support None AHCI SATA controllers with driver model" + depends on DM + help + This enables a uclass for disk controllers in U-Boot. such as AHCI. It + support None AHCI sata with DM mode + config SATA bool "Support SATA controllers" select HAVE_BLOCK_DEVICE @@ -32,6 +39,15 @@ config SCSI_AHCI help Enable this to allow interfacing SATA devices via the SCSI layer. +config SCSI_NONE_AHCI + bool "Enable SCSI interface to None AHCI SATA devices" + select LIBATA + select SCSI + select DM_SCSI + help + Enable this to allow interfacing None AHCI SATA devices via the DM + SCSI layer. + menu "SATA/SCSI device support" config AHCI_PCI @@ -49,7 +65,6 @@ config SATA_CEVA ZynqMP. Support up to 2 external devices. Complient with SATA 3.1 and AHCI 1.3 specifications with hot-plug detect feature. - config DWC_AHCI bool "Enable Synopsys DWC AHCI driver support" select SCSI_AHCI diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 6e03384..cddbdc8 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -6,8 +6,10 @@ obj-$(CONFIG_DWC_AHCI) += dwc_ahci.o obj-$(CONFIG_FSL_AHCI) += fsl_ahci.o obj-$(CONFIG_AHCI) += ahci-uclass.o +obj-$(CONFIG_NONE_AHCI) += ata-uclass.o obj-$(CONFIG_AHCI_PCI) += ahci-pci.o obj-$(CONFIG_SCSI_AHCI) += ahci.o +obj-$(CONFIG_SCSI_NONE_AHCI) += ata.o obj-$(CONFIG_DWC_AHSATA) += dwc_ahsata.o obj-$(CONFIG_FSL_SATA) += fsl_sata.o obj-$(CONFIG_LIBATA) += libata.o diff --git a/drivers/ata/ata-uclass.c b/drivers/ata/ata-uclass.c new file mode 100644 index 0000000..e2cc499 --- /dev/null +++ b/drivers/ata/ata-uclass.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2019 NXP, Inc + * Written by Peng Ma<peng.ma(a)nxp.com> + */ + +#include <common.h> +#include <dm.h> +#include <scsi.h> +#include "scsi_ata.h" + +UCLASS_DRIVER(ata) = { + .id = UCLASS_NONE_AHCI, + .name = "ata", + .per_device_auto_alloc_size = sizeof(struct ata_uc_priv), +}; diff --git a/drivers/ata/ata.c b/drivers/ata/ata.c new file mode 100644 index 0000000..bdb7403 --- /dev/null +++ b/drivers/ata/ata.c @@ -0,0 +1,244 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) NXP, Inc. 2019. + * Author: Peng Ma<peng.ma(a)nxp.com> + * + * with the reference on libata and none ahci drvier in kernel + * + * This driver provides a DM SCSI interface to None AHCI SATA. + */ + +#include <common.h> +#include <dm/lists.h> +#include <dm.h> +#include <scsi.h> +#include <libata.h> +#include <sata.h> +#include <malloc.h> +#include <memalign.h> +#include <fis.h> + +#include "scsi_ata.h" + +int ata_bind_scsi(struct udevice *ata_dev, struct udevice **devp) +{ + int ret; + struct udevice *dev; + + ret = device_bind_driver(ata_dev, "ata_scsi", "ata_scsi", &dev); + if (ret) + return ret; + *devp = dev; + + return 0; +} + +static int scsi_exec_internal(struct udevice *dev, struct scsi_cmd *pccb, + bool is_write) +{ + u32 temp; + u16 blocks = 0; + int ret = -ENODEV; + lbaint_t start = 0; + u8 port = pccb->target; + u8 *buffer = pccb->pdata; + struct ata_uc_priv *uc_priv = dev_get_uclass_priv(dev); + + /* Retrieve the base LBA number from the ccb structure. */ + if (pccb->cmd[0] == SCSI_READ16) { + memcpy(&start, pccb->cmd + 2, 8); + start = be64_to_cpu(start); + } else { + memcpy(&temp, pccb->cmd + 2, 4); + start = be32_to_cpu(temp); + } + + if (pccb->cmd[0] == SCSI_READ16) + blocks = (((u16)pccb->cmd[13]) << 8) | ((u16)pccb->cmd[14]); + else + blocks = (((u16)pccb->cmd[7]) << 8) | ((u16)pccb->cmd[8]); + + debug("scsi_ata: %s %u blocks starting from lba 0x" LBAFU "\n", + is_write ? "write" : "read", blocks, start); + + if (is_write) + if (uc_priv->write) + ret = uc_priv->write(dev, start, blocks, buffer, port); + else + pr_err("scsi_ata: write ptr is NULL\n"); + else + if (uc_priv->read) + ret = uc_priv->read(dev, start, blocks, buffer, port); + else + pr_err("scsi_ata: read ptr is NULL\n"); + return ret; +} + +static char *fsl_ata_id_strcpy(u16 *target, u16 *src, int len) +{ + int i; + + for (i = 0; i < len / 2; i++) + target[i] = src[i]; + + return (char *)target; +} + +static int ata_scsiop_inquiry(struct udevice *dev, struct scsi_cmd *pccb) +{ + u8 port; + u16 *idbuf; + struct ata_uc_priv *uc_priv = dev_get_uclass_priv(dev); + + ALLOC_CACHE_ALIGN_BUFFER(u16, tmpid, ATA_ID_WORDS); + + /* Clean ccb data buffer */ + memset(pccb->pdata, 0, pccb->datalen); + + if (pccb->datalen <= 35) + return 0; + + /* Read id from sata */ + port = pccb->target; + + if (uc_priv->ata_inquiry) { + uc_priv->ata_inquiry(dev, (u16 *)tmpid, port); + } else { + pr_err("scsi_ata: ata_inquiry ptr is NULL\n"); + return -ENODEV; + } + + if (!uc_priv->ataid[port]) { + uc_priv->ataid[port] = malloc(ATA_ID_WORDS * 2); + if (!uc_priv->ataid[port]) { + pr_err("%s: No memory for ataid[port]\n", __func__); + return -ENOMEM; + } + } + + idbuf = uc_priv->ataid[port]; + + memcpy(idbuf, tmpid, ATA_ID_WORDS * 2); + + memcpy(&pccb->pdata[8], "ATA ", 8); + fsl_ata_id_strcpy((u16 *)&pccb->pdata[16], &idbuf[ATA_ID_PROD], 16); + fsl_ata_id_strcpy((u16 *)&pccb->pdata[32], &idbuf[ATA_ID_FW_REV], 4); + +#ifdef DEBUG + ata_dump_id(idbuf); +#endif + return 0; +} + +/* + * SCSI READ CAPACITY10 command operation. + */ +static int ata_scsiop_read_capacity10(struct ata_uc_priv *uc_priv, + struct scsi_cmd *pccb) +{ + u32 cap; + u64 cap64; + u32 block_size; + + if (!uc_priv->ataid[pccb->target]) { + pr_err("scsi_ata: SCSI READ CAPACITY10 command failure."); + pr_err("\tNo ATA info!\n"); + pr_err("\tPlease run SCSI command INQUIRY first!\n"); + return -EPERM; + } + + cap64 = ata_id_n_sectors(uc_priv->ataid[pccb->target]); + if (cap64 > 0x100000000ULL) + cap64 = 0xffffffff; + + cap = cpu_to_be32(cap64); + memcpy(pccb->pdata, &cap, sizeof(cap)); + + block_size = cpu_to_be32((u32)512); + memcpy(&pccb->pdata[4], &block_size, 4); + + return 0; +} + +/* + * SCSI READ CAPACITY16 command operation. + */ +static int ata_scsiop_read_capacity16(struct ata_uc_priv *uc_priv, + struct scsi_cmd *pccb) +{ + u64 cap; + u64 block_size; + + if (!uc_priv->ataid[pccb->target]) { + pr_err("scsi_ata: SCSI READ CAPACITY16 command failure."); + pr_err("\tNo ATA info!\n"); + pr_err("\tPlease run SCSI command INQUIRY first!\n"); + return -EPERM; + } + + cap = ata_id_n_sectors(uc_priv->ataid[pccb->target]); + cap = cpu_to_be64(cap); + memcpy(pccb->pdata, &cap, sizeof(cap)); + + block_size = cpu_to_be64((u64)512); + memcpy(&pccb->pdata[8], &block_size, 8); + + return 0; +} + +/* + * SCSI TEST UNIT READY command operation. + */ +static int ata_scsiop_test_unit_ready(struct ata_uc_priv *uc_priv, + struct scsi_cmd *pccb) +{ + return (uc_priv->ataid[pccb->target]) ? 0 : -EPERM; +} + +static int ata_scsi_exec(struct udevice *dev, struct scsi_cmd *pccb) +{ + struct ata_uc_priv *uc_priv = dev_get_uclass_priv(dev->parent); + int ret; + + switch (pccb->cmd[0]) { + case SCSI_READ16: + case SCSI_READ10: + ret = scsi_exec_internal(dev->parent, pccb, 0); + break; + case SCSI_WRITE10: + ret = scsi_exec_internal(dev->parent, pccb, 1); + break; + case SCSI_RD_CAPAC10: + ret = ata_scsiop_read_capacity10(uc_priv, pccb); + break; + case SCSI_RD_CAPAC16: + ret = ata_scsiop_read_capacity16(uc_priv, pccb); + break; + case SCSI_TST_U_RDY: + ret = ata_scsiop_test_unit_ready(uc_priv, pccb); + break; + case SCSI_INQUIRY: + ret = ata_scsiop_inquiry(dev->parent, pccb); + break; + default: + pr_err("Unsupport SCSI command 0x%02x\n", pccb->cmd[0]); + return -ENOTSUPP; + } + + if (ret) { + debug("SCSI command 0x%02x ret errno %d\n", pccb->cmd[0], ret); + return ret; + } + + return 0; +} + +struct scsi_ops ata_scsi_ops = { + .exec = ata_scsi_exec, +}; + +U_BOOT_DRIVER(ata_scsi) = { + .name = "ata_scsi", + .id = UCLASS_SCSI, + .ops = &ata_scsi_ops, +}; diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c index e384b80..1fee375 100644 --- a/drivers/ata/sata.c +++ b/drivers/ata/sata.c @@ -83,7 +83,7 @@ static unsigned long sata_bwrite(struct blk_desc *block_dev, lbaint_t start, } #endif -#ifndef CONFIG_AHCI +#ifndef CONFIG_SCSI int __sata_initialize(void) { int rc, ret = -1; diff --git a/drivers/ata/scsi_ata.h b/drivers/ata/scsi_ata.h new file mode 100644 index 0000000..472a562 --- /dev/null +++ b/drivers/ata/scsi_ata.h @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) NXP Inc. 2019. + * Author: Peng Ma<peng.ma(a)nxp.com> + */ +#ifndef _AHCI_H_ +#define _AHCI_H_ + +#include <pci.h> + +#define ATA_MAX_PORTS 32 +/** + * struct ata_uc_priv - information about an ATA controller + * + * When driver model is used, this is accessible using dev_get_uclass_priv(dev) + * where dev is the controller (although at present it sometimes stands alone). + */ +struct ata_uc_priv { +#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI) + struct udevice *dev; +#else + pci_dev_t dev; +#endif + u16 *ataid[ATA_MAX_PORTS]; + + ulong (*read)(struct udevice *dev, lbaint_t start, u16 blkcnt, + void *buffer, u8 port); + ulong (*write)(struct udevice *dev, lbaint_t start, u16 blkcnt, + const void *buffer, u8 port); + int (*ata_inquiry)(struct udevice *dev, u16 *buffer, u8 port); +}; + +/** + * ata_bind_scsi() - bind a new SCSI bus as a child + * + * Note that the SCSI bus device will itself bind block devices + * + * @ahci_dev: AHCI parent device + * @devp: Returns new SCSI bus device + * @return 0 if OK, -ve on error + */ +int ata_bind_scsi(struct udevice *ahci_dev, struct udevice **devp); +#endif diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index d4d9610..087cd2d 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -29,6 +29,7 @@ enum uclass_id { /* U-Boot uclasses start here - in alphabetical order */ UCLASS_ADC, /* Analog-to-digital converter */ UCLASS_AHCI, /* SATA disk controller */ + UCLASS_NONE_AHCI, /* SATA disk controller of None AHCI */ UCLASS_AUDIO_CODEC, /* Audio codec with control and data path */ UCLASS_AXI, /* AXI bus */ UCLASS_BLK, /* Block device */ -- 2.9.5

3 7

[U-Boot] buildman tests and --output directory
by Tom Rini 30 Sep '19

30 Sep '19

Hey, I've found a problem that I can't quite seem to figure out how to fix it. When we run the buildman tests, they don't respect the --output-dir flag. This ends up being a problem in that we end up using ".." rather than /tmp and then ".." might not actually be writeable. Any ideas? Thanks! -- Tom

2 1

[U-Boot] [PATCH v3] patman: Use the Change-Id, version, and prefix in the Message-Id
by Douglas Anderson 30 Sep '19

30 Sep '19

As per the centithread on ksummit-discuss [1], there are folks who feel that if a Change-Id is present in a developer's local commit that said Change-Id could be interesting to include in upstream posts. Specifically if two commits are posted with the same Change-Id there's a reasonable chance that they are either the same commit or a newer version of the same commit. Specifically this is because that's how gerrit has trained people to work. There is much angst about Change-Id in upstream Linux, but one thing that seems safe and non-controversial is to include the Change-Id as part of the string of crud that makes up a Message-Id. Let's give that a try. In theory (if there is enough adoption) this could help a tool more reliably find various versions of a commit. This actually might work pretty well for U-Boot where (I believe) quite a number of developers use patman, so there could be critical mass (assuming that enough of these people also use a git hook that adds Change-Id to their commits). I was able to find this git hook by searching for "gerrit change id git hook" in my favorite search engine. In theory one could imagine something like this could be integrated into other tools, possibly even git-send-email. Getting it into patman seems like a sane first step, though. NOTE: this patch is being posted using a patman containing this patch, so you should be able to see the Message-Id of this patch and see that it contains my local Change-Id, which ends in 2b9 if you want to check. [1] https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2019-August/006… Signed-off-by: Douglas Anderson <dianders(a)chromium.org> --- Changes in v3: - Allow faking the time of Message-Id for testing (testBasic) - Add skip_blank for Change-Id (testBasic). - Check the Message-Id in testBasic. Changes in v2: - Add a "v" before the version part of the Message-Id - Reorder the parts of the Message-Id as per Johannes. tools/patman/README | 8 ++++- tools/patman/commit.py | 3 ++ tools/patman/patchstream.py | 64 +++++++++++++++++++++++++++++++++++-- tools/patman/test.py | 15 +++++++-- 4 files changed, 85 insertions(+), 5 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 7917fc8bdc33..02d582974495 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -259,12 +259,18 @@ Series-process-log: sort, uniq unique entries. If omitted, no change log processing is done. Separate each tag with a comma. +Change-Id: + This tag is stripped out but is used to generate the Message-Id + of the emails that will be sent. When you keep the Change-Id the + same you are asserting that this is a slightly different version + (but logically the same patch) as other patches that have been + sent out with the same Change-Id. + Various other tags are silently removed, like these Chrome OS and Gerrit tags: BUG=... TEST=... -Change-Id: Review URL: Reviewed-on: Commit-xxxx: (except Commit-notes) diff --git a/tools/patman/commit.py b/tools/patman/commit.py index 2bf3a0ba5b92..48d0529c5365 100644 --- a/tools/patman/commit.py +++ b/tools/patman/commit.py @@ -21,6 +21,8 @@ class Commit: The dict is indexed by change version (an integer) cc_list: List of people to aliases/emails to cc on this commit notes: List of lines in the commit (not series) notes + change_id: the Change-Id: tag that was stripped from this commit + and can be used to generate the Message-Id. """ def __init__(self, hash): self.hash = hash @@ -30,6 +32,7 @@ class Commit: self.cc_list = [] self.signoff_set = set() self.notes = [] + self.change_id = None def AddChange(self, version, info): """Add a new change line to the change list for a version. diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index b6455b0fa383..ef0660629795 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -2,6 +2,7 @@ # Copyright (c) 2011 The Chromium OS Authors. # +import datetime import math import os import re @@ -14,7 +15,7 @@ import gitutil from series import Series # Tags that we detect and remove -re_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Change-Id:|^Review URL:' +re_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Review URL:' '|Reviewed-on:|Commit-\w*:') # Lines which are allowed after a TEST= line @@ -32,6 +33,9 @@ re_cover_cc = re.compile('^Cover-letter-cc: *(.*)') # Patch series tag re_series_tag = re.compile('^Series-([a-z-]*): *(.*)') +# Change-Id will be used to generate the Message-Id and then be stripped +re_change_id = re.compile('^Change-Id: *(.*)') + # Commit series tag re_commit_tag = re.compile('^Commit-([a-z-]*): *(.*)') @@ -156,6 +160,7 @@ class PatchStream: # Handle state transition and skipping blank lines series_tag_match = re_series_tag.match(line) + change_id_match = re_change_id.match(line) commit_tag_match = re_commit_tag.match(line) cover_match = re_cover.match(line) cover_cc_match = re_cover_cc.match(line) @@ -177,7 +182,7 @@ class PatchStream: self.state = STATE_MSG_HEADER # If a tag is detected, or a new commit starts - if series_tag_match or commit_tag_match or \ + if series_tag_match or commit_tag_match or change_id_match or \ cover_match or cover_cc_match or signoff_match or \ self.state == STATE_MSG_HEADER: # but we are already in a section, this means 'END' is missing @@ -275,6 +280,16 @@ class PatchStream: self.AddToSeries(line, name, value) self.skip_blank = True + # Detect Change-Id tags + elif change_id_match: + value = change_id_match.group(1) + if self.is_log: + if self.commit.change_id: + raise ValueError("%s: Two Change-Ids: '%s' vs. '%s'" % + (self.commit.hash, self.commit.change_id, value)) + self.commit.change_id = value + self.skip_blank = True + # Detect Commit-xxx tags elif commit_tag_match: name = commit_tag_match.group(1) @@ -345,6 +360,47 @@ class PatchStream: self.warn.append('Found %d lines after TEST=' % self.lines_after_test) + def WriteMessageId(self, outfd): + """Write the Message-Id into the output. + + This is based on the Change-Id in the original patch, the version, + and the prefix. + + Args: + outfd: Output stream file object + """ + if not self.commit.change_id: + return + + # If the count is -1 we're testing, so use a fixed time + if self.commit.count == -1: + time_now = datetime.datetime(1999, 12, 31, 23, 59, 59) + else: + time_now = datetime.datetime.now() + + # In theory there is email.utils.make_msgid() which would be nice + # to use, but it already produces something way too long and thus + # will produce ugly commit lines if someone throws this into + # a "Link:" tag in the final commit. So (sigh) roll our own. + + # Start with the time; presumably we wouldn't send the same series + # with the same Change-Id at the exact same second. + parts = [time_now.strftime("%Y%m%d%H%M%S")] + + # These seem like they would be nice to include. + if 'prefix' in self.series: + parts.append(self.series['prefix']) + if 'version' in self.series: + parts.append("v%s" % self.series['version']) + + parts.append(str(self.commit.count + 1)) + + # The Change-Id must be last, right before the @ + parts.append(self.commit.change_id) + + # Join parts together with "." and write it out. + outfd.write('Message-Id: <%s@changeid>\n' % '.'.join(parts)) + def ProcessStream(self, infd, outfd): """Copy a stream from infd to outfd, filtering out unwanting things. @@ -358,6 +414,9 @@ class PatchStream: fname = None last_fname = None re_fname = re.compile('diff --git a/(.*) b/.*') + + self.WriteMessageId(outfd) + while True: line = infd.readline() if not line: @@ -481,6 +540,7 @@ def FixPatches(series, fnames): for fname in fnames: commit = series.commits[count] commit.patch = fname + commit.count = count result = FixPatch(backup_dir, fname, series, commit) if result: print('%d warnings for %s:' % (len(result), fname)) diff --git a/tools/patman/test.py b/tools/patman/test.py index e1b94bd1a7db..cc61c20606e8 100644 --- a/tools/patman/test.py +++ b/tools/patman/test.py @@ -12,6 +12,7 @@ import checkpatch import gitutil import patchstream import series +import commit class TestPatch(unittest.TestCase): @@ -48,7 +49,8 @@ Signed-off-by: Simon Glass <sjg(a)chromium.org> arch/arm/cpu/armv7/tegra2/ap20.c | 57 ++---- arch/arm/cpu/armv7/tegra2/clock.c | 163 +++++++++++++++++ ''' - expected=''' + expected='''Message-Id: <19991231235959.0.I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413@changeid> + From 656c9a8c31fa65859d924cd21da920d6ba537fad Mon Sep 17 00:00:00 2001 From: Simon Glass <sjg(a)chromium.org> @@ -79,7 +81,16 @@ Signed-off-by: Simon Glass <sjg(a)chromium.org> expfd.write(expected) expfd.close() - patchstream.FixPatch(None, inname, series.Series(), None) + # Normally by the time we call FixPatch we've already collected + # metadata. Here, we haven't, but at least fake up something. + # Set the "count" to -1 which tells FixPatch to use a bogus/fixed + # time for generating the Message-Id. + com = commit.Commit('') + com.change_id = 'I80fe1d0c0b7dd10aa58ce5bb1d9290b6664d5413' + com.count = -1 + + patchstream.FixPatch(None, inname, series.Series(), com) + rc = os.system('diff -u %s %s' % (inname, expname)) self.assertEqual(rc, 0) -- 2.23.0.444.g18eeb5a265-goog

2 1

[U-Boot] [PATCH] ARM: dts: rmobile: Restore increase off-on delay on the SD Vcc regulator
by Marek Vasut 30 Sep '19

30 Sep '19

This patch restores commit c49d0ac38a76 ("ARM: dts: rmobile: Increase off-on delay on the SD Vcc regulator"), which was accidentally dropped during DT resync in commit 317d13ac6307 ("ARM: dts: rmobile: Synchronize Gen3 DTs with Linux 5.0"). Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> Fixes: 317d13ac6307 ("ARM: dts: rmobile: Synchronize Gen3 DTs with Linux 5.0") --- arch/arm/dts/r8a7795-h3ulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a7795-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a7796-m3ulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a7796-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a77965-m3nulcb-u-boot.dts | 4 ++++ arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 8 ++++++++ arch/arm/dts/r8a77990-ebisu-u-boot.dts | 8 ++++++++ 7 files changed, 44 insertions(+) diff --git a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts index dda339bd30..ef1c57f672 100644 --- a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts +++ b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts @@ -30,3 +30,7 @@ mmc-hs400-1_8v; max-frequency = <200000000>; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts index 66b608a0f1..e93afe37d0 100644 --- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts @@ -26,3 +26,11 @@ sd-uhs-sdr104; max-frequency = <208000000>; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts index 1defe84f98..314eacc2bc 100644 --- a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts +++ b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts @@ -30,3 +30,7 @@ mmc-hs400-1_8v; max-frequency = <200000000>; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts index 2610f8baa8..2a7b149894 100644 --- a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts @@ -26,3 +26,11 @@ sd-uhs-sdr104; max-frequency = <208000000>; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts b/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts index 8ecfc7a3aa..cf10431269 100644 --- a/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts +++ b/arch/arm/dts/r8a77965-m3nulcb-u-boot.dts @@ -32,3 +32,7 @@ max-frequency = <200000000>; status = "okay"; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts index 208ed56bd1..e4bd2d3e4f 100644 --- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts +++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts @@ -29,3 +29,11 @@ max-frequency = <208000000>; status = "okay"; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi3 { + u-boot,off-on-delay-us = <20000>; +}; diff --git a/arch/arm/dts/r8a77990-ebisu-u-boot.dts b/arch/arm/dts/r8a77990-ebisu-u-boot.dts index 1ce22e5c0f..0ea0cc9cb1 100644 --- a/arch/arm/dts/r8a77990-ebisu-u-boot.dts +++ b/arch/arm/dts/r8a77990-ebisu-u-boot.dts @@ -29,3 +29,11 @@ sd-uhs-sdr25; max-frequency = <208000000>; }; + +&vcc_sdhi0 { + u-boot,off-on-delay-us = <20000>; +}; + +&vcc_sdhi1 { + u-boot,off-on-delay-us = <20000>; +}; -- 2.23.0

1 0

[U-Boot] [PATCH] rockchip: make_fit_atf.py: fix .its generation for a single atf image
by Heiko Stuebner 29 Sep '19

29 Sep '19

The commit 619f002db864 ("rockchip: make_fit_atf.py: fix loadables property set error") fixed the double-loading of the primary atf-image, but didn't take into account that there may be rare atf images with only that main section present. Right now this will result in a broken its due to the loadables section not getting closed correctly, so fix that by adapting the guards around the loop. The guards now protect against 0 segments when the bl31 binary doesn't contain any section and 1 segment when only a core atf section is present. Fixes: 619f002db864 ("rockchip: make_fit_atf.py: fix loadables property set error") Signed-off-by: Heiko Stuebner <heiko(a)sntech.de> --- arch/arm/mach-rockchip/make_fit_atf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py index b9a1988298..585edcf9d5 100755 --- a/arch/arm/mach-rockchip/make_fit_atf.py +++ b/arch/arm/mach-rockchip/make_fit_atf.py @@ -82,7 +82,7 @@ def append_conf_section(file, cnt, dtname, segments): file.write('\t\t\tdescription = "%s";\n' % dtname) file.write('\t\t\tfirmware = "atf_1";\n') file.write('\t\t\tloadables = "uboot"') - if segments != 0: + if segments > 1: file.write(',') for i in range(1, segments): file.write('"atf_%d"' % (i + 1)) @@ -90,7 +90,7 @@ def append_conf_section(file, cnt, dtname, segments): file.write(',') else: file.write(';\n') - if segments == 0: + if segments <= 1: file.write(';\n') file.write('\t\t\tfdt = "fdt_1";\n') file.write('\t\t};\n') -- 2.23.0

2 2

[U-Boot] [PATCH] rockchip: misc: read the correct number of bytes from the efuse
by Heiko Stuebner 29 Sep '19

29 Sep '19

Originally the cpuid var the value gets read into was defined as u8 cpuid[RK3399_CPUID_LEN]; hence the sizeof(cpuid) would return the correct the correct number of array elements. With the move to a separate function cpuid becomes a pointer and sizeof(cpuid) hence returns the pointer size - 8 in the arm64 case. We do have the actual id length available as function param so use it for actual amount of bytes to read. Fixes: 04825384999f ("rockchip: rk3399: derive ethaddr from cpuid") Signed-off-by: Heiko Stuebner <heiko(a)sntech.de> --- arch/arm/mach-rockchip/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 4423b296b1..bed4317f7e 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -75,7 +75,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, } /* read the cpu_id range from the efuses */ - ret = misc_read(dev, cpuid_offset, cpuid, sizeof(cpuid)); + ret = misc_read(dev, cpuid_offset, cpuid, cpuid_length); if (ret) { debug("%s: reading cpuid from the efuses failed\n", __func__); -- 2.23.0

3 3