December 2022 - U-Boot

[PATCH] rockchip: jerry: Enable RESET driver
by Simon Glass 07 Dec '22

07 Dec '22

At present the display does not work since it needs the reset driver to operate. Fix this by enabling it. Signed-off-by: Simon Glass <sjg(a)chromium.org> Fixes: cd529f7ad62 ("rockchip: video: edp: Add missing reset support") Fixes: 9749d2ea29e ("rockchip: video: vop: Add reset support") --- configs/chromebook_jerry_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 35d546e6315..a60468eafa5 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -95,6 +95,7 @@ CONFIG_REGULATOR_RK8XX=y CONFIG_PWM_ROCKCHIP=y CONFIG_RAM=y CONFIG_SPL_RAM=y +CONFIG_DM_RESET=y CONFIG_DEBUG_UART_SHIFT=2 CONFIG_ROCKCHIP_SERIAL=y CONFIG_SOUND=y -- 2.37.3.998.g577e59143f-goog

2 2

[PATCH v2] arm: dts: rockchip: rk3399: usb: ehci: Fix EHCI probe in rk3399 to access peripherals by USB 2.
by Xavier Drudis Ferran 06 Dec '22

06 Dec '22

arch/arm/dts/rk3399.dtsi has a node usb_host0_ehci: usb@fe380000 { compatible = "generic-ehci"; with clocks: clocks = <&cru HCLK_HOST0>, <&cru HCLK_HOST0_ARB>, <&u2phy0>; The first 2 refer to nodes with class UCLASS_CLK, but &u2phy0 has class UCLASS_PHY. u2phy0: usb2phy@e450 { compatible = "rockchip,rk3399-usb2phy"; Since clk_get_bulk() only looks for devices with UCLASS_CLK, it fails with -ENODEV and then ehci_usb_probe() aborts. The consequence is peripherals connected to a USB 2 port (e.g. in a Rock Pi 4 the white port, nearer the edge) not being detected. They're detected if CONFIG_USB_OHCI_GENERIC is selected in Kconfig, because ohci_usb_probe() does not abort when one clk_get_by_index() fails, but then they work in USB 1 mode,. rk3399.dtsi comes from linux and the u2phy0 was added[1] to the clock list in: commit b5d1c57299734f5b54035ef2e61706b83041f20c Author: William wu <wulf(a)rock-chips.com> Date: Wed Dec 21 18:41:05 2016 +0800 arm64: dts: rockchip: add u2phy clock for ehci and ohci of rk3399 We found that the suspend process was blocked when it run into ehci/ohci module due to clk-480m of usb2-phy was disabled. [...] Suspend concerns don't apply to U-Boot, and the problem with U-Boot failing to probe EHCI doesn't apply to linux, because in linux rockchip_usb2phy_clk480m_register makes u2phy0 a proper clock provider when called by rockchip_usb2phy_probe(). So I can think of a few alternative solutions: 1- Change ehci_usb_probe() to make it more similar to ohci_usb_probe(), and survive failure to get one clock. Looks a little harder, and I don't know whether it could break something if it ignored a clock that was important for something else than suspend. 2- Change rk3399.dtsi effecttively reverting the linux commit b5d1c57299734f5b54035ef2e61706b83041f20c. This dealigns the .dtsi from linux and seems fragile at the next synchronisation. 3- Change the clock list in rk3399-u-boot.dtsi or somewhere else. This survives .dts* sync but may survive "too much" and miss some change from linux that we might want. 4- Enable CONFIG_USB_OHCI_GENERIC and use the ports in USB 1 mode. This would need to be made for all boards using rk3399. In a simple test reading one file from USB storage it gave 769.5 KiB/s instead of 20.5 MiB/s with solution 2. 5- Trying to replicate linux and have usb2phy somehow provide a clk, or have a separate clock device for usb2phy in addition to the phy device. I just can't seem to imagine how to achieve this with the U-Boot driver model, maybe because of my limited familiarity with it. This patch is option 1 as Kever Yang requested on August 27th[2] when option 3 didn't get through. Sorry for the delay. Yet maybe the get_some_clks() function should be added to clk-uclass.c if it may be useful elsewhere. Or alternatively, clk_get_bulk() could be changed to the lenient behaviour of get_some_clks(), but that seems too invasive to me. Either of these changes can always be done in a later patch if needed. If so, one possibility would be to call it from ohci-generic.c. As it is now it looks like if it ever misses a clock but finds a subsequent clock, assigned to a higher index in the clock table, it may leave clock_count too low to release all found clocks. I don't know of a case where this happens, for rk3399 usb, even with non-default CONFIG_OHCI_GENERIC, the missing clock is the last one, and so the release iteration happens to find all found clocks. Link: [1] https://lkml.kernel.org/lkml/1731551.Q6cHK6n5ZM@phil/T/ [2] https://patchwork.ozlabs.org/project/uboot/patch/20220701185959.GC1700@begu… Cc: Simon Glass <sjg(a)chromium.org> Cc: Philipp Tomsich <philipp.tomsich(a)vrull.eu> Cc: Kever Yang <kever.yang(a)rock-chips.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Marek Vasut <marex(a)denx.de> Signed-off-by: Xavier Drudis Ferran <xdrudis(a)tinet.cat> --- Changes: v2: implement option 1 (ehci-generic.c tolerates missing clocks) instead of option 3 (change dts node to remove the missing clock). --- drivers/usb/host/ehci-generic.c | 59 ++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index a765a307a3..aa86dcc435 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -60,6 +60,63 @@ static int ehci_disable_vbus_supply(struct generic_ehci *priv) return 0; } +/** + * get_some_clks() - Get/request all available clocks of a + * device. Leave other as null. + * + * @dev: The client device. + * @bulk: A pointer to a clock bulk struct to initialize. + * + * This looks up and requests all clocks of the client device; each + * device is assumed to have n clocks associated with it somehow, and + * this function tries to find and request all of them in a separate + * structure. The mapping of client device clock indices to provider + * clocks may be via device-tree properties, board-provided mapping + * tables, or some other mechanism. + * + * This is like clk_get_bulk() in clk uclass, but failure to get some + * of the clocks is accepted and only the available ones are assigned + * to bulk->clks. So bulk->clks may contain invalid (zeroed) clk + * structs. clk_release_bulk(), clk_enable_bulk() and + * clk_disable_bulk() can deal with that. + * + * bulk->count will contain the number of attempted clocks (size of + * bulk->clks). Or an error when getting the clocks phandle if + * negative. + * + * Return: If some clocks could be successfully located and requested, + * it returns 0. If all failed, then returns the last error code. + */ +static int get_some_clks(struct udevice *dev, struct clk_bulk *bulk) +{ + int i, ret, count; + + count = 0; + + bulk->count = dev_count_phandle_with_args(dev, "clocks", "#clock-cells", 0); + if (bulk->count < 1) + return bulk->count; + + bulk->clks = devm_kcalloc(dev, bulk->count, sizeof(struct clk), GFP_KERNEL); + if (!bulk->clks) + return -ENOMEM; + + for (i = 0; i < bulk->count; i++) { + ret = clk_get_by_index(dev, i, &bulk->clks[i]); + if (ret < 0) { + dev_warn(dev, "Failed to get clock %i/%i (ret=%d)\n", i, bulk->count, ret); + break; + } + + ++count; + } + + if (!count) + return ret; + + return 0; +} + static int ehci_usb_probe(struct udevice *dev) { struct generic_ehci *priv = dev_get_priv(dev); @@ -68,7 +125,7 @@ static int ehci_usb_probe(struct udevice *dev) int err, ret; err = 0; - ret = clk_get_bulk(dev, &priv->clocks); + ret = get_some_clks(dev, &priv->clocks); if (ret && ret != -ENOENT) { dev_err(dev, "Failed to get clocks (ret=%d)\n", ret); return ret; -- 2.20.1

2 2

PSU initialization code on zynqmp platforms
by Graeme Smecher 06 Dec '22

06 Dec '22

Hi Michal, (Well, that's embarassing. Sending again with a useful subject.) I'm bringing up u-boot on a custom zynqmp platform. For the PSU initialization, I can start with the psu_init_gpl.[ch] files embedded in the .xsa generated by Vivado. However, these are pretty flawed [1, 2]. What is your workflow for generating and maintaining the in-tree psu_init_gpl files you maintain? Are these files cleaned up and maintained by hand? If your workflow is functional, I will happily emulate it instead - even if it means straying from Vivado's configuration GUI. best, Graeme 1: https://lists.denx.de/pipermail/u-boot/2021-February/439394.html 2: https://support.xilinx.com/s/feed/0D52E00006kuRAMSA2

2 2

Pull request for sound-2023-01-rc4
by Heinrich Schuchardt 06 Dec '22

06 Dec '22

Dear Tom, The following changes since commit a50622d78c5c6babd1853ae913f339df54fe532c: Merge tag 'xilinx-for-v2023.01-rc3-v2' of https://source.denx.de/u-boot/custodians/u-boot-microblaze (2022-12-05 08:33:19 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/sound-2023-01-rc4 for you to fetch changes up to 304bc9f437df51b4d982fe25fd0988350c8f5fc9: sandbox: fix sound driver (2022-12-05 17:43:23 +0100) Gitlab CI showed no issues: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/14337 ---------------------------------------------------------------- Pull request for sound-2023-01-rc4 * Avoid endless loop and amend unit test * Add man-page for the sound command * Fix sandbox sound driver ---------------------------------------------------------------- Heinrich Schuchardt (5): sound: avoid endless loop test: test sandbox sound driver more rigorously cmd: fix long text for sound command doc: man-page for the sound command sandbox: fix sound driver arch/sandbox/cpu/sdl.c | 11 +++++------ arch/sandbox/include/asm/test.h | 10 ++++++++++ cmd/sound.c | 2 +- doc/usage/cmd/sound.rst | 41 +++++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + drivers/sound/sandbox.c | 9 +++++++++ drivers/sound/sound.c | 5 ++++- test/dm/sound.c | 11 +++++++++++ 8 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 doc/usage/cmd/sound.rst

2 1

[tom.rini@gmail.com: Fwd: New Defects reported by Coverity Scan for Das U-Boot]
by Tom Rini 06 Dec '22

06 Dec '22

Here's the latest report ---------- Forwarded message --------- From: <scan-admin(a)coverity.com> Date: Mon, Dec 5, 2022, 3:35 PM Subject: New Defects reported by Coverity Scan for Das U-Boot To: <tom.rini(a)gmail.com> Hi, Please find the latest report on new defect(s) introduced to Das U-Boot found with Coverity Scan. 4 new defect(s) introduced to Das U-Boot found with Coverity Scan. 1 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defect(s) Reported-by: Coverity Scan Showing 4 of 4 defect(s) ** CID 430977: Null pointer dereferences (FORWARD_NULL) /net/ndisc.c: 268 in ndisc_receive() ________________________________________________________________________________________________________ *** CID 430977: Null pointer dereferences (FORWARD_NULL) /net/ndisc.c: 268 in ndisc_receive() 262 sizeof(struct in6_addr)) == 0) && 263 ndisc_has_option(ip6, ND_OPT_TARGET_LL_ADDR)) { 264 ndisc_extract_enetaddr(ndisc, neigh_eth_addr); 265 266 /* save address for later use */ 267 if (!net_nd_packet_mac) >>> CID 430977: Null pointer dereferences (FORWARD_NULL) >>> Passing null pointer "net_nd_packet_mac" to "memcpy", which dereferences it. [Note: The source code implementation of the function has been overridden by a builtin model.] 268 memcpy(net_nd_packet_mac, neigh_eth_addr, 7); 269 270 /* modify header, and transmit it */ 271 memcpy(((struct ethernet_hdr *)net_nd_tx_packet)->et_dest, 272 neigh_eth_addr, 6); 273 ** CID 430976: Control flow issues (DEADCODE) /net/tftp.c: 744 in sanitize_tftp_block_size_option() ________________________________________________________________________________________________________ *** CID 430976: Control flow issues (DEADCODE) /net/tftp.c: 744 in sanitize_tftp_block_size_option() 738 } 739 /* 740 * If not CONFIG_IP_DEFRAG, cap at the same value as 741 * for tftp put, namely normal MTU minus protocol 742 * overhead. 743 */ >>> CID 430976: Control flow issues (DEADCODE) >>> Execution cannot reach this statement: "[[fallthrough]];". 744 fallthrough; 745 case TFTPPUT: 746 default: 747 /* 748 * U-Boot does not support IP fragmentation on TX, so 749 * this must be small enough that it fits normal MTU ** CID 430975: Control flow issues (MISSING_BREAK) /net/net.c: 1270 in net_process_received_packet() ________________________________________________________________________________________________________ *** CID 430975: Control flow issues (MISSING_BREAK) /net/net.c: 1270 in net_process_received_packet() 1264 #ifdef CONFIG_CMD_RARP 1265 case PROT_RARP: 1266 rarp_receive(ip, len); 1267 break; 1268 #endif 1269 #if IS_ENABLED(CONFIG_IPV6) >>> CID 430975: Control flow issues (MISSING_BREAK) >>> The case for value "34525" is not terminated by a "break" statement. 1270 case PROT_IP6: 1271 net_ip6_handler(et, (struct ip6_hdr *)ip, len); 1272 #endif 1273 case PROT_IP: 1274 debug_cond(DEBUG_NET_PKT, "Got IP\n"); 1275 /* Before we start poking the header, make sure it is there */ ** CID 430974: Memory - corruptions (OVERRUN) /net/ndisc.c: 268 in ndisc_receive() ________________________________________________________________________________________________________ *** CID 430974: Memory - corruptions (OVERRUN) /net/ndisc.c: 268 in ndisc_receive() 262 sizeof(struct in6_addr)) == 0) && 263 ndisc_has_option(ip6, ND_OPT_TARGET_LL_ADDR)) { 264 ndisc_extract_enetaddr(ndisc, neigh_eth_addr); 265 266 /* save address for later use */ 267 if (!net_nd_packet_mac) >>> CID 430974: Memory - corruptions (OVERRUN) >>> Overrunning array "neigh_eth_addr" of 6 bytes by passing it to a function which accesses it at byte offset 6 using argument "7UL". [Note: The source code implementation of the function has been overridden by a builtin model.] 268 memcpy(net_nd_packet_mac, neigh_eth_addr, 7); 269 270 /* modify header, and transmit it */ 271 memcpy(((struct ethernet_hdr *)net_nd_tx_packet)->et_dest, 272 neigh_eth_addr, 6); 273 -- Tom

1 0

[PATCH 1/4] ARM: stm32: Fix ECDSA authentication with Dcache enabled
by Marek Vasut 06 Dec '22

06 Dec '22

In case Dcache is enabled while the ECDSA authentication function is called via BootROM ROM API, the CRYP DMA might pick stale version of data from DRAM. Disable Dcache around the BootROM call to avoid this issue. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- arch/arm/mach-stm32mp/ecdsa_romapi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/arm/mach-stm32mp/ecdsa_romapi.c b/arch/arm/mach-stm32mp/ecdsa_romapi.c index a2f63ff879f..72b87bf2c64 100644 --- a/arch/arm/mach-stm32mp/ecdsa_romapi.c +++ b/arch/arm/mach-stm32mp/ecdsa_romapi.c @@ -64,6 +64,7 @@ static int romapi_ecdsa_verify(struct udevice *dev, const void *signature, size_t sig_len) { struct ecdsa_rom_api rom; + bool reenable_dcache; uint8_t raw_key[64]; uint32_t rom_ret; int algo; @@ -81,8 +82,21 @@ static int romapi_ecdsa_verify(struct udevice *dev, memcpy(raw_key + 32, pubkey->y, 32); stm32mp_rom_get_ecdsa_functions(&rom); + + /* + * Disable D-cache before calling into BootROM, else CRYP DMA + * may fail to pick up the correct data. + */ + if (dcache_status()) { + dcache_disable(); + reenable_dcache = true; + } + rom_ret = rom.ecdsa_verify_signature(hash, raw_key, signature, algo); + if (reenable_dcache) + dcache_enable(); + return rom_ret == ROM_API_SUCCESS ? 0 : -EPERM; } -- 2.35.1

3 13

[RFC 1/1] sound: allow waveform selection
by Heinrich Schuchardt 06 Dec '22

06 Dec '22

* Allow the sound command to select the sine or the square waveform. * Allow to play multiple tones with one command. * Adjust documentation. * Adjust unit test. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- This would be the alternative to [v2,6/7] sound: add CONFIG_SOUND_SINE symbol For testing with the sandbox remove this line arch/sandbox/dts/test.dts:969 sandbox,silent; /* Don't emit sounds while testing */ run the sand box with './u-boot -T' and issue the following commands sound play sound play -s sound play -s 600 500 -q sound play -s 500 1047 500 880 500 0 500 1047 500 880 500 0 500 784 500 698 500 784 1000 698 Listening to the output demonstrates why patch 7/7 is needed. --- arch/sandbox/include/asm/test.h | 7 ++++ cmd/sound.c | 60 ++++++++++++++++++++++++++------- doc/usage/cmd/sound.rst | 28 ++++++++++++++- drivers/sound/sandbox.c | 7 ++++ drivers/sound/sound-uclass.c | 19 +++++++++-- include/sound.h | 21 +++++++++--- test/dm/sound.c | 45 ++++++++++++++++--------- 7 files changed, 151 insertions(+), 36 deletions(-) diff --git a/arch/sandbox/include/asm/test.h b/arch/sandbox/include/asm/test.h index 568738c16d..199a38f57e 100644 --- a/arch/sandbox/include/asm/test.h +++ b/arch/sandbox/include/asm/test.h @@ -188,6 +188,13 @@ int sandbox_get_setup_called(struct udevice *dev); */ int sandbox_get_sound_active(struct udevice *dev); +/** + * sandbox_reset_sound_count() - reset sound data count and sum + * + * @dev: device to reset + */ +void sandbox_reset_sound_count(struct udevice *dev); + /** * sandbox_get_sound_count() - Read back the count of the sound data so far * diff --git a/cmd/sound.c b/cmd/sound.c index 20ac3f758e..d1724e0b7c 100644 --- a/cmd/sound.c +++ b/cmd/sound.c @@ -39,26 +39,56 @@ static int do_play(struct cmd_tbl *cmdtp, int flag, int argc, int ret = 0; int msec = 1000; int freq = 400; - - if (argc > 1) - msec = dectoul(argv[1], NULL); - if (argc > 2) - freq = dectoul(argv[2], NULL); + enum sound_waveform waveform = SOUND_SQUARE; + bool first = true; ret = uclass_first_device_err(UCLASS_SOUND, &dev); - if (!ret) - ret = sound_beep(dev, msec, freq); - if (ret) { - printf("Sound device failed to play (err=%d)\n", ret); - return CMD_RET_FAILURE; + if (ret) + goto err; + + --argc; + ++argv; + while (argc || first) { + first = false; + if (argc && *argv[0] == '-') { + switch (argv[0][1]) { + case 'q': + waveform = SOUND_SQUARE; + break; + case 's': + waveform = SOUND_SINE; + break; + default: + return CMD_RET_USAGE; + } + --argc; + ++argv; + } + if (argc && *argv[0] != '-') { + msec = dectoul(argv[0], NULL); + --argc; + ++argv; + } + if (argc && *argv[0] != '-') { + freq = dectoul(argv[0], NULL); + --argc; + ++argv; + } + ret = sound_beep(dev, msec, freq, waveform); + if (ret) + goto err; } return 0; + +err: + printf("Sound device failed to play (err=%d)\n", ret); + return CMD_RET_FAILURE; } static struct cmd_tbl cmd_sound_sub[] = { U_BOOT_CMD_MKENT(init, 0, 1, do_init, "", ""), - U_BOOT_CMD_MKENT(play, 2, 1, do_play, "", ""), + U_BOOT_CMD_MKENT(play, INT_MAX, 1, do_play, "", ""), }; /* process sound command */ @@ -83,8 +113,12 @@ static int do_sound(struct cmd_tbl *cmdtp, int flag, int argc, } U_BOOT_CMD( - sound, 4, 1, do_sound, + sound, INT_MAX, 1, do_sound, "sound sub-system", "init - initialise the sound driver\n" - "sound play [len [freq]] - play a sound for len ms at freq Hz\n" + "sound play [[[-q|-s] len [freq]] ...] - play a sound\n" + " -q - square waveform\n" + " -s - sine waveform\n" + " len - duration in ms\n" + " freq - frequency in Hz\n" ); diff --git a/doc/usage/cmd/sound.rst b/doc/usage/cmd/sound.rst index d3fac243b1..03e3a2de78 100644 --- a/doc/usage/cmd/sound.rst +++ b/doc/usage/cmd/sound.rst @@ -10,7 +10,7 @@ Synopsis :: sound init - sound play [len [freq]] + sound play [[[-q|-s] len [freq]] ...] Description ----------- @@ -24,12 +24,38 @@ sound play plays a square wave sound. It does not depend on previously calling *sound init*. +-q + generate a square waveform (this is the default) + +-s + generate a sine waveform + len duration of the sound in ms, defaults to 1000 ms freq frequency of the sound in Hz, defaults to 400 Hz +Examples +-------- + +Square wave beep with 400 Hz for 1000 ms:: + + sound play + +Sine wave beep with 400 Hz for 1000 ms:: + + sound play -s + +Sine wave beep at 500 Hz for 600 ms followed by square wave beep at 500 Hz +for 600 ms:: + + sound play -s 600 500 -q + +Melody played with sine waveform:: + + sound play -s 500 1047 500 880 500 0 500 1047 500 880 500 0 500 784 500 698 500 784 1000 698 + Configuration ------------- diff --git a/drivers/sound/sandbox.c b/drivers/sound/sandbox.c index c6cbd81fdb..693611fcc8 100644 --- a/drivers/sound/sandbox.c +++ b/drivers/sound/sandbox.c @@ -69,6 +69,13 @@ int sandbox_get_sound_active(struct udevice *dev) return priv->active; } +void sandbox_reset_sound_count(struct udevice *dev) { + struct sandbox_sound_priv *priv = dev_get_priv(dev); + + priv->count = 0; + priv->sum = 0; +} + int sandbox_get_sound_count(struct udevice *dev) { struct sandbox_sound_priv *priv = dev_get_priv(dev); diff --git a/drivers/sound/sound-uclass.c b/drivers/sound/sound-uclass.c index 2ffc4fc7c1..c459b86ef1 100644 --- a/drivers/sound/sound-uclass.c +++ b/drivers/sound/sound-uclass.c @@ -66,7 +66,8 @@ int sound_stop_beep(struct udevice *dev) return ops->stop_beep(dev); } -int sound_beep(struct udevice *dev, int msecs, int frequency_hz) +int sound_beep(struct udevice *dev, int msecs, int frequency_hz, + enum sound_waveform waveform) { struct sound_uc_priv *uc_priv = dev_get_uclass_priv(dev); struct i2s_uc_priv *i2s_uc_priv; @@ -99,8 +100,20 @@ int sound_beep(struct udevice *dev, int msecs, int frequency_hz) return -ENOMEM; } - sound_create_square_wave(i2s_uc_priv->samplingrate, data, data_size, - frequency_hz, i2s_uc_priv->channels); + switch (waveform) { + case SOUND_SINE: + sound_create_sine_wave(i2s_uc_priv->samplingrate, data, + data_size, frequency_hz, + i2s_uc_priv->channels); + break; + case SOUND_SQUARE: + sound_create_square_wave(i2s_uc_priv->samplingrate, data, + data_size, frequency_hz, + i2s_uc_priv->channels); + break; + default: + return -EINVAL; + } ret = 0; while (msecs >= 1000) { diff --git a/include/sound.h b/include/sound.h index cf9c3e8fb7..be9bdc58bf 100644 --- a/include/sound.h +++ b/include/sound.h @@ -19,6 +19,17 @@ struct sound_codec_info { int i2c_dev_addr; }; +/** + * enum sound_waveform - sound waveform + * + * @SOUND_SQUARE: square waveform + * @SOUND_SINE: sine waveform + */ +enum sound_waveform { + SOUND_SQUARE, + SOUND_SINE, +}; + /** * struct sound_uc_priv - private uclass information about each sound device * @@ -125,12 +136,14 @@ int sound_setup(struct udevice *dev); /** * play() - Play a beep * - * @dev: Sound device - * @msecs: Duration of beep in milliseconds - * @frequency_hz: Frequency of the beep in Hertz + * @dev: sound device + * @msecs: duration of beep in milliseconds + * @frequency_hz: frequency of the beep in Hertz + * @waveform: waveform * Return: 0 if OK, -ve on error */ -int sound_beep(struct udevice *dev, int msecs, int frequency_hz); +int sound_beep(struct udevice *dev, int msecs, int frequency_hz, + enum sound_waveform waveform); /** * sound_start_beep() - Start beeping diff --git a/test/dm/sound.c b/test/dm/sound.c index 15d545ab5a..cfa6306527 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -12,11 +12,19 @@ #include <test/test.h> #include <asm/test.h> + /* Basic test of the sound codec uclass */ static int dm_test_sound(struct unit_test_state *uts) { struct sound_uc_priv *uc_priv; struct udevice *dev; + struct test_data { + enum sound_waveform waveform; + int expected; + } test_data[2] = { + {SOUND_SQUARE, 4560}, + {SOUND_SINE, 3494}, + }; /* check probe success */ ut_assertok(uclass_first_device_err(UCLASS_SOUND, &dev)); @@ -25,21 +33,28 @@ static int dm_test_sound(struct unit_test_state *uts) ut_asserteq_str("i2s", uc_priv->i2s->name); ut_asserteq(0, sandbox_get_setup_called(dev)); - ut_assertok(sound_beep(dev, 1, 100)); - ut_asserteq(48, sandbox_get_sound_count(dev)); - ut_asserteq(4560, sandbox_get_sound_sum(dev)); - ut_assertok(sound_beep(dev, 1, 100)); - ut_asserteq(96, sandbox_get_sound_count(dev)); - ut_asserteq(9120, sandbox_get_sound_sum(dev)); - ut_assertok(sound_beep(dev, 1, -100)); - ut_asserteq(144, sandbox_get_sound_count(dev)); - ut_asserteq(9120, sandbox_get_sound_sum(dev)); - ut_assertok(sound_beep(dev, 1, 0)); - ut_asserteq(192, sandbox_get_sound_count(dev)); - ut_asserteq(9120, sandbox_get_sound_sum(dev)); - ut_assertok(sound_beep(dev, 1, INT_MAX)); - ut_asserteq(240, sandbox_get_sound_count(dev)); - ut_asserteq(9120, sandbox_get_sound_sum(dev)); + for (int i = 0; i < 2; ++i) { + int expected = test_data->expected; + + sandbox_reset_sound_count(dev); + ut_assertok(sound_beep(dev, 1, 100, test_data->waveform)); + ut_asserteq(48, sandbox_get_sound_count(dev)); + ut_asserteq(expected, sandbox_get_sound_sum(dev)); + ut_assertok(sound_beep(dev, 1, 100, test_data->waveform)); + ut_asserteq(96, sandbox_get_sound_count(dev)); + expected *= 2; + ut_asserteq(expected, sandbox_get_sound_sum(dev)); + ut_assertok(sound_beep(dev, 1, -100, test_data->waveform)); + ut_asserteq(144, sandbox_get_sound_count(dev)); + ut_asserteq(expected, sandbox_get_sound_sum(dev)); + ut_assertok(sound_beep(dev, 1, 0, test_data->waveform)); + ut_asserteq(192, sandbox_get_sound_count(dev)); + ut_asserteq(expected, sandbox_get_sound_sum(dev)); + ut_assertok(sound_beep(dev, 1, INT_MAX, test_data->waveform)); + ut_asserteq(240, sandbox_get_sound_count(dev)); + ut_asserteq(expected, sandbox_get_sound_sum(dev)); + } + ut_asserteq(false, sandbox_get_sound_active(dev)); return 0; -- 2.37.2

2 2

[PATCH v5 00/19] IPv6 support
by Viacheslav Mitrofanov 06 Dec '22

06 Dec '22

This patch set adds basic IPv6 support to U-boot. It is based on Chris's Packham patches (https://lists.denx.de/pipermail/u-boot/2017-January/279366.html) Chris's patches were taken as base. There were efforts to launch it on HiFive SiFive Unmatched board but the board didn't work well. The code was refactored, fixed some bugs as CRC for little-endian, some parts were implemented in our own way, something was taken from Linux. Finally we did manual tests and the board worked well. Testing was done on HiFive SiFive Unmatched board (RISC-V) Signed-off-by: Viacheslav Mitrofanov <v.v.mitrofanov(a)yadro.com> --- Changes in v2: - Split big patches into smaller - If an address in tftpboot is IPv6 than use IPv6 to boot - Add tests Changes in v3: - Added functions and structures description in whole patch-series - Removed memory allocation in on_ip6addr() - Some functions got return code from errno.h - Add to string_to_ip6() length parameter to avoid obligatory null termination - Add a lot of small decorative cnages Changes in v4: - Fixed funcs and structures style description - Added omitted tags Changes in v5: - Move patches to the latest u-boot version - Move IPV6 tests under CONFIG_IPV6 ifdef - Add CONFIG_IPV6 to sandboxes Viacheslav Mitrofanov (19): net: ipv6: Add IPv6 basic primitives net: ipv6: Add IPv6 build options net: ipv6: Add callbacks declarations to get access to IPv6 variables net: ipv6: Add Neighbor Discovery Protocol (NDP) net: ipv6: Add string_to_ip6 converter net: ipv6: Enable IPv6 typeconversion specifier net: ipv6: Add ip6addr, gatewayip6, serverip6 variables callbacks net: ipv6: Add implementation of main IPv6 functions net: ipv6: Incorporate IPv6 support into u-boot net subsystem net: tftp: Add IPv6 support for tftpboot net: ping6: Add ping6 command test: dm: eth: Add string_to_ip6 test test: dm: eth: Add csum_ipv6_magic test test: dm: eth: Add ip6_addr_in_subnet test test: dm: eth: Add ip6_make_snma test test: dm: eth: Add ip6_make_lladdr test configs: Add IPV6 config to sandbox_defconfig configs: Add IPV6 config to sandbox64_defconfig configs: Add IPV6 config to sandbox_flattree_defconfig cmd/Kconfig | 7 + cmd/net.c | 61 ++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + include/env_callback.h | 10 + include/env_flags.h | 10 + include/ndisc.h | 102 +++++++ include/net.h | 4 +- include/net6.h | 432 ++++++++++++++++++++++++++++ lib/net_utils.c | 109 +++++++ lib/vsprintf.c | 7 +- net/Kconfig | 10 + net/Makefile | 3 + net/ndisc.c | 289 +++++++++++++++++++ net/net.c | 53 +++- net/net6.c | 445 +++++++++++++++++++++++++++++ net/ping6.c | 118 ++++++++ net/tftp.c | 58 +++- test/dm/eth.c | 148 ++++++++++ 20 files changed, 1853 insertions(+), 16 deletions(-) create mode 100644 include/ndisc.h create mode 100644 include/net6.h create mode 100644 net/ndisc.c create mode 100644 net/net6.c create mode 100644 net/ping6.c -- 2.25.1

4 25

[PATCH] timer: Kconfig: add clint timer support
by chenzhipeng 06 Dec '22

06 Dec '22

add the clint timer device configuration item to Kconfig Signed-off-by: chenzhipeng <chenzhipeng(a)eswincomputing.com> --- drivers/timer/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 6d6665005c..3dd1b940f1 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -216,6 +216,13 @@ config RISCV_TIMER Select this to enable support for a generic RISC-V S-Mode timer driver. +config CLINT_TIMER + bool "RISC-V clint timer support" + depends on TIMER && RISCV + help + Select this to enables the clint timer for RISC-V systems. The clint + driver is usually used for NoMMU RISC-V systems. + config ROCKCHIP_TIMER bool "Rockchip timer support" depends on TIMER -- 2.25.1

2 1

[v1] spl: nand: allow partial nand page reads during nand_spl_load_image
by Colin Foster 06 Dec '22

06 Dec '22

The nand_spl_load_image function was guaranteed to read an entire block into RAM, regardless of how many bytes were to be read. This is particularly problematic when spl_load_legacy_image is called, as this function attempts to load a struct image_header but gets surprised with a full flash sector. Allow partial reads to restore functionality to the code path spl_nand_load_element() -> spl_load_legacy_img() -> spl_nand_legacy_read(load, header, sizeof(hdr), header); Signed-off-by: Colin Foster <colin.foster(a)in-advantage.com> --- drivers/mtd/nand/raw/nand_spl_loaders.c | 36 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_spl_loaders.c b/drivers/mtd/nand/raw/nand_spl_loaders.c index 4befc75c04..84ac482c06 100644 --- a/drivers/mtd/nand/raw/nand_spl_loaders.c +++ b/drivers/mtd/nand/raw/nand_spl_loaders.c @@ -1,9 +1,18 @@ +/* + * Temporary storage for non NAND page aligned and non NAND page sized + * reads. Note: This does not support runtime detected FLASH yet, but + * that should be reasonably easy to fix by making the buffer large + * enough :) + */ +static u8 scratch_buf[CONFIG_SYS_NAND_PAGE_SIZE]; + int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) { + unsigned int read_this_time = CONFIG_SYS_NAND_PAGE_SIZE; + unsigned int size_remaining = size; unsigned int block, lastblock; unsigned int page, page_offset; - /* offs has to be aligned to a page address! */ block = offs / CONFIG_SYS_NAND_BLOCK_SIZE; lastblock = (offs + size - 1) / CONFIG_SYS_NAND_BLOCK_SIZE; page = (offs % CONFIG_SYS_NAND_BLOCK_SIZE) / CONFIG_SYS_NAND_PAGE_SIZE; @@ -12,8 +21,18 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) while (block <= lastblock) { if (!nand_is_bad_block(block)) { /* Skip bad blocks */ - while (page < CONFIG_SYS_NAND_PAGE_COUNT) { - nand_read_page(block, page, dst); + while (page < CONFIG_SYS_NAND_PAGE_COUNT && + size_remaining > 0) { + if (size_remaining < CONFIG_SYS_NAND_PAGE_SIZE) + { + nand_read_page(block, page, + scratch_buf); + memcpy(dst, scratch_buf, + size_remaining); + read_this_time = size_remaining; + } else { + nand_read_page(block, page, dst); + } /* * When offs is not aligned to page address the * extra offset is copied to dst as well. Copy @@ -26,7 +45,8 @@ int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst) dst = (void *)((int)dst - page_offset); page_offset = 0; } - dst += CONFIG_SYS_NAND_PAGE_SIZE; + dst += read_this_time; + size_remaining -= read_this_time; page++; } @@ -70,14 +90,6 @@ u32 nand_spl_adjust_offset(u32 sector, u32 offs) } #ifdef CONFIG_SPL_UBI -/* - * Temporary storage for non NAND page aligned and non NAND page sized - * reads. Note: This does not support runtime detected FLASH yet, but - * that should be reasonably easy to fix by making the buffer large - * enough :) - */ -static u8 scratch_buf[CONFIG_SYS_NAND_PAGE_SIZE]; - /** * nand_spl_read_block - Read data from physical eraseblock into a buffer * @block: Number of the physical eraseblock -- 2.25.1

2 3