September 2018 - U-Boot

[U-Boot] [PATCH V2] spl: Weed out CONFIG_SYS_TEXT_BASE usage
by Marek Vasut 04 Oct '18

04 Oct '18

The SPL loaders assume that the CONFIG_SYS_TEXT_BASE memory location is available and can be corrupted by loading ie. uImage or fitImage headers there. Sometimes it could be beneficial to load the headers elsewhere, ie. if CONFIG_SYS_TEXT_BASE is not yet writable while we still want to parse the image headers in some local onchip memory to ie. extract firmware from that image. Add the possibility to override the location where the headers get loaded by introducing new function, spl_get_load_buffer() which takes two arguments -- offset from the CONFIG_SYS_TEXT_BASE and size of the data that are to be loaded there -- and returns a valid buffer address or hangs the system. The default behavior is the same as before, add the offset to CONFIG_SYS_TEXT_BASE and return that address. User can override the weak spl_get_load_buffer() function though. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- V2: Fix build issues on multiple boards due to incorrect pointer casting --- common/spl/spl.c | 5 +++++ common/spl/spl_ext.c | 3 +-- common/spl/spl_fat.c | 3 +-- common/spl/spl_fit.c | 6 +++--- common/spl/spl_mmc.c | 6 +++--- common/spl/spl_nand.c | 4 ++-- common/spl/spl_onenand.c | 3 +-- common/spl/spl_ram.c | 5 +++-- common/spl/spl_spi.c | 3 +-- common/spl/spl_ubi.c | 3 +-- include/spl.h | 9 +++++++++ 11 files changed, 30 insertions(+), 20 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index eda84d0c74..7c22d0f44d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -127,6 +127,11 @@ __weak void spl_board_prepare_for_boot(void) /* Nothing to do! */ } +__weak struct image_header *spl_get_load_buffer(ssize_t offset, size_t size) +{ + return (struct image_header *)(CONFIG_SYS_TEXT_BASE + offset); +} + void spl_set_header_raw_uboot(struct spl_image_info *spl_image) { ulong u_boot_pos = binman_sym(ulong, u_boot_any, image_pos); diff --git a/common/spl/spl_ext.c b/common/spl/spl_ext.c index fd30a61f9a..fe05223605 100644 --- a/common/spl/spl_ext.c +++ b/common/spl/spl_ext.c @@ -16,8 +16,7 @@ int spl_load_image_ext(struct spl_image_info *spl_image, loff_t filelen, actlen; disk_partition_t part_info = {}; - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - - sizeof(struct image_header)); + header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); if (part_get_info(block_dev, partition, &part_info)) { printf("spl: no partition table found\n"); diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c index 0403016bb4..163e540622 100644 --- a/common/spl/spl_fat.c +++ b/common/spl/spl_fat.c @@ -63,8 +63,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, if (err) goto end; - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - - sizeof(struct image_header)); + header = spl_get_load_buffer(-sizeof(*header), sizeof(*header)); err = file_fat_read(filename, header, sizeof(struct image_header)); if (err <= 0) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 9eabb1c105..f08e5018c3 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -357,7 +357,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, struct spl_image_info image_info; int node = -1; int images, ret; - int base_offset, align_len = ARCH_DMA_MINALIGN - 1; + int base_offset, hsize, align_len = ARCH_DMA_MINALIGN - 1; int index = 0; /* @@ -386,8 +386,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, * For FIT with data embedded, data is loaded as part of FIT image. * For FIT with external data, data is not loaded in this step. */ - fit = (void *)((CONFIG_SYS_TEXT_BASE - size - info->bl_len - - align_len) & ~align_len); + hsize = (size + info->bl_len + align_len) & ~align_len; + fit = spl_get_load_buffer(-hsize, hsize); sectors = get_aligned_image_size(info, size, 0); count = info->read(info, sector, sectors, fit); debug("fit read sector %lx, sectors=%d, dst=%p, count=%lu\n", diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 0b2f059570..75c41598e6 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -55,13 +55,13 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image, { unsigned long count; struct image_header *header; + struct blk_desc *bd = mmc_get_blk_desc(mmc); int ret = 0; - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - - sizeof(struct image_header)); + header = spl_get_load_buffer(-sizeof(*header), bd->blksz); /* read image header to find the image size & load address */ - count = blk_dread(mmc_get_blk_desc(mmc), sector, 1, header); + count = blk_dread(bd, sector, 1, header); debug("hdr read sector %lx, count=%lu\n", sector, count); if (count == 0) { ret = -EIO; diff --git a/common/spl/spl_nand.c b/common/spl/spl_nand.c index 2722fd3860..6eb190f1ea 100644 --- a/common/spl/spl_nand.c +++ b/common/spl/spl_nand.c @@ -83,8 +83,8 @@ static int spl_nand_load_image(struct spl_image_info *spl_image, #endif nand_init(); - /*use CONFIG_SYS_TEXT_BASE as temporary storage area */ - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); + header = spl_get_load_buffer(0, sizeof(*header)); + #ifdef CONFIG_SPL_OS_BOOT if (!spl_start_uboot()) { /* diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index d32333935a..ee30f328e6 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -21,8 +21,7 @@ static int spl_onenand_load_image(struct spl_image_info *spl_image, debug("spl: onenand\n"); - /*use CONFIG_SYS_TEXT_BASE as temporary storage area */ - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); + header = spl_get_load_buffer(0, CONFIG_SYS_ONENAND_PAGE_SIZE); /* Load u-boot */ onenand_spl_load_image(CONFIG_SYS_ONENAND_U_BOOT_OFFS, CONFIG_SYS_ONENAND_PAGE_SIZE, (void *)header); diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c index e594beaeaa..619b39a537 100644 --- a/common/spl/spl_ram.c +++ b/common/spl/spl_ram.c @@ -63,8 +63,9 @@ static int spl_ram_load_image(struct spl_image_info *spl_image, * No binman support or no information. For now, fix it * to the address pointed to by U-Boot. */ - u_boot_pos = CONFIG_SYS_TEXT_BASE - - sizeof(struct image_header); + header = spl_get_load_buffer(-sizeof(*header), + sizeof(*header)); + } header = (struct image_header *)map_sysmem(u_boot_pos, 0); diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index ba60a3a3c5..e10cf0124f 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -88,8 +88,7 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, return -ENODEV; } - /* use CONFIG_SYS_TEXT_BASE as temporary storage area */ - header = (struct image_header *)(CONFIG_SYS_TEXT_BASE); + header = spl_get_load_buffer(-sizeof(*header), 0x40); #if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) payload_offs = fdtdec_get_config_int(gd->fdt_blob, diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index a7939e9030..67e5fadd7c 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -61,8 +61,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image, puts("Loading Linux failed, falling back to U-Boot.\n"); } #endif - header = (struct image_header *) - (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); + header = spl_get_load_buffer(-sizeof(*header), sizeof(header)); volumes[0].vol_id = CONFIG_SPL_UBI_LOAD_MONITOR_ID; volumes[0].load_addr = (void *)header; diff --git a/include/spl.h b/include/spl.h index 7fad62c043..b42683c9e7 100644 --- a/include/spl.h +++ b/include/spl.h @@ -303,4 +303,13 @@ void board_return_to_bootrom(void); * the boot-payload */ void spl_perform_fixups(struct spl_image_info *spl_image); + +/* + * spl_get_load_buffer() - get buffer for loading partial image data + * + * Returns memory area which can be populated by partial image data, + * ie. uImage or fitImage header. + */ +struct image_header *spl_get_load_buffer(ssize_t offset, size_t size); + #endif -- 2.16.2

6 15

[U-Boot] [PATCH v9 01/16] test: regmap: Increase size of syscon0 memory
by Mario Six 04 Oct '18

04 Oct '18

The upcoming changes to the regmap interface will contain a proper check for plausibility when reading/writing from/to a register map. To still have the current tests pass, increase the size of the memory region for the syscon0 device, since one of the tests reads and writes beyond this range. Reviewed-by: Anatolij Gustschin <agust(a)denx.de> Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- v8 -> v9: No changes v7 -> v8: No changes v6 -> v7: No changes v5 -> v6: * Fix the test that checks the changed size v4 -> v5: No changes v3 -> v4: No changes v2 -> v3: New in v3 --- arch/sandbox/dts/test.dts | 2 +- test/dm/regmap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 751c13b51da..93808309fdd 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -467,7 +467,7 @@ syscon@0 { compatible = "sandbox,syscon0"; - reg = <0x10 4>; + reg = <0x10 16>; }; syscon@1 { diff --git a/test/dm/regmap.c b/test/dm/regmap.c index d4b86b3b03c..b28d6a6cd11 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -25,7 +25,7 @@ static int dm_test_regmap_base(struct unit_test_state *uts) ut_assertok_ptr(map); ut_asserteq(1, map->range_count); ut_asserteq(0x10, map->ranges[0].start); - ut_asserteq(4, map->ranges[0].size); + ut_asserteq(16, map->ranges[0].size); ut_asserteq(0x10, map_to_sysmem(regmap_get_range(map, 0))); ut_assertok(uclass_get_device(UCLASS_SYSCON, 1, &dev)); -- 2.11.0

2 18

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Oct '18

03 Oct '18

Hi Tom, Here are some binman and core driver-model enhancements. https://travis-ci.org/sglass68/u-boot/builds/435045761 Re signed tags, I did read this link: http://web.mit.edu/git/www/howto/using-signed-tag-in-pull-request.html but I get: error: gpg failed to sign the data error: unable to sign the tag The tag message has been left in .git/TAG_EDITMSG I have tried for a while to get gpg going. I used to use it a long time again. Do you know any good instructions for that? Regards, Simon The following changes since commit bbef20d479441b01d62252cf127498c58078b2c3: Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze (2018-09-27 08:29:10 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git for you to fetch changes up to 31b8217e83a63d1c8c70edcdcdf5aff3b1791640: dm: test: Add "/firmware" node scan test (2018-09-29 11:49:35 -0600) ---------------------------------------------------------------- Jens Wiklander (1): fdt: fdtdec_setup_memory_banksize() use livetree Liviu Dudau (2): include/clk.h: Fix the name of the clock uclass in comment include/dm.h: Remove duplicated include directive Marek Vasut (1): cmd: clk: Add trivial implementation of clock dump for DM Mario Six (7): core: Add functions to set properties in live-tree test: Add tests for DT-manipulation functions core: Add dev_{disable,enable}_by_path test: Add tests for dev_{enable, disable}_by_path drivers: Add board uclass board: Add gazerbeam driver test: Add tests for board uclass Rajan Vaja (2): firmware: Add FIRMWARE config prompt string dm: test: Add "/firmware" node scan test Simon Glass (33): fdt: Add Python support for adding/removing nodes binman: Move 'special properties' docs to README.entries binman: Allow 'fill' entry to have a size of 0 binman: Generate an error when text is not provided binman: Add x86 support for starting TPL binman: Tidy up the vblock entry binman: Support building a selection of images dtoc: Allow syncing of the device tree back to a file dtoc: Fixed endianness in Prop.GetEmpty() dtoc: Support adding new nodes dtoc: Add methods for adding and updating properties dtoc: Add a way to create an Fdt object from a data block binman: Add an entry method for getting the default filename binman: Move state information into a new module binman: Move state logic into the state module binman: Centralise device-tree updates within binman binman: Obtain the list of device trees from the config binman: Allow control of whether a fake DT is used binman: Support updating all device tree files patman: Detect missing tools and report them binman: Support compressed entries binman: Allow zero-size sections binman: Support adding files binman: Support expanding entries binman: Mention section attributes in docs binman: Support hashing entries binman: Support x86 microcode in TPL binman: Record the parent section of each section binman: Correct fmap output on x86 binman: Support ELF files for U-Boot and SPL binman: Allow writing a map file when something goes wrong buildman: Avoid hanging when the config changes sandbox: Add an explanation of the sandbox variants .travis.yml | 1 + Documentation/devicetree/bindings/board/gdsys,board_gazerbeam.txt | 46 ++++ arch/Kconfig | 1 + arch/sandbox/dts/test.dts | 10 + board/sandbox/README.sandbox | 24 ++ cmd/clk.c | 37 +++ configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 2 + configs/sandbox_noblk_defconfig | 2 + configs/sandbox_spl_defconfig | 2 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/board/Kconfig | 22 ++ drivers/board/Makefile | 7 + drivers/board/board-uclass.c | 60 +++++ drivers/board/gazerbeam.c | 262 ++++++++++++++++++++ drivers/board/gazerbeam.h | 18 ++ drivers/board/sandbox.c | 107 +++++++++ drivers/board/sandbox.h | 12 + drivers/core/device.c | 78 ++++++ drivers/core/ofnode.c | 70 ++++++ drivers/firmware/Kconfig | 2 +- drivers/firmware/Makefile | 1 + drivers/firmware/firmware-sandbox.c | 20 ++ drivers/firmware/firmware-uclass.c | 2 +- include/board.h | 139 +++++++++++ include/clk.h | 2 +- include/dm.h | 1 - include/dm/device.h | 16 ++ include/dm/ofnode.h | 46 ++++ include/dm/uclass-id.h | 1 + lib/fdtdec.c | 44 ++-- scripts/dtc/pylibfdt/libfdt.i_shipped | 34 ++- test/dm/Makefile | 2 + test/dm/board.c | 57 +++++ test/dm/firmware.c | 22 ++ test/dm/test-fdt.c | 82 +++++++ tools/binman/README | 49 +++- tools/binman/README.entries | 103 +++++++- tools/binman/bsection.py | 69 +++++- tools/binman/cmdline.py | 4 + tools/binman/control.py | 96 ++++---- tools/binman/entry.py | 92 +++++++- tools/binman/entry_test.py | 16 ++ tools/binman/etype/_testing.py | 7 +- tools/binman/etype/blob.py | 49 +++- tools/binman/etype/blob_dtb.py | 33 +++ tools/binman/etype/files.py | 57 +++++ tools/binman/etype/fill.py | 2 +- tools/binman/etype/fmap.py | 11 +- tools/binman/etype/section.py | 14 +- tools/binman/etype/text.py | 3 + tools/binman/etype/u_boot_dtb.py | 9 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 27 ++- tools/binman/etype/u_boot_elf.py | 39 +++ tools/binman/etype/u_boot_spl_dtb.py | 6 +- tools/binman/etype/u_boot_spl_elf.py | 24 ++ tools/binman/etype/u_boot_spl_with_ucode_ptr.py | 2 + tools/binman/etype/u_boot_tpl_dtb.py | 6 +- tools/binman/etype/u_boot_tpl_dtb_with_ucode.py | 25 ++ tools/binman/etype/u_boot_tpl_with_ucode_ptr.py | 27 +++ tools/binman/etype/u_boot_ucode.py | 26 +- tools/binman/etype/u_boot_with_ucode_ptr.py | 24 +- tools/binman/etype/vblock.py | 11 +- tools/binman/etype/x86_start16_tpl.py | 30 +++ tools/binman/fmap_util.py | 6 +- tools/binman/ftest.py | 394 ++++++++++++++++++++++++++++++- tools/binman/image.py | 30 ++- tools/binman/state.py | 253 ++++++++++++++++++++ tools/binman/test/80_fill_empty.dts | 15 ++ tools/binman/test/81_x86-start16-tpl.dts | 14 ++ tools/binman/test/82_fdt_update_all.dts | 18 ++ tools/binman/test/83_compress.dts | 11 + tools/binman/test/84_files.dts | 11 + tools/binman/test/85_files_compress.dts | 11 + tools/binman/test/86_files_none.dts | 12 + tools/binman/test/87_files_no_pattern.dts | 11 + tools/binman/test/88_expand_size.dts | 43 ++++ tools/binman/test/89_expand_size_bad.dts | 14 ++ tools/binman/test/90_hash.dts | 12 + tools/binman/test/91_hash_no_algo.dts | 11 + tools/binman/test/92_hash_bad_algo.dts | 12 + tools/binman/test/93_x86_tpl_ucode.dts | 29 +++ tools/binman/test/94_fmap_x86.dts | 20 ++ tools/binman/test/95_fmap_x86_section.dts | 22 ++ tools/binman/test/96_elf.dts | 14 ++ tools/binman/test/97_elf_strip.dts | 15 ++ tools/binman/test/99_hash_section.dts | 18 ++ tools/binman/test/files/1.dat | 1 + tools/binman/test/files/2.dat | 1 + tools/binman/test/files/ignored_dir.dat/ignore | 0 tools/binman/test/files/not-this-one | 1 + tools/buildman/builder.py | 2 +- tools/dtoc/fdt.py | 197 +++++++++++++++- tools/dtoc/test_fdt.py | 67 +++++- tools/patman/tools.py | 47 +++- 97 files changed, 3212 insertions(+), 200 deletions(-) create mode 100644 Documentation/devicetree/bindings/board/gdsys,board_gazerbeam.txt create mode 100644 drivers/board/Kconfig create mode 100644 drivers/board/Makefile create mode 100644 drivers/board/board-uclass.c create mode 100644 drivers/board/gazerbeam.c create mode 100644 drivers/board/gazerbeam.h create mode 100644 drivers/board/sandbox.c create mode 100644 drivers/board/sandbox.h create mode 100644 drivers/firmware/firmware-sandbox.c create mode 100644 include/board.h create mode 100644 test/dm/board.c create mode 100644 test/dm/firmware.c create mode 100644 tools/binman/etype/blob_dtb.py create mode 100644 tools/binman/etype/files.py create mode 100644 tools/binman/etype/u_boot_elf.py create mode 100644 tools/binman/etype/u_boot_spl_elf.py create mode 100644 tools/binman/etype/u_boot_tpl_dtb_with_ucode.py create mode 100644 tools/binman/etype/u_boot_tpl_with_ucode_ptr.py create mode 100644 tools/binman/etype/x86_start16_tpl.py create mode 100644 tools/binman/state.py create mode 100644 tools/binman/test/80_fill_empty.dts create mode 100644 tools/binman/test/81_x86-start16-tpl.dts create mode 100644 tools/binman/test/82_fdt_update_all.dts create mode 100644 tools/binman/test/83_compress.dts create mode 100644 tools/binman/test/84_files.dts create mode 100644 tools/binman/test/85_files_compress.dts create mode 100644 tools/binman/test/86_files_none.dts create mode 100644 tools/binman/test/87_files_no_pattern.dts create mode 100644 tools/binman/test/88_expand_size.dts create mode 100644 tools/binman/test/89_expand_size_bad.dts create mode 100644 tools/binman/test/90_hash.dts create mode 100644 tools/binman/test/91_hash_no_algo.dts create mode 100644 tools/binman/test/92_hash_bad_algo.dts create mode 100644 tools/binman/test/93_x86_tpl_ucode.dts create mode 100644 tools/binman/test/94_fmap_x86.dts create mode 100644 tools/binman/test/95_fmap_x86_section.dts create mode 100644 tools/binman/test/96_elf.dts create mode 100644 tools/binman/test/97_elf_strip.dts create mode 100644 tools/binman/test/99_hash_section.dts create mode 100644 tools/binman/test/files/1.dat create mode 100644 tools/binman/test/files/2.dat create mode 100644 tools/binman/test/files/ignored_dir.dat/ignore create mode 100644 tools/binman/test/files/not-this-one Regards, Simon

3 3

[U-Boot] [PATCH] i2c: Add support for the Arm's Versatile Express I2C controller.
by Liviu Dudau 03 Oct '18

03 Oct '18

The Arm Versatile Express I2C controller is a simple register-based controller that uses a register to control the state of the SCL and SDA lines. Add support for it. Signed-off-by: Liviu Dudau <liviu.dudau(a)foss.arm.com> --- drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/i2c-versatile.c | 270 ++++++++++++++++++++++++++++++++++++ 3 files changed, 278 insertions(+) create mode 100644 drivers/i2c/i2c-versatile.c diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index ae3b501555..1ef22e6bcd 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -416,6 +416,13 @@ config SYS_I2C_UNIPHIER_F Support for UniPhier FIFO-builtin I2C controller driver. This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs. +config SYS_I2C_VERSATILE + bool "Arm Ltd Versatile I2C bus driver" + depends on DM_I2C && (TARGET_VEXPRESS_CA15_TC2 || TARGET_VEXPRESS64_JUNO) + help + Add support for the Arm Ltd Versatile Express I2C driver. The I2C host + controller is present in the development boards manufactured by Arm Ltd. + config SYS_I2C_MVTWSI bool "Marvell I2C driver" depends on DM_I2C diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index f2cbe78c53..d3637bcd8d 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_SYS_I2C_STM32F7) += stm32f7_i2c.o obj-$(CONFIG_SYS_I2C_TEGRA) += tegra_i2c.o obj-$(CONFIG_SYS_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_SYS_I2C_UNIPHIER_F) += i2c-uniphier-f.o +obj-$(CONFIG_SYS_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_SYS_I2C_ZYNQ) += zynq_i2c.o obj-$(CONFIG_TEGRA186_BPMP_I2C) += tegra186_bpmp_i2c.o diff --git a/drivers/i2c/i2c-versatile.c b/drivers/i2c/i2c-versatile.c new file mode 100644 index 0000000000..5faa5c93e2 --- /dev/null +++ b/drivers/i2c/i2c-versatile.c @@ -0,1 +1,270 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2018 Arm Ltd. + * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> + * + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <i2c.h> +#include <asm/io.h> +#include <clk.h> +#include <linux/io.h> + +#define I2C_CONTROL_REG 0x00 +#define I2C_SET_REG 0x00 +#define I2C_CLEAR_REG 0x04 + +#define SCL BIT(0) +#define SDA BIT(1) + +struct versatile_i2c_priv { + phys_addr_t base; + u32 delay; +}; + +static inline void versatile_sda_set(struct versatile_i2c_priv *priv, u8 state) +{ + writel(SDA, priv->base + (state ? I2C_SET_REG : I2C_CLEAR_REG)); + udelay(priv->delay); +} + +static inline int versatile_sda_get(struct versatile_i2c_priv *priv) +{ + int v = !!(readl(priv->base + I2C_CONTROL_REG) & SDA); + udelay(priv->delay); + return v; +} + +static inline void versatile_scl_set(struct versatile_i2c_priv *priv, u8 state) +{ + writel(SCL, priv->base + (state ? I2C_SET_REG : I2C_CLEAR_REG)); + udelay(priv->delay); +} + +static inline int versatile_scl_get(struct versatile_i2c_priv *priv) +{ + int v = !!(readl(priv->base + I2C_CONTROL_REG) & SCL); + udelay(priv->delay); + return v; +} + +/* start: SDA goes from high to low while SCL is high */ +static void versatile_i2c_start(struct versatile_i2c_priv *priv) +{ + udelay(priv->delay); + versatile_sda_set(priv, 1); + versatile_scl_set(priv, 1); + versatile_sda_set(priv, 0); +} + +/* stop: SDA goes from low to high while SCL is high */ +static void versatile_i2c_stop(struct versatile_i2c_priv *priv) +{ + versatile_scl_set(priv, 0); + versatile_sda_set(priv, 0); + versatile_scl_set(priv, 1); + versatile_sda_set(priv, 1); +} + +/* read a bit from the SDA line (data or ACK/NACK) */ +static u8 versatile_i2c_read_bit(struct versatile_i2c_priv *priv) +{ + versatile_scl_set(priv, 0); + versatile_sda_set(priv, 1); + versatile_scl_set(priv, 1); + udelay(priv->delay); + return (u8)versatile_sda_get(priv); +} + +/* write a bit on the SDA line */ +static void versatile_i2c_write_bit(struct versatile_i2c_priv *priv, u8 bit) +{ + versatile_scl_set(priv, 0); + versatile_sda_set(priv, bit); + versatile_scl_set(priv, 1); + udelay(priv->delay); +} + +/* send a reset sequence of 9 clocks with SDA high */ +static void versatile_i2c_reset_bus(struct versatile_i2c_priv *priv) +{ + int i; + + for (i = 0; i < 9; i++) + versatile_i2c_write_bit(priv, 1); + + versatile_i2c_stop(priv); +} + +/* write byte without start/stop sequence */ +static int versatile_i2c_write_byte(struct versatile_i2c_priv *priv, u8 byte) +{ + u8 nak, i; + + for (i = 0; i < 8; i++) { + versatile_i2c_write_bit(priv, byte & 0x80); + byte <<= 1; + } + + /* read ACK */ + nak = versatile_i2c_read_bit(priv); + versatile_scl_set(priv, 0); + + return nak; /* not a nack is an ack */ +} + +static int versatile_i2c_read_byte(struct versatile_i2c_priv *priv, u8 *byte, u8 ack) +{ + u8 i; + + *byte = 0; + for (i = 0; i < 8; i++) { + *byte <<= 1; + *byte |= versatile_i2c_read_bit(priv); + } + /* write the nack */ + versatile_i2c_write_bit(priv, ack); + + return 0; +} + +static int versatile_i2c_send_slave_addr(struct versatile_i2c_priv *priv, + struct i2c_msg *msg) +{ + u8 addr; + int ret; + + if (msg->flags & I2C_M_TEN) { + /* 10-bit address, send extended address code first */ + addr = 0xf0 | ((msg->addr >> 7) & 0x06); + ret = versatile_i2c_write_byte(priv, addr); + if (ret) { + versatile_i2c_stop(priv); + return -EIO; + } + + /* remaining bits */ + ret = versatile_i2c_write_byte(priv, msg->addr & 0xff); + if (ret) { + versatile_i2c_stop(priv); + return -EIO; + } + /* reads need to resend the addr */ + if (msg->flags & I2C_M_RD) { + versatile_i2c_start(priv); + addr |= 1; + ret = versatile_i2c_write_byte(priv, addr); + if (ret) { + versatile_i2c_stop(priv); + return -EIO; + } + } + } else { + /* normal 7-bit address */ + addr = msg->addr << 1; + if (msg->flags & I2C_M_RD) + addr |= 1; + ret = versatile_i2c_write_byte(priv, addr); + if (ret) { + versatile_i2c_stop(priv); + return -EIO; + } + } + + return 0; +} + +static int versatile_i2c_message_xfer(struct versatile_i2c_priv *priv, + struct i2c_msg *msg) +{ + int i, ret; + + versatile_i2c_start(priv); + if (versatile_i2c_send_slave_addr(priv, msg)) + return -EIO; + + for (i = 0; i < msg->len; i++) { + if (msg->flags & I2C_M_RD) { + u8 ack = (msg->len - i - 1) == 0 ? 1 : 0; + ret = versatile_i2c_read_byte(priv, &msg->buf[i], ack); + } else { + ret = versatile_i2c_write_byte(priv, msg->buf[i]); + } + + if (ret) + break; + } + + versatile_i2c_stop(priv); + + return ret; +} + +static int versatile_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) +{ + struct versatile_i2c_priv *priv = dev_get_priv(bus); + int ret; + + for ( ; nmsgs > 0; nmsgs--, msg++) { + ret = versatile_i2c_message_xfer(priv, msg); + if (ret) + return -EREMOTEIO; + } + + return 0; +} + +static int versatile_i2c_chip_probe(struct udevice *bus, uint chip, uint chip_flags) +{ + /* probe the presence of a slave by writing a 0-size message */ + struct i2c_msg msg = { .addr = chip, .flags = chip_flags, .len = 0, .buf = NULL }; + struct versatile_i2c_priv *priv = dev_get_priv(bus); + + return versatile_i2c_message_xfer(priv, &msg); +} + +static int versatile_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) +{ + struct versatile_i2c_priv *priv = dev_get_priv(bus); + + priv->delay = 1000000 / (speed << 2); + + versatile_i2c_reset_bus(priv); + + return 0; +} + +static int versatile_i2c_probe(struct udevice *dev) +{ + struct versatile_i2c_priv *priv = dev_get_priv(dev); + + priv->base = (phys_addr_t)dev_read_addr(dev); + priv->delay = 25; /* 25us * 4 = 100kHz */ + /* U-Boot still doesn't assign automatically sequence numbers to devices */ + dev->req_seq = 1; + + return 0; +} + +static const struct dm_i2c_ops versatile_i2c_ops = { + .xfer = versatile_i2c_xfer, + .probe_chip = versatile_i2c_chip_probe, + .set_bus_speed = versatile_i2c_set_bus_speed, +}; + +static const struct udevice_id versatile_i2c_of_match[] = { + { .compatible = "arm,versatile-i2c" }, + { } +}; + +U_BOOT_DRIVER(versatile_i2c) = { + .name = "i2c-bus-versatile", + .id = UCLASS_I2C, + .of_match = versatile_i2c_of_match, + .probe = versatile_i2c_probe, + .priv_auto_alloc_size = sizeof(struct versatile_i2c_priv), + .ops = &versatile_i2c_ops, +}; -- 2.18.0

2 5

Re: [U-Boot] [PATCH 1/1] riscv: allow native compilation
by Rick Chen 03 Oct '18

03 Oct '18

> If environment variable CROSS_COMPILE is not set, this indicates native > compilation. In this case we should not set an arbitrary value which is not > applicable for 64bit anyway. > OK ! Thanks for your correction. B.R Rick > Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> > --- > arch/riscv/config.mk | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk index > 219e66683d..f7a2ffbbc6 100644 > --- a/arch/riscv/config.mk > +++ b/arch/riscv/config.mk > @@ -10,10 +10,6 @@ > # Rick Chen, Andes Technology Corporation <rick(a)andestech.com> # > > -ifeq ($(CROSS_COMPILE),) > -CROSS_COMPILE := riscv32-unknown-linux-gnu- -endif > - > 32bit-emul := elf32lriscv > 64bit-emul := elf64lriscv >

3 4

[U-Boot] [PATCH 1/5] efi_loader: Generate Microsoft PE format complaint images
by Bin Meng 02 Oct '18

02 Oct '18

Per Microsoft PE Format documentation [1], PointerToSymbolTable and NumberOfSymbols should be zero for an image in the COFF file header. Currently U-Boot is generating *.efi images (eg: helloworld.efi) in which these two members are not zero. This updates the build rules to tell linker to remove the symbol table completely so that we can generate compliant *.efi images. [1] https://docs.microsoft.com/zh-cn/windows/desktop/Debug/pe-format Reported-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index f8c3fff..91f0b20 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -381,7 +381,7 @@ $(obj)/%.efi: $(obj)/%_efi.so quiet_cmd_efi_ld = LD $@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ - -Bsymbolic $^ -o $@ + -Bsymbolic -s $^ -o $@ EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) -- 2.7.4

2 10

[U-Boot] [PATCH] clk: Add support for Arm's Versatile Express OSC clock generators
by Liviu Dudau 02 Oct '18

02 Oct '18

The Arm Versatile Express and Juno development boards contain an OSC clock generator that can be accessed through the Versatile Express config bus. The generators are quite often being controlled by some MCU and the config bus offers a uniform way of exposing them. Signed-off-by: Liviu Dudau <liviu.dudau(a)foss.arm.com> --- drivers/clk/Kconfig | 7 +++ drivers/clk/Makefile | 1 + drivers/clk/clk_vexpress_osc.c | 109 +++++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 drivers/clk/clk_vexpress_osc.c diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 809eb3dacf..008cd1186e 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -68,6 +68,13 @@ config CLK_HSDK help Enable this to support the cgu clocks on Synopsys ARC HSDK +config CLK_VEXPRESS_OSC + bool "Enable driver for Arm Versatile Express OSC clock generators" + depends on CLK && VEXPRESS_CONFIG + help + This clock driver adds support for clock generators present on + Arm Versatile Express platforms. + config CLK_ZYNQ bool "Enable clock driver support for Zynq" depends on CLK && ARCH_ZYNQ diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 82c36b7478..2975e21120 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_CLK_RENESAS) += renesas/ obj-$(CONFIG_CLK_STM32F) += clk_stm32f.o obj-$(CONFIG_CLK_STM32MP1) += clk_stm32mp1.o obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ +obj-$(CONFIG_CLK_VEXPRESS_OSC) += clk_vexpress_osc.o obj-$(CONFIG_CLK_ZYNQ) += clk_zynq.o obj-$(CONFIG_CLK_ZYNQMP) += clk_zynqmp.o obj-$(CONFIG_ICS8N3QV01) += ics8n3qv01.o diff --git a/drivers/clk/clk_vexpress_osc.c b/drivers/clk/clk_vexpress_osc.c new file mode 100644 index 0000000000..450f47ac3d --- /dev/null +++ b/drivers/clk/clk_vexpress_osc.c @@ -0,1 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Arm Ltd + * Author: Liviu Dudau <liviu.dudau(a)foss.arm.com> + * + */ +#define DEBUG +#include <common.h> +#include <clk-uclass.h> +#include <dm.h> +#include <dm/lists.h> +#include <errno.h> +#include <misc.h> + +#define CLK_FUNCTION BIT(20) + +struct vexpress_osc_clk_priv { + u8 osc; + ulong rate_min; + ulong rate_max; +}; + +static ulong vexpress_osc_clk_get_rate(struct clk *clk) +{ + int err; + u32 data; + struct udevice *vexpress_cfg = dev_get_parent(clk->dev); + struct vexpress_osc_clk_priv *priv = dev_get_priv(clk->dev); + + data = CLK_FUNCTION | priv->osc; + err = misc_read(vexpress_cfg, 0, &data, sizeof(data)); + if (err) + return err; + + return data; +} + +#ifndef CONFIG_SPL_BUILD +static ulong vexpress_osc_clk_set_rate(struct clk *clk, ulong rate) +{ + int err; + u32 buffer[2]; + struct udevice *vexpress_cfg = dev_get_parent(clk->dev); + struct vexpress_osc_clk_priv *priv = dev_get_priv(clk->dev); + + if (rate < priv->rate_min || rate > priv->rate_max) + return -EINVAL; + + /* + * we are sending the parent the info about the oscillator + * and the value we want to set + */ + buffer[0] = CLK_FUNCTION | priv->osc; + buffer[1] = rate; + err = misc_write(vexpress_cfg, 0, buffer, 2 * sizeof(u32)); + if (err) + return err; + + return rate; +} +#endif + +static struct clk_ops vexpress_osc_clk_ops = { + .get_rate = vexpress_osc_clk_get_rate, +#ifndef CONFIG_SPL_BUILD + .set_rate = vexpress_osc_clk_set_rate, +#endif +}; + +static int vexpress_osc_clk_probe(struct udevice *dev) +{ + struct vexpress_osc_clk_priv *priv = dev_get_priv(dev); + u32 values[2]; + int err; + + err = dev_read_u32_array(dev, "freq-range", values, 2); + if (err) + return err; + priv->rate_min = values[0]; + priv->rate_max = values[1]; + + err = dev_read_u32_array(dev, "arm,vexpress-sysreg,func", values, 2); + if (err) + return err; + + if (values[0] != 1) { + dev_err(dev, "Invalid VExpress function for clock, must be '1'"); + return -EINVAL; + } + priv->osc = values[1]; + debug("clk \"%s%d\", min freq %luHz, max freq %luHz\n", dev->name, + priv->osc, priv->rate_min, priv->rate_max); + + return 0; +} + +static const struct udevice_id vexpress_osc_clk_ids[] = { + { .compatible = "arm,vexpress-osc", }, + {} +}; + +U_BOOT_DRIVER(vexpress_osc_clk) = { + .name = "vexpress_osc_clk", + .id = UCLASS_CLK, + .of_match = vexpress_osc_clk_ids, + .ops = &vexpress_osc_clk_ops, + .priv_auto_alloc_size = sizeof(struct vexpress_osc_clk_priv), + .probe = vexpress_osc_clk_probe, +}; -- 2.18.0

4 11

[U-Boot] [PATCH v12 0/8] SPI-NAND support (third batch)
by Miquel Raynal 02 Oct '18

02 Oct '18

During the last months, Boris Brezillon shared his work to support serial flashes within Linux. First, he delivered (and merged) a new layer called spi-mem. He also initiated in Linux MTD subsystem the move of all 'raw' NAND related code to a raw/ subdirectory, adding at the same time a NAND core that would be shared with all NAND devices. Then, he contributed a generic SPI-NAND driver, making use of this NAND core, as well as some vendor code to drive a few chips. On top of this work, I made some cleanups in the MTD layer and added an 'mtd' U-Boot command to handle all sort of MTD devices. This should become the default command instead of having one per flash flavor ('sf', 'nand', 'spi-nand' ?). The series has been tested on an Ocelot board PCB123 (VSC7514), featuring a Macronix SPI NAND chip. TL;DR: the series contains (stripped version since ~30 patches have already been taken): - Support for spi-nand devices in mtdparts. - Generics mtdparts/mtdids parsers. - A new 'mtd' command. - A note to set mtdparts command legacy. To test your SPI-NAND device with U-Boot, you can test someting like: > setenv mtdparts 'spi-nand0:1m(foo),-(bar)' > setenv mtdids 'spi-nand0=spi0.0' # spi0.0 is Linux MTD name for this device > ubi part bar # create a static UBI volume in the bar partition > mtd list # show the current MTD devices/partitions Thanks, Miquèl NB1: If UBI refuses to attach, verify the partition is epty with # mtd erase bar NB2: If your U-Boot crashes and you are using a non SPI-NAND device, don't forget to probe your device *first* (sf probe, ...). Changes since v11: ------------------ * Due to the number of small changes I had to do to handle the various build failures reported by Travis, I decided to send a full v12 so that all the patches can be replaced and are known to compile properly. * Adding a patch to drop an unused helper in mtd_uboot.c that in some cases causes build issues (if compiled without DM support enabled). * Travis CI status (build success except for one unrelated issue): https://travis-ci.org/miquelraynal/u-boot/builds/434796123 Changes since v10: ------------------ * Only two patches sent independently with small fixes to handle build failures for some configurations (reported by Travis) Changes since v9: ----------------- * mtd_search_alternate_name() is moved in mtd_uboot.c (generic code, everybody wants to use mtdids). * mtd_parse_partitions() is still in mtdparts.c because it depends on partitions support, but the header file declaring it (include/linux/mtd/partitions.h) also has a dummy function if #if IS_ENABLED(CONFIG_MTD_PARTITIONS) is false. * Typo corrected in mtd_parse_partitions prototype (s/_nb_parts/_nparts/). * Added Boris' R-b tags. Changes since v8 (called v7 by mistake): ---------------------------------------- * Moved most of the generic logic to the core (mtd_uboot.c) so that it can be reused by other parts of U-Boot without depending on anything else than the MTD core itself. * Removed the "#ifdef CONFIG_MTD" around mtd_probe_devices() calls now that the code is in the core. * Created an helper for partitions deletion (as there is one to parse/create partition objects). * Drop "cmd: mtdparts: try to probe the MTD devices as a fallback" to actually deprecate the command. * Enhanced a bit the text in Kconfig about deprecating mtdparts. * Fixed checkpatch.pl warnings in the mtdparts driver. cmd/mtd.c: * The logic in the mtd_is_aligned_with_*() functions was wrong, inversed it so the result is what the reader expects (the logic in the end was valid, though). * Discriminate two path: for NAND-like devices (pages, OOB, raw mode, bad blocks) and the others. * Add the "bad" feature to display all bad blocks (if any). * Fix some typos/display strings. * Moved the refcounting put_mtd_device() below in the code as suggested by Boris. * Avoid writing empty pages by default (add an option to force the writing). * Always skip bad blocks. * Lightened the code by creating helpers. Changes since v7: ----------------- * Added Stefan R-b tags. * Used tolower() as suggested by Stefan in lib/strto.c. * Added a mention saying that we continue to abuse the kB suffix in lib/strto.c by not making a difference between kB and kiB which both mean "* 1024" for us. This has been added in the commit log. * Fixed various bugs in the mtd command and in the parsers, they should be pretty stable now (tested with two MTD devices probed and several different partition configurations). * mtdids is not deprecated at all as opposed at what I wrote in v6. U-Boot still uses its own MTD names (being <type><idx> like nor0 or spi-nand1) and mtdids is still needed to do the glue. * Removed a useless patch removing a Kconfig entry I added myself since during a rebase someone else also added this symbol. Changes since v6: ----------------- * Squashed Boris' fixes about build issues in Travis. * Merged Stefan Roese's contributions. * cmd: mtdparts: * added fallthrough comments in switch blocks deriving sizes. * balanced debug messages to compare freed and allocated partitions. * move mtdparts_init() declaration in mtd/partitions.h to be used in mtd command as well. * introduced a "compatibility" function to return what the MTD device name could be thanks to the mtdids environment variable (which is useless with the new partitioning logic). * mtd: mtdpart: * reworked the way partitions are created/handled. * cmd: mtd: * implement a partitioning logic that takes the best out of the MTD layer without re-inventing the wheel. Partitions are all freed correctly when the value of mtdparts changes. * balance get_mtd_device() by put_mtd_device() calls. * prevent memory leak by reorganizing the code a bit in do_mtd. * do not reconstruct partition list when a partition is already in use (complain about that instead). * add support for the legacy mtdids (not needed anymore if mtdparts directly uses the MTD device names as in Linux. * cmd: ubi: * clean and simplify the partition handling a bit to make use the best use of the MTD layer as well and keep the code simple. Changes since v5: ----------------- * Included Boris fixup about the build issues. * Added Rb/Ab tags from Jagan on patchs 20/21. Changes since v4: ----------------- * Added Jagan's Acked-by tags to every patch related to the SPI-mem/SPI-NAND addition. * Rebased on top of master. Changes since v3: ----------------- * Fixed the debug messages in spi-mem to print either Rx or Tx data. * Fixed a Kconfig error that prevented to build mtdparts with plain defconfig. * Fixed a compilation error due to the above error that prevented one file to be compiled. * Adapted the mtd command to probe MTD partitions also. * Declared mtd_probe_devices() in a header so mtdparts or UBI could use it too (to probe all devices and MTD partitions in a clean way). * As I worked on mtdparts, I found annoying and completely useless the fact that we need to prefix the environment variable with "mtdparts=". Canceled this obligation. * Added one patch to allow spi-nand devices to be recognized by mtdparts (this is purely useless but needed to be done in order to use this command). * Removed useless definitions of MTD device types in UBI code. * Wrote a generic mtdparts environment variable parser, used by the mtd command. * Used the mtd_probe_devices() function from get_mtd_info() in cmd/mtdparts.c to be sure the desired partition really does not exist (otherwise it will be probed and then found). Changes since v2: ----------------- * Rebased on u-boot master branch. * Removed extra-parenthesis in "mtd: Fallback to ->_read/write() when ->_read/write_oob() is missing" * s/fiels/files/ in "mtd: move NAND fiels into a raw/ subdirectory" * Do not describe generic SPI device properties in SPI NAND bindings. * Changes in the mtd command: * Printing more information in 'mtd list' (device type, device characteristics) * Switch to do_div() instead of '(u32)value64b % value32b' which only worked because value32b was a power of 2. * Removed erase.chip option. * By default, erase/read/write happen on the full MTD device while a dump will only work on a single page. Changes since v1: ----------------- * Fixed the nand_memorg structure of the MX35LF2GE4AB chip. * Added Reviewed-by tags from Jagan. * Backported and squashed two patches fixing things in the SPI NAND core received on the Linux ML. * Backported more changes in mtdcore.c from Linux. * Added a patch to add a fallback on mtd->_read/_write() in mtdcore.c when mtd->_read/write_oob() is not supported. * Removed the DT changes, useless as the DTs are not available in mainline yet. * Addressed Boris/Stefan comments on the 'mtd' command. * Added support for multi-pages OOB read/write. Miquel Raynal (8): dm: drop unused helper in MTD header mtd: uclass: add probe function mtd: mtdpart: add a generic mtdparts-like parser mtd: uboot: search for an equivalent MTD name with the mtdids mtd: mtdpart: implement proper partition handling cmd: mtd: add 'mtd' command cmd: ubi: clean the partition handling cmd: mtdparts: describe as legacy cmd/Kconfig | 18 +- cmd/Makefile | 1 + cmd/mtd.c | 473 +++++++++++++++++++++++++ cmd/ubi.c | 96 ++--- drivers/mtd/Makefile | 2 +- drivers/mtd/mtd-uclass.c | 16 + drivers/mtd/mtd_uboot.c | 224 +++++++++++- drivers/mtd/mtdcore.c | 2 + drivers/mtd/mtdpart.c | 623 ++++++++++++++++++++------------- include/linux/mtd/mtd.h | 37 ++ include/linux/mtd/partitions.h | 22 +- include/mtd.h | 12 +- 12 files changed, 1201 insertions(+), 325 deletions(-) create mode 100644 cmd/mtd.c -- 2.17.1

3 14

[U-Boot] [PATCH] mtd: spi: Add DM support to SH QSPI driver
by Marek Vasut 02 Oct '18

02 Oct '18

Add DM support to the SH QSPI driver while retaining non-DM support. The later is required as this driver is used in SPL which has a size limitation of 16 kiB. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- drivers/spi/sh_qspi.c | 215 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 150 insertions(+), 65 deletions(-) diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index e9123e2c39..64dfd748d6 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -67,15 +67,12 @@ struct sh_qspi_regs { }; struct sh_qspi_slave { +#ifndef CONFIG_DM_SPI struct spi_slave slave; +#endif struct sh_qspi_regs *regs; }; -static inline struct sh_qspi_slave *to_sh_qspi(struct spi_slave *slave) -{ - return container_of(slave, struct sh_qspi_slave, slave); -} - static void sh_qspi_init(struct sh_qspi_slave *ss) { /* QSPI initialize */ @@ -119,15 +116,8 @@ static void sh_qspi_init(struct sh_qspi_slave *ss) setbits_8(&ss->regs->spcr, SPCR_SPE); } -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - return 1; -} - -void spi_cs_activate(struct spi_slave *slave) +static void sh_qspi_cs_activate(struct sh_qspi_slave *ss) { - struct sh_qspi_slave *ss = to_sh_qspi(slave); - /* Set master mode only */ writeb(SPCR_MSTR, &ss->regs->spcr); @@ -147,61 +137,15 @@ void spi_cs_activate(struct spi_slave *slave) setbits_8(&ss->regs->spcr, SPCR_SPE); } -void spi_cs_deactivate(struct spi_slave *slave) +static void sh_qspi_cs_deactivate(struct sh_qspi_slave *ss) { - struct sh_qspi_slave *ss = to_sh_qspi(slave); - /* Disable SPI Function */ clrbits_8(&ss->regs->spcr, SPCR_SPE); } -void spi_init(void) -{ - /* nothing to do */ -} - -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int mode) -{ - struct sh_qspi_slave *ss; - - if (!spi_cs_is_valid(bus, cs)) - return NULL; - - ss = spi_alloc_slave(struct sh_qspi_slave, bus, cs); - if (!ss) { - printf("SPI_error: Fail to allocate sh_qspi_slave\n"); - return NULL; - } - - ss->regs = (struct sh_qspi_regs *)SH_QSPI_BASE; - - /* Init SH QSPI */ - sh_qspi_init(ss); - - return &ss->slave; -} - -void spi_free_slave(struct spi_slave *slave) +static int sh_qspi_xfer_common(struct sh_qspi_slave *ss, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) { - struct sh_qspi_slave *spi = to_sh_qspi(slave); - - free(spi); -} - -int spi_claim_bus(struct spi_slave *slave) -{ - return 0; -} - -void spi_release_bus(struct spi_slave *slave) -{ -} - -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, - void *din, unsigned long flags) -{ - struct sh_qspi_slave *ss = to_sh_qspi(slave); u32 nbyte, chunk; int i, ret = 0; u8 dtdata = 0, drdata; @@ -210,7 +154,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, if (dout == NULL && din == NULL) { if (flags & SPI_XFER_END) - spi_cs_deactivate(slave); + sh_qspi_cs_deactivate(ss); return 0; } @@ -222,7 +166,7 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, nbyte = bitlen / 8; if (flags & SPI_XFER_BEGIN) { - spi_cs_activate(slave); + sh_qspi_cs_activate(ss); /* Set 1048576 byte */ writel(0x100000, spbmul0); @@ -273,7 +217,148 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, } if (flags & SPI_XFER_END) - spi_cs_deactivate(slave); + sh_qspi_cs_deactivate(ss); return ret; } + +#ifndef CONFIG_DM_SPI +static inline struct sh_qspi_slave *to_sh_qspi(struct spi_slave *slave) +{ + return container_of(slave, struct sh_qspi_slave, slave); +} + +int spi_cs_is_valid(unsigned int bus, unsigned int cs) +{ + return 1; +} + +void spi_cs_activate(struct spi_slave *slave) +{ + struct sh_qspi_slave *ss = to_sh_qspi(slave); + + sh_qspi_cs_activate(ss); +} + +void spi_cs_deactivate(struct spi_slave *slave) +{ + struct sh_qspi_slave *ss = to_sh_qspi(slave); + + sh_qspi_cs_deactivate(ss); +} + +void spi_init(void) +{ + /* nothing to do */ +} + +struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int mode) +{ + struct sh_qspi_slave *ss; + + if (!spi_cs_is_valid(bus, cs)) + return NULL; + + ss = spi_alloc_slave(struct sh_qspi_slave, bus, cs); + if (!ss) { + printf("SPI_error: Fail to allocate sh_qspi_slave\n"); + return NULL; + } + + ss->regs = (struct sh_qspi_regs *)SH_QSPI_BASE; + + /* Init SH QSPI */ + sh_qspi_init(ss); + + return &ss->slave; +} + +void spi_free_slave(struct spi_slave *slave) +{ + struct sh_qspi_slave *spi = to_sh_qspi(slave); + + free(spi); +} + +int spi_claim_bus(struct spi_slave *slave) +{ + return 0; +} + +void spi_release_bus(struct spi_slave *slave) +{ +} + +int spi_xfer(struct spi_slave *slave, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct sh_qspi_slave *ss = to_sh_qspi(slave); + + return sh_qspi_xfer_common(ss, bitlen, dout, din, flags); +} + +#else + +#include <dm.h> + +static int sh_qspi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev->parent; + struct sh_qspi_slave *ss = dev_get_platdata(bus); + + return sh_qspi_xfer_common(ss, bitlen, dout, din, flags); +} + +static int sh_qspi_set_speed(struct udevice *dev, uint speed) +{ + /* This is a SPI NOR controller, do nothing. */ + return 0; +} + +static int sh_qspi_set_mode(struct udevice *dev, uint mode) +{ + /* This is a SPI NOR controller, do nothing. */ + return 0; +} + +static int sh_qspi_probe(struct udevice *dev) +{ + struct sh_qspi_slave *ss = dev_get_platdata(dev); + + sh_qspi_init(ss); + + return 0; +} + +static int sh_qspi_ofdata_to_platdata(struct udevice *dev) +{ + struct sh_qspi_slave *plat = dev_get_platdata(dev); + + plat->regs = (struct sh_qspi_regs *)dev_read_addr(dev); + + return 0; +} + +static const struct dm_spi_ops sh_qspi_ops = { + .xfer = sh_qspi_xfer, + .set_speed = sh_qspi_set_speed, + .set_mode = sh_qspi_set_mode, +}; + +static const struct udevice_id sh_qspi_ids[] = { + { .compatible = "renesas,qspi" }, + { } +}; + +U_BOOT_DRIVER(sh_qspi) = { + .name = "sh_qspi", + .id = UCLASS_SPI, + .of_match = sh_qspi_ids, + .ops = &sh_qspi_ops, + .ofdata_to_platdata = sh_qspi_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct sh_qspi_slave), + .probe = sh_qspi_probe, +}; +#endif -- 2.16.2

2 8

[U-Boot] [PATCH 0/4] rockchip: allow rk3188 to boot from mmc devices
by Heiko Stuebner 02 Oct '18

02 Oct '18

With this series I can now sucessfully boot from a sd-card, with even big kernels being read sucessfully. Patch 1 is not strictly necessary for that but was a result of me investigating the mmc hang which even hung the whole uboot. Heiko Stuebner (4): mmc: dw_mmc: check fifo status with a timeout in fifo mode rockchip: dwmmc: add rk2928-dw-mshc compatible rockchip: rk3188: add u-boot-specific mmc properties rockchip: rk3188: explicitly set vcc_sd0 pin to gpio on rk3188-radxarock arch/arm/dts/rk3188-radxarock-u-boot.dtsi | 15 +++++++++++ arch/arm/dts/rk3188-radxarock.dts | 8 ++++++ drivers/mmc/dw_mmc.c | 32 +++++++++++++++++++++-- drivers/mmc/rockchip_dw_mmc.c | 1 + include/dwmmc.h | 2 ++ 5 files changed, 56 insertions(+), 2 deletions(-) -- 2.18.0

2 12