February 2019 - U-Boot

[U-Boot] [PATCH v2 00/10] Various fixes and improvements
by Simon Glass 22 May '19

22 May '19

This series collects together a large number of small patches that I have been fiddling with for a while. At lot of them relate to SPL and TPL and updating Chromium OS verified boot to work on U-Boot. Unfortunately one patch (RTC) in the original series had a subtle failure which requires a bit of fiddling to fix. This v2 series includes this. Changes in v2: - Rebase to master - Correct definition of log() when logging is disabled - Leave the misc uclass alone since it stops sandbox_spl working - Drop patches previously applied - Add new patches to support the RTC change Simon Glass (10): malloc_simple: Add logging of allocations spl: misc: Allow misc drivers in SPL and TPL power: pmic: Correct debug/error output test: Add a 'make qcheck' target for quicker testing dm: core: Export uclass_find_device_by_phandle() dm: core: Add a few more specific child-finding functions dm: core: Put UCLASS_SIMPLE_BUS in order dm: sandbox: i2c: Add a new 'emulation parent' uclass dm: sandbox: i2c: Use new emulator parent uclass rtc: Allow child drivers Makefile | 6 ++- arch/sandbox/dts/sandbox.dts | 25 ++++++--- arch/sandbox/dts/sandbox_pmic.dtsi | 71 ++++++++++++------------- arch/sandbox/dts/test.dts | 30 +++++++---- common/malloc_simple.c | 58 +++++++++++++-------- drivers/core/device.c | 34 ++++++++++++ drivers/core/uclass.c | 6 +-- drivers/i2c/i2c-emul-uclass.c | 77 ++++++++++++++++++++++++++++ drivers/i2c/sandbox_i2c.c | 20 +------- drivers/misc/Kconfig | 72 ++++++++++++++++++++++++++ drivers/misc/Makefile | 8 +-- drivers/power/pmic/act8846.c | 2 +- drivers/power/pmic/as3722.c | 14 ++--- drivers/power/pmic/as3722_gpio.c | 11 ++-- drivers/power/pmic/i2c_pmic_emul.c | 2 +- drivers/power/pmic/lp873x.c | 6 +-- drivers/power/pmic/lp87565.c | 6 +-- drivers/power/pmic/max77686.c | 8 +-- drivers/power/pmic/max8997.c | 4 +- drivers/power/pmic/max8998.c | 4 +- drivers/power/pmic/mc34708.c | 4 +- drivers/power/pmic/palmas.c | 8 +-- drivers/power/pmic/pfuze100.c | 6 +-- drivers/power/pmic/rk8xx.c | 6 +-- drivers/power/pmic/rn5t567.c | 4 +- drivers/power/pmic/s2mps11.c | 8 +-- drivers/power/pmic/s5m8767.c | 6 +-- drivers/power/pmic/sandbox.c | 4 +- drivers/power/pmic/stpmu1.c | 2 +- drivers/power/pmic/tps65090.c | 8 +-- drivers/rtc/rtc-uclass.c | 1 + include/dm/device.h | 25 +++++++++ include/dm/uclass-id.h | 3 +- include/dm/uclass-internal.h | 17 ++++++ include/i2c.h | 21 ++++++++ include/log.h | 2 +- include/malloc.h | 1 + test/README | 6 ++- test/dm/i2c.c | 2 +- test/dm/rtc.c | 9 ++-- test/dm/test-fdt.c | 47 +++++++++++++++++ test/py/tests/test_fs/test_basic.py | 1 + test/py/tests/test_fs/test_ext.py | 1 + test/py/tests/test_fs/test_mkdir.py | 1 + test/py/tests/test_fs/test_unlink.py | 1 + test/run | 10 +++- 46 files changed, 502 insertions(+), 166 deletions(-) -- 2.19.1.1215.g8438c0b245-goog

4 24

[U-Boot] [PATCH v3 0/7] android: implement A/B boot process
by Igor Opaniuk 20 May '19

20 May '19

This patch series adds support for Android A/B boot process [1]. Main steps of A/B boot process are: - A/B metadata integrity check - looking for the current slot (where the system should be booting from) - getting the name of the current boot partition (boot_a or boot_b) and loading the corresponding Android boot image - getting the name of the current system partition (system_a or system_b) and passing of its full name via kernel command line (like 'root=/dev/mmcblk1p11') - passing current slot via kernel command line (like 'androidboot.slot_suffix=_a') and via A/B metadata (e.g. via misc partition) - A/B metadata processing: setting the boot success flag for current slot, handling the retry counter, etc A/B metadata is organized according to Android reference [2] and stored on 'misc' partition. On the first A/B boot process, when 'misc' partition doesn't contain required data, default A/B metadata will be created and stored in 'misc' partition. In the end of the Android boot, 'update_verifier' and 'update_engine' services are processing the A/B metadata through the Boot Control HAL. To confirm the boot was successful using current slot, "boot success" flag must be set on Android side. To enable Android A/B support in U-Boot: 1. Set the following config options: CONFIG_ANDROID_AB=y CONFIG_CMD_AB_SELECT=y 2. Change the disk layout so that it has sloted boot partitions. E.g. instead of 'boot' and 'system' partitions there should be 'boot_a', 'boot_b', 'system_a' and 'system_b' partitions. To be able to actually test this patch series, the A/B features must be implemented and enabled in Android as well (see [1] for details). Documentation and corresponding test for A/B boot is present here. The last patch in this series integrates A/B boot support on AM57xx based boards (though it's not enabled by default). Future users of A/B boot feature can use it as a reference. This series is a part of previous submission [3] by Alex Deymo. It contains only A/B feature that was stripped out from there with some modifications for using with "bootm" command preferred in upstream. Changes in v3: * Minor fixes in the ab metadata handling (added additional sanity checks). * As Ruslan Trofymenko left Linaro and won't address comments anymore, continue (added my S-b tag) upstreaming patches on my own. Changes in v2: * 'android_ab_select' command is renamed to 'ab_select' command and moved to separate 'Android support commands' menu * For am57xx boards slotted sections (e.g. system_a and system_b) are added to the default sections if CONFIG_CMD_AB_SELECT flag is defined * Returned function error codes are clarified (errno using) * Some types constants and files are renamed * Assertion condition is clarified in test case * 'debug' calls are changed to 'log_debug' * The Guide is clarified by the results of changes [1] https://source.android.com/devices/tech/ota/ab/ab_implement [2] bootable/recovery/bootloader_message/include/bootloader_message/bootloader_message.h [3] https://lists.denx.de/pipermail/u-boot/2017-April/285841.html Ruslan Trofymenko (7): cmd: part: Add 'number' sub-command disk: part: Extend API to get partition info common: Implement A/B metadata cmd: Add 'ab_select' command test/py: Add base test case for A/B updates doc: android: Add simple guide for A/B updates env: am57xx: Implement A/B boot process cmd/Kconfig | 15 +++ cmd/Makefile | 1 + cmd/ab_select.c | 52 ++++++++ cmd/part.c | 16 ++- common/Kconfig | 10 ++ common/Makefile | 1 + common/android_ab.c | 290 ++++++++++++++++++++++++++++++++++++++++++ configs/sandbox_defconfig | 2 + disk/part.c | 68 ++++++++++ doc/README.android-ab | 67 ++++++++++ include/android_ab.h | 34 +++++ include/android_bl_msg.h | 169 ++++++++++++++++++++++++ include/environment/ti/boot.h | 58 ++++++++- include/part.h | 21 +++ test/py/tests/test_ab.py | 74 +++++++++++ 15 files changed, 871 insertions(+), 7 deletions(-) create mode 100644 cmd/ab_select.c create mode 100644 common/android_ab.c create mode 100644 doc/README.android-ab create mode 100644 include/android_ab.h create mode 100644 include/android_bl_msg.h create mode 100644 test/py/tests/test_ab.py -- 2.7.4

9 25

[U-Boot] [PATCH 1/2] fdt: Allow indicating a node is for U-Boot proper only
by Patrick Delaunay 20 May '19

20 May '19

This add missing parts for previous commit 06f94461a9f4 ("fdt: Allow indicating a node is for U-Boot proper only") At present it is not possible to specify that a node should be used before relocation (in U-Boot proper) without it also ending up in SPL and TPL device trees. Add a new "u-boot,dm-pre-proper" boolean property for this. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Hi, I create this patch, after testing the new key "u-boot,dm-pre-proper" for ltdc VIDEO driver on stm32mp1 board. I try to replace the previous used "u-boot,dm-pre-reloc". /* pre-reloc probe = reserve video frame buffer in video_reserve() */ &ltdc { - u-boot,dm-pre-reloc; + u-boot,dm-pre-proper; }; And it is failing. NB: preloc support is only needed in video uclass to reserved the frame buffer(called by board_f), so the node for video u-class driver is only used in U-BOOT pre-relocation and not in SPL. After a grep in code, I see that the initial patch don't add the support of the new "u-boot,dm-pre-proper" in all location where "u-boot,dm-pre-reloc" was tested. When I add the needed test in util.c, it is working. drivers/core/util.c | 4 ++++ drivers/video/video-uclass.c | 4 +++- include/dm/ofnode.h | 6 ++++-- include/dm/util.h | 12 ++++++++---- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/core/util.c b/drivers/core/util.c index 27a6848..6bedc8a 100644 --- a/drivers/core/util.c +++ b/drivers/core/util.c @@ -35,6 +35,8 @@ bool dm_fdt_pre_reloc(const void *blob, int offset) { if (fdt_getprop(blob, offset, "u-boot,dm-pre-reloc", NULL)) return true; + if (fdt_getprop(blob, offset, "u-boot,dm-pre-proper", NULL)) + return true; #ifdef CONFIG_TPL_BUILD if (fdt_getprop(blob, offset, "u-boot,dm-tpl", NULL)) @@ -59,6 +61,8 @@ bool dm_ofnode_pre_reloc(ofnode node) { if (ofnode_read_bool(node, "u-boot,dm-pre-reloc")) return true; + if (ofnode_read_bool(node, "u-boot,dm-pre-proper")) + return true; #ifdef CONFIG_TPL_BUILD if (ofnode_read_bool(node, "u-boot,dm-tpl")) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index f307cf2..a9d40fe 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -290,7 +290,9 @@ static int video_post_bind(struct udevice *dev) return 0; size = alloc_fb(dev, &addr); if (addr < gd->video_bottom) { - /* Device tree node may need the 'u-boot,dm-pre-reloc' tag */ + /* Device tree node may need the 'u-boot,dm-pre-reloc' or + * 'u-boot,dm-pre-proper' tag + */ printf("Video device '%s' cannot allocate frame buffer memory -ensure the device is set up before relocation\n", dev->name); return -ENOSPC; diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index d206ee2..b45da5e 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -662,12 +662,14 @@ int ofnode_read_simple_size_cells(ofnode node); * After relocation and jumping into the real U-Boot binary it is possible to * determine if a node was bound in one of SPL/TPL stages. * - * There are 3 settings currently in use - * - + * There are 4 settings currently in use + * - u-boot,dm-pre-proper: U-Boot proper pre-relocation only * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL * Existing platforms only use it to indicate nodes needed in * SPL. Should probably be replaced by u-boot,dm-spl for * new platforms. + * - u-boot,dm-spl: SPL and U-Boot pre-relocation + * - u-boot,dm-tpl: TPL and U-Boot pre-relocation * * @node: node to check * @return true if node is needed in SPL/TL, false otherwise diff --git a/include/dm/util.h b/include/dm/util.h index 9ff6531..cbc209d 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -52,12 +52,14 @@ static inline void dm_dump_devres(void) * it is possible to determine if a node was bound in one of * SPL/TPL stages. * - * There are 3 settings currently in use - * - + * There are 4 settings currently in use + * - u-boot,dm-pre-proper: U-Boot proper pre-relocation only * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL * Existing platforms only use it to indicate nodes needed in * SPL. Should probably be replaced by u-boot,dm-spl for * existing platforms. + * - u-boot,dm-spl: SPL and U-Boot pre-relocation + * - u-boot,dm-tpl: TPL and U-Boot pre-relocation * @blob: devicetree * @offset: node offset * @@ -78,12 +80,14 @@ bool dm_fdt_pre_reloc(const void *blob, int offset); * it is possible to determine if a node was bound in one of * SPL/TPL stages. * - * There are 3 settings currently in use - * - + * There are 4 settings currently in use + * - u-boot,dm-pre-proper: U-Boot proper pre-relocation only * - u-boot,dm-pre-reloc: legacy and indicates any of TPL or SPL * Existing platforms only use it to indicate nodes needed in * SPL. Should probably be replaced by u-boot,dm-spl for * existing platforms. + * - u-boot,dm-spl: SPL and U-Boot pre-relocation + * - u-boot,dm-tpl: TPL and U-Boot pre-relocation * @node: of node * * Returns true if node is needed in SPL/TL, false otherwise. -- 2.7.4

4 13

[U-Boot] [PATCH] fit: Add support for printing more than one FPGA node name
by tien.fong.chee＠intel.com 19 May '19

19 May '19

From: Tien Fong Chee <tien.fong.chee(a)intel.com> This would print out all the FPGA node names setting to fpga property. Signed-off-by: Tien Fong Chee <tien.fong.chee(a)intel.com> --- common/image-fit.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/common/image-fit.c b/common/image-fit.c index ac901e1..816e17d 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -263,6 +263,7 @@ static void fit_conf_print(const void *fit, int noffset, const char *p) int ret; int fdt_index, loadables_index; int ndepth; + ulong count; /* Mandatory properties */ ret = fit_get_desc(fit, noffset, &desc); @@ -299,9 +300,16 @@ static void fit_conf_print(const void *fit, int noffset, const char *p) printf("%s\n", uname); } - uname = fdt_getprop(fit, noffset, FIT_FPGA_PROP, NULL); - if (uname) - printf("%s FPGA: %s\n", p, uname); + count = fit_conf_get_prop_node_count(fit, noffset, FIT_FPGA_PROP); + + for (ndepth = 0; ndepth < count; ndepth++) { + int images_noffset = fit_conf_get_prop_node_index(fit, noffset, + FIT_FPGA_PROP, ndepth); + uname = fit_get_name(fit, images_noffset, NULL); + + if (uname) + printf("%s FPGA: %s\n", p, uname); + } /* Print out all of the specified loadables */ for (loadables_index = 0; -- 1.7.7.4

3 5

[U-Boot] [PATCH V3 01/10] disk: support host devices in dev_print()
by Stephen Warren 18 May '19

18 May '19

Add a case statement for IF_TYPE_HOST in dev_print() so that it prints the device type rather than the "device type unknown" message. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- disk/part.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/disk/part.c b/disk/part.c index 43485c9148b0..4e72257434b6 100644 --- a/disk/part.c +++ b/disk/part.c @@ -179,6 +179,9 @@ void dev_print (block_dev_desc_t *dev_desc) case IF_TYPE_DOC: puts("device type DOC\n"); return; + case IF_TYPE_HOST: + puts("host device\n"); + break; case IF_TYPE_UNKNOWN: puts("device type unknown\n"); return; -- 1.9.1

2 13

[U-Boot] [PATCH 0/2] iMX6 SPL NAND flash detection fixes
by Andrea Scian 17 May '19

17 May '19

While working on different iMX6 platforms, I've encountered some issue with a couple of NAND device while booting from SPL. It seems that there's a NAND protocol violation in ONFI detection: I try a naive fix, which works only for LP NAND. However, AFAIK, all the mxs_nand_spl code is minimalistic and assume it's working with a LP NAND. A more generic approach will have a bigger impact and requires more tests. I've also changed mxs_flash_ident() code so, when legacy full-ident detection is enabled, this one is used only as fall back when ONFI detection fails. This is closer to standard MTD implementation than the previous solution, where ONFI and full-ident detection where mutually exclusive. This has been originally developed on old v2017.03 but ported on current master. Kind Regards, Andrea Scian Andrea Scian (2): mtd: mxs_nand_spl: fix nand_command protocol violation mtd: mxs_nand_spl: use legacy probe only if ONFI fails drivers/mtd/nand/raw/mxs_nand_spl.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) -- 2.19.2

4 6

[U-Boot] [PATCH v1] dm: pinctrl: Remove obsolete function pinctrl_decode_pin_config_dm().
by Christoph Muellner 16 May '19

16 May '19

This reverts commit 5ff776889212c080e3d1a33634ac904405ed6845. As noted in the comment, the function pinctrl_decode_pin_config_dm() only served as a temporary solution. Since the function has no users anymore, we can remove it again. Signed-off-by: Christoph Muellner <christoph.muellner(a)theobroma-systems.com> --- drivers/pinctrl/pinctrl-uclass.c | 22 ---------------------- include/dm/pinctrl.h | 12 ------------ 2 files changed, 34 deletions(-) diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c index 0e3260afd1..6db0445067 100644 --- a/drivers/pinctrl/pinctrl-uclass.c +++ b/drivers/pinctrl/pinctrl-uclass.c @@ -27,28 +27,6 @@ int pinctrl_decode_pin_config(const void *blob, int node) return flags; } -/* - * TODO: this function is temporary for v2019.01. - * It should be renamed to pinctrl_decode_pin_config(), - * the original pinctrl_decode_pin_config() function should - * be removed and all callers of the original function should - * be migrated to use the new one. - */ -int pinctrl_decode_pin_config_dm(struct udevice *dev) -{ - int pinconfig = 0; - - if (dev->uclass->uc_drv->id != UCLASS_PINCONFIG) - return -EINVAL; - - if (dev_read_bool(dev, "bias-pull-up")) - pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_UP; - else if (dev_read_bool(dev, "bias-pull-down")) - pinconfig |= 1 << PIN_CONFIG_BIAS_PULL_DOWN; - - return pinconfig; -} - #if CONFIG_IS_ENABLED(PINCTRL_FULL) /** * pinctrl_config_one() - apply pinctrl settings for a single node diff --git a/include/dm/pinctrl.h b/include/dm/pinctrl.h index ff2b82e7c2..63a7d55b88 100644 --- a/include/dm/pinctrl.h +++ b/include/dm/pinctrl.h @@ -355,18 +355,6 @@ int pinctrl_get_periph_id(struct udevice *dev, struct udevice *periph); int pinctrl_decode_pin_config(const void *blob, int node); /** - * pinctrl_decode_pin_config_dm() - decode pin configuration flags - * - * This decodes some of the PIN_CONFIG values into flags, with each value - * being (1 << pin_cfg). This does not support things with values like the - * slew rate. - * - * @pinconfig: Pinconfig udevice - * @return decoded flag value, or -ve on error - */ -int pinctrl_decode_pin_config_dm(struct udevice *dev); - -/** * pinctrl_get_gpio_mux() - get the mux value for a particular GPIO * * This allows the raw mux value for a GPIO to be obtained. It is -- 2.11.0

4 7

[U-Boot] [PATCH] Convert CONFIG_IP_DEFRAG to Kconfig
by Christian Gmeiner 09 May '19

09 May '19

This converts the following to Kconfig: CONFIG_IP_DEFRAG Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- net/Kconfig | 6 ++++++ scripts/config_whitelist.txt | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/net/Kconfig b/net/Kconfig index f2363e5256..5f5f632469 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -8,6 +8,12 @@ menuconfig NET if NET +config IP_DEFRAG + bool "Support IP datagram reassembly" + help + Selecting this will enable IP datagram reassembly according + to the algorithm in RFC815. + config NET_RANDOM_ETHADDR bool "Random ethaddr if unset" help diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b3572568b..6b746c5242 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -972,7 +972,6 @@ CONFIG_IPAM390_GPIO_BOOTMODE CONFIG_IPAM390_GPIO_LED_GREEN CONFIG_IPAM390_GPIO_LED_RED CONFIG_IPROC -CONFIG_IP_DEFRAG CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE -- 2.20.1

2 3

[U-Boot] [PATCH] mmc: Downgrade SD/MMC from UHS/HS200/HS400 modes before boot
by Marek Vasut 07 May '19

07 May '19

Older kernel versions or systems which do not connect eMMC reset line properly may not be able to handle situations where either the eMMC is left in HS200/HS400 mode or SD card in UHS modes by the bootloader and may misbehave. Downgrade the eMMC to HS/HS52 mode and/or SD card to non-UHS mode before booting the kernel to allow such older kernels to work with modern U-Boot. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Tom Rini <trini(a)konsulko.com> --- drivers/mmc/mmc-uclass.c | 19 +++++++++++++++++++ drivers/mmc/mmc.c | 26 ++++++++++++++++++++++++++ include/mmc.h | 6 ++++++ 3 files changed, 51 insertions(+) diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c index 76225b7939..a9c8f335c1 100644 --- a/drivers/mmc/mmc-uclass.c +++ b/drivers/mmc/mmc-uclass.c @@ -368,6 +368,19 @@ static int mmc_blk_probe(struct udevice *dev) return 0; } +#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) +static int mmc_blk_remove(struct udevice *dev) +{ + struct udevice *mmc_dev = dev_get_parent(dev); + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(mmc_dev); + struct mmc *mmc = upriv->mmc; + + return mmc_deinit(mmc); +} +#endif + static const struct blk_ops mmc_blk_ops = { .read = mmc_bread, #if CONFIG_IS_ENABLED(MMC_WRITE) @@ -382,6 +395,12 @@ U_BOOT_DRIVER(mmc_blk) = { .id = UCLASS_BLK, .ops = &mmc_blk_ops, .probe = mmc_blk_probe, +#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) + .remove = mmc_blk_remove, + .flags = DM_FLAG_OS_PREPARE, +#endif }; #endif /* CONFIG_BLK */ diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b04345a1e1..1c1527cc74 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2781,6 +2781,32 @@ int mmc_init(struct mmc *mmc) return err; } +#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) +int mmc_deinit(struct mmc *mmc) +{ + u32 caps_filtered; + + if (!mmc->has_init) + return 0; + + if (IS_SD(mmc)) { + caps_filtered = mmc->card_caps & + ~(MMC_CAP(UHS_SDR12) | MMC_CAP(UHS_SDR25) | + MMC_CAP(UHS_SDR50) | MMC_CAP(UHS_DDR50) | + MMC_CAP(UHS_SDR104)); + + return sd_select_mode_and_width(mmc, caps_filtered); + } else { + caps_filtered = mmc->card_caps & + ~(MMC_CAP(MMC_HS_200) | MMC_CAP(MMC_HS_400)); + + return mmc_select_mode_and_width(mmc, caps_filtered); + } +} +#endif + int mmc_set_dsr(struct mmc *mmc, u16 val) { mmc->dsr = val; diff --git a/include/mmc.h b/include/mmc.h index d84e4fca73..1f30f71d25 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -690,6 +690,12 @@ int mmc_initialize(bd_t *bis); int mmc_init(struct mmc *mmc); int mmc_send_tuning(struct mmc *mmc, u32 opcode, int *cmd_error); +#if CONFIG_IS_ENABLED(MMC_UHS_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS200_SUPPORT) || \ + CONFIG_IS_ENABLED(MMC_HS400_SUPPORT) +int mmc_deinit(struct mmc *mmc); +#endif + /** * mmc_of_parse() - Parse the device tree to get the capabilities of the host * -- 2.19.2

3 6

[U-Boot] [RESEND PATCH 0/3] arm: Introduce writel/readl_relaxed accessors
by Andre Przywara 01 May '19

01 May '19

Hi, this is a resend of what I posted some weeks ago, just adding the missing Signed-off-by: in patch 2/3, as pointed out by Philipp. I used the opportunity to add his Reviewed-by: tags on the first two patches. (Many thanks for that!) The rest is unchanged. ------------------- Admittedly this is the long way round to solve some nasty SPL code size problem, but it looked beneficial to others as well, so here we go: arch/arm/include/asm/io.h looks like it's been around since the dawn of time, and was more or less blindly copied from Linux. We don't use and don't need most of the definitions, and mainline Linux got rid of them anyway, so patch 1/3 cleans up this header file to just contain what we need in U-Boot. Patch 2/3 introduces readl/writel_relaxed accessors, which are cheaper, but more importantly save one (barrier) instruction per accessor. This helps to bring down code size, since especially DRAM controller inits in SPLs tend to do a lot of MMIO. Consequently patch 3/3 introduces them in the Allwinner H6 DRAM driver, which reduces the SPL size by a whopping 2KB, due to a twist: The AArch64 exception table needs to be 2KB aligned, but we don't do anything special about it the linker script. So depending on where the code before the vectors ends, we have potentially large padding: At the moment this last address is 0x1824 for the H6, so the vectors can only start at 0x2000. By reducing the code size before the vectors by just (at least) 9 instructions, the vectors start at 0x1800 and we save most of the padding. I understand that the proper solution is to fill the gap before the vectors with code instead of NOPs, but I couldn't find any obvious way doing this in the linker script. If anyone has any idea here, I am all ears. Cheers, Andre. Andre Przywara (3): arm: clean up asm/io.h arm: introduce _relaxed MMIO accessors sunxi: H6: use writel_relaxed for DRAM timing register accesses arch/arm/include/asm/io.h | 164 +++-------------------------------- arch/arm/mach-sunxi/dram_sun50i_h6.c | 79 +++++++++-------- 2 files changed, 54 insertions(+), 189 deletions(-) -- 2.14.5

5 17