September 2024 - U-Boot

[PATCH] mtd: spi-nor-ids: Deduplicate mx25u25635f entry
by Marek Vasut 10 Oct '24

10 Oct '24

The mx25u25635f entry exists twice in spi_nor_ids, remove the less complete variant of the entry and keep only one copy of it. Fixes: f0084f1dfdbc ("drivers/mtd/spi/spi-nor-ids.c: add mx25u25635f support") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andre Przywara <andre.przywara(a)arm.com> Cc: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Cc: Dhruva Gole <d-gole(a)ti.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Jim Liu <jim.t90615(a)gmail.com> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Neal Frager <neal.frager(a)amd.com> Cc: Prasad Kummari <prasad.kummari(a)amd.com> Cc: Teik Heng Chong <teik.heng.chong(a)intel.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: u-boot(a)lists.denx.de --- drivers/mtd/spi/spi-nor-ids.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index d1389e681d6..5582a978ab5 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -258,7 +258,6 @@ const struct flash_info spi_nor_ids[] = { { INFO("mx25u6435f", 0xc22537, 0, 64 * 1024, 128, SECT_4K) }, { INFO("mx25l12805d", 0xc22018, 0, 64 * 1024, 256, SECT_4K) }, { INFO("mx25u12835f", 0xc22538, 0, 64 * 1024, 256, SECT_4K) }, - { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K) }, { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) }, -- 2.45.2

4 3

[PATCH] mtd: spi-nor-ids: Deduplicate w25q16dw entry
by Marek Vasut 10 Oct '24

10 Oct '24

The w25q16dw entry exists twice in spi_nor_ids, remove the less complete variant of the entry and keep only one copy of it. Fixes: baef13ec9d59 ("mtd: spi-nor-ids: Add support for flashes tested by xilinx") Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andre Przywara <andre.przywara(a)arm.com> Cc: Ashok Reddy Soma <ashok.reddy.soma(a)amd.com> Cc: Dhruva Gole <d-gole(a)ti.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Jim Liu <jim.t90615(a)gmail.com> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Neal Frager <neal.frager(a)amd.com> Cc: Prasad Kummari <prasad.kummari(a)amd.com> Cc: Teik Heng Chong <teik.heng.chong(a)intel.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: u-boot(a)lists.denx.de --- drivers/mtd/spi/spi-nor-ids.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 88709a52b3a..d1389e681d6 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -430,11 +430,6 @@ const struct flash_info spi_nor_ids[] = { { INFO("w25x05", 0xef3010, 0, 64 * 1024, 1, SECT_4K) }, { INFO("w25x40", 0xef3013, 0, 64 * 1024, 8, SECT_4K) }, { INFO("w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K) }, - { - INFO("w25q16dw", 0xef6015, 0, 64 * 1024, 32, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | - SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) - }, { INFO("w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K) }, { INFO("w25q20cl", 0xef4012, 0, 64 * 1024, 4, SECT_4K) }, { INFO("w25q20bw", 0xef5012, 0, 64 * 1024, 4, SECT_4K) }, @@ -442,7 +437,8 @@ const struct flash_info spi_nor_ids[] = { { INFO("w25q32", 0xef4016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("w25q16dw", 0xef6015, 0, 64 * 1024, 32, - SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) + SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | + SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, { INFO("w25q32dw", 0xef6016, 0, 64 * 1024, 64, -- 2.45.2

4 3

[PATCH 0/4] spi: Various Kconfig fixes
by John Watts 10 Oct '24

10 Oct '24

I'm doing some SPI work so I tried to compile all the drivers on my sunxi board to try and avoid some regressions. This failed, so here are some fixes for this. Signed-off-by: John Watts <contact(a)jookia.org> --- John Watts (4): spi: Kconfig: Add some required arch depends for drivers spi: mtk_spim: Remove completion.h include spi: ca_sflash: Add missing dm include spi: rockchip_sfc: Select BOUNCE_BUFFER drivers/spi/Kconfig | 17 +++++++++++++++++ drivers/spi/ca_sflash.c | 1 + drivers/spi/mtk_spim.c | 1 - 3 files changed, 18 insertions(+), 1 deletion(-) --- base-commit: 174ac987655c888017c82df1883c0c2ea0dc2495 change-id: 20240427-spikconfig-2417bbcf4c14 Best regards, -- John Watts <contact(a)jookia.org>

2 6

[PATCH 1/1] mtd: simplify CONFIG_DM_SPI_FLASH dependencies
by Heinrich Schuchardt 10 Oct '24

10 Oct '24

CONFIG_DM_SPI depends on CONFIG_DM. There is no need to list CONFIG_DM explicitly as dependency for CONFIG_DM_SPI_FLASH Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- drivers/mtd/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index bedc4e970e..63b0fd899f 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -2,7 +2,7 @@ menu "SPI Flash Support" config DM_SPI_FLASH bool "Enable Driver Model for SPI flash" - depends on DM && DM_SPI + depends on DM_SPI imply SPI_FLASH help Enable driver model for SPI flash. This SPI flash interface -- 2.43.0

2 1

[PATCH v1] eth: asix88179: drop ADVERTISE_LPACK and ADVERTISE_NPAGE advertise flags
by bigunclemax＠gmail.com 09 Oct '24

09 Oct '24

From: Maksim Kiselev <bigunclemax(a)gmail.com> Some USB-ETH adapters based on the AX88179 (ex. D-link DUB-2312) has link issue if ADVERTISE_NPAGE flag is set. Also Linux drivers for ASIX chips doesn't use these flags. Signed-off-by: Maksim Kiselev <bigunclemax(a)gmail.com> --- drivers/usb/eth/asix88179.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/eth/asix88179.c b/drivers/usb/eth/asix88179.c index 4bd3b9d10d..1f469a1a7d 100644 --- a/drivers/usb/eth/asix88179.c +++ b/drivers/usb/eth/asix88179.c @@ -345,8 +345,8 @@ static int asix_basic_reset(struct ueth_data *dev, asix_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE, 2, 2, tmp16); u16 adv = 0; - adv = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_LPACK | - ADVERTISE_NPAGE | ADVERTISE_PAUSE_ASYM | ADVERTISE_PAUSE_CAP; + adv = ADVERTISE_ALL | ADVERTISE_CSMA | ADVERTISE_PAUSE_ASYM | + ADVERTISE_PAUSE_CAP; asix_write_cmd(dev, AX_ACCESS_PHY, 0x03, MII_ADVERTISE, 2, &adv); adv = ADVERTISE_1000FULL; -- 2.45.2

3 2

[PATCH v14 0/8] spi-nor: Add parallel and stacked memories support
by Venkatesh Yadav Abbarapu 09 Oct '24

09 Oct '24

This series adds support for Xilinx qspi parallel and stacked memeories. In parallel mode, the current implementation assumes that a maximum of two flashes are connected. The QSPI controller splits the data evenly between both the flashes so, both the flashes that are connected in parallel mode should be identical. During each operation SPI-NOR sets 0th bit for CS0 & 1st bit for CS1 in nor->flags. In stacked mode the current implementation assumes that a maximum of two flashes are connected and both the flashes are of same make but can differ in sizes. So, except the sizes all other flash parameters of both the flashes are identical. Spi-nor will pass on the appropriate flash select flag to low level driver, and it will select pass all the data to that particular flash. Write operation in parallel mode are performed in page size * 2 chunks as each write operation results in writing both the flashes. For doubling the address space each operation is performed at addr/2 flash offset, where addr is the address specified by the user. Similarly for read and erase operations it will read from both flashes, so size and offset are divided by 2 and send to flash. Changes in v2: - Fixed the compilation issues. Changes in v3: - Fixed the CI issues. Changes in v4: - Removed the dio,dummy_bytes variables from zynq_qspi driver. - Fix the compilation issue by including the DM_SPI config. Changes in v5: - Fixed the issue reported by buildman. Changes in v6: - Fixed the issues reported while running the sandbox test cases. Changes in v7: - Fixed the issues reported while running these da850evm_defconfig, imx28_xea_defconfig configs. - Fixed the issue when DM_SPI config is disabled. - Fixed the issue while running the sandbox_noinst_defconfig with spl ./spl/u-boot-spl -d arch/sandbox/dts/test.dtb jedec_spi_nor spi.bin@0: has no valid 'reg' property (-12) jedec_spi_nor spi.bin@1: has no valid 'reg' property (-12) ### ERROR ### Please RESET the board ### Changes in v8: - Fixed the compilation issue with imx28_xea_defconfig. - Fixed the SPL size issue with the axm and taurus defconfigs. - Rebased the patches on top of next branch. Changes in v9: - Updated the commit log why SPL_FIT is being enabled. Changes in v10: - Added the new config SPI_ADVANCE to fix the issue while enabling imx28_xea_defconfig. Changes in v11: - Removed the unused variable, corrected the type of variable and replaced memcpy with memmove. Changes in v12: - Fixed the compilation issue with mx6sabresd defconfig, as the binary size got exceeded. Changes in v13: - Fixed the compilation issue for imx28 by making bisectable. Changes in v14: - Enable the parallel/stacked feature only when the SPI_ADVANCE config is enabled. Ashok Reddy Soma (2): mtd: spi-nor: Add parallel memories support for read_sr and read_fsr mtd: spi-nor: Add parallel and stacked memories support in read_bar and write_bar Venkatesh Yadav Abbarapu (6): config: mx6sabresd: Default don't enable the flash lock mtd: spi-nor: Add parallel and stacked memories support spi: spi-uclass: Read chipselect and restrict capabilities spi: zynqmp_gqspi: Add parallel memories support in GQSPI driver spi: zynq_qspi: Add parallel memories support in QSPI driver config: xilinx: Enable the SPI_ADVANCE config option configs/mx6sabresd_defconfig | 1 + configs/xilinx_versal_net_virt_defconfig | 5 +- configs/xilinx_versal_virt_defconfig | 5 +- configs/xilinx_zynq_virt_defconfig | 7 +- configs/xilinx_zynqmp_virt_defconfig | 14 +- drivers/mtd/spi/sandbox.c | 2 +- drivers/mtd/spi/spi-nor-core.c | 404 ++++++++++++++++++++--- drivers/spi/Kconfig | 6 + drivers/spi/altera_spi.c | 4 +- drivers/spi/atcspi200_spi.c | 2 +- drivers/spi/ath79_spi.c | 2 +- drivers/spi/atmel_spi.c | 6 +- drivers/spi/bcm63xx_hsspi.c | 42 +-- drivers/spi/bcm63xx_spi.c | 6 +- drivers/spi/bcmbca_hsspi.c | 34 +- drivers/spi/cf_spi.c | 6 +- drivers/spi/davinci_spi.c | 8 +- drivers/spi/fsl_dspi.c | 18 +- drivers/spi/fsl_espi.c | 4 +- drivers/spi/fsl_qspi.c | 4 +- drivers/spi/gxp_spi.c | 2 +- drivers/spi/mpc8xx_spi.c | 4 +- drivers/spi/mpc8xxx_spi.c | 10 +- drivers/spi/mscc_bb_spi.c | 4 +- drivers/spi/mxc_spi.c | 6 +- drivers/spi/npcm_fiu_spi.c | 14 +- drivers/spi/nxp_fspi.c | 2 +- drivers/spi/octeon_spi.c | 2 +- drivers/spi/omap3_spi.c | 4 +- drivers/spi/pic32_spi.c | 2 +- drivers/spi/rk_spi.c | 4 +- drivers/spi/rockchip_sfc.c | 2 +- drivers/spi/spi-aspeed-smc.c | 28 +- drivers/spi/spi-mxic.c | 6 +- drivers/spi/spi-qup.c | 4 +- drivers/spi/spi-sifive.c | 6 +- drivers/spi/spi-sn-f-ospi.c | 2 +- drivers/spi/spi-sunxi.c | 6 +- drivers/spi/spi-synquacer.c | 4 +- drivers/spi/spi-uclass.c | 30 +- drivers/spi/stm32_qspi.c | 2 +- drivers/spi/stm32_spi.c | 4 +- drivers/spi/ti_qspi.c | 14 +- drivers/spi/xilinx_spi.c | 6 +- drivers/spi/zynq_qspi.c | 121 ++++++- drivers/spi/zynq_spi.c | 6 +- drivers/spi/zynqmp_gqspi.c | 141 +++++++- include/linux/mtd/spi-nor.h | 17 + include/spi.h | 23 +- lib/acpi/acpi_device.c | 2 +- 50 files changed, 811 insertions(+), 247 deletions(-) -- 2.25.1

2 10

[PATCH] arch: arm: dts: k3-j7200-r5-evm: Enable AVS feature
by Udit Kumar 09 Oct '24

09 Oct '24

During DT sync with kernel 6.6, AVS feature was removed by mistake. So adding back AVS feature. Fixes: df73e791ce09("arm: dts: j7200: dts sync with Linux 6.6-rc1") Signed-off-by: Udit Kumar <u-kumar1(a)ti.com> --- Test logs with this patch Added print in avs driver to see, voltage being set. U-Boot SPL 2024.10-rc4-00436-ga252ef4f0842-dirty (Sep 11 2024 - 13:57:26 +0530) SYSFW ABI: 4.0 (firmware rev 0x000a '10.0.8--v10.00.08 (Fiery Fox)') avs init volt 800000 Trying to boot from MMC2 arch/arm/dts/k3-j7200-r5-common-proc-board.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts index 94760c78dd..fac108ce14 100644 --- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts @@ -102,3 +102,8 @@ &mcu_udmap { ti,sci = <&dm_tifs>; }; + +&wkup_vtm0 { + vdd-supply-2 = <&buckb1>; + bootph-pre-ram; +}; -- 2.34.1

3 2

[PATCH 1/2] arm64: versal: Remove description for USB1
by Michal Simek 09 Oct '24

09 Oct '24

There is only one USB controller that's why remove description for USB1. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- include/configs/xilinx_versal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index dc3f41b94a29..212dc9df2a2e 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -85,7 +85,7 @@ "jtag " #define BOOT_TARGET_DEVICES_USB_DFU(func) \ - func(USB_DFU, usb_dfu, 0) func(USB_DFU, usb_dfu, 1) + func(USB_DFU, usb_dfu, 0) #define BOOTENV_DEV_USB_DFU(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \ @@ -99,7 +99,7 @@ "" #define BOOT_TARGET_DEVICES_USB_THOR(func) \ - func(USB_THOR, usb_thor, 0) func(USB_THOR, usb_thor, 1) + func(USB_THOR, usb_thor, 0) #define BOOTENV_DEV_USB_THOR(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=setenv dfu_alt_info boot.scr ram " \ -- 2.43.0

2 5

[PATCH] mkimage: ecdsa: add nodes to signature/key node
by Matthias Pritschet 08 Oct '24

08 Oct '24

From: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> Add the "required", "algo", and "key-name-hint" nodes to the signature/key node if ecdsa256 is used. This change is mainly copy&paste from rsa_add_verify_data which already adds these nodes. Signed-off-by: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> --- lib/ecdsa/ecdsa-libcrypto.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c index db0a828a29..4513703d08 100644 --- a/lib/ecdsa/ecdsa-libcrypto.c +++ b/lib/ecdsa/ecdsa-libcrypto.c @@ -272,7 +272,8 @@ int ecdsa_verify(struct image_sign_info *info, return ret; } -static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) +static int do_add(struct signer *ctx, void *fdt, const char *key_node_name, + struct image_sign_info *info) { int signature_node, key_node, ret, key_bits; const char *curve_name; @@ -322,6 +322,11 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) point = EC_KEY_get0_public_key(ctx->ecdsa_key); EC_POINT_get_affine_coordinates(group, point, x, y, NULL); + ret = fdt_setprop_string(fdt, key_node, FIT_KEY_HINT, + info->keyname); + if (ret < 0) + return ret; + ret = fdt_setprop_string(fdt, key_node, "ecdsa,curve", curve_name); if (ret < 0) return ret; @@ -334,6 +339,16 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) if (ret < 0) return ret; + ret = fdt_setprop_string(fdt, key_node, FIT_ALGO_PROP, + info->name); + if (ret < 0) + return ret; + + ret = fdt_setprop_string(fdt, key_node, FIT_KEY_REQUIRED, + info->require_keys); + if (ret < 0) + return ret; + return key_node; } @@ -346,7 +361,7 @@ int ecdsa_add_verify_data(struct image_sign_info *info, void *fdt) fdt_key_name = info->keyname ? info->keyname : "default-key"; ret = prepare_ctx(&ctx, info); if (ret >= 0){ - ret = do_add(&ctx, fdt, fdt_key_name); + ret = do_add(&ctx, fdt, fdt_key_name, info); if (ret < 0) ret = ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; } -- 2.34.1

2 1

[PATCH] mkimage: ecdsa: add signature/key nodes to dtb if missing
by Matthias Pritschet 08 Oct '24

08 Oct '24

From: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> If the signature/key node(s) are not yet present in the U-Boot device tree, ecdsa_add_verify_data simply fails if it can't find the nodes. This behaviour differs from rsa_add_verify_data, wich does add the missing nodes and proceeds in that case. This change is mainly copy&paste from rsa_add_verify_data to add the same behaviour to ecdsa_add_verify_data. Signed-off-by: Matthias Pritschet <matthias.pritschet(a)itk-engineering.de> --- lib/ecdsa/ecdsa-libcrypto.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/lib/ecdsa/ecdsa-libcrypto.c b/lib/ecdsa/ecdsa-libcrypto.c index 5fa9be10b4..db0a828a29 100644 --- a/lib/ecdsa/ecdsa-libcrypto.c +++ b/lib/ecdsa/ecdsa-libcrypto.c @@ -281,16 +281,35 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name) BIGNUM *x, *y; signature_node = fdt_subnode_offset(fdt, 0, FIT_SIG_NODENAME); - if (signature_node < 0) { - fprintf(stderr, "Could not find 'signature node: %s\n", + if (signature_node == -FDT_ERR_NOTFOUND) { + signature_node = fdt_add_subnode(fdt, 0, FIT_SIG_NODENAME); + if (signature_node < 0) { + if (signature_node != -FDT_ERR_NOSPACE) { + fprintf(stderr, "Couldn't create signature node: %s\n", + fdt_strerror(signature_node)); + } + return signature_node; + } + } else if (signature_node < 0) { + fprintf(stderr, "Cannot select keys signature_node: %s\n", fdt_strerror(signature_node)); return signature_node; } - key_node = fdt_add_subnode(fdt, signature_node, key_node_name); - if (key_node < 0) { - fprintf(stderr, "Could not create '%s' node: %s\n", - key_node_name, fdt_strerror(key_node)); + /* Either create or overwrite the named key node */ + key_node = fdt_subnode_offset(fdt, signature_node, key_node_name); + if (key_node == -FDT_ERR_NOTFOUND) { + key_node = fdt_add_subnode(fdt, signature_node, key_node_name); + if (key_node < 0) { + if (key_node != -FDT_ERR_NOSPACE) { + fprintf(stderr, "Could not create key subnode: %s\n", + fdt_strerror(key_node)); + } + return key_node; + } + } else if (key_node < 0) { + fprintf(stderr, "Cannot select keys key_node: %s\n", + fdt_strerror(key_node)); return key_node; } @@ -326,8 +345,11 @@ int ecdsa_add_verify_data(struct image_sign_info *info, void *fdt) fdt_key_name = info->keyname ? info->keyname : "default-key"; ret = prepare_ctx(&ctx, info); - if (ret >= 0) + if (ret >= 0){ ret = do_add(&ctx, fdt, fdt_key_name); + if (ret < 0) + ret = ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; + } free_ctx(&ctx); return ret; -- 2.34.1

3 3