January 2023 - U-Boot

[PATCH 0/2] Add support for Infineon s25fs256t
by tkuw584924＠gmail.com 26 Jan '23

26 Jan '23

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Infineon S25FS256T is 256Mb QSPI NOR Flash. https://www.infineon.com/dgdlac/Infineon-S25FS256T_256Mb_SEMPER_Nano_Flash_… Tested on Xilinx Zynq-7000 FPGA board. Takahiro Kuwano (2): mtd: spi-nor: s/s25hx_t/s25 mtd: spi-nor: Add support for s25fs256t drivers/mtd/spi/spi-nor-core.c | 87 ++++++++++++++++++++++------------ drivers/mtd/spi/spi-nor-ids.c | 2 + include/linux/mtd/spi-nor.h | 1 + 3 files changed, 61 insertions(+), 29 deletions(-) -- 2.25.1

3 4

[PATCH 0/3] cmd: fix return code of sf command
by Heinrich Schuchardt 26 Jan '23

26 Jan '23

For 'sf write', 'sf read', 'sf erase' using excessive values of offset or size should not display the command usage but only the error message. Use CMD_RET_* constants. Simplify do_spi_flash(). Heinrich Schuchardt (3): cmd: fix return code of 'sf write' and 'sf read' cmd: simplify do_spi_flash() cmd: fix return code of 'sf erase' cmd/sf.c | 45 +++++++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 26 deletions(-) -- 2.37.2

3 5

[PATCH V4 0/2] spi: cqspi: Fix register reads in STIG Mode
by Dhruva Gole 26 Jan '23

26 Jan '23

Intent of these patches is to fix register reads in STIG mode and also use STIG mode while reading flash registers. Currently if you try to read a register while in STIG mode there is no support for ADDR and thus naturally a register never gets read from the flash. This series supercedes the previously sent: https://lore.kernel.org/u-boot/20221125055932.398322-1-d-gole@ti.com/ Logs demonstrating the usage and working of QSPI-NOR Flash (Cypress s25hs512t) can be found on the link below: https://gist.github.com/DhruvaG2000/11e7b4ee6a381be9d86b69b2bc2616e4 change log: ---------- v4: * Improve the commit message for PATCH 2/2 * Address Pratyush's review to use <= CQSPI_STIG_DATA_LEN_MAX instead. v3: Improvements over the last 2 versions, I have added a bit mask to make sure nbytes dont overflow bit fields. Also minor improvements in wording of comments and commit log. v2: add the setup ADDR bits patch because STIG read of registers wasn't present earlier. v1: use STIG mode if reads are small. Dhruva Gole (2): spi: cadence_qspi: setup ADDR Bits in cmd reads spi: cadence_qspi: use STIG mode for small reads drivers/spi/cadence_qspi.c | 8 +++++++- drivers/spi/cadence_qspi_apb.c | 13 +++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) -- 2.25.1

2 3

[PATCH v2 0/2] Keep CFR5V[6] as 1 in Octal DTR enable
by tkuw584924＠gmail.com 26 Jan '23

26 Jan '23

From: Takahiro Kuwano <Takahiro.Kuwano(a)infineon.com> Same fix is needed in Linux MTD [0] and Tudor helped for that [1][2]. This series applies the same changes as Linux MTD. [0] https://patchwork.ozlabs.org/project/linux-mtd/patch/20230106030601.6530-1-… [1] https://patchwork.ozlabs.org/project/linux-mtd/patch/20230110164703.83413-1… [2] https://patchwork.ozlabs.org/project/linux-mtd/patch/20230110164703.83413-2… Takahiro Kuwano (2): mtd: spi-nor: Consider reserved bits in CFR5 register mtd: spi-nor: Make CFRx reg fields generic drivers/mtd/spi/spi-nor-core.c | 8 ++++---- include/linux/mtd/spi-nor.h | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) -- 2.25.1

4 7

[PATCH v2] usb: gadget: ether: split start/stop from init/halt
by Niel Fourie 26 Jan '23

26 Jan '23

Split out _usb_eth_start() from _usb_eth_init() and usb_eth_stop() from _usb_eth_halt(). Now _usb_eth_init() only initialises and registers the gadget device, which _usb_eth_halt() reverses, and together are used for probing and removing the device. The _usb_eth_start() and _usb_eth_stop() functions connect and disconnect the gadget as expected by the start()/stop() callbacks. Previously the gadget device was probed on every start() and removed on every stop(), which is inconsistent with other DM_ETH drivers. Signed-off-by: Niel Fourie <lusus(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Ramon Fried <rfried.dev(a)gmail.com> --- Changes for v2: - fixed variable declaration order - removed non-DM_ETH code due to upstream removal during rebasing drivers/usb/gadget/ether.c | 51 +++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 85c971e4c4..914427eb77 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -2274,15 +2274,11 @@ fail: /*-------------------------------------------------------------------------*/ static void _usb_eth_halt(struct ether_priv *priv); +static void _usb_eth_stop(struct ether_priv *priv); static int _usb_eth_init(struct ether_priv *priv) { - struct eth_dev *dev = &priv->ethdev; - struct usb_gadget *gadget; - unsigned long ts; int ret; - unsigned long timeout = USB_CONNECT_TIMEOUT; - ret = usb_gadget_initialize(0); if (ret) return ret; @@ -2322,14 +2318,26 @@ static int _usb_eth_init(struct ether_priv *priv) priv->eth_driver.resume = eth_resume; if (usb_gadget_register_driver(&priv->eth_driver) < 0) goto fail; + return 0; +fail: + _usb_eth_halt(priv); + return -1; +} - dev->network_started = 0; +static int _usb_eth_start(struct ether_priv *priv) +{ + unsigned long timeout = USB_CONNECT_TIMEOUT; + struct eth_dev *dev = &priv->ethdev; + unsigned long ts; + if (!dev->gadget) + return -1; + + dev->network_started = 0; packet_received = 0; packet_sent = 0; - gadget = dev->gadget; - usb_gadget_connect(gadget); + usb_gadget_connect(dev->gadget); if (env_get("cdc_connect_timeout")) timeout = dectoul(env_get("cdc_connect_timeout"), NULL) * CONFIG_SYS_HZ; @@ -2347,6 +2355,7 @@ static int _usb_eth_init(struct ether_priv *priv) rx_submit(dev, dev->rx_req, 0); return 0; fail: + _usb_eth_stop(priv); _usb_eth_halt(priv); return -1; } @@ -2426,11 +2435,10 @@ static int _usb_eth_recv(struct ether_priv *priv) return 0; } -static void _usb_eth_halt(struct ether_priv *priv) +static void _usb_eth_stop(struct ether_priv *priv) { struct eth_dev *dev = &priv->ethdev; - /* If the gadget not registered, simple return */ if (!dev->gadget) return; @@ -2454,6 +2462,14 @@ static void _usb_eth_halt(struct ether_priv *priv) usb_gadget_handle_interrupts(0); dev->network_started = 0; } +} + +static void _usb_eth_halt(struct ether_priv *priv) +{ + struct eth_dev *dev = &priv->ethdev; + + if (!dev->gadget) + return; usb_gadget_unregister_driver(&priv->eth_driver); usb_gadget_release(0); @@ -2463,7 +2479,7 @@ static int usb_eth_start(struct udevice *dev) { struct ether_priv *priv = dev_get_priv(dev); - return _usb_eth_init(priv); + return _usb_eth_start(priv); } static int usb_eth_send(struct udevice *dev, void *packet, int length) @@ -2513,7 +2529,7 @@ static void usb_eth_stop(struct udevice *dev) { struct ether_priv *priv = dev_get_priv(dev); - _usb_eth_halt(priv); + _usb_eth_stop(priv); } static int usb_eth_probe(struct udevice *dev) @@ -2527,6 +2543,16 @@ static int usb_eth_probe(struct udevice *dev) get_ether_addr(CONFIG_USBNET_DEV_ADDR, pdata->enetaddr); eth_env_set_enetaddr("usbnet_devaddr", pdata->enetaddr); + return _usb_eth_init(priv); + + return 0; +} + +static int usb_eth_remove(struct udevice *dev) +{ + struct ether_priv *priv = dev_get_priv(dev); + + _usb_eth_halt(priv); return 0; } @@ -2562,6 +2588,7 @@ U_BOOT_DRIVER(eth_usb) = { .name = "usb_ether", .id = UCLASS_ETH, .probe = usb_eth_probe, + .remove = usb_eth_remove, .ops = &usb_eth_ops, .priv_auto = sizeof(struct ether_priv), .plat_auto = sizeof(struct eth_pdata), -- 2.39.0

3 4

[PATCH] arm: kirkwood: Use Kirkwood common early malloc area for various Kirkwood boards
by Tony Dinh 26 Jan '23

26 Jan '23

For Kirkwood boards, it is necessary to have early malloc in DRAM area when Driver Model for Serial is enabled. This patch removes individual board settings for early malloc in various Kirkwood boards, and uses the Kirkwood commonly defined settings in arch/arm/mach-kirkwood/Kconfig. Signed-off-by: Tony Dinh <mibodhi(a)gmail.com> --- configs/dockstar_defconfig | 3 --- configs/dreamplug_defconfig | 3 --- configs/goflexhome_defconfig | 3 --- configs/iconnect_defconfig | 3 --- configs/nsa310s_defconfig | 3 --- configs/pogo_e02_defconfig | 3 --- configs/pogo_v4_defconfig | 3 --- configs/sheevaplug_defconfig | 3 --- 8 files changed, 24 deletions(-) diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index a17d01f3fd..d08182d270 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" CONFIG_SYS_PROMPT="DockStar> " CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; ubifsload 0x1100000 ${initrd}; bootm 0x800000 0x1100000" diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 6deb05575c..3cff5034b9 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x100000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv ethact ethernet-controller@72000; ${x_bootcmd_ethernet}; setenv ethact ethernet-controller@76000; ${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;" diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 8ee1183309..8dc285241b 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_SYS_PROMPT="GoFlexHome> " CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index f536dd3bcb..94f4ee2772 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" CONFIG_SYS_PROMPT="iConnect> " CONFIG_IDENT_STRING=" Iomega iConnect" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part rootfs; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index e7d6ffd925..ab896ff54e 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NSA310S=y CONFIG_ENV_SIZE=0x20000 @@ -19,8 +18,6 @@ CONFIG_SYS_PROMPT="NSA310s> " CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 116e5d0ed3..067fb9e13b 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" CONFIG_SYS_PROMPT="PogoE02> " CONFIG_IDENT_STRING="\nPogo E02" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs $(bootargs_console); run bootcmd_usb; bootm 0x00800000 0x01100000" diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 57ec6f1fb6..3860ad30d3 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_POGO_V4=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 @@ -18,8 +17,6 @@ CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_IDENT_STRING="\nPogoplug V4" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTSTAGE=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=10 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 79f36c0360..cb38a3fbd5 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -16,9 +16,6 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_BOOTDELAY=3 -- 2.30.2

2 2

[PATCH 0/7] README: start cleanup
by Heinrich Schuchardt 26 Jan '23

26 Jan '23

Our main README file contains information that * is outdated * should be moved to the HTML documentation * is redundant to existing HTML documenation Let's start cleaning up. Heinrich Schuchardt (7): README: correct path to sandbox.rst README: rework contribution advices README: remove NetBSD section README: replace references to CHANGELOG doc: move 'Reproducible builds' README: remove section 'Versioning' doc: move directory hierarchy to HTML README | 222 +++--------------------------------- doc/build/index.rst | 1 + doc/build/reproducible.rst | 25 ++++ doc/develop/directories.rst | 76 ++++++++++++ doc/develop/index.rst | 1 + 5 files changed, 116 insertions(+), 209 deletions(-) create mode 100644 doc/build/reproducible.rst create mode 100644 doc/develop/directories.rst -- 2.38.1

3 21

[PATCH] Revert "config: tools only: add VIDEO to build bmp_logo"
by Fabio Estevam 26 Jan '23

26 Jan '23

This reverts commit 1cfba53ca46cade2dbf4e067afc8c19e72909a4b. Since commit 1cfba53ca46c ("config: tools only: add VIDEO to build bmp_logo") the build of tools-only_defconfig fails: | /bin/sh: line 1: tools/bmp_logo: No such file or directory This has been noticed in OpenEmbedded and Debian [1]. Revert it for now. [1] https://lists.denx.de/pipermail/u-boot/2023-January/504758.html Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- configs/tools-only_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 2197063112..fb75235e3d 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -29,7 +29,6 @@ CONFIG_DM_RTC=y CONFIG_SOUND=y CONFIG_SYSRESET=y CONFIG_TIMER=y -CONFIG_VIDEO=y # CONFIG_VIRTIO_MMIO is not set # CONFIG_VIRTIO_PCI is not set # CONFIG_VIRTIO_SANDBOX is not set -- 2.25.1

5 12

[PATCH] tools: mkimage: Allow changing U-Boot image magic
by Hauke Mehrtens 26 Jan '23

26 Jan '23

Extend mkimage with a new optional option -M to specify a special U-Boot image magic number. OpenWrt ships images for about 30 different boards with vendor boot loaders which are expecting the mkimage format, but with a different image magic. OpenWrt includes this patch for mkimage more than 10 years. It was added by Gabor Juhos in this commit: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=f3d2056b81b7a… Cc: Gabor Juhos <j4g8y7(a)gmail.com> Signed-off-by: Hauke Mehrtens <hauke(a)hauke-m.de> --- tools/default_image.c | 4 ++-- tools/imagetool.h | 1 + tools/mkimage.c | 14 ++++++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tools/default_image.c b/tools/default_image.c index 0ac3382003..514edf05a5 100644 --- a/tools/default_image.c +++ b/tools/default_image.c @@ -57,7 +57,7 @@ static int image_verify_header(unsigned char *ptr, int image_size, */ memcpy(hdr, ptr, sizeof(struct legacy_img_hdr)); - if (be32_to_cpu(hdr->ih_magic) != IH_MAGIC) { + if (be32_to_cpu(hdr->ih_magic) != params->magic) { debug("%s: Bad Magic Number: \"%s\" is no valid image\n", params->cmdname, params->imagefile); return -FDT_ERR_BADMAGIC; @@ -126,7 +126,7 @@ static void image_set_header(void *ptr, struct stat *sbuf, int ifd, } /* Build new header */ - image_set_magic(hdr, IH_MAGIC); + image_set_magic(hdr, params->magic); image_set_time(hdr, time); image_set_size(hdr, imagesize); image_set_load(hdr, addr); diff --git a/tools/imagetool.h b/tools/imagetool.h index ca7c2e48ba..5e61228a5f 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -59,6 +59,7 @@ struct image_tool_params { int arch; int type; int comp; + unsigned int magic; char *dtc; unsigned int addr; unsigned int ep; diff --git a/tools/mkimage.c b/tools/mkimage.c index 8306861ce5..957abe115c 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -26,6 +26,7 @@ static struct image_tool_params params = { .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, .comp = IH_COMP_GZIP, + .magic = IH_MAGIC, .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, .imagename = "", .imagename2 = "", @@ -89,11 +90,12 @@ static void usage(const char *msg) " -q ==> quiet\n", params.cmdname); fprintf(stderr, - " %s [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image\n" + " %s [-x] -A arch -O os -T type -C comp -M magic -a addr -e ep -n name -d data_file[:data_file...] image\n" " -A ==> set architecture to 'arch'\n" " -O ==> set operating system to 'os'\n" " -T ==> set image type to 'type'\n" " -C ==> set compression type 'comp'\n" + " -M ==> set image magic to 'magic' (hex)\n" " -a ==> set load address to 'addr' (hex)\n" " -e ==> set entry point to 'ep' (hex)\n" " -n ==> set image name to 'name'\n" @@ -159,7 +161,7 @@ static int add_content(int type, const char *fname) } static const char optstring[] = - "a:A:b:B:c:C:d:D:e:Ef:Fg:G:i:k:K:ln:N:o:O:p:qrR:stT:vVx"; + "a:A:b:B:c:C:d:D:e:Ef:Fg:G:i:k:K:lM:n:N:o:O:p:qrR:stT:vVx"; static const struct option longopts[] = { { "load-address", required_argument, NULL, 'a' }, @@ -298,6 +300,14 @@ static void process_args(int argc, char **argv) case 'l': params.lflag = 1; break; + case 'M': + params.magic = strtoull(optarg, &ptr, 16); + if (*ptr) { + fprintf(stderr, "%s: invalid magic %s\n", + params.cmdname, optarg); + exit(EXIT_FAILURE); + } + break; case 'n': params.imagename = optarg; break; -- 2.39.0

2 3

[PATCH 1/2] mmc: Check support for TRIM operations
by Loic Poulain 26 Jan '23

26 Jan '23

When secure/insecure TRIM operations are supported. When used as erase command argument it applies the erase operation to write blocks instead of erase groups. Signed-off-by: Loic Poulain <loic.poulain(a)linaro.org> --- drivers/mmc/mmc.c | 3 +++ include/mmc.h | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46..e5f5ccb5f4 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2432,6 +2432,9 @@ static int mmc_startup_v4(struct mmc *mmc) mmc->wr_rel_set = ext_csd[EXT_CSD_WR_REL_SET]; + mmc->can_trim = + !!(ext_csd[EXT_CSD_SEC_FEATURE] & EXT_CSD_SEC_FEATURE_TRIM_EN); + return 0; error: if (mmc->ext_csd) { diff --git a/include/mmc.h b/include/mmc.h index 571fa625d0..f6e23625ca 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -241,6 +241,7 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx) #define EXT_CSD_HC_WP_GRP_SIZE 221 /* RO */ #define EXT_CSD_HC_ERASE_GRP_SIZE 224 /* RO */ #define EXT_CSD_BOOT_MULT 226 /* RO */ +#define EXT_CSD_SEC_FEATURE 231 /* RO */ #define EXT_CSD_GENERIC_CMD6_TIME 248 /* RO */ #define EXT_CSD_BKOPS_SUPPORT 502 /* RO */ @@ -315,6 +316,8 @@ static inline bool mmc_is_tuning_cmd(uint cmdidx) #define EXT_CSD_WR_DATA_REL_USR (1 << 0) /* user data area WR_REL */ #define EXT_CSD_WR_DATA_REL_GP(x) (1 << ((x)+1)) /* GP part (x+1) WR_REL */ +#define EXT_CSD_SEC_FEATURE_TRIM_EN (1 << 4) /* Support secure & insecure trim */ + #define R1_ILLEGAL_COMMAND (1 << 22) #define R1_APP_CMD (1 << 5) @@ -687,6 +690,7 @@ struct mmc { uint tran_speed; uint legacy_speed; /* speed for the legacy mode provided by the card */ uint read_bl_len; + bool can_trim; #if CONFIG_IS_ENABLED(MMC_WRITE) uint write_bl_len; uint erase_grp_size; /* in 512-byte sectors */ -- 2.34.1

2 2