May 2024 - U-Boot

[PATCH 04/15] net-lwip: add TFTP support and tftpboot command
by Jerome Forissier 22 May '24

22 May '24

Implement do_tftpb(). Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- cmd/Kconfig | 3 +- cmd/net-lwip.c | 8 ++ net-lwip/dhcp.c | 11 ++- net-lwip/tftp.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 223 insertions(+), 5 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 0ef3189d8c..7bb6269b7a 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2101,10 +2101,9 @@ config CMD_DHCP_LWIP config CMD_TFTPBOOT_LWIP bool "tftp" select PROT_UDP_LWIP - default n + default y help tftpboot - load file via network using TFTP protocol - Currently a placeholder (not implemented) endif diff --git a/cmd/net-lwip.c b/cmd/net-lwip.c index c740461c64..30b396f2d0 100644 --- a/cmd/net-lwip.c +++ b/cmd/net-lwip.c @@ -11,3 +11,11 @@ U_BOOT_CMD( "[loadAddress] [[hostIPaddr:]bootfilename]" ); #endif + +#if defined(CONFIG_CMD_TFTPBOOT_LWIP) +U_BOOT_CMD( + tftpboot, 3, 0, do_tftpb, + "boot image via network using TFTP protocol\n", + "[loadAddress] [[hostIPaddr:]bootfilename]" +); +#endif diff --git a/net-lwip/dhcp.c b/net-lwip/dhcp.c index ae2d922cda..f4655162fe 100644 --- a/net-lwip/dhcp.c +++ b/net-lwip/dhcp.c @@ -94,11 +94,20 @@ int do_dhcp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) int dhcp_run(ulong addr, const char *fname, bool autoload) { char *dhcp_argv[] = {"dhcp", NULL, }; +#ifdef CONFIG_CMD_TFTPBOOT_LWIP + char *tftp_argv[] = {"tftpboot", boot_file_name, NULL, }; +#endif struct cmd_tbl cmdtp = {}; /* dummy */ if (autoload) { - /* Will be supported when TFTP is added */ +#ifdef CONFIG_CMD_TFTPBOOT_LWIP + /* Assume DHCP was already performed */ + if (boot_file_name[0]) + return do_tftpb(&cmdtp, 0, 2, tftp_argv); + return 0; +#else return -EOPNOTSUPP; +#endif } return do_dhcp(&cmdtp, 0, 1, dhcp_argv); diff --git a/net-lwip/tftp.c b/net-lwip/tftp.c index 1fa246f55d..19bf083d99 100644 --- a/net-lwip/tftp.c +++ b/net-lwip/tftp.c @@ -2,10 +2,212 @@ /* Copyright (C) 2024 Linaro Ltd. */ #include <command.h> +#include <console.h> +#include <display_options.h> +#include <image.h> +#include <linux/delay.h> +#include <lwip/apps/tftp_client.h> +#include <lwip/timeouts.h> #include <net-lwip.h> +#include <time.h> + +static ulong daddr; +static ulong size; +static ulong prevsize; +#define PROGRESS_PRINT_STEP_BYTES (100 * 1024) +static ulong start_time; +static enum done_state { + NOT_DONE = 0, + SUCCESS = 1, + FAILURE = 2 +} done; + +static void *tftp_open(const char *fname, const char *mode, u8_t is_write) +{ + return NULL; +} + +static void tftp_close(void *handle) +{ + ulong elapsed; + + if (done == FAILURE) { + /* Closing after an error */ + return; + } + + elapsed = get_timer(start_time); + done = SUCCESS; + log_info("\n%lu bytes transferred in %lu ms (", size, + get_timer(start_time)); + print_size(size / elapsed * 1000, "/s)\n"); + + + if (env_set_hex("filesize", size)) { + log_err("filesize not updated\n"); + return; + } +} + +static int tftp_read(void *handle, void *buf, int bytes) +{ + return 0; +} + +static int tftp_write(void *handle, struct pbuf *p) +{ + struct pbuf *q; + + for (q = p; q != NULL; q = q->next) { + memcpy((void *)daddr, q->payload, q->len); + daddr += q->len; + size += q->len; + if (size - prevsize > PROGRESS_PRINT_STEP_BYTES) { + printf("#"); + prevsize = size; + } + } + + return 0; +} + +static void tftp_error(void *handle, int err, const char *msg, int size) +{ + char message[100]; + + done = FAILURE; + memset(message, 0, sizeof(message)); + memcpy(message, msg, LWIP_MIN(sizeof(message) - 1, (size_t)size)); + + log_info("\nTFTP error: %d (%s)\n", err, message); +} + +static const struct tftp_context tftp_context = { + tftp_open, + tftp_close, + tftp_read, + tftp_write, + tftp_error +}; + +static int tftp_run(ulong addr, char *fname, ip_addr_t srvip) +{ + void *f = (void *)0x1; /* unused fake file handle*/ + err_t err; + + if (!fname || addr == 0) + return -1; + + done = NOT_DONE; + size = 0; + prevsize = 0; + daddr = addr; + + log_info("TFTP from server %s; our IP address is %s\n", + ip4addr_ntoa(&srvip), env_get("ipaddr")); + log_info("Filename '%s'.\n", fname); + log_info("Load address: 0x%lx\n", daddr); + log_info("Loading: "); + + err = tftp_init_client(&tftp_context); + if (!(err == ERR_OK || err == ERR_USE)) + log_err("tftp_init_client err: %d\n", err); + + start_time = get_timer(0); + err = tftp_get(f, &srvip, TFTP_PORT, fname, TFTP_MODE_OCTET); + /* might return different errors, like routing problems */ + if (err != ERR_OK) { + log_err("tftp_get err=%d\n", err); + return -1; + } + + while (!done) { + eth_rx(); + sys_check_timeouts(); + if (ctrlc()) + break; + } + + tftp_cleanup(); + + if (done == SUCCESS) { + if (env_set_hex("fileaddr", addr)) { + log_err("fileaddr not updated\n"); + return -1; + } + return 0; + } + + return -1; +} int do_tftpb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - /* Not implemented */ - return CMD_RET_FAILURE; + char *fname; + char *server_ip; + ip_addr_t srvip; + ulong addr; + char *end; + char *col; + + image_load_addr = env_get_ulong("loadaddr", 16, image_load_addr); + + switch (argc) { + case 1: + fname = env_get("bootfile"); + break; + case 2: + /* + * Only one arg - accept two forms: + * Just load address, or just boot file name. The latter + * form must be written in a format which can not be + * mis-interpreted as a valid number. + */ + addr = hextoul(argv[1], &end); + if (end == (argv[1] + strlen(argv[1]))) { + image_load_addr = addr; + fname = env_get("bootfile"); + } else { + fname = argv[1]; + } + break; + case 3: + image_load_addr = hextoul(argv[1], NULL); + fname = argv[2]; + break; + default: + return CMD_RET_USAGE; + } + + col = strchr(fname, ':'); + if (col) { + server_ip = fname; + *col = '\0'; + fname = col + 1; + } else { + server_ip = env_get("serverip"); + if (!server_ip) { + log_err("error: serverip variable has to be set\n"); + return CMD_RET_FAILURE; + } + } + if (!ipaddr_aton(server_ip, &srvip)) { + log_err("error: ipaddr_aton\n"); + return CMD_RET_FAILURE; + } + + if (!fname) { + log_err("error: no file name\n"); + return CMD_RET_FAILURE; + } + + if (!image_load_addr) { + log_err("error: no load address\n"); + return CMD_RET_FAILURE; + } + + if (tftp_run(image_load_addr, fname, srvip) < 0) + return CMD_RET_FAILURE; + + return CMD_RET_SUCCESS; } -- 2.40.1

1 0

[PATCH 01/15] net: introduce alternative implementation as net-lwip/
by Jerome Forissier 22 May '24

22 May '24

Prepare the introduction of the lwIP (lightweight IP) TCP/IP stack by adding a new net-lwip/ directory and the CONFIG_NET_LWIP symbol. At this point, enabling CONFIG_NET_LWIP simply disables CONFIG_NET. Subsequent commits will introduce the lwIP code, re-work the NETDEVICE integration and port some of the NET commands and features to lwIP. CONFIG_SPL_NET cannot be enabled when CONFIG_NET_LWIP=y. SPL_NET pulls some symbols that are part of NET (such as arp_init(), arp_timeout_check(), arp_receive(), net_arp_wait_packet_ip()). lwIP support in SPL may be added later. Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- Kconfig | 2 ++ Makefile | 2 +- common/Kconfig | 2 +- common/spl/Kconfig | 1 + drivers/dfu/Kconfig | 2 +- drivers/fastboot/Kconfig | 4 ++-- drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- net-lwip/Kconfig | 15 +++++++++++++++ net/Kconfig | 1 + 10 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 net-lwip/Kconfig diff --git a/Kconfig b/Kconfig index 82df59f176..758256ab12 100644 --- a/Kconfig +++ b/Kconfig @@ -747,6 +747,8 @@ source "env/Kconfig" source "net/Kconfig" +source "net-lwip/Kconfig" + source "drivers/Kconfig" source "fs/Kconfig" diff --git a/Makefile b/Makefile index 44deb339af..6296ad6f78 100644 --- a/Makefile +++ b/Makefile @@ -859,7 +859,7 @@ libs-$(CONFIG_OF_EMBED) += dts/ libs-y += env/ libs-y += lib/ libs-y += fs/ -libs-y += net/ +libs-$(CONFIG_NET) += net/ libs-y += disk/ libs-y += drivers/ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/ diff --git a/common/Kconfig b/common/Kconfig index 5e3070e925..807b726384 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -424,7 +424,7 @@ config LOGF_FUNC_PAD config LOG_SYSLOG bool "Log output to syslog server" - depends on NET + depends on NET || NET_LWIP help Enables a log driver which broadcasts log records via UDP port 514 to syslog servers. diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 6405374bcc..f67f0a859d 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1055,6 +1055,7 @@ config SPL_DM_SPI_FLASH config SPL_NET bool "Support networking" + depends on !NET_LWIP help Enable support for network devices (such as Ethernet) in SPL. This permits SPL to load U-Boot over a network link rather than diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig index 0360d9da14..d331b05993 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -11,7 +11,7 @@ config DFU_OVER_USB config DFU_OVER_TFTP bool - depends on NET + depends on NET || NET_LWIP if DFU config DFU_WRITE_ALT diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index 70207573de..05e988166f 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -27,7 +27,7 @@ config USB_FUNCTION_FASTBOOT This enables the USB part of the fastboot gadget. config UDP_FUNCTION_FASTBOOT - depends on NET + depends on NET || NET_LWIP select FASTBOOT bool "Enable fastboot protocol over UDP" help @@ -41,7 +41,7 @@ config UDP_FUNCTION_FASTBOOT_PORT The fastboot protocol requires a UDP port number. config TCP_FUNCTION_FASTBOOT - depends on NET + depends on NET || NET_LWIP select FASTBOOT bool "Enable fastboot protocol over TCP" help diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 3d96938eab..738752d29c 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -11,7 +11,7 @@ config MV88E6352_SWITCH menuconfig PHYLIB bool "Ethernet PHY (physical media interface) support" - depends on NET + depends on NET || NET_LWIP help Enable Ethernet PHY (physical media interface) support. diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 4621a6fd5e..03fe3bca19 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -224,7 +224,7 @@ endif # USB_GADGET_DOWNLOAD config USB_ETHER bool "USB Ethernet Gadget" - depends on NET + depends on NET || NET_LWIP default y if ARCH_SUNXI && USB_MUSB_GADGET help Creates an Ethernet network device through a USB peripheral diff --git a/net-lwip/Kconfig b/net-lwip/Kconfig new file mode 100644 index 0000000000..f8e0481964 --- /dev/null +++ b/net-lwip/Kconfig @@ -0,0 +1,15 @@ +# +# Network configuration (with lwIP stack) +# + +menuconfig NET_LWIP + bool "Networking support (lwIP stack) -- EXPERIMENTAL" + help + Include networking support based on the lwIP (lightweight IP) + TCP/IP stack (https://nongnu.org/lwip). This is a replacement for + the default U-Boot network stack and applications located in net/ + and enabled via CONFIG_NET as well as other pieces of code that + depend on CONFIG_NET (such as cmd/net.c enabled via CONFIG_CMD_NET). + Therefore the two symbols CONFIG_NET and CONFIG_NET_LWIP are mutually + exclusive. + NOTE: This is currently a placeholder. diff --git a/net/Kconfig b/net/Kconfig index 5dff633629..04b81dd497 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -6,6 +6,7 @@ menuconfig NET bool "Networking support" default y imply NETDEVICES + depends on !NET_LWIP if NET -- 2.40.1

1 0

[PATCH 00/15] Introduce the lwIP network stack
by Jerome Forissier 22 May '24

22 May '24

This is a rework of a patch series by Maxim Uvarov: "net/lwip: add lwip library for the network stack" [1]. The goal is to introduce the lwIP TCP/IP stack [2] [3] as an alternative to the current implementation in net/, selectable with Kconfig, and ultimately keep only lwIP if possible. Some reasons for doing so are: - Make the support of HTTPS in the wget command easier. Javier T. (CC'd) has some additional lwIP and Mbed TLS patches to do so. With that it becomes possible to fetch and launch a distro installer such as Debian etc. directly from the U-Boot shell. - Possibly benefit from additional features implemented in lwIP - Less code to maintain in U-Boot The first patch introduces a new Kconfig symbol: NET_LWIP, which selects the lwIP implementation instead of the current one (NET). Contrary to the approach chosen by Maxim in [1], NET_LWIP and NET cannot be enabled simultaneously. The rationale is we want to start from a clean state and not pull potentially duplicated functionality from both stacks. Note however that a few files are still built in net/, they are the ones related to ethernet device management and the ethernet bootflow. The second patch imports the lwIP code under lib/lwip. There is no change made to the code itself so upgrading to newer versions should be trivial. The code could be imported as a Git subtree if that's preferred. The subsequent patches implement various network-oriented commands and features: dhcp, dns, ping, tftpboot, wget. The commands have their own Kconfig symbol suffixed with _LWIP. For example CMD_PING_LWIP is the equivalent of CMD_PING but using the lwIP stack. Again this is meant to avoid pulling any unwanted code. NET_LWIP is not enabled by default because it lacks functionality compared to NET and many CI tests would fail to run or even build. Some tests (dm dsa/eth) are disabled when NET_LWIP is selected because they make strong assumptions on how the network stack is implemented and how the packet flow occurs. For example, an ARP exchange is expected when an ICMP packet goes out, but with lwIP no exchange will occur if the host IP is already in the the ARP cache. Due to the above and in order to provide some level of testing, a new QEMU configuration is introduced (qemu_arm64_lwip_defconfig) which is the same as qemu_arm64_lwip_defconfig but with NET_LWIP and CMD_*_LWIP enabled. Tests are added to test/py/tests/test_net.py for that configuration. The series passes the CI tests on GitHub [4]. Regarding the size of the U-Boot binary, I compared various builds using the command: linux/scripts/bloat-o-meter A/u-boot B/u-boot | \ grep -E "(add/remove|Total:)" - Comparing default configs (some features that are enabled by default when lwIP is not used but not supported with lwIP are disabled manually) (A) master branch, qemu_arm64_defconfig BOOTP_PXE=n CMD_MII=n DFU_TFTP=n (B) this series, qemu_arm64_lwip_defconfig add/remove: 167/161 grow/shrink: 5/11 up/down: 22335/-19971 (2364) Total: Before=811018, After=813382, chg +0.29% - With all the supported network commands enabled (dhcp + dns + ping + tftpboot + wget) (A) master branch, qemu_arm64_defconfig BOOTP_PXE=n CMD_MII=n DFU_TFTP=n CMD_DNS=y CMD_WGET=y (B) this series, qemu_arm64_lwip_defconfig CMD_DNS_LWIP=y CMD_WGET_LWIP=y add/remove: 303/218 grow/shrink: 8/11 up/down: 48655/-26686 (21969) Total: Before=818017, After=839986, chg +2.69% [1] https://lore.kernel.org/all/20231127125726.3735-1-maxim.uvarov@linaro.org/ [2] https://www.nongnu.org/lwip/ [3] https://en.wikipedia.org/wiki/LwIP [4] https://github.com/u-boot/u-boot/pull/531 CC: Javier Tia <javier.tia(a)linaro.org> Jerome Forissier (15): net: introduce alternative implementation as net-lwip/ net-lwip: import lwIP library under lib/lwip net-lwip: add DHCP support and dhcp commmand net-lwip: add TFTP support and tftpboot command net-lwip: add ping command net-lwip: add dns command net-lwip: add wget command net-lwip: import net command from cmd/net.c net-lwip: add support for EFI_HTTP_BOOT test: dm: dsa, eth: disable tests when CONFIG_NET_LWIP=y cmd: bdinfo: enable -e when CONFIG_CMD_NET_LWIP=y configs: add qemu_arm64_lwip_defconfig test/py: net: add _lwip variants of dhcp, ping and tftpboot tests MAINTAINERS: net-lwip: add myself as a maintainer CI: add qemu_arm64_lwip to the test matrix .azure-pipelines.yml | 7 + Kconfig | 2 + MAINTAINERS | 11 + Makefile | 3 +- boot/Kconfig | 3 + boot/bootmeth_efi.c | 3 +- cmd/Kconfig | 44 + cmd/Makefile | 4 + cmd/bdinfo.c | 5 +- cmd/efidebug.c | 8 +- cmd/net-lwip.c | 143 + common/Kconfig | 2 +- common/board_r.c | 4 +- common/spl/Kconfig | 1 + configs/qemu_arm64_lwip_defconfig | 70 + drivers/dfu/Kconfig | 4 +- drivers/fastboot/Kconfig | 4 +- drivers/net/Kconfig | 2 +- drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- include/config_distro_bootcmd.h | 2 +- include/net-lwip.h | 140 + include/net.h | 2 +- lib/Makefile | 2 + lib/efi_loader/Kconfig | 5 +- lib/lwip/Makefile | 57 + lib/lwip/README | 6 + lib/lwip/api/api_lib.c | 1367 ++++++ lib/lwip/api/api_msg.c | 2177 +++++++++ lib/lwip/api/err.c | 115 + lib/lwip/api/if_api.c | 102 + lib/lwip/api/netbuf.c | 250 + lib/lwip/api/netdb.c | 422 ++ lib/lwip/api/netifapi.c | 380 ++ lib/lwip/api/sockets.c | 4205 +++++++++++++++++ lib/lwip/api/tcpip.c | 706 +++ lib/lwip/apps/http/http_client.c | 911 ++++ lib/lwip/apps/tftp/tftp.c | 548 +++ lib/lwip/core/altcp.c | 717 +++ lib/lwip/core/altcp_alloc.c | 87 + lib/lwip/core/altcp_tcp.c | 578 +++ lib/lwip/core/def.c | 263 ++ lib/lwip/core/dns.c | 1657 +++++++ lib/lwip/core/inet_chksum.c | 608 +++ lib/lwip/core/init.c | 387 ++ lib/lwip/core/ip.c | 167 + lib/lwip/core/ipv4/acd.c | 557 +++ lib/lwip/core/ipv4/autoip.c | 379 ++ lib/lwip/core/ipv4/dhcp.c | 1999 ++++++++ lib/lwip/core/ipv4/etharp.c | 1251 +++++ lib/lwip/core/ipv4/icmp.c | 407 ++ lib/lwip/core/ipv4/igmp.c | 801 ++++ lib/lwip/core/ipv4/ip4.c | 1166 +++++ lib/lwip/core/ipv4/ip4_addr.c | 323 ++ lib/lwip/core/ipv4/ip4_frag.c | 894 ++++ lib/lwip/core/ipv6/dhcp6.c | 821 ++++ lib/lwip/core/ipv6/ethip6.c | 123 + lib/lwip/core/ipv6/icmp6.c | 425 ++ lib/lwip/core/ipv6/inet6.c | 53 + lib/lwip/core/ipv6/ip6.c | 1494 ++++++ lib/lwip/core/ipv6/ip6_addr.c | 355 ++ lib/lwip/core/ipv6/ip6_frag.c | 862 ++++ lib/lwip/core/ipv6/mld6.c | 626 +++ lib/lwip/core/ipv6/nd6.c | 2474 ++++++++++ lib/lwip/core/mem.c | 1017 ++++ lib/lwip/core/memp.c | 447 ++ lib/lwip/core/netif.c | 1855 ++++++++ lib/lwip/core/pbuf.c | 1545 ++++++ lib/lwip/core/raw.c | 673 +++ lib/lwip/core/stats.c | 168 + lib/lwip/core/sys.c | 148 + lib/lwip/core/tcp.c | 2696 +++++++++++ lib/lwip/core/tcp_in.c | 2184 +++++++++ lib/lwip/core/tcp_out.c | 2257 +++++++++ lib/lwip/core/timeouts.c | 451 ++ lib/lwip/core/udp.c | 1321 ++++++ lib/lwip/include/compat/posix/arpa/inet.h | 33 + lib/lwip/include/compat/posix/net/if.h | 36 + lib/lwip/include/compat/posix/netdb.h | 33 + lib/lwip/include/compat/posix/sys/socket.h | 33 + lib/lwip/include/compat/stdc/errno.h | 33 + lib/lwip/include/lwip/acd.h | 109 + lib/lwip/include/lwip/altcp.h | 207 + lib/lwip/include/lwip/altcp_tcp.h | 72 + lib/lwip/include/lwip/altcp_tls.h | 196 + lib/lwip/include/lwip/api.h | 434 ++ lib/lwip/include/lwip/apps/FILES | 2 + .../include/lwip/apps/altcp_proxyconnect.h | 79 + .../lwip/apps/altcp_tls_mbedtls_opts.h | 111 + lib/lwip/include/lwip/apps/fs.h | 139 + lib/lwip/include/lwip/apps/http_client.h | 160 + lib/lwip/include/lwip/apps/httpd.h | 256 + lib/lwip/include/lwip/apps/httpd_opts.h | 416 ++ lib/lwip/include/lwip/apps/lwiperf.h | 109 + lib/lwip/include/lwip/apps/mdns.h | 154 + lib/lwip/include/lwip/apps/mdns_domain.h | 80 + lib/lwip/include/lwip/apps/mdns_opts.h | 121 + lib/lwip/include/lwip/apps/mdns_out.h | 138 + lib/lwip/include/lwip/apps/mdns_priv.h | 237 + lib/lwip/include/lwip/apps/mqtt.h | 205 + lib/lwip/include/lwip/apps/mqtt_opts.h | 103 + lib/lwip/include/lwip/apps/mqtt_priv.h | 104 + lib/lwip/include/lwip/apps/netbiosns.h | 51 + lib/lwip/include/lwip/apps/netbiosns_opts.h | 66 + lib/lwip/include/lwip/apps/smtp.h | 128 + lib/lwip/include/lwip/apps/smtp_opts.h | 80 + lib/lwip/include/lwip/apps/snmp.h | 145 + lib/lwip/include/lwip/apps/snmp_core.h | 377 ++ lib/lwip/include/lwip/apps/snmp_mib2.h | 78 + lib/lwip/include/lwip/apps/snmp_opts.h | 297 ++ lib/lwip/include/lwip/apps/snmp_scalar.h | 113 + .../include/lwip/apps/snmp_snmpv2_framework.h | 32 + lib/lwip/include/lwip/apps/snmp_snmpv2_usm.h | 24 + lib/lwip/include/lwip/apps/snmp_table.h | 134 + lib/lwip/include/lwip/apps/snmp_threadsync.h | 114 + lib/lwip/include/lwip/apps/snmpv3.h | 114 + lib/lwip/include/lwip/apps/sntp.h | 81 + lib/lwip/include/lwip/apps/sntp_opts.h | 215 + lib/lwip/include/lwip/apps/tftp_client.h | 50 + lib/lwip/include/lwip/apps/tftp_common.h | 108 + lib/lwip/include/lwip/apps/tftp_opts.h | 106 + lib/lwip/include/lwip/apps/tftp_server.h | 42 + lib/lwip/include/lwip/arch.h | 402 ++ lib/lwip/include/lwip/autoip.h | 90 + lib/lwip/include/lwip/debug.h | 161 + lib/lwip/include/lwip/def.h | 156 + lib/lwip/include/lwip/dhcp.h | 155 + lib/lwip/include/lwip/dhcp6.h | 104 + lib/lwip/include/lwip/dns.h | 131 + lib/lwip/include/lwip/err.h | 117 + lib/lwip/include/lwip/errno.h | 198 + lib/lwip/include/lwip/etharp.h | 110 + lib/lwip/include/lwip/ethip6.h | 68 + lib/lwip/include/lwip/icmp.h | 110 + lib/lwip/include/lwip/icmp6.h | 72 + lib/lwip/include/lwip/if_api.h | 70 + lib/lwip/include/lwip/igmp.h | 115 + lib/lwip/include/lwip/inet.h | 188 + lib/lwip/include/lwip/inet_chksum.h | 104 + lib/lwip/include/lwip/init.h | 100 + lib/lwip/include/lwip/init.h.cmake.in | 100 + lib/lwip/include/lwip/ip.h | 339 ++ lib/lwip/include/lwip/ip4.h | 109 + lib/lwip/include/lwip/ip4_addr.h | 225 + lib/lwip/include/lwip/ip4_frag.h | 100 + lib/lwip/include/lwip/ip6.h | 93 + lib/lwip/include/lwip/ip6_addr.h | 372 ++ lib/lwip/include/lwip/ip6_frag.h | 144 + lib/lwip/include/lwip/ip6_zone.h | 306 ++ lib/lwip/include/lwip/ip_addr.h | 468 ++ lib/lwip/include/lwip/mem.h | 82 + lib/lwip/include/lwip/memp.h | 155 + lib/lwip/include/lwip/mld6.h | 99 + lib/lwip/include/lwip/nd6.h | 90 + lib/lwip/include/lwip/netbuf.h | 116 + lib/lwip/include/lwip/netdb.h | 150 + lib/lwip/include/lwip/netif.h | 698 +++ lib/lwip/include/lwip/netifapi.h | 161 + lib/lwip/include/lwip/opt.h | 3595 ++++++++++++++ lib/lwip/include/lwip/pbuf.h | 326 ++ lib/lwip/include/lwip/priv/altcp_priv.h | 159 + lib/lwip/include/lwip/priv/api_msg.h | 272 ++ lib/lwip/include/lwip/priv/mem_priv.h | 84 + lib/lwip/include/lwip/priv/memp_priv.h | 161 + lib/lwip/include/lwip/priv/memp_std.h | 153 + lib/lwip/include/lwip/priv/nd6_priv.h | 143 + lib/lwip/include/lwip/priv/raw_priv.h | 69 + lib/lwip/include/lwip/priv/sockets_priv.h | 175 + lib/lwip/include/lwip/priv/tcp_priv.h | 523 ++ lib/lwip/include/lwip/priv/tcpip_priv.h | 176 + lib/lwip/include/lwip/prot/acd.h | 91 + lib/lwip/include/lwip/prot/autoip.h | 65 + lib/lwip/include/lwip/prot/dhcp.h | 178 + lib/lwip/include/lwip/prot/dhcp6.h | 138 + lib/lwip/include/lwip/prot/dns.h | 140 + lib/lwip/include/lwip/prot/etharp.h | 114 + lib/lwip/include/lwip/prot/ethernet.h | 127 + lib/lwip/include/lwip/prot/iana.h | 97 + lib/lwip/include/lwip/prot/icmp.h | 105 + lib/lwip/include/lwip/prot/icmp6.h | 172 + lib/lwip/include/lwip/prot/ieee.h | 91 + lib/lwip/include/lwip/prot/igmp.h | 90 + lib/lwip/include/lwip/prot/ip.h | 59 + lib/lwip/include/lwip/prot/ip4.h | 131 + lib/lwip/include/lwip/prot/ip6.h | 235 + lib/lwip/include/lwip/prot/mld6.h | 71 + lib/lwip/include/lwip/prot/nd6.h | 274 ++ lib/lwip/include/lwip/prot/tcp.h | 100 + lib/lwip/include/lwip/prot/udp.h | 68 + lib/lwip/include/lwip/raw.h | 143 + lib/lwip/include/lwip/sio.h | 142 + lib/lwip/include/lwip/snmp.h | 213 + lib/lwip/include/lwip/sockets.h | 707 +++ lib/lwip/include/lwip/stats.h | 491 ++ lib/lwip/include/lwip/sys.h | 575 +++ lib/lwip/include/lwip/tcp.h | 500 ++ lib/lwip/include/lwip/tcpbase.h | 88 + lib/lwip/include/lwip/tcpip.h | 114 + lib/lwip/include/lwip/timeouts.h | 128 + lib/lwip/include/lwip/udp.h | 195 + lib/lwip/include/netif/bridgeif.h | 127 + lib/lwip/include/netif/bridgeif_opts.h | 90 + lib/lwip/include/netif/etharp.h | 3 + lib/lwip/include/netif/ethernet.h | 77 + lib/lwip/include/netif/ieee802154.h | 112 + lib/lwip/include/netif/lowpan6.h | 89 + lib/lwip/include/netif/lowpan6_ble.h | 78 + lib/lwip/include/netif/lowpan6_common.h | 82 + lib/lwip/include/netif/lowpan6_opts.h | 122 + lib/lwip/include/netif/ppp/ccp.h | 164 + lib/lwip/include/netif/ppp/chap-md5.h | 36 + lib/lwip/include/netif/ppp/chap-new.h | 200 + lib/lwip/include/netif/ppp/chap_ms.h | 44 + lib/lwip/include/netif/ppp/eap.h | 169 + lib/lwip/include/netif/ppp/ecp.h | 62 + lib/lwip/include/netif/ppp/eui64.h | 102 + lib/lwip/include/netif/ppp/fsm.h | 182 + lib/lwip/include/netif/ppp/ipcp.h | 134 + lib/lwip/include/netif/ppp/ipv6cp.h | 191 + lib/lwip/include/netif/ppp/lcp.h | 179 + lib/lwip/include/netif/ppp/magic.h | 130 + lib/lwip/include/netif/ppp/mppe.h | 181 + lib/lwip/include/netif/ppp/polarssl/arc4.h | 81 + lib/lwip/include/netif/ppp/polarssl/des.h | 92 + lib/lwip/include/netif/ppp/polarssl/md4.h | 97 + lib/lwip/include/netif/ppp/polarssl/md5.h | 96 + lib/lwip/include/netif/ppp/polarssl/sha1.h | 96 + lib/lwip/include/netif/ppp/ppp.h | 698 +++ lib/lwip/include/netif/ppp/ppp_impl.h | 736 +++ lib/lwip/include/netif/ppp/ppp_opts.h | 610 +++ lib/lwip/include/netif/ppp/pppapi.h | 137 + lib/lwip/include/netif/ppp/pppcrypt.h | 144 + lib/lwip/include/netif/ppp/pppdebug.h | 88 + lib/lwip/include/netif/ppp/pppoe.h | 187 + lib/lwip/include/netif/ppp/pppol2tp.h | 209 + lib/lwip/include/netif/ppp/pppos.h | 125 + lib/lwip/include/netif/ppp/upap.h | 131 + lib/lwip/include/netif/ppp/vj.h | 169 + lib/lwip/include/netif/slipif.h | 86 + lib/lwip/include/netif/zepif.h | 81 + lib/lwip/netif/ethernet.c | 329 ++ lib/lwip/u-boot/arch/cc.h | 43 + lib/lwip/u-boot/arch/sys_arch.h | 0 lib/lwip/u-boot/limits.h | 0 lib/lwip/u-boot/lwipopts.h | 197 + net-lwip/Kconfig | 61 + net-lwip/Makefile | 18 + net-lwip/dhcp.c | 114 + net-lwip/dns.c | 107 + net-lwip/eth_internal.h | 35 + net-lwip/net-lwip.c | 224 + net-lwip/ping.c | 171 + net-lwip/tftp.c | 213 + net-lwip/wget.c | 184 + net/Kconfig | 1 + net/eth_bootdev.c | 2 +- test/dm/dsa.c | 2 + test/dm/eth.c | 4 + test/py/tests/test_net.py | 21 +- 259 files changed, 77765 insertions(+), 26 deletions(-) create mode 100644 cmd/net-lwip.c create mode 100644 configs/qemu_arm64_lwip_defconfig create mode 100644 include/net-lwip.h create mode 100644 lib/lwip/Makefile create mode 100644 lib/lwip/README create mode 100644 lib/lwip/api/api_lib.c create mode 100644 lib/lwip/api/api_msg.c create mode 100644 lib/lwip/api/err.c create mode 100644 lib/lwip/api/if_api.c create mode 100644 lib/lwip/api/netbuf.c create mode 100644 lib/lwip/api/netdb.c create mode 100644 lib/lwip/api/netifapi.c create mode 100644 lib/lwip/api/sockets.c create mode 100644 lib/lwip/api/tcpip.c create mode 100644 lib/lwip/apps/http/http_client.c create mode 100644 lib/lwip/apps/tftp/tftp.c create mode 100644 lib/lwip/core/altcp.c create mode 100644 lib/lwip/core/altcp_alloc.c create mode 100644 lib/lwip/core/altcp_tcp.c create mode 100644 lib/lwip/core/def.c create mode 100644 lib/lwip/core/dns.c create mode 100644 lib/lwip/core/inet_chksum.c create mode 100644 lib/lwip/core/init.c create mode 100644 lib/lwip/core/ip.c create mode 100644 lib/lwip/core/ipv4/acd.c create mode 100644 lib/lwip/core/ipv4/autoip.c create mode 100644 lib/lwip/core/ipv4/dhcp.c create mode 100644 lib/lwip/core/ipv4/etharp.c create mode 100644 lib/lwip/core/ipv4/icmp.c create mode 100644 lib/lwip/core/ipv4/igmp.c create mode 100644 lib/lwip/core/ipv4/ip4.c create mode 100644 lib/lwip/core/ipv4/ip4_addr.c create mode 100644 lib/lwip/core/ipv4/ip4_frag.c create mode 100644 lib/lwip/core/ipv6/dhcp6.c create mode 100644 lib/lwip/core/ipv6/ethip6.c create mode 100644 lib/lwip/core/ipv6/icmp6.c create mode 100644 lib/lwip/core/ipv6/inet6.c create mode 100644 lib/lwip/core/ipv6/ip6.c create mode 100644 lib/lwip/core/ipv6/ip6_addr.c create mode 100644 lib/lwip/core/ipv6/ip6_frag.c create mode 100644 lib/lwip/core/ipv6/mld6.c create mode 100644 lib/lwip/core/ipv6/nd6.c create mode 100644 lib/lwip/core/mem.c create mode 100644 lib/lwip/core/memp.c create mode 100644 lib/lwip/core/netif.c create mode 100644 lib/lwip/core/pbuf.c create mode 100644 lib/lwip/core/raw.c create mode 100644 lib/lwip/core/stats.c create mode 100644 lib/lwip/core/sys.c create mode 100644 lib/lwip/core/tcp.c create mode 100644 lib/lwip/core/tcp_in.c create mode 100644 lib/lwip/core/tcp_out.c create mode 100644 lib/lwip/core/timeouts.c create mode 100644 lib/lwip/core/udp.c create mode 100644 lib/lwip/include/compat/posix/arpa/inet.h create mode 100644 lib/lwip/include/compat/posix/net/if.h create mode 100644 lib/lwip/include/compat/posix/netdb.h create mode 100644 lib/lwip/include/compat/posix/sys/socket.h create mode 100644 lib/lwip/include/compat/stdc/errno.h create mode 100644 lib/lwip/include/lwip/acd.h create mode 100644 lib/lwip/include/lwip/altcp.h create mode 100644 lib/lwip/include/lwip/altcp_tcp.h create mode 100644 lib/lwip/include/lwip/altcp_tls.h create mode 100644 lib/lwip/include/lwip/api.h create mode 100644 lib/lwip/include/lwip/apps/FILES create mode 100644 lib/lwip/include/lwip/apps/altcp_proxyconnect.h create mode 100644 lib/lwip/include/lwip/apps/altcp_tls_mbedtls_opts.h create mode 100644 lib/lwip/include/lwip/apps/fs.h create mode 100644 lib/lwip/include/lwip/apps/http_client.h create mode 100644 lib/lwip/include/lwip/apps/httpd.h create mode 100644 lib/lwip/include/lwip/apps/httpd_opts.h create mode 100644 lib/lwip/include/lwip/apps/lwiperf.h create mode 100644 lib/lwip/include/lwip/apps/mdns.h create mode 100644 lib/lwip/include/lwip/apps/mdns_domain.h create mode 100644 lib/lwip/include/lwip/apps/mdns_opts.h create mode 100644 lib/lwip/include/lwip/apps/mdns_out.h create mode 100644 lib/lwip/include/lwip/apps/mdns_priv.h create mode 100644 lib/lwip/include/lwip/apps/mqtt.h create mode 100644 lib/lwip/include/lwip/apps/mqtt_opts.h create mode 100644 lib/lwip/include/lwip/apps/mqtt_priv.h create mode 100644 lib/lwip/include/lwip/apps/netbiosns.h create mode 100644 lib/lwip/include/lwip/apps/netbiosns_opts.h create mode 100644 lib/lwip/include/lwip/apps/smtp.h create mode 100644 lib/lwip/include/lwip/apps/smtp_opts.h create mode 100644 lib/lwip/include/lwip/apps/snmp.h create mode 100644 lib/lwip/include/lwip/apps/snmp_core.h create mode 100644 lib/lwip/include/lwip/apps/snmp_mib2.h create mode 100644 lib/lwip/include/lwip/apps/snmp_opts.h create mode 100644 lib/lwip/include/lwip/apps/snmp_scalar.h create mode 100644 lib/lwip/include/lwip/apps/snmp_snmpv2_framework.h create mode 100644 lib/lwip/include/lwip/apps/snmp_snmpv2_usm.h create mode 100644 lib/lwip/include/lwip/apps/snmp_table.h create mode 100644 lib/lwip/include/lwip/apps/snmp_threadsync.h create mode 100644 lib/lwip/include/lwip/apps/snmpv3.h create mode 100644 lib/lwip/include/lwip/apps/sntp.h create mode 100644 lib/lwip/include/lwip/apps/sntp_opts.h create mode 100644 lib/lwip/include/lwip/apps/tftp_client.h create mode 100644 lib/lwip/include/lwip/apps/tftp_common.h create mode 100644 lib/lwip/include/lwip/apps/tftp_opts.h create mode 100644 lib/lwip/include/lwip/apps/tftp_server.h create mode 100644 lib/lwip/include/lwip/arch.h create mode 100644 lib/lwip/include/lwip/autoip.h create mode 100644 lib/lwip/include/lwip/debug.h create mode 100644 lib/lwip/include/lwip/def.h create mode 100644 lib/lwip/include/lwip/dhcp.h create mode 100644 lib/lwip/include/lwip/dhcp6.h create mode 100644 lib/lwip/include/lwip/dns.h create mode 100644 lib/lwip/include/lwip/err.h create mode 100644 lib/lwip/include/lwip/errno.h create mode 100644 lib/lwip/include/lwip/etharp.h create mode 100644 lib/lwip/include/lwip/ethip6.h create mode 100644 lib/lwip/include/lwip/icmp.h create mode 100644 lib/lwip/include/lwip/icmp6.h create mode 100644 lib/lwip/include/lwip/if_api.h create mode 100644 lib/lwip/include/lwip/igmp.h create mode 100644 lib/lwip/include/lwip/inet.h create mode 100644 lib/lwip/include/lwip/inet_chksum.h create mode 100644 lib/lwip/include/lwip/init.h create mode 100644 lib/lwip/include/lwip/init.h.cmake.in create mode 100644 lib/lwip/include/lwip/ip.h create mode 100644 lib/lwip/include/lwip/ip4.h create mode 100644 lib/lwip/include/lwip/ip4_addr.h create mode 100644 lib/lwip/include/lwip/ip4_frag.h create mode 100644 lib/lwip/include/lwip/ip6.h create mode 100644 lib/lwip/include/lwip/ip6_addr.h create mode 100644 lib/lwip/include/lwip/ip6_frag.h create mode 100644 lib/lwip/include/lwip/ip6_zone.h create mode 100644 lib/lwip/include/lwip/ip_addr.h create mode 100644 lib/lwip/include/lwip/mem.h create mode 100644 lib/lwip/include/lwip/memp.h create mode 100644 lib/lwip/include/lwip/mld6.h create mode 100644 lib/lwip/include/lwip/nd6.h create mode 100644 lib/lwip/include/lwip/netbuf.h create mode 100644 lib/lwip/include/lwip/netdb.h create mode 100644 lib/lwip/include/lwip/netif.h create mode 100644 lib/lwip/include/lwip/netifapi.h create mode 100644 lib/lwip/include/lwip/opt.h create mode 100644 lib/lwip/include/lwip/pbuf.h create mode 100644 lib/lwip/include/lwip/priv/altcp_priv.h create mode 100644 lib/lwip/include/lwip/priv/api_msg.h create mode 100644 lib/lwip/include/lwip/priv/mem_priv.h create mode 100644 lib/lwip/include/lwip/priv/memp_priv.h create mode 100644 lib/lwip/include/lwip/priv/memp_std.h create mode 100644 lib/lwip/include/lwip/priv/nd6_priv.h create mode 100644 lib/lwip/include/lwip/priv/raw_priv.h create mode 100644 lib/lwip/include/lwip/priv/sockets_priv.h create mode 100644 lib/lwip/include/lwip/priv/tcp_priv.h create mode 100644 lib/lwip/include/lwip/priv/tcpip_priv.h create mode 100644 lib/lwip/include/lwip/prot/acd.h create mode 100644 lib/lwip/include/lwip/prot/autoip.h create mode 100644 lib/lwip/include/lwip/prot/dhcp.h create mode 100644 lib/lwip/include/lwip/prot/dhcp6.h create mode 100644 lib/lwip/include/lwip/prot/dns.h create mode 100644 lib/lwip/include/lwip/prot/etharp.h create mode 100644 lib/lwip/include/lwip/prot/ethernet.h create mode 100644 lib/lwip/include/lwip/prot/iana.h create mode 100644 lib/lwip/include/lwip/prot/icmp.h create mode 100644 lib/lwip/include/lwip/prot/icmp6.h create mode 100644 lib/lwip/include/lwip/prot/ieee.h create mode 100644 lib/lwip/include/lwip/prot/igmp.h create mode 100644 lib/lwip/include/lwip/prot/ip.h create mode 100644 lib/lwip/include/lwip/prot/ip4.h create mode 100644 lib/lwip/include/lwip/prot/ip6.h create mode 100644 lib/lwip/include/lwip/prot/mld6.h create mode 100644 lib/lwip/include/lwip/prot/nd6.h create mode 100644 lib/lwip/include/lwip/prot/tcp.h create mode 100644 lib/lwip/include/lwip/prot/udp.h create mode 100644 lib/lwip/include/lwip/raw.h create mode 100644 lib/lwip/include/lwip/sio.h create mode 100644 lib/lwip/include/lwip/snmp.h create mode 100644 lib/lwip/include/lwip/sockets.h create mode 100644 lib/lwip/include/lwip/stats.h create mode 100644 lib/lwip/include/lwip/sys.h create mode 100644 lib/lwip/include/lwip/tcp.h create mode 100644 lib/lwip/include/lwip/tcpbase.h create mode 100644 lib/lwip/include/lwip/tcpip.h create mode 100644 lib/lwip/include/lwip/timeouts.h create mode 100644 lib/lwip/include/lwip/udp.h create mode 100644 lib/lwip/include/netif/bridgeif.h create mode 100644 lib/lwip/include/netif/bridgeif_opts.h create mode 100644 lib/lwip/include/netif/etharp.h create mode 100644 lib/lwip/include/netif/ethernet.h create mode 100644 lib/lwip/include/netif/ieee802154.h create mode 100644 lib/lwip/include/netif/lowpan6.h create mode 100644 lib/lwip/include/netif/lowpan6_ble.h create mode 100644 lib/lwip/include/netif/lowpan6_common.h create mode 100644 lib/lwip/include/netif/lowpan6_opts.h create mode 100644 lib/lwip/include/netif/ppp/ccp.h create mode 100644 lib/lwip/include/netif/ppp/chap-md5.h create mode 100644 lib/lwip/include/netif/ppp/chap-new.h create mode 100644 lib/lwip/include/netif/ppp/chap_ms.h create mode 100644 lib/lwip/include/netif/ppp/eap.h create mode 100644 lib/lwip/include/netif/ppp/ecp.h create mode 100644 lib/lwip/include/netif/ppp/eui64.h create mode 100644 lib/lwip/include/netif/ppp/fsm.h create mode 100644 lib/lwip/include/netif/ppp/ipcp.h create mode 100644 lib/lwip/include/netif/ppp/ipv6cp.h create mode 100644 lib/lwip/include/netif/ppp/lcp.h create mode 100644 lib/lwip/include/netif/ppp/magic.h create mode 100644 lib/lwip/include/netif/ppp/mppe.h create mode 100644 lib/lwip/include/netif/ppp/polarssl/arc4.h create mode 100644 lib/lwip/include/netif/ppp/polarssl/des.h create mode 100644 lib/lwip/include/netif/ppp/polarssl/md4.h create mode 100644 lib/lwip/include/netif/ppp/polarssl/md5.h create mode 100644 lib/lwip/include/netif/ppp/polarssl/sha1.h create mode 100644 lib/lwip/include/netif/ppp/ppp.h create mode 100644 lib/lwip/include/netif/ppp/ppp_impl.h create mode 100644 lib/lwip/include/netif/ppp/ppp_opts.h create mode 100644 lib/lwip/include/netif/ppp/pppapi.h create mode 100644 lib/lwip/include/netif/ppp/pppcrypt.h create mode 100644 lib/lwip/include/netif/ppp/pppdebug.h create mode 100644 lib/lwip/include/netif/ppp/pppoe.h create mode 100644 lib/lwip/include/netif/ppp/pppol2tp.h create mode 100644 lib/lwip/include/netif/ppp/pppos.h create mode 100644 lib/lwip/include/netif/ppp/upap.h create mode 100644 lib/lwip/include/netif/ppp/vj.h create mode 100644 lib/lwip/include/netif/slipif.h create mode 100644 lib/lwip/include/netif/zepif.h create mode 100644 lib/lwip/netif/ethernet.c create mode 100644 lib/lwip/u-boot/arch/cc.h create mode 100644 lib/lwip/u-boot/arch/sys_arch.h create mode 100644 lib/lwip/u-boot/limits.h create mode 100644 lib/lwip/u-boot/lwipopts.h create mode 100644 net-lwip/Kconfig create mode 100644 net-lwip/Makefile create mode 100644 net-lwip/dhcp.c create mode 100644 net-lwip/dns.c create mode 100644 net-lwip/eth_internal.h create mode 100644 net-lwip/net-lwip.c create mode 100644 net-lwip/ping.c create mode 100644 net-lwip/tftp.c create mode 100644 net-lwip/wget.c -- 2.40.1

1 0

[PATCH RESEND] clk: rockchip: rk3588: Set SPLL frequency during SPL stage
by Heiko Stuebner 22 May '24

22 May '24

From: Heiko Stuebner <heiko.stuebner(a)cherry.de> All parts expect the SPLL to run at 702MHz. In U-Boot it's the SPLL_HZ declaring this rate and in the kernel it's a fixed clock definition. While everything is expecting 702MHz, the SPLL is not running that frequency when coming from the bootrom though, instead it's running at 351MHz and the vendor-u-boot just sets it to the expected frequency. The SPLL itself is located inside the secure-BUSCRU and in theory accessible as an SCMI clock, though this requires an unknown amount of cooperation from trusted-firmware to set at a later stage, though during the SPL stage we can still access the relevant CRU directly. The SPLL is for example necessary for the DSI controllers to produce output. As the SPLL is "just" another rk3588 pll, just set the desired rate directly during the SPL stage. Tested on rk3588-rock5b and rk3588-tiger by reading back the PLL rate and also observing working DSI output with this change. Fixes: 6737771600d4 ("rockchip: rk3588: Add support for sdmmc clocks in SPL") Suggested-by: Andy Yan <andy.yan(a)rock-chips.com> Signed-off-by: Heiko Stuebner <heiko.stuebner(a)cherry.de> Cc: Jonas Karlman <jonas(a)kwiboo.se> --- Resend, because I forgot the u-boot list .../include/asm/arch-rockchip/cru_rk3588.h | 1 + drivers/clk/rockchip/clk_rk3588.c | 26 ++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h index a4507e5fdd7..85b4da0bc2c 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h @@ -29,6 +29,7 @@ enum rk3588_pll_id { V0PLL, AUPLL, PPLL, + SPLL, PLL_COUNT, }; diff --git a/drivers/clk/rockchip/clk_rk3588.c b/drivers/clk/rockchip/clk_rk3588.c index 4c611a39049..5384b3213f5 100644 --- a/drivers/clk/rockchip/clk_rk3588.c +++ b/drivers/clk/rockchip/clk_rk3588.c @@ -37,6 +37,7 @@ static struct rockchip_pll_rate_table rk3588_pll_rates[] = { RK3588_PLL_RATE(786000000, 1, 131, 2, 0), RK3588_PLL_RATE(742500000, 4, 495, 2, 0), RK3588_PLL_RATE(722534400, 8, 963, 2, 24850), + RK3588_PLL_RATE(702000000, 3, 351, 2, 0), RK3588_PLL_RATE(600000000, 2, 200, 2, 0), RK3588_PLL_RATE(594000000, 2, 198, 2, 0), RK3588_PLL_RATE(200000000, 3, 400, 4, 0), @@ -65,6 +66,11 @@ static struct rockchip_pll_clock rk3588_pll_clks[] = { RK3588_MODE_CON0, 0, 15, 0, rk3588_pll_rates), [PPLL] = PLL(pll_rk3588, PLL_PPLL, RK3588_PMU_PLL_CON(128), RK3588_MODE_CON0, 10, 15, 0, rk3588_pll_rates), +#ifdef CONFIG_SPL_BUILD + /* SBUSCRU MODE_CON has the same register offset as the main MODE_CON */ + [SPLL] = PLL(pll_rk3588, 0, RK3588_PLL_CON(136), + RK3588_MODE_CON0, 0, 15, 0, rk3588_pll_rates), +#endif }; #ifndef CONFIG_SPL_BUILD @@ -2044,6 +2050,7 @@ U_BOOT_DRIVER(rockchip_rk3588_cru) = { #ifdef CONFIG_SPL_BUILD #define SCRU_BASE 0xfd7d0000 +#define BUSSCRU_BASE 0xfd7d8000 static ulong rk3588_scru_clk_get_rate(struct clk *clk) { @@ -2118,15 +2125,28 @@ static ulong rk3588_scru_clk_set_rate(struct clk *clk, ulong rate) return rk3588_scru_clk_get_rate(clk); } +static int rk3588_scru_clk_probe(struct udevice *dev) +{ + int ret; + + ret = rockchip_pll_set_rate(&rk3588_pll_clks[SPLL], + (void *)BUSSCRU_BASE, SPLL, SPLL_HZ); + if (ret) + debug("%s setting spll rate failed %d\n", __func__, ret); + + return 0; +} + static const struct clk_ops rk3588_scru_clk_ops = { .get_rate = rk3588_scru_clk_get_rate, .set_rate = rk3588_scru_clk_set_rate, }; U_BOOT_DRIVER(rockchip_rk3588_scru) = { - .name = "rockchip_rk3588_scru", - .id = UCLASS_CLK, - .ops = &rk3588_scru_clk_ops, + .name = "rockchip_rk3588_scru", + .id = UCLASS_CLK, + .ops = &rk3588_scru_clk_ops, + .probe = rk3588_scru_clk_probe, }; static int rk3588_scmi_spl_glue_bind(struct udevice *dev) -- 2.39.2

3 3

[PATCH 2/2 v4] board: starfive: support Pine64 Star64 board
by H Bell 22 May '24

22 May '24

Add documentation files Signed-off-by: Henry Bell <dmoo_dv(a)protonmail.com> Cc: ycliang(a)andestech.com Cc: heinrich.schuchardt(a)canonical.com --- Changes since v1 - New patch Changes since v2 - Remove extra params to - Clarification on boot section - Add entry on MAC adresses and how to correct them Changes since v3 - Rebase against d678a59d2d --- doc/board/starfive/index.rst | 1 + doc/board/starfive/pine64_star64.rst | 136 +++++++++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 doc/board/starfive/pine64_star64.rst diff --git a/doc/board/starfive/index.rst b/doc/board/starfive/index.rst index d369b986cc..72ab6ddfbf 100644 --- a/doc/board/starfive/index.rst +++ b/doc/board/starfive/index.rst @@ -8,4 +8,5 @@ StarFive milk-v_mars milk-v_mars_cm + pine64_star64 visionfive2 diff --git a/doc/board/starfive/pine64_star64.rst b/doc/board/starfive/pine64_star64.rst new file mode 100644 index 0000000000..567d1207ba --- /dev/null +++ b/doc/board/starfive/pine64_star64.rst @@ -0,0 +1,136 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Pine64 Star64 +=========== + +U-Boot for the Star64 uses the same U-Boot binaries as the VisionFive 2 board. +In U-Boot SPL the actual board is detected and the device-tree patched +accordingly. + +Building +~~~~~~~~ + +1. Add the RISC-V toolchain to your PATH. +2. Setup ARCH & cross compilation environment variable: + +.. code-block:: none + + export CROSS_COMPILE=<riscv64 toolchain prefix> + +The M-mode software OpenSBI provides the supervisor binary interface (SBI) and +is responsible for the switch to S-Mode. It is a prerequisite to build U-Boot. +Support for the JH7110 was introduced in OpenSBI 1.2. It is recommended to use +a current release. + +.. code-block:: console + + git clone https://github.com/riscv/opensbi.git + cd opensbi + make PLATFORM=generic FW_TEXT_START=0x40000000 + +Now build the U-Boot SPL and U-Boot proper. + +.. code-block:: console + + cd <U-Boot-dir> + make starfive_visionfive2_defconfig + make OPENSBI=$(opensbi_dir)/build/platform/generic/firmware/fw_dynamic.bin + +This will generate the U-Boot SPL image (spl/u-boot-spl.bin.normal.out) as well +as the FIT image (u-boot.itb) with OpenSBI and U-Boot. + +Device-tree selection +~~~~~~~~~~~~~~~~~~~~~ + +U-Boot will set variable $fdtfile to starfive/jh7110-pine64-star64.dtb. + +To overrule this selection the variable can be set manually and saved in the +environment + +:: + + setenv fdtfile my_device-tree.dtb + env save + +or the configuration variable CONFIG_DEFAULT_FDT_FILE can be used to set to +provide a default value. + +Boot source selection +~~~~~~~~~~~~~~~~~~~~~ + +The board provides the DIP switches (marked S1804) adjacent to the 40pin GPIO +Bus for boot selection. The ``L`` (0) and ``H`` (1) silk screening to the side +of the should be used to determine state (not the ``ON/ONKE`` markings +physically on the component). ``GPIO_0`` is channel 2 on the switch, while +``GPIO_1`` is channel 1. + ++ (QSPI) Flash: 00 ``??`` ++ SD: 01 ``??`` ++ EMMC: 10 ``??`` ++ UART: 11 ``??`` + +Preparing the SD-Card +~~~~~~~~~~~~~~~~~~~~~ + +The device firmware loads U-Boot SPL (u-boot-spl.bin.normal.out) from the +partition with type GUID 2E54B353-1271-4842-806F-E436D6AF6985. You are free +to choose any partition number. + +With the default configuration U-Boot SPL loads the U-Boot FIT image +(u-boot.itb) from partition 2 (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x2). +When formatting it is recommended to use GUID +BC13C2FF-59E6-4262-A352-B275FD6F7172 for this partition. + +The FIT image (u-boot.itb) is a combination of OpenSBI's fw_dynamic.bin, +u-boot-nodtb.bin and the device tree blob. + +Format the SD card (make sure the disk has GPT, otherwise use gdisk to switch) + +.. code-block:: bash + + sudo sgdisk --clear \ + --set-alignment=2 \ + --new=1:4096:8191 --change-name=1:spl --typecode=1:2E54B353-1271-4842-806F-E436D6AF6985\ + --new=2:8192:16383 --change-name=2:uboot --typecode=2:BC13C2FF-59E6-4262-A352-B275FD6F7172 \ + --new=3:16384:1654784 --change-name=3:system --typecode=3:EBD0A0A2-B9E5-4433-87C0-68B6B72699C7 \ + /dev/sdb + +Copy U-Boot to the SD card + +.. code-block:: bash + + sudo dd if=u-boot-spl.bin.normal.out of=/dev/sdb1 + sudo dd if=u-boot.itb of=/dev/sdb2 + + sudo mount /dev/sdb3 /mnt/ + sudo cp u-boot-spl.bin.normal.out /mnt/ + sudo cp u-boot.itb /mnt/ + sudo cp Image.gz /mnt/ + sudo cp initramfs.cpio.gz /mnt/ + sudo cp jh7110-starfive-visionfive-2.dtb /mnt/ + sudo umount /mnt + +Booting +~~~~~~~ + +Once you plugin the sdcard and power up, you should see the U-Boot prompt. + +MAC address issues +~~~~~~~~~~~~~~~~~~ + +The Star64 does not currently ship with unique serial numbers per-device. +Devices tested (all 4GiB RAM) have the same serial number of +``STAR64V1-2310-D004E000-00000005`` and the mac addresses of +``6c:cf:39:00:75:61`` (lower) and ``6c:cf:39:00:75:62`` (upper) port will be +assigned. Shipped models also have the EEPROM set as write protected, so it +cannot be changed using ``mac`` commands. + +The MAC addresses may be "set" as follows by writing as a custom config to SPI +(Change the last 3 bytes of MAC addreses as appropriate): + +:: + + env set ethaddr 6c:cf:39:00:75:63 + env set eth1addr 6c:cf:39:00:75:64 + env save + reset -- 2.44.0

3 2

[PATCH 00/10] xtensa: Enable qemu-xtensa board
by Jiaxun Yang 22 May '24

22 May '24

Hi all, This series enabled qemu-xtensa board. For dc232b CPU it needs to be built with toolchain[1]. This is a side product of me investigating architectures physical address != virtual address in U-Boot. Now we can get it covered under CI and regular tests. VirtIO devices are not working as expected, due to U-Boot's assumption on VA == PA everywhere, I'm going to get this fixed later. My Xtensa knowledge is pretty limited, Xtensa people please feel free to point out if I got anything wrong. Thanks [1]: https://github.com/foss-xtensa/toolchain/releases/download/2020.07/x86_64-2… Signed-off-by: Jiaxun Yang <jiaxun.yang(a)flygoat.com> --- Jiaxun Yang (10): xtensa: Move dram_init to xtfpga board file xtensa: Correct define of _end symbol xtensa: Implement phys virt conversion for PTP_MMU xtensa: Define PLATFORM_ELFFLAGS xtensa: Bring in semihosting headers and config options drivers: serial: Add xtensa semihosting driver drivers: cpu: Add xtensa CPU driver dts/upsteam: Add Makefile for xtensa board: emulation: New board qemu-xtensa doc: New documentation for qemu-xtensa arch/xtensa/Kconfig | 32 +++++++ arch/xtensa/config.mk | 3 + arch/xtensa/cpu/cpu.c | 5 - arch/xtensa/cpu/u-boot.lds | 2 + arch/xtensa/include/asm/addrspace.h | 2 + arch/xtensa/include/asm/io.h | 32 +++++++ arch/xtensa/include/asm/ldscript.h | 1 - arch/xtensa/include/asm/platform/simcall-gdbio.h | 34 +++++++ arch/xtensa/include/asm/platform/simcall-iss.h | 73 ++++++++++++++ arch/xtensa/include/asm/platform/simcall.h | 110 +++++++++++++++++++++ board/cadence/xtfpga/xtfpga.c | 5 + board/emulation/qemu-xtensa/Kconfig | 41 ++++++++ board/emulation/qemu-xtensa/MAINTAINERS | 7 ++ board/emulation/qemu-xtensa/Makefile | 5 + board/emulation/qemu-xtensa/qemu-xtensa.c | 60 ++++++++++++ configs/qemu-xtensa-dc232b_defconfig | 32 +++++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-xtensa.rst | 33 +++++++ drivers/cpu/Kconfig | 6 ++ drivers/cpu/Makefile | 1 + drivers/cpu/xtensa_cpu.c | 117 +++++++++++++++++++++++ drivers/serial/Kconfig | 18 +++- drivers/serial/Makefile | 1 + drivers/serial/serial_xtensa_semihosting.c | 79 +++++++++++++++ dts/upstream/src/xtensa/Makefile | 14 +++ include/configs/qemu-xtensa.h | 34 +++++++ 26 files changed, 741 insertions(+), 7 deletions(-) --- base-commit: 3be9f399e911cfc437a37ac826441f1d96da1c9b change-id: 20240519-qemu-xtensa-5fb95bb474e9 Best regards, -- Jiaxun Yang <jiaxun.yang(a)flygoat.com>

3 21

[RFC 00/14] efi_loader: improve device-tree loading
by Heinrich Schuchardt 22 May '24

22 May '24

In U-Boot EFI boot options can already specify both an EFI binary and an initrd. With this series we can additionally define the matching device-tree to be loaded in the boot option. With the last patch the boot manager will fall back the device-tree specified by $fdtfile in directories '/dtb/', '/', or '/dtb/current/' on the boot device if no device-tree is specified in the boot option or via a bootefi command parameter. Heinrich Schuchardt (14): efi_loader: pass GUID by address to efi_dp_from_lo efi_loader: library function efi_dp_merge efi_loader: simplify efi_dp_concat() cmd: eficonfig: add support for setting fdt cmd: efidebug: add support for setting fdt efi_loader: superfluous efi_restore_gd after EFI_CALL cmd: terminate efidebug test bootmgr early on error efi_loader: improve error handling in try_load_entry() efi_loader: do not install dtb if bootmgr fails efi_loader: load device-tree specified in boot option efi_loader: move distro_efi_get_fdt_name() efi_loader: return binary from efi_dp_from_lo() efi_loader: export efi_load_image_from_path efi_loader: load distro dtb in bootmgr boot/bootmeth_efi.c | 60 +----- cmd/bootefi.c | 1 - cmd/eficonfig.c | 90 +++++++-- cmd/efidebug.c | 89 +++++++-- include/efi_loader.h | 15 +- lib/efi_loader/Makefile | 1 + lib/efi_loader/efi_bootbin.c | 2 +- lib/efi_loader/efi_bootmgr.c | 186 +++++++++++++----- lib/efi_loader/efi_boottime.c | 3 +- lib/efi_loader/efi_device_path.c | 77 +++++--- lib/efi_loader/efi_device_path_utilities.c | 2 +- lib/efi_loader/efi_fdt.c | 117 +++++++++++ lib/efi_loader/efi_helper.c | 6 +- lib/efi_loader/efi_load_initrd.c | 2 +- test/py/tests/test_efi_secboot/test_signed.py | 28 +-- .../test_efi_secboot/test_signed_intca.py | 10 +- .../tests/test_efi_secboot/test_unsigned.py | 6 +- 17 files changed, 489 insertions(+), 206 deletions(-) create mode 100644 lib/efi_loader/efi_fdt.c -- 2.43.0

5 35

[PATCH 0/2] Add AM64x Support to PRUSS and PRU_RPROC driver
by MD Danish Anwar 22 May '24

22 May '24

This series adds AM64x related compatibles to PRUSS and PRU_RPROC drivers. This series is a prerequisite for ICSSG Ethernet driver. Once Support for AM64x is added to PRUSS and PRU_RPROC driver, I'll send another series to enable ICSSG Ethernet driver for AM64x as well. MD Danish Anwar (2): remoteproc: pru: Add support for AM64x PRU / RTU cores soc: ti: pruss: Add support for AM64x drivers/remoteproc/pru_rproc.c | 9 +++++++-- drivers/soc/ti/pruss.c | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) base-commit: ff0de1f0557ed7d2dab47ba976a37347a1fdc432 -- 2.34.1

3 8

[PATCH] ARM: dts: imx8mm: Enable CPLD_Dn pull down resistor on MX8Menlo
by Marek Vasut 22 May '24

22 May '24

Enable CPLD_Dn pull down resistor instead of pull up to avoid intefering with CPLD power off functionality. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: "NXP i.MX U-Boot Team" <uboot-imx(a)nxp.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Francesco Dolcini <francesco.dolcini(a)toradex.com> Cc: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Cc: Philippe Schenker <philippe.schenker(a)toradex.com> Cc: Martyn Welch <martyn.welch(a)collabora.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: u-boot(a)lists.denx.de --- arch/arm/dts/imx8mm-mx8menlo.dts | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/arch/arm/dts/imx8mm-mx8menlo.dts b/arch/arm/dts/imx8mm-mx8menlo.dts index 0b123a84018..c226285c6ea 100644 --- a/arch/arm/dts/imx8mm-mx8menlo.dts +++ b/arch/arm/dts/imx8mm-mx8menlo.dts @@ -290,6 +290,28 @@ >; }; +&pinctrl_gpio_hog1 { + fsl,pins = < + MX8MM_IOMUXC_SAI1_MCLK_GPIO4_IO20 0x1c4 /* SODIMM 88 */ + MX8MM_IOMUXC_SAI1_RXC_GPIO4_IO1 0x1c4 /* CPLD_int */ + MX8MM_IOMUXC_SAI1_RXD0_GPIO4_IO2 0x1c4 /* CPLD_reset */ + MX8MM_IOMUXC_SAI1_RXD1_GPIO4_IO3 0x1c4 /* SODIMM 94 */ + MX8MM_IOMUXC_SAI1_RXD2_GPIO4_IO4 0x1c4 /* SODIMM 96 */ + MX8MM_IOMUXC_SAI1_RXD3_GPIO4_IO5 0x184 /* CPLD_D[7] */ + MX8MM_IOMUXC_SAI1_RXFS_GPIO4_IO0 0x184 /* CPLD_D[6] */ + MX8MM_IOMUXC_SAI1_TXC_GPIO4_IO11 0x184 /* CPLD_D[5] */ + MX8MM_IOMUXC_SAI1_TXD0_GPIO4_IO12 0x184 /* CPLD_D[4] */ + MX8MM_IOMUXC_SAI1_TXD1_GPIO4_IO13 0x184 /* CPLD_D[3] */ + MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14 0x184 /* CPLD_D[2] */ + MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15 0x184 /* CPLD_D[1] */ + MX8MM_IOMUXC_SAI1_TXD4_GPIO4_IO16 0x184 /* CPLD_D[0] */ + MX8MM_IOMUXC_SAI2_MCLK_GPIO4_IO27 0x1c4 /* KBD_intK */ + MX8MM_IOMUXC_SAI5_RXD1_GPIO3_IO22 0x1c4 /* DISP_reset */ + MX8MM_IOMUXC_SAI5_RXD2_GPIO3_IO23 0x1c4 /* KBD_intI */ + MX8MM_IOMUXC_SAI5_RXD3_GPIO3_IO24 0x1c4 + >; +}; + &reg_usb_otg1_vbus { /delete-property/ enable-active-high; gpio = <&gpio1 12 GPIO_ACTIVE_LOW>; -- 2.43.0

2 2

[PATCH 0/2] scripts/setlocalversion sync with linux 6.9
by Rasmus Villemoes 22 May '24

22 May '24

The first commit is trivial cleanup. The second syncs scripts/setlocalversion with linux 6.9, with just a one-line change on top to account for a Kbuild change that U-Boot has not yet adopted. Rasmus Villemoes (2): Makefile: refactor ubootrelease target scripts/setlocalversion: sync with linux v6.9 Makefile | 7 +- scripts/setlocalversion | 226 ++++++++++++++++++++-------------------- 2 files changed, 117 insertions(+), 116 deletions(-) -- 2.40.1.1.g1c60b9335d

2 3