March 2022 - U-Boot

ubifs: fix journal replay wrt. xattr nodes
by Ville Baillie 25 Mar '22

25 Mar '22

Hi all Has there been any thought about bringing this fix into the u-boot ubifs layer? https://github.com/torvalds/linux/commit/1cb51a15b576ee325d527726afff409472… This fixes something that can break boot if you rely on UBIFS to load your kernel images. Thanks Ville

2 1

[PATCH] CI: Pin pylint version to 2.12.2
by Tom Rini 25 Mar '22

25 Mar '22

For consistency in runs, we need to always use the same pylint version. Pin to 2.12.2 as this is what we have been using so far. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 0f1a1bd86326..cd54688881d7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -214,7 +214,7 @@ stages: cd ${WORK_DIR} export USER=azure pip install -r test/py/requirements.txt - pip install asteval pylint pyopenssl + pip install asteval pylint==2.12.2 pyopenssl export PATH=${PATH}:~/.local/bin echo "[MASTER]" >> .pylintrc echo "load-plugins=pylint.extensions.docparams" >> .pylintrc diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388e666ec9e3..7df7e939f542 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -220,7 +220,7 @@ Run pylint: stage: testsuites script: - pip install -r test/py/requirements.txt - - pip install asteval pylint pyopenssl + - pip install asteval pylint==2.12.2 pyopenssl - export PATH=${PATH}:~/.local/bin - echo "[MASTER]" >> .pylintrc - echo "load-plugins=pylint.extensions.docparams" >> .pylintrc -- 2.25.1

1 1

[PATCH 1/1] doc: update doc/sphinx/requirements.txt
by Heinrich Schuchardt 25 Mar '22

25 Mar '22

Pin all dependencies as reported by 'pip freeze'. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/sphinx/requirements.txt | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt index 44c187880d..5baec4d93e 100644 --- a/doc/sphinx/requirements.txt +++ b/doc/sphinx/requirements.txt @@ -1,4 +1,25 @@ +alabaster==0.7.12 +Babel==2.9.1 +certifi==2021.10.8 +charset-normalizer==2.0.12 docutils==0.16 -sphinx==3.4.3 -sphinx_rtd_theme==1.0.0 +idna==3.3 +imagesize==1.3.0 +Jinja2==3.0.3 +MarkupSafe==2.1.1 +packaging==21.3 +Pygments==2.11.2 +pyparsing==3.0.7 +pytz==2022.1 +requests==2.27.1 six==1.16.0 +snowballstemmer==2.2.0 +Sphinx==3.4.3 +sphinx-rtd-theme==1.0.0 +sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 +urllib3==1.26.9 -- 2.34.1

2 1

[PATCH] arm64: zynqmp: enable the PMUFW watchdog
by Jorge Ramirez-Ortiz 25 Mar '22

25 Mar '22

>From 528b3117a36b7b4eea1839afbea7191d60638b0c Mon Sep 17 00:00:00 2001 From: Jorge Ramirez-Ortiz <jorge(a)foundries.io> Date: Wed, 23 Mar 2022 14:41:15 +0100 Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdog If the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started. We do this by faking the FSBL done state. Reference code in PMUFW: https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/s… It needs this fix on the PMUFW https://github.com/Xilinx/embeddedsw/pull/190 Signed-off-by: Jorge Ramirez-Ortiz <jorge(a)foundries.io> --- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-zynqmp/include/mach/hardware.h b/arch/arm/mach-zynqmp/include/mach/hardware.h index a70d6d611b..24c3ef3d7d 100644 --- a/arch/arm/mach-zynqmp/include/mach/hardware.h +++ b/arch/arm/mach-zynqmp/include/mach/hardware.h @@ -174,8 +174,11 @@ struct csu_regs { #define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 + struct pmu_regs { - u32 reserved[18]; + u32 reserved[17]; + u32 gen_storage5; /* 0x44 */ u32 gen_storage6; /* 0x48 */ }; diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 70b3c81f12..c88c5fb8ea 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -419,6 +419,10 @@ int board_init(void) zynqmp_pm_cfg_obj_size); printf("Silicon version:\t%d\n", zynqmp_get_silicon_version()); + /* fake FSBL completion to start the PMUFW watchdog when enabled */ + writel(readl(&pmu_base->gen_storage5) | FSBL_COMPLETION, + &pmu_base->gen_storage5); + /* the CSU disables the JTAG interface when secure boot is enabled */ if (CONFIG_IS_ENABLED(ZYNQMP_RESTORE_JTAG)) restore_jtag(); -- 2.34.1

3 4

[PATCH-next] include: configs: at91/sam: remove stray #ifdef/#else
by Eugen Hristev 25 Mar '22

25 Mar '22

With the commit that moves the BOOTCOMMAND to Kconfig: 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig") some stray ifdefs have been left in the header files which are now useless. Clean up the include files to remove these lines. Fixes: 970bf8603b ("Convert CONFIG_USE_BOOTCOMMAND et al to Kconfig") Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- include/configs/at91-sama5_common.h | 11 ----------- include/configs/at91sam9260ek.h | 12 ------------ include/configs/at91sam9261ek.h | 13 ------------- include/configs/at91sam9263ek.h | 9 --------- include/configs/at91sam9m10g45ek.h | 6 ------ include/configs/at91sam9n12ek.h | 9 --------- include/configs/at91sam9rlek.h | 14 -------------- include/configs/at91sam9x5ek.h | 8 -------- include/configs/sam9x60ek.h | 10 ---------- include/configs/sama5d27_som1_ek.h | 4 ---- include/configs/sama5d2_xplained.h | 12 ------------ 11 files changed, 108 deletions(-) diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 669a8ec7c7..4631acfd66 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -15,15 +15,4 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */ -#ifdef CONFIG_SD_BOOT -#else - -#ifdef CONFIG_NAND_BOOT -/* u-boot env in nand flash */ -#elif CONFIG_SPI_BOOT -/* u-boot env in serial flash, by default is bus 0 and cs 0 */ -#endif - -#endif - #endif diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 4252a8ce37..f5cc0b2b91 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -67,16 +67,4 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#ifdef CONFIG_SYS_USE_DATAFLASH_CS0 - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ -#elif defined(CONFIG_SYS_USE_NANDFLASH) - -/* bootstrap + u-boot + env + linux in nandflash */ - -#else /* CONFIG_SYS_USE_MMC */ -/* bootstrap + u-boot + env + linux in mmc */ -/* For FAT system, most cases it should be in the reserved sector */ -#endif - #endif diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index fefdb83709..f5da8a096e 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -73,17 +73,4 @@ #endif #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#ifdef CONFIG_SYS_USE_DATAFLASH_CS0 - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_DATAFLASH_CS3 - -/* bootstrap + u-boot + env + linux in dataflash on CS3 */ - -#else /* CONFIG_SYS_USE_NANDFLASH */ - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - #endif diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b084f96afd..e759ce4124 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -197,13 +197,4 @@ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#ifdef CONFIG_SYS_USE_DATAFLASH - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_NANDFLASH - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - #endif diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 0f5d991022..92f0549485 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -50,12 +50,6 @@ #define CONFIG_RESET_PHY_R #define CONFIG_AT91_WANTS_COMMON_PHY -#ifdef CONFIG_NAND_BOOT -/* bootstrap + u-boot + env in nandflash */ -#elif CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in mmc */ -#endif - /* Defines for SPL */ #define CONFIG_SPL_MAX_SIZE 0x010000 #define CONFIG_SPL_STACK 0x310000 diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 1771defa16..a1ed1c4fc2 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -63,15 +63,6 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 #endif -#ifdef CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif defined(CONFIG_NAND_BOOT) - -/* bootstrap + u-boot + env + linux in nandflash */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 89cfcbd951..2e81c36d1b 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -52,18 +52,4 @@ #endif -/* Ethernet - not present */ - -#ifdef CONFIG_SYS_USE_DATAFLASH - -/* bootstrap + u-boot + env + linux in dataflash on CS0 */ - -#elif CONFIG_SYS_USE_NANDFLASH - -/* bootstrap + u-boot + env + linux in nandflash */ - -#else /* CONFIG_SYS_USE_MMC */ - -/* bootstrap + u-boot + env + linux in mmc */ -#endif #endif diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index c813136dbe..013c7cfc59 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -54,14 +54,6 @@ #endif #endif -#ifdef CONFIG_NAND_BOOT -/* bootstrap + u-boot + env + linux in nandflash */ -#elif defined(CONFIG_SPI_BOOT) -/* bootstrap + u-boot + env + linux in spi flash */ -#elif defined(CONFIG_SYS_USE_DATAFLASH) -/* bootstrap + u-boot + env + linux in data flash */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x6000 #define CONFIG_SPL_STACK 0x308000 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 772805d624..c965fcb4e8 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -40,14 +40,4 @@ #define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PD5 #endif -#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env + linux in sd card */ - -#elif defined(CONFIG_NAND_BOOT) -/* bootstrap + u-boot + env + linux in nandflash */ - -#elif defined(CONFIG_QSPI_BOOT) -/* bootstrap + u-boot + env + linux in SPI NOR flash */ -#endif - #endif diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h index f7d8fb6352..b9144584e3 100644 --- a/include/configs/sama5d27_som1_ek.h +++ b/include/configs/sama5d27_som1_ek.h @@ -21,10 +21,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -#ifdef CONFIG_SD_BOOT -/* bootstrap + u-boot + env in sd card */ -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 11c13c65d8..cab6ae5069 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -18,18 +18,6 @@ (0x22000000 + 16 * 1024 - GENERATED_GBL_DATA_SIZE) #endif -/* SerialFlash */ - -#ifdef CONFIG_SD_BOOT - -/* bootstrap + u-boot + env in sd card */ - -#elif CONFIG_SPI_BOOT - -/* bootstrap + u-boot + env in sd card, but kernel + dtb in eMMC */ - -#endif - /* SPL */ #define CONFIG_SPL_MAX_SIZE 0x10000 #define CONFIG_SPL_BSS_START_ADDR 0x20000000 -- 2.25.1

3 3

[PATCH v2 0/9] efi_loader: booting via short-form device-path
by Heinrich Schuchardt 25 Mar '22

25 Mar '22

The GUID of partitions is sufficient for identification and will stay constant in the lifetime of a boot option. The preceding path of the device-path may change due to changes in the enumeration of devices. Therefore it is preferable to use the short-form of device-paths in load options. With this series booting via short-form device-paths is reenable. The 'efidebug boot add' command is adjusted to create either short-form or long-form device paths. The check for the EFI System Partition used for capsule updates is corrected. A unit test for the boot manager is added. v2: merge multiple patches to a series fix ESP detection Heinrich Schuchardt (9): efi_loader: export efi_dp_shorten() efi_loader: fix efi_dp_find_obj() efi_loader: efi_dp_find_obj() add protocol check efi_loader: support booting via short-form device-path efi_loader: use short-form DP for load options efi_loader: export efi_system_partition_guid efi_loader: remove efi_disk_is_system_part() efi_loader: move dtbdump.c, initrddump.c to lib/efi_loader test: test UEFI boot manager cmd/efidebug.c | 70 ++- include/efi_loader.h | 12 +- lib/efi_loader/Makefile | 12 + lib/efi_loader/dtbdump.c | 539 ++++++++++++++++++ lib/efi_loader/efi_boottime.c | 22 +- lib/efi_loader/efi_capsule.c | 13 +- lib/efi_loader/efi_device_path.c | 138 +++-- lib/efi_loader/efi_disk.c | 31 +- lib/efi_loader/initrddump.c | 449 +++++++++++++++ lib/efi_selftest/Makefile | 12 - lib/efi_selftest/dtbdump.c | 539 ------------------ lib/efi_selftest/initrddump.c | 449 --------------- test/py/tests/test_efi_bootmgr/conftest.py | 42 ++ .../test_efi_bootmgr/test_efi_bootmgr.py | 31 + 14 files changed, 1232 insertions(+), 1127 deletions(-) create mode 100644 lib/efi_loader/dtbdump.c create mode 100644 lib/efi_loader/initrddump.c delete mode 100644 lib/efi_selftest/dtbdump.c delete mode 100644 lib/efi_selftest/initrddump.c create mode 100644 test/py/tests/test_efi_bootmgr/conftest.py create mode 100644 test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py -- 2.34.1

3 17

[PATCH 0/1] arm: bcmbca: introduce the bcmbca architecture and 47622 SOC
by William Zhang 25 Mar '22

25 Mar '22

This change introduces Broadcom's ARCH_BCMBCA architecture for armv7 and armv8 based Broadband SoCs. We expect to send additional patches for each SoC in the near future. William Zhang (1): arm: bcmbca: introduce the bcmbca architecture and 47622 SOC MAINTAINERS | 11 ++++++++ arch/arm/Kconfig | 7 ++++++ arch/arm/Makefile | 1 + arch/arm/dts/Makefile | 3 +++ arch/arm/dts/bcm47622.dtsi | 25 ++++++++++++++++++ arch/arm/dts/bcm947622.dts | 31 +++++++++++++++++++++++ arch/arm/mach-bcmbca/Kconfig | 17 +++++++++++++ arch/arm/mach-bcmbca/Makefile | 6 +++++ arch/arm/mach-bcmbca/bcm47622/Kconfig | 17 +++++++++++++ arch/arm/mach-bcmbca/bcm47622/Makefile | 5 ++++ board/broadcom/bcmbca/Kconfig | 17 +++++++++++++ board/broadcom/bcmbca/Makefile | 5 ++++ board/broadcom/bcmbca/board.c | 35 ++++++++++++++++++++++++++ configs/bcm947622_defconfig | 18 +++++++++++++ include/configs/bcm947622.h | 21 ++++++++++++++++ 15 files changed, 219 insertions(+) create mode 100644 arch/arm/dts/bcm47622.dtsi create mode 100644 arch/arm/dts/bcm947622.dts create mode 100644 arch/arm/mach-bcmbca/Kconfig create mode 100644 arch/arm/mach-bcmbca/Makefile create mode 100644 arch/arm/mach-bcmbca/bcm47622/Kconfig create mode 100644 arch/arm/mach-bcmbca/bcm47622/Makefile create mode 100644 board/broadcom/bcmbca/Kconfig create mode 100644 board/broadcom/bcmbca/Makefile create mode 100644 board/broadcom/bcmbca/board.c create mode 100644 configs/bcm947622_defconfig create mode 100644 include/configs/bcm947622.h -- 2.17.1

3 8

I just want to make a simple change to the README
by Clay Shoaf 24 Mar '22

24 Mar '22

It took me too long to figure out what the proper name for my board was when using the premade config. Sorry, I don't know the proper way to submit this sort of thing. I was going to make a PR on GitHub, but then I saw your message asking not to do that. I don't know how to properly make a patch file, so attached is the edited version of the README. I just added one line.

1 0

[PATCH v3] mtd: gpmi: fix the bch setting backward compatible issue
by Han Xu 24 Mar '22

24 Mar '22

Previous u-boot code changed the default bch setting behavior and caused backward compatible issue. This fix choose the legacy bch geometry back again as the default option. If the minimum ecc strength that NAND chips required need to be chosen, it can be enabled by either adding DT flag "fsl,use-minimum-ecc" or CONFIG_NAND_MXS_USE_MINIMUM_ECC in configs. The unused flag "fsl,legacy-bch-geometry" get removed. Fixes: 51cdf83eea (mtd: gpmi: provide the option to use legacy bch geometry) Fixes: 616f03daba (mtd: gpmi: change the BCH layout setting for large oob NAND) Tested-by: Tim Harvey <tharvey(a)gateworks.com> Tested-by: Sean Nyekjaer <sean(a)geanix.com> Signed-off-by: Han Xu <han.xu(a)nxp.com> --- Changes in v2: - change the commit log about backward compatible issue is in u-boot - removed the unused flag - add fixes and test tag Changes in v3: - fix the fixes syntax - fix the change log syntax - add more test tag --- drivers/mtd/nand/raw/mxs_nand.c | 71 ++++++++++++++++++++++++++---- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 - include/mxs_nand.h | 2 - 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 748056a43e..ee5d7fde9c 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -195,6 +195,7 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, struct nand_chip *chip = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(chip); unsigned int block_mark_bit_offset; + int corr, ds_corr; /* The default for the length of Galois Field. */ geo->gf_len = 13; @@ -225,6 +226,17 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, geo->ecc_strength = min(round_down(geo->ecc_strength, 2), nand_info->max_ecc_strength_supported); + /* check ecc strength, same as nand_ecc_is_strong_enough() did*/ + if (chip->ecc_step_ds) { + corr = mtd->writesize * geo->ecc_strength / + geo->ecc_chunkn_size; + ds_corr = mtd->writesize * chip->ecc_strength_ds / + chip->ecc_step_ds; + if (corr < ds_corr || + geo->ecc_strength < chip->ecc_strength_ds) + return -EINVAL; + } + block_mark_bit_offset = mtd->writesize * 8 - (geo->ecc_strength * geo->gf_len * (geo->ecc_chunk_count - 1) + MXS_NAND_METADATA_SIZE * 8); @@ -1111,6 +1123,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *nand = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + int err; if (chip->ecc_strength_ds > nand_info->max_ecc_strength_supported) { printf("unsupported NAND chip, minimum ecc required %d\n" @@ -1118,19 +1131,57 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) return -EINVAL; } - if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) && - mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) { - dev_warn(mtd->dev, "use legacy bch geometry\n"); - return mxs_nand_legacy_calc_ecc_layout(geo, mtd); + /* use the legacy bch setting by default */ + if ((!nand_info->use_minimum_ecc && mtd->oobsize < 1024) || + !(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0)) { + dev_dbg(mtd->dev, "use legacy bch geometry\n"); + err = mxs_nand_legacy_calc_ecc_layout(geo, mtd); + if (!err) + return 0; } - if (mtd->oobsize > 1024 || chip->ecc_step_ds < mtd->oobsize) - return mxs_nand_calc_ecc_for_large_oob(geo, mtd); + /* for large oob nand */ + if (mtd->oobsize > 1024) { + dev_dbg(mtd->dev, "use large oob bch geometry\n"); + err = mxs_nand_calc_ecc_for_large_oob(geo, mtd); + if (!err) + return 0; + } - return mxs_nand_calc_ecc_layout_by_info(geo, mtd, - chip->ecc_strength_ds, chip->ecc_step_ds); + /* otherwise use the minimum ecc nand chips required */ + dev_dbg(mtd->dev, "use minimum ecc bch geometry\n"); + err = mxs_nand_calc_ecc_layout_by_info(geo, mtd, chip->ecc_strength_ds, + chip->ecc_step_ds); - return 0; + if (err) + dev_err(mtd->dev, "none of the bch geometry setting works\n"); + + return err; +} + +void mxs_nand_dump_geo(struct mtd_info *mtd) +{ + struct nand_chip *nand = mtd_to_nand(mtd); + struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + struct bch_geometry *geo = &nand_info->bch_geometry; + + dev_dbg(mtd->dev, "BCH Geometry :\n" + "GF Length\t\t: %u\n" + "ECC Strength\t\t: %u\n" + "ECC for Meta\t\t: %u\n" + "ECC Chunk0 Size\t\t: %u\n" + "ECC Chunkn Size\t\t: %u\n" + "ECC Chunk Count\t\t: %u\n" + "Block Mark Byte Offset\t: %u\n" + "Block Mark Bit Offset\t: %u\n", + geo->gf_len, + geo->ecc_strength, + geo->ecc_for_meta, + geo->ecc_chunk0_size, + geo->ecc_chunkn_size, + geo->ecc_chunk_count, + geo->block_mark_byte_offset, + geo->block_mark_bit_offset); } /* @@ -1159,6 +1210,8 @@ int mxs_nand_setup_ecc(struct mtd_info *mtd) if (ret) return ret; + mxs_nand_dump_geo(mtd); + /* Configure BCH and set NFC geometry */ mxs_reset_block(&bch_regs->hw_bch_ctrl_reg); diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index 878796d555..b9833a646f 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -92,8 +92,6 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->use_minimum_ecc = dev_read_bool(dev, "fsl,use-minimum-ecc"); - info->legacy_bch_geometry = dev_read_bool(dev, "fsl,legacy-bch-geometry"); - if (IS_ENABLED(CONFIG_CLK) && IS_ENABLED(CONFIG_IMX8)) { /* Assigned clock already set clock */ struct clk gpmi_clk; diff --git a/include/mxs_nand.h b/include/mxs_nand.h index 66c909318d..741dc8734e 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -44,8 +44,6 @@ struct mxs_nand_info { struct udevice *dev; unsigned int max_ecc_strength_supported; bool use_minimum_ecc; - /* legacy bch geometry flag */ - bool legacy_bch_geometry; int cur_chip; uint32_t cmd_queue_len; -- 2.17.1

2 1

Please pull u-boot-marvell/master
by Stefan Roese 24 Mar '22

24 Mar '22

Hi Tom, please pull this Espressobin fix from Pali: ---------------------------------------------------------------- - a37xx: espressobin: Fix non-working SPI (Pali) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=169&view=results Thanks, Stefan The following changes since commit 5bc486286f4f54d9f399adaa560720d4bf9f6566: Merge tag 'i2c-2022-04-rc5' of https://source.denx.de/u-boot/custodians/u-boot-i2c (2022-03-23 09:10:34 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 8285b928c5c1cb48a6ef9f54dae99cfc1066a44e: arm: a37xx: espressobin: Fix non-working SPI (2022-03-24 08:09:30 +0100) ---------------------------------------------------------------- Pali Rohár (1): arm: a37xx: espressobin: Fix non-working SPI arch/arm/dts/armada-3720-espressobin-u-boot.dtsi | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)

2 1