September 2019 - U-Boot

[U-Boot] [PATCH] cmd: avb: Fix requested partitions list
by Sam Protsenko 21 Oct '19

21 Oct '19

The requested_partitions[] array should contain only boot partitions. Usually it's only 'boot' partition, as can be seen in [1]. Also, seems like the requested_partitions[] are only used when there is no 'vbmeta' partition [2], which is not a regular use-case. Make requested_partitions[] contain only 'boot' partition as it was supposed to be, and also make that array to be a local in do_avb_verify_part() function, as nobody else needs that. [1] https://android.googlesource.com/platform/external/avb/+/master/test/avb_sl… [2] https://android.googlesource.com/platform/external/avb/+/master/libavb/avb_… Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- cmd/avb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/avb.c b/cmd/avb.c index d1942d6605..8f2bb85fce 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -14,11 +14,6 @@ #define AVB_BOOTARGS "avb_bootargs" static struct AvbOps *avb_ops; -static const char * const requested_partitions[] = {"boot", - "system", - "vendor", - NULL}; - int do_avb_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { unsigned long mmc_dev; @@ -231,6 +226,7 @@ int do_avb_get_uuid(cmd_tbl_t *cmdtp, int flag, int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { + const char * const requested_partitions[] = {"boot", NULL}; AvbSlotVerifyResult slot_result; AvbSlotVerifyData *out_data; char *cmdline; -- 2.20.1

3 6

[U-Boot] [PATCH 0/4] aes: add support for aes192 and aes256
by Philippe Reynes 21 Oct '19

21 Oct '19

This serie add the support of aes192 and aes256. This first commit clean a bit the code, and introduce a constant for the block (instead of using the key size). The second commit add the support of aes192 and aes256 to the lib and the cmd. The third update the code of crypto for tegra20, and the forth one add tests in pytest for aes192 and aes256. Philippe Reynes (4): aes: add a define for the size of a block aes: add support of aes192 and aes256 tegra20: crypto: update code to use new aes api pytest: aes: add test for aes192 and aes256 arch/arm/mach-tegra/tegra20/crypto.c | 41 +++++++------ cmd/aes.c | 40 +++++++++---- include/uboot_aes.h | 39 ++++++++---- lib/aes.c | 111 ++++++++++++++++++++++------------- test/py/tests/aes/key192.bin | 1 + test/py/tests/aes/key256.bin | 1 + test/py/tests/test_aes.py | 54 ++++++++++++++++- 7 files changed, 201 insertions(+), 86 deletions(-) create mode 100644 test/py/tests/aes/key192.bin create mode 100644 test/py/tests/aes/key256.bin -- 2.7.4

2 5

[U-Boot] [PATCH V2 0/4] pytest: add a simple test to check the command aes
by Philippe Reynes 21 Oct '19

21 Oct '19

This serie fix the command aes on sandbox and add a simple pytest for aes. The first and second patch enable the command aes on sandbox and sandbox64. Thr third patch fix the command aes on sandbox (adding map_sysmem to avoid a segfault), the forth patch add a simple pytest for the command aes. Philippe Reynes (4): sandbox: enable command aes sandbox64: enable command aes cmd: aes: use map_sysmem when accessing memory pytest: add a new test for aes Changelog: v2: - add binary file (key128.bin, iv128.bin and plaintext.bin) cmd/aes.c | 9 ++++---- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + test/py/tests/aes/iv128.bin | 1 + test/py/tests/aes/key128.bin | 1 + test/py/tests/aes/plaintext.bin | 1 + test/py/tests/test_aes.py | 48 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 4 deletions(-) create mode 100644 test/py/tests/aes/iv128.bin create mode 100644 test/py/tests/aes/key128.bin create mode 100644 test/py/tests/aes/plaintext.bin create mode 100644 test/py/tests/test_aes.py -- 2.7.4

2 6

[U-Boot] [PATCH 0/4] pytest: add a simple test to check the command aes
by Philippe Reynes 21 Oct '19

21 Oct '19

This serie fix the command aes on sandbox and add a simple pytest for aes. The first and second patch enable the command aes on sandbox and sandbox64. Thr third patch fix the command aes on sandbox (adding map_sysmem to avoid a segfault), the forth patch add a simple pytest for the command aes. Philippe Reynes (4): sandbox: enable command aes sandbox64: enable command aes cmd: aes: use map_sysmem when accessing memory pytest: add a new test for aes cmd/aes.c | 9 +++++---- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + test/py/tests/test_aes.py | 48 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 test/py/tests/test_aes.py -- 2.7.4

2 5

[U-Boot] [PATCH] cmd: avb: Support A/B slots
by Sam Protsenko 21 Oct '19

21 Oct '19

Add optional parameter to 'avb verify' sub-command, so that user is able to specify which slot to use, in case when user's partitions are slotted. If that parameter is omitted, the behavior of 'avb verify' will be the same as before, so user API is content. Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- cmd/avb.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/avb.c b/cmd/avb.c index 3f6fd763a0..d1942d6605 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -235,6 +235,7 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, AvbSlotVerifyData *out_data; char *cmdline; char *extra_args; + char *slot_suffix = ""; bool unlocked = false; int res = CMD_RET_FAILURE; @@ -244,9 +245,12 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, return CMD_RET_FAILURE; } - if (argc != 1) + if (argc < 1 || argc > 2) return CMD_RET_USAGE; + if (argc == 2) + slot_suffix = argv[1]; + printf("## Android Verified Boot 2.0 version %s\n", avb_version_string()); @@ -259,7 +263,7 @@ int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, slot_result = avb_slot_verify(avb_ops, requested_partitions, - "", + slot_suffix, unlocked, AVB_HASHTREE_ERROR_MODE_RESTART_AND_INVALIDATE, &out_data); @@ -419,7 +423,7 @@ static cmd_tbl_t cmd_avb[] = { U_BOOT_CMD_MKENT(read_part, 5, 0, do_avb_read_part, "", ""), U_BOOT_CMD_MKENT(read_part_hex, 4, 0, do_avb_read_part_hex, "", ""), U_BOOT_CMD_MKENT(write_part, 5, 0, do_avb_write_part, "", ""), - U_BOOT_CMD_MKENT(verify, 1, 0, do_avb_verify_part, "", ""), + U_BOOT_CMD_MKENT(verify, 2, 0, do_avb_verify_part, "", ""), #ifdef CONFIG_OPTEE_TA_AVB U_BOOT_CMD_MKENT(read_pvalue, 3, 0, do_avb_read_pvalue, "", ""), U_BOOT_CMD_MKENT(write_pvalue, 3, 0, do_avb_write_pvalue, "", ""), @@ -462,6 +466,7 @@ U_BOOT_CMD( "avb read_pvalue <name> <bytes> - read a persistent value <name>\n" "avb write_pvalue <name> <value> - write a persistent value <name>\n" #endif - "avb verify - run verification process using hash data\n" + "avb verify [slot_suffix] - run verification process using hash data\n" " from vbmeta structure\n" + " [slot_suffix] - _a, _b, etc (if vbmeta partition is slotted)\n" ); -- 2.20.1

2 2

[U-Boot] [PATCH v5 1/5] spl: dm: disable SPI DM flash for non-DM SPL
by Xiaowei Bao 21 Oct '19

21 Oct '19

From: Chuanhua Han <chuanhua.han(a)nxp.com> This patch solves the problem that spiboot cannot be performed in non-DM SPL. Signed-off-by: Pan Jiafei <Jiafei.Pan(a)freescale.com> Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- Changes in v5: - No change. Changes in v4: - No change. Changes in v3: - Add a cover-letter for this patch set. Changes in v2: - No change. include/config_uncmd_spl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index c2f9735..da94b3d 100644 --- a/include/config_uncmd_spl.h +++ b/include/config_uncmd_spl.h @@ -15,6 +15,7 @@ #undef CONFIG_DM_GPIO #undef CONFIG_DM_I2C #undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH #endif #undef CONFIG_DM_WARN -- 2.9.5

3 20

[U-Boot] [PATCH v2 00/38] x86: Various modifications to prepare for FSP2
by Simon Glass 21 Oct '19

21 Oct '19

Quite a bit of minor refactoring is needed to prepare for using FSP2 in U-Boot. This series consists of a number of small changes to this end. It is the last series before apollolake support is added. Changes include: - Allowing drivers to be used in TPL/SPL - Moving common FSP code into a common directory - Support for memory-mapped flash on newer Intel chips - Passing the HOB list from SPL to U-Boot proper This series is available at u-boot-dm/x86-working Changes in v2: - Fix the Kconfig condition to avoid build errors on snow - Add the missing header file - Add support for of-platdata for TPL - Rename the fast SPI headers - Rebase to master Simon Glass (38): binman: Pass the toolpath to binman from the main Makefile binman: Allow selection of logging verbosity dm: gpio: Allow control of GPIO uclass in SPL mtd: spi: Add 'struct spi_flash {' to the code serial: ns16550: Allow serial to enabled/disabled in SPL spl: Correct priority selection for image loaders spl: Avoid checking for Ctrl-C in SPL with print_buffer() spl: handoff: Correct Kconfig condition for SPL and TPL spl: Add an arch-specific hook for writing to SPL handoff spl: Set up the bloblist in board_init_r() spl: Add a function to determine the U-Boot phase x86: spi: Add a driver for the Intel Fast SPI interface spi: sandbox: Add a test driver for sandbox SPI flash spi: Add support for memory-mapped flash x86: sysreset: Allow reset driver to be included in SPL/TPL x86: Rename some FSP functions to have an fsp_ prefix x86: fsp: Create a common fsp_support.h header x86: fsp: Use if() instead of #ifdef x86: fsp: Tidy up comment style a little x86: fsp: Move common dram functions into a common file x86: Move common fsp functions into a common file x86: fsp: Move common support functions into a common file efi: Move inline functions to unconditional part of header x86: fsp: Add a few more definitions for FSP2 x86: fsp: Add access to variable MRC data x86: Move common Intel CPU info code into a function x86: Add binman symbols to the image x86: pci: Add a function to clear and set PCI config regs x86: spl: Use hang() instead of a while() loop x86: spl: Reduce priority of the basic SPL image loader x86: spl: Move broadwell-specific code out of generic x86 spl x86: fsp: Save usable RAM and hob_list in the handoff area x86: fsp: Allow the HOBs to be used after relocation x86: Change condition for using CAR x86: Add more comments to the start-up code x86: Add support for booting from Fast SPI x86: Add various MTRR indexes and values x86: Rename turbo ratio MSR to MSR_TURBO_RATIO_LIMIT Makefile | 4 +- arch/sandbox/cpu/spl.c | 7 + arch/sandbox/dts/test.dts | 4 + arch/x86/Kconfig | 8 + arch/x86/cpu/baytrail/fsp_configs.c | 2 +- arch/x86/cpu/braswell/fsp_configs.c | 2 +- arch/x86/cpu/broadwell/cpu.c | 5 + arch/x86/cpu/broadwell/cpu_full.c | 18 +- arch/x86/cpu/cpu.c | 6 + arch/x86/cpu/intel_common/Makefile | 1 + arch/x86/cpu/intel_common/cpu.c | 13 + arch/x86/cpu/intel_common/cpu_from_spl.c | 6 + arch/x86/cpu/intel_common/fast_spi.c | 48 +++ arch/x86/cpu/ivybridge/fsp_configs.c | 2 +- arch/x86/cpu/ivybridge/model_206ax.c | 8 +- arch/x86/cpu/pci.c | 19 ++ arch/x86/cpu/queensbay/fsp_configs.c | 2 +- arch/x86/cpu/start.S | 16 +- arch/x86/cpu/start_from_spl.S | 5 +- arch/x86/cpu/start_from_tpl.S | 3 +- arch/x86/cpu/u-boot-spl.lds | 6 + arch/x86/include/asm/cpu_common.h | 11 + arch/x86/include/asm/fsp/fsp_hob.h | 4 + arch/x86/include/asm/fsp/fsp_infoheader.h | 15 +- arch/x86/include/asm/fsp/fsp_support.h | 174 +++++++++++ arch/x86/include/asm/fsp1/fsp_support.h | 147 +-------- arch/x86/include/asm/handoff.h | 8 + arch/x86/include/asm/hob.h | 26 +- arch/x86/include/asm/msr-index.h | 24 +- arch/x86/include/asm/mtrr.h | 1 + arch/x86/include/asm/pci.h | 40 +++ arch/x86/include/asm/spl.h | 4 +- arch/x86/lib/Makefile | 1 + arch/x86/lib/fsp/Makefile | 7 + arch/x86/lib/fsp/fsp_common.c | 104 +++++++ arch/x86/lib/fsp/fsp_dram.c | 100 ++++++ arch/x86/lib/fsp/fsp_support.c | 199 ++++++++++++ arch/x86/lib/fsp1/fsp_car.S | 10 +- arch/x86/lib/fsp1/fsp_common.c | 96 +----- arch/x86/lib/fsp1/fsp_dram.c | 88 +----- arch/x86/lib/fsp1/fsp_support.c | 181 +---------- arch/x86/lib/hob.c | 19 +- arch/x86/lib/spl.c | 13 +- arch/x86/lib/tpl.c | 7 +- cmd/x86/fsp.c | 2 +- common/spl/Kconfig | 4 +- common/spl/spl.c | 47 +-- configs/slimbootloader_defconfig | 1 + drivers/gpio/Kconfig | 22 ++ drivers/gpio/Makefile | 2 +- drivers/mtd/spi/Kconfig | 9 + drivers/mtd/spi/Makefile | 3 +- drivers/mtd/spi/intel_fast_spi.c | 360 ++++++++++++++++++++++ drivers/mtd/spi/sandbox_direct.c | 110 +++++++ drivers/mtd/spi/sf-uclass.c | 11 + drivers/pci/pci-uclass.c | 2 +- drivers/serial/ns16550.c | 6 +- drivers/sysreset/Kconfig | 12 + drivers/sysreset/Makefile | 2 +- include/config_uncmd_spl.h | 1 - include/efi_loader.h | 10 +- include/handoff.h | 13 + include/linux/mtd/spi-nor.h | 8 +- include/spi_flash.h | 27 ++ include/spl.h | 64 +++- lib/display_options.c | 2 + test/dm/sf.c | 51 +++ tools/binman/README | 6 + 68 files changed, 1662 insertions(+), 577 deletions(-) create mode 100644 arch/x86/cpu/intel_common/fast_spi.c create mode 100644 arch/x86/include/asm/fsp/fsp_support.h create mode 100644 arch/x86/lib/fsp/Makefile create mode 100644 arch/x86/lib/fsp/fsp_common.c create mode 100644 arch/x86/lib/fsp/fsp_dram.c create mode 100644 arch/x86/lib/fsp/fsp_support.c create mode 100644 drivers/mtd/spi/intel_fast_spi.c create mode 100644 drivers/mtd/spi/sandbox_direct.c -- 2.23.0.444.g18eeb5a265-goog

4 131

[U-Boot] [PATCH] drivers: nand: brcmnand: fix nand_chip ecc layout structure
by William Zhang 21 Oct '19

21 Oct '19

The current brcmnand driver is based on 4.18 linux kernel which uses mtd_set_ooblayout to set ecc layout. But nand base code in u-boot is from old kernel which does not use this new API and expect nand_chip.ecc.layout structure to be set. This cause nand_scan_tail function running into a bug check if the device has a different oob size than the default ones. This patch ports the brcmstb_choose_ecc_layout function from kernel 4.6.7 that supports the ecc layout struture and replaces the mtd_set_ooblayout method Signed-off-by: William Zhang <william.zhang(a)broadcom.com> --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 260 +++++++++-------------- 1 file changed, 104 insertions(+), 156 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index faa6da42d5..0745929253 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -888,183 +888,131 @@ static inline bool is_hamming_ecc(struct brcmnand_controller *ctrl, } /* - * Set mtd->ooblayout to the appropriate mtd_ooblayout_ops given - * the layout/configuration. - * Returns -ERRCODE on failure. + * Returns a nand_ecclayout strucutre for the given layout/configuration. + * Returns NULL on failure. */ -static int brcmnand_hamming_ooblayout_ecc(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) +static struct nand_ecclayout *brcmnand_create_layout(int ecc_level, + struct brcmnand_host *host) { - struct nand_chip *chip = mtd_to_nand(mtd); - struct brcmnand_host *host = nand_get_controller_data(chip); - struct brcmnand_cfg *cfg = &host->hwcfg; - int sas = cfg->spare_area_size << cfg->sector_size_1k; - int sectors = cfg->page_size / (512 << cfg->sector_size_1k); - - if (section >= sectors) - return -ERANGE; - - oobregion->offset = (section * sas) + 6; - oobregion->length = 3; - - return 0; -} - -static int brcmnand_hamming_ooblayout_free(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - struct brcmnand_host *host = nand_get_controller_data(chip); struct brcmnand_cfg *cfg = &host->hwcfg; - int sas = cfg->spare_area_size << cfg->sector_size_1k; - int sectors = cfg->page_size / (512 << cfg->sector_size_1k); + int i, j; + struct nand_ecclayout *layout; + int req; + int sectors; + int sas; + int idx1, idx2; - if (section >= sectors * 2) - return -ERANGE; - - oobregion->offset = (section / 2) * sas; - - if (section & 1) { - oobregion->offset += 9; - oobregion->length = 7; - } else { - oobregion->length = 6; - - /* First sector of each page may have BBI */ - if (!section) { - /* - * Small-page NAND use byte 6 for BBI while large-page - * NAND use byte 0. - */ - if (cfg->page_size > 512) - oobregion->offset++; - oobregion->length--; +#ifndef __UBOOT__ + layout = devm_kzalloc(&host->pdev->dev, sizeof(*layout), GFP_KERNEL); +#else + layout = devm_kzalloc(host->pdev, sizeof(*layout), GFP_KERNEL); +#endif + if (!layout) + return NULL; + + sectors = cfg->page_size / (512 << cfg->sector_size_1k); + sas = cfg->spare_area_size << cfg->sector_size_1k; + + /* Hamming */ + if (is_hamming_ecc(host->ctrl, cfg)) { + for (i = 0, idx1 = 0, idx2 = 0; i < sectors; i++) { + /* First sector of each page may have BBI */ + if (i == 0) { + layout->oobfree[idx2].offset = i * sas + 1; + /* Small-page NAND use byte 6 for BBI */ + if (cfg->page_size == 512) + layout->oobfree[idx2].offset--; + layout->oobfree[idx2].length = 5; + } else { + layout->oobfree[idx2].offset = i * sas; + layout->oobfree[idx2].length = 6; + } + idx2++; + layout->eccpos[idx1++] = i * sas + 6; + layout->eccpos[idx1++] = i * sas + 7; + layout->eccpos[idx1++] = i * sas + 8; + layout->oobfree[idx2].offset = i * sas + 9; + layout->oobfree[idx2].length = 7; + idx2++; + /* Leave zero-terminated entry for OOBFREE */ + if (idx1 >= MTD_MAX_ECCPOS_ENTRIES_LARGE || + idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1) + break; } - } - - return 0; -} - -static const struct mtd_ooblayout_ops brcmnand_hamming_ooblayout_ops = { - .ecc = brcmnand_hamming_ooblayout_ecc, - .free = brcmnand_hamming_ooblayout_free, -}; - -static int brcmnand_bch_ooblayout_ecc(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - struct brcmnand_host *host = nand_get_controller_data(chip); - struct brcmnand_cfg *cfg = &host->hwcfg; - int sas = cfg->spare_area_size << cfg->sector_size_1k; - int sectors = cfg->page_size / (512 << cfg->sector_size_1k); - - if (section >= sectors) - return -ERANGE; - oobregion->offset = (section * (sas + 1)) - chip->ecc.bytes; - oobregion->length = chip->ecc.bytes; - - return 0; -} - -static int brcmnand_bch_ooblayout_free_lp(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - struct brcmnand_host *host = nand_get_controller_data(chip); - struct brcmnand_cfg *cfg = &host->hwcfg; - int sas = cfg->spare_area_size << cfg->sector_size_1k; - int sectors = cfg->page_size / (512 << cfg->sector_size_1k); - - if (section >= sectors) - return -ERANGE; - - if (sas <= chip->ecc.bytes) - return 0; - - oobregion->offset = section * sas; - oobregion->length = sas - chip->ecc.bytes; - - if (!section) { - oobregion->offset++; - oobregion->length--; + return layout; } - return 0; -} - -static int brcmnand_bch_ooblayout_free_sp(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobregion) -{ - struct nand_chip *chip = mtd_to_nand(mtd); - struct brcmnand_host *host = nand_get_controller_data(chip); - struct brcmnand_cfg *cfg = &host->hwcfg; - int sas = cfg->spare_area_size << cfg->sector_size_1k; + /* + * CONTROLLER_VERSION: + * < v5.0: ECC_REQ = ceil(BCH_T * 13/8) + * >= v5.0: ECC_REQ = ceil(BCH_T * 14/8) + * But we will just be conservative. + */ + req = DIV_ROUND_UP(ecc_level * 14, 8); + if (req >= sas) { + dev_err(&host->pdev->dev, + "error: ECC too large for OOB (ECC bytes %d, spare sector %d)\n", + req, sas); + return NULL; + } - if (section > 1 || sas - chip->ecc.bytes < 6 || - (section && sas - chip->ecc.bytes == 6)) - return -ERANGE; + layout->eccbytes = req * sectors; + for (i = 0, idx1 = 0, idx2 = 0; i < sectors; i++) { + for (j = sas - req; j < sas && idx1 < + MTD_MAX_ECCPOS_ENTRIES_LARGE; j++, idx1++) + layout->eccpos[idx1] = i * sas + j; - if (!section) { - oobregion->offset = 0; - oobregion->length = 5; - } else { - oobregion->offset = 6; - oobregion->length = sas - chip->ecc.bytes - 6; + /* First sector of each page may have BBI */ + if (i == 0) { + if (cfg->page_size == 512 && (sas - req >= 6)) { + /* Small-page NAND use byte 6 for BBI */ + layout->oobfree[idx2].offset = 0; + layout->oobfree[idx2].length = 5; + idx2++; + if (sas - req > 6) { + layout->oobfree[idx2].offset = 6; + layout->oobfree[idx2].length = + sas - req - 6; + idx2++; + } + } else if (sas > req + 1) { + layout->oobfree[idx2].offset = i * sas + 1; + layout->oobfree[idx2].length = sas - req - 1; + idx2++; + } + } else if (sas > req) { + layout->oobfree[idx2].offset = i * sas; + layout->oobfree[idx2].length = sas - req; + idx2++; + } + /* Leave zero-terminated entry for OOBFREE */ + if (idx1 >= MTD_MAX_ECCPOS_ENTRIES_LARGE || + idx2 >= MTD_MAX_OOBFREE_ENTRIES_LARGE - 1) + break; } - return 0; + return layout; } -static const struct mtd_ooblayout_ops brcmnand_bch_lp_ooblayout_ops = { - .ecc = brcmnand_bch_ooblayout_ecc, - .free = brcmnand_bch_ooblayout_free_lp, -}; - -static const struct mtd_ooblayout_ops brcmnand_bch_sp_ooblayout_ops = { - .ecc = brcmnand_bch_ooblayout_ecc, - .free = brcmnand_bch_ooblayout_free_sp, -}; - -static int brcmstb_choose_ecc_layout(struct brcmnand_host *host) +static struct nand_ecclayout *brcmstb_choose_ecc_layout( + struct brcmnand_host *host) { + struct nand_ecclayout *layout; struct brcmnand_cfg *p = &host->hwcfg; - struct mtd_info *mtd = nand_to_mtd(&host->chip); - struct nand_ecc_ctrl *ecc = &host->chip.ecc; unsigned int ecc_level = p->ecc_level; - int sas = p->spare_area_size << p->sector_size_1k; - int sectors = p->page_size / (512 << p->sector_size_1k); if (p->sector_size_1k) ecc_level <<= 1; - if (is_hamming_ecc(host->ctrl, p)) { - ecc->bytes = 3 * sectors; - mtd_set_ooblayout(mtd, &brcmnand_hamming_ooblayout_ops); - return 0; - } - - /* - * CONTROLLER_VERSION: - * < v5.0: ECC_REQ = ceil(BCH_T * 13/8) - * >= v5.0: ECC_REQ = ceil(BCH_T * 14/8) - * But we will just be conservative. - */ - ecc->bytes = DIV_ROUND_UP(ecc_level * 14, 8); - if (p->page_size == 512) - mtd_set_ooblayout(mtd, &brcmnand_bch_sp_ooblayout_ops); - else - mtd_set_ooblayout(mtd, &brcmnand_bch_lp_ooblayout_ops); - - if (ecc->bytes >= sas) { + layout = brcmnand_create_layout(ecc_level, host); + if (!layout) { dev_err(&host->pdev->dev, - "error: ECC too large for OOB (ECC bytes %d, spare sector %d)\n", - ecc->bytes, sas); - return -EINVAL; + "no proper ecc_layout for this NAND cfg\n"); + return NULL; } - return 0; + return layout; } static void brcmnand_wp(struct mtd_info *mtd, int wp) @@ -2383,9 +2331,9 @@ static int brcmnand_init_cs(struct brcmnand_host *host, ofnode dn) /* only use our internal HW threshold */ mtd->bitflip_threshold = 1; - ret = brcmstb_choose_ecc_layout(host); - if (ret) - return ret; + chip->ecc.layout = brcmstb_choose_ecc_layout(host); + if (!chip->ecc.layout) + return -ENXIO; ret = nand_scan_tail(mtd); if (ret) -- 2.18.0

3 3

[U-Boot] [PATCH v2] arm: dts: sync dts for Allwinner H6
by Clément Péron 19 Oct '19

19 Oct '19

Sync Kernel DTS for Allwinner H6 boards. Drop /omit-if-no-ref/ keyword as it's not supported by U-boot. commit <d45331b00ddb> Linux 5.3-rc4 Signed-off-by: Clément Péron <peron.clem(a)gmail.com> --- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++ arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++ arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++- 3 files changed, 131 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts index 54b0882bed..0dc33c90dd 100644 --- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts @@ -14,6 +14,7 @@ compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; aliases { + ethernet0 = &emac; serial0 = &uart0; }; @@ -21,6 +22,17 @@ stdout-path = "serial0:115200n8"; }; + connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con_in: endpoint { + remote-endpoint = <&hdmi_out_con>; + }; + }; + }; + leds { compatible = "gpio-leds"; @@ -41,6 +53,40 @@ }; }; +&de { + status = "okay"; +}; + +&ehci0 { + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&ext_rgmii_pins>; + phy-mode = "rgmii"; + phy-handle = <&ext_rgmii_phy>; + phy-supply = <&reg_aldo2>; + status = "okay"; +}; + +&hdmi { + status = "okay"; +}; + +&hdmi_out { + hdmi_out_con: endpoint { + remote-endpoint = <&hdmi_con_in>; + }; +}; + +&mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +}; + &mmc0 { vmmc-supply = <&reg_cldo1>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; @@ -57,6 +103,15 @@ status = "okay"; }; +&ohci0 { + status = "okay"; +}; + +&pio { + vcc-pd-supply = <&reg_cldo1>; + vcc-pg-supply = <&reg_aldo1>; +}; + &r_i2c { status = "okay"; @@ -177,8 +232,29 @@ }; }; +&r_pio { + /* + * PL0 and PL1 are used for PMIC I2C + * don't enable the pl-supply else + * it will fail at boot + * + * vcc-pl-supply = <&reg_aldo1>; + */ + vcc-pm-supply = <&reg_aldo1>; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_ph_pins>; status = "okay"; }; + +&usb2otg { + dr_mode = "host"; + status = "okay"; +}; + +&usb2phy { + usb0_vbus-supply = <&reg_vcc5v>; + status = "okay"; +}; diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts index 4802902e12..1898345183 100644 --- a/arch/arm/dts/sun50i-h6-pine-h64.dts +++ b/arch/arm/dts/sun50i-h6-pine-h64.dts @@ -127,6 +127,12 @@ status = "okay"; }; +&pio { + vcc-pc-supply = <&reg_bldo2>; + vcc-pd-supply = <&reg_cldo1>; + vcc-pg-supply = <&reg_aldo1>; +}; + &r_i2c { status = "okay"; @@ -243,10 +249,16 @@ pcf8563: rtc@51 { compatible = "nxp,pcf8563"; reg = <0x51>; + interrupt-parent = <&r_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; #clock-cells = <0>; }; }; +&r_pio { + vcc-pm-supply = <&reg_aldo1>; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_ph_pins>; diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi index e0dc4a05c1..a117f479ae 100644 --- a/arch/arm/dts/sun50i-h6.dtsi +++ b/arch/arm/dts/sun50i-h6.dtsi @@ -101,7 +101,7 @@ #size-cells = <1>; ranges; - display-engine@1000000 { + bus@1000000 { compatible = "allwinner,sun50i-h6-de3", "allwinner,sun50i-a64-de2"; reg = <0x1000000 0x400000>; @@ -203,11 +203,32 @@ #reset-cells = <1>; }; + dma: dma-controller@3002000 { + compatible = "allwinner,sun50i-h6-dma"; + reg = <0x03002000 0x1000>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>; + clock-names = "bus", "mbus"; + dma-channels = <16>; + dma-requests = <46>; + resets = <&ccu RST_BUS_DMA>; + #dma-cells = <1>; + }; + sid: sid@3006000 { compatible = "allwinner,sun50i-h6-sid"; reg = <0x03006000 0x400>; }; + watchdog: watchdog@30090a0 { + compatible = "allwinner,sun50i-h6-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x030090a0 0x20>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; + /* Broken on some H6 boards */ + status = "disabled"; + }; + pio: pinctrl@300b000 { compatible = "allwinner,sun50i-h6-pinctrl"; reg = <0x0300b000 0x400>; @@ -243,6 +264,18 @@ bias-pull-up; }; + /* + * /omit-if-no-ref/ isn't supported by U-boot + * keep this comment to avoid bad sync with Linux + */ + mmc1_pins: mmc1-pins { + pins = "PG0", "PG1", "PG2", "PG3", + "PG4", "PG5"; + function = "mmc1"; + drive-strength = <30>; + bias-pull-up; + }; + mmc2_pins: mmc2-pins { pins = "PC1", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", @@ -294,6 +327,8 @@ resets = <&ccu RST_BUS_MMC1>; reset-names = "ahb"; interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -445,7 +480,6 @@ resets = <&ccu RST_BUS_OHCI3>, <&ccu RST_BUS_EHCI3>; phys = <&usb2phy 3>; - phy-names = "usb"; status = "disabled"; }; @@ -457,7 +491,6 @@ <&ccu CLK_USB_OHCI3>; resets = <&ccu RST_BUS_OHCI3>; phys = <&usb2phy 3>; - phy-names = "usb"; status = "disabled"; }; @@ -613,6 +646,13 @@ #reset-cells = <1>; }; + r_watchdog: watchdog@7020400 { + compatible = "allwinner,sun50i-h6-wdt", + "allwinner,sun6i-a31-wdt"; + reg = <0x07020400 0x20>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + }; + r_intc: interrupt-controller@7021000 { compatible = "allwinner,sun50i-h6-r-intc", "allwinner,sun6i-a31-r-intc"; -- 2.20.1

4 5

[U-Boot] [PATCH v3 00/28] Add and update drivers for MediaTek MT76x8 SoCs
by Weijie Gao 18 Oct '19

18 Oct '19

This patch series have the following changes: - Add pinctrl(both pinmux and pinconf) driver, reset controller driver and clock driver for mt7628. - Add mt7628 platform to mtk-sd driver. - Modify mt7628's ethernet & usb phy driver to take advantages from the new drivers. - Update mt7621-spi driver with a new transfer method. - Enable fifo, disable flow control, and enable non-DM implementation for mtk hsuart driver. - Enanble the new drivers for currently existed mt7628 boards. Changes of v2: - Change clock gateing driver to a more 'generic' driver which supports output clock rates of CPU/SYS_BUS/peripherals. - mt7621-spi now uses accurate sys_freq from clock driver. - Make PHY link detection optional via DT. - Select essential drivers in Kconfig instead of setting in defconfig files. Changes of v3: - Add const qualifier for structs in pinctrl-mt7628.c. - Make mt76x8-usb-phy depends on SOC_MT7628. - Simplify logic of card-detection in mtk-sd.c. Weijie Gao (28): serial: serial_mtk: enable FIFO and disable flow control serial: serial_mtk: add non-DM version for SPL dts: mtmips: move uart property clock-frequency into mt7628an.dtsi dts: mtmips: enable high-speed UART support for mt7628 clk: add clock driver for MediaTek MT76x8 platform dts: mtmips: add clock node for mt7628 spi: mt7621-spi: use clock frequency from clk driver spi: mt7621-spi: remove data cache and rewrite its xfer function spi: mt7621-spi: restore default register value after each xfer pinctrl: add support for MediaTek MT7628 dts: mtmips: add pinctrl node for mt7628 dts: mtmips: add default pinctrl for uart nodes reset: add reset controller driver for MediaTek MIPS platform dts: mtmips: update reset controller node for mt7628 phy: mt76x8-usb-phy: add slew rate calibration and remove non-mt7628 part net: mt7628-eth: remove hardcoded gpio settings and regmap-based phy reset net: mt7628-eth: make phy link up detection optional via DT net: mt7628-eth: free rx descriptor on receiving failure net: mt7628-eth: add support to isolate LAN/WAN ports dts: mtmips: enable eth port0 led and link poll functions for all boards mmc: mtk-sd: add support for MediaTek MT7620/MT7628 SoCs mmc: mtk-sd: add a dts property cd-active-high for builtin-cd mode dts: mtmips: add mmc related nodes for mt7628an.dtsi dts: mtmips: add default pinctrl for gardena-smart-gateway-mt7688 dts: mtmips: add default pinctrl to eth nodes for all boards mips: mtmips: change baudrate table for all boards mips: mtmips: select essential drivers in Kconfig configs: mtmips: remove configs which are selected in Kconfig or useless arch/mips/Kconfig | 6 + .../mips/dts/gardena-smart-gateway-mt7688.dts | 19 +- arch/mips/dts/linkit-smart-7688.dts | 16 +- arch/mips/dts/mt7628a.dtsi | 246 +++++++- arch/mips/mach-mtmips/Kconfig | 2 + ...gardena-smart-gateway-mt7688-ram_defconfig | 7 - .../gardena-smart-gateway-mt7688_defconfig | 7 - configs/linkit-smart-7688-ram_defconfig | 7 - configs/linkit-smart-7688_defconfig | 7 - drivers/clk/Makefile | 1 + drivers/clk/mtmips/Makefile | 3 + drivers/clk/mtmips/clk-mt7628.c | 158 +++++ drivers/mmc/Kconfig | 2 +- drivers/mmc/mtk-sd.c | 29 +- drivers/net/Kconfig | 1 + drivers/net/mt7628-eth.c | 135 ++-- drivers/phy/Kconfig | 1 + drivers/phy/mt76x8-usb-phy.c | 225 +++++-- drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/Makefile | 1 + drivers/pinctrl/mtmips/Kconfig | 13 + drivers/pinctrl/mtmips/Makefile | 7 + drivers/pinctrl/mtmips/pinctrl-mt7628.c | 585 ++++++++++++++++++ .../pinctrl/mtmips/pinctrl-mtmips-common.c | 87 +++ .../pinctrl/mtmips/pinctrl-mtmips-common.h | 53 ++ drivers/reset/Kconfig | 7 + drivers/reset/Makefile | 1 + drivers/reset/reset-mtmips.c | 82 +++ drivers/serial/serial.c | 2 + drivers/serial/serial_mtk.c | 223 ++++++- drivers/spi/mt7621_spi.c | 247 ++++---- .../configs/gardena-smart-gateway-mt7688.h | 2 +- include/configs/linkit-smart-7688.h | 2 +- include/dt-bindings/clock/mt7628-clk.h | 37 ++ include/dt-bindings/reset/mt7628-reset.h | 36 ++ 35 files changed, 1929 insertions(+), 329 deletions(-) create mode 100644 drivers/clk/mtmips/Makefile create mode 100644 drivers/clk/mtmips/clk-mt7628.c create mode 100644 drivers/pinctrl/mtmips/Kconfig create mode 100644 drivers/pinctrl/mtmips/Makefile create mode 100644 drivers/pinctrl/mtmips/pinctrl-mt7628.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mtmips-common.c create mode 100644 drivers/pinctrl/mtmips/pinctrl-mtmips-common.h create mode 100644 drivers/reset/reset-mtmips.c create mode 100644 include/dt-bindings/clock/mt7628-clk.h create mode 100644 include/dt-bindings/reset/mt7628-reset.h -- 2.17.1

3 32