From patchwork Fri Aug 2 13:13:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Forissier X-Patchwork-Id: 816249 Delivered-To: patch@linaro.org Received: by 2002:adf:e00d:0:b0:367:895a:4699 with SMTP id s13csp298816wrh; Fri, 2 Aug 2024 07:22:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXNuz7hLLxVbB0pI0GqTN4yuRDXgK9it8ZWK+z3sa20b4B5KYWodDgTB2p5ST171LmG13tpiFpkXcS7uYSBwwAH X-Google-Smtp-Source: AGHT+IF2bkqQqC/EJ5utYInmHKR4hJ+Eeq+gijUazlR62TjHzOxkuoZJJFGdpuROoQlzUpRCAyEm X-Received: by 2002:a05:6402:40c5:b0:594:4d7e:1b6b with SMTP id 4fb4d7f45d1cf-5b77c28e112mr5070130a12.5.1722608534559; Fri, 02 Aug 2024 07:22:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722608534; cv=none; d=google.com; s=arc-20160816; b=wzdwETdZJRx0IidrQxjbGZ8T2Q6nmmyLloMRJKJAtDoEr1tRwS+izW1K5p6rv8jREN y72dVeMkasx2aSkVFMHY1gdl0+Ezi8gKY9dlZ0ezCnea730oKcMmAvoQcoJ6WBN7pNDO VhjSeOidKUROcqhmVrTqS+hQ6226xijHmlGI3fouL33Rw++nGsCGQvRz4C3vXEkKRN/Q hsFIytREdptR23amtyPSGjXBUAtMxZO7xEVI0giKcVGtWKrk6yYGr9AiP/rgEJaUg1na EQpqAwh2sfLW5szrfH5CSdOV9PXGVKBz9/NTdD+JDX2bsiDOL7a5ZhZo4AVbngLcm8nz MTHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=x3lRhZ4W1ivr5QtoWjLq8kI+u54INtM8ftsWrmXp3YI=; fh=J0yv3uUj+5gDEbU7EP/zCED7LlcYi0yNsw+wiHaRWq4=; b=RmUTP+ngYXHCAcOBXYvaWBanUEP21UdhzBnpVT+WG7MQwpmDy1iq4EBIxezFhAZtnd UVyWwBPiEvWKwsW1yJN4bJOESDHnNnD/74Ur8mDU7l7su+782Egr4xgP1KInu4Gu3dYF XY+RDb0egPObbNrQP+jfrUd7AmpdNGn5ESNP0jrAL9Va7R81AU2bT5aHgo+Cbz1qL2Bb dST5EtOFbwwxtCV0Ahjf+CSy9va/qQLFtd3mVES1v5OZdqCa5Vrt1M0sbXafN5ZlKQtq ZqD7O9rFI0kdW1gteAg1EcYrUWtGI/sS16KZ8A4JjgUvYvMYxtzuycHkeVCsqfOSRb4+ lxjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=awllXH9s; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id 4fb4d7f45d1cf-5b83971099fsi1173287a12.27.2024.08.02.07.22.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 07:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=awllXH9s; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 524878870E; Fri, 2 Aug 2024 16:22:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="awllXH9s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3641B88967; Fri, 2 Aug 2024 15:14:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B418388B8E for ; Fri, 2 Aug 2024 15:14:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jerome.forissier@linaro.org Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4280c55e488so19328175e9.0 for ; Fri, 02 Aug 2024 06:14:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722604470; x=1723209270; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x3lRhZ4W1ivr5QtoWjLq8kI+u54INtM8ftsWrmXp3YI=; b=awllXH9sxnMLMD8ZU/1gkYGH/q2T7szKHei+LeFfxNyAuXL52DnFK7NrdPyTt4e5yq pZfkjKFz6Iua+NRhenUxf/mM6cRwFS5VEupF1UWH5qcu+CQ9OVxYBG9n5DALDBqsOotZ wxA+yKURQ9Irtuxb/1h/kF2zCzEj4TPq1GjoEC3II2g/fpJ3exjlpW0DjvrFGQ0nT7EV O1YmRk+bM6GdOU/4ItIML1b2sM/0KcgbK+kVP5ifiYypBbP8bAPMoY3sW++UFDe20oLn Zxk6n9ZQ2UtCYxtjTRbRwkrhEPqAtrI13lPq1/sxvE4sYYukowjeBJc7nseeW7axRBjE bkBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722604470; x=1723209270; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x3lRhZ4W1ivr5QtoWjLq8kI+u54INtM8ftsWrmXp3YI=; b=OvxQRl69XBgs6fVObCVOkYJXAcKggVKh7FpVkio4ESi6lC8QYDMCqUWsSxwn3w6EZ6 fvE1i1tlcVMMm+NULvGd3dQZ2IeFQJQBI1KwZsIRpbH3ZmMMl69vx1vPSZdDXaPW5uUb IYjAk1Ilmhf7qLBCqjiHwTvULkGOt9GNWaWwwHxuboiPeK0/a/sRi9/Rpg1mSgI4aTEj crigw6qUXM9I7TRAV+bRlwptU5IGagFa5O2yqjMBIgiomp81qDkMj/0TwulW6PgMfvEk qV+pQN0CcVGPblH7DgsyWdCqsOxhLymYx8iI7u7TijeIKGzTmvLXM2h/+C5CloE6IJ8H nJZQ== X-Gm-Message-State: AOJu0Yz8pwY0p3llVEwt+rf+XEDxiToukh3vGt7Y69AvC1gPdDd5irBD Lxo/0GDwKJ064+u+RCPAkMWfXu0b20dIU5UJMajNgYB2Qp3Z8G1GXH2PMem01XNR/UEYxcUbtQo EoW+Qdc0b X-Received: by 2002:a05:600c:1d20:b0:426:706c:a55a with SMTP id 5b1f17b1804b1-428e6f7d703mr22837225e9.2.1722604469867; Fri, 02 Aug 2024 06:14:29 -0700 (PDT) Received: from builder.. ([2a01:e0a:3cb:7bb0:4fc9:a3ab:c134:cdf4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36bbcf0cc58sm1970304f8f.2.2024.08.02.06.14.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Aug 2024 06:14:29 -0700 (PDT) From: Jerome Forissier To: u-boot@lists.denx.de Cc: Ilias Apalodimas , Javier Tia , Raymond Mao , Maxim Uvarov , Tim Harvey , Jerome Forissier , Tom Rini , Lukasz Majewski , Mattijs Korpershoek , Joe Hershberger , Ramon Fried , Marek Vasut , Simon Glass , Nathan Barrett-Morrison , Marcel Ziswiler , Kever Yang , Jesse Taube , Greg Malysa , Shengyu Qu , Stefan Roese , Jagan Teki , Rasmus Villemoes , Sean Anderson , Andre Przywara , Oleksandr Suvorov , Samuel Holland , Lukas Funke , Jaehoon Chung , Heinrich Schuchardt , Ion Agorria , Quentin Schulz , Svyatoslav Ryhel , Alexey Romanov , Yang Xiwen , Boon Khai Ng , Jonas Karlman , Neil Armstrong , Nicolas Frattaroli , Miquel Raynal , Baruch Siach Subject: [PATCH v6 02/20] net: introduce alternative implementation as net-lwip/ Date: Fri, 2 Aug 2024 15:13:49 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Fri, 02 Aug 2024 16:22:11 +0200 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Prepare the introduction of the lwIP (lightweight IP) TCP/IP stack by adding a new net/lwip/ directory and the NET_LWIP symbol. Network support is either NO_NET, NET (legacy stack) or NET_LWIP. Subsequent commits will introduce the lwIP code, re-work the NETDEVICE integration and port some of the NET commands and features to lwIP. SPL_NET cannot be enabled when 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. Similarly, DFU_TFTP and FASTBOOT are not compatible with NET_LWIP because of dependencies on net_loop(), tftp_timeout_ms, tftp_timeout_count_max and other NET things. Let's add a dependency on !NET_LWIP for now. As for SANDBOX, NET_LWIP cannot be used either because of strong assumptions on the network stack. Make NET_LWIP depend on !SANDBOX so that the NET_LWIP alternative is not visible in make menuconfig when sandbox_defconfig is used. Signed-off-by: Jerome Forissier --- Kconfig | 30 +++++++++++++++++++ common/Kconfig | 2 +- common/spl/Kconfig | 1 + drivers/dfu/Kconfig | 1 + drivers/fastboot/Kconfig | 1 + drivers/net/Kconfig | 1 + drivers/net/phy/Kconfig | 2 +- drivers/usb/gadget/Kconfig | 2 +- net/Kconfig | 61 +++++++++++++++++++------------------- net/Makefile | 4 +++ net/lwip/Kconfig | 34 +++++++++++++++++++++ 11 files changed, 106 insertions(+), 33 deletions(-) create mode 100644 net/lwip/Kconfig diff --git a/Kconfig b/Kconfig index 82df59f176e..6657b9e5e30 100644 --- a/Kconfig +++ b/Kconfig @@ -745,8 +745,38 @@ source "dts/Kconfig" source "env/Kconfig" +menu Networking + +choice + prompt "Networking stack" + default NET + +config NO_NET + bool "No networking support" + +config NET + bool "Legacy U-Boot networking stack" + imply NETDEVICES + +config NET_LWIP + bool "Use lwIP for networking stack" + imply NETDEVICES + depends on !SANDBOX + 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. + +endchoice + source "net/Kconfig" +endmenu + source "drivers/Kconfig" source "fs/Kconfig" diff --git a/common/Kconfig b/common/Kconfig index 4bb9f08977a..1daa495080a 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 af43b5f5d3c..2731849841a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1063,6 +1063,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 971204758aa..d034b501360 100644 --- a/drivers/dfu/Kconfig +++ b/drivers/dfu/Kconfig @@ -20,6 +20,7 @@ config DFU_WRITE_ALT config DFU_TFTP bool "DFU via TFTP" depends on NETDEVICES + depends on !NET_LWIP select UPDATE_COMMON select DFU_OVER_TFTP help diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index 70207573de2..1eb460f5a02 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -1,5 +1,6 @@ menu "Fastboot support" depends on CMDLINE + depends on !NET_LWIP config FASTBOOT bool diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b4ff033afa9..d332f712a7c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -48,6 +48,7 @@ config DM_DSA bool "Enable Driver Model for DSA switches" depends on DM_MDIO depends on PHY_FIXED + depends on !NET_LWIP help Enable driver model for DSA switches diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index 73064b2af68..75986162914 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 4621a6fd5e6..03fe3bca197 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/Kconfig b/net/Kconfig index 5dff6336293..0e9f2b4cc5b 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -2,11 +2,6 @@ # Network configuration # -menuconfig NET - bool "Networking support" - default y - imply NETDEVICES - if NET config ARP_TIMEOUT @@ -26,15 +21,6 @@ config PROT_UDP Enable a generic udp framework that allows defining a custom handler for udp protocol. -config BOOTDEV_ETH - bool "Enable bootdev for ethernet" - depends on BOOTSTD - default y - help - Provide a bootdev for ethernet so that is it possible to boot - an operationg system over the network, using the PXE (Preboot - Execution Environment) protocol. - config BOOTP_SEND_HOSTNAME bool "Send hostname to DNS server" help @@ -45,15 +31,6 @@ config BOOTP_SEND_HOSTNAME of the "hostname" environment variable is passed as option 12 to the DHCP server. -config NET_RANDOM_ETHADDR - bool "Random ethaddr if unset" - help - Selecting this will allow the Ethernet interface to function even - when the ethaddr variable for that interface is unset. In this case, - a random MAC address in the locally administered address space is - generated. It will be saved to the appropriate environment variable, - too. - config NETCONSOLE bool "NetConsole support" help @@ -255,11 +232,35 @@ config IPV6 endif # if NET +source "net/lwip/Kconfig" + +if NET || NET_LWIP + +config BOOTDEV_ETH + bool "Enable bootdev for ethernet" + depends on BOOTSTD + default y + help + Provide a bootdev for ethernet so that is it possible to boot + an operating system over the network, using the PXE (Preboot + Execution Environment) protocol. + +config NET_RANDOM_ETHADDR + bool "Random ethaddr if unset" + help + Selecting this will allow the Ethernet interface to function even + when the ethaddr variable for that interface is unset. In this case, + a random MAC address in the locally administered address space is + generated. It will be saved to the appropriate environment variable, + too. + +endif # if NET || NET_LWIP + config SYS_RX_ETH_BUFFER - int "Number of receive packet buffers" - default 4 - help - Defines the number of Ethernet receive buffers. On some Ethernet - controllers it is recommended to set this value to 8 or even higher, - since all buffers can be full shortly after enabling the interface on - high Ethernet traffic. + int "Number of receive packet buffers" + default 4 + help + Defines the number of Ethernet receive buffers. On some Ethernet + controllers it is recommended to set this value to 8 or even higher, + since all buffers can be full shortly after enabling the interface on + high Ethernet traffic. diff --git a/net/Makefile b/net/Makefile index 64ab7ec740a..70eec8caf0d 100644 --- a/net/Makefile +++ b/net/Makefile @@ -5,6 +5,8 @@ #ccflags-y += -DDEBUG +ifeq ($(CONFIG_NET),y) + obj-$(CONFIG_NET) += arp.o obj-$(CONFIG_CMD_BOOTP) += bootp.o obj-$(CONFIG_CMD_CDP) += cdp.o @@ -38,3 +40,5 @@ obj-$(CONFIG_CMD_WGET) += wget.o # sprintf(buf, index ? "foo%d" : "foo", index) # and this is intentional usage. CFLAGS_eth_common.o += -Wno-format-extra-args + +endif diff --git a/net/lwip/Kconfig b/net/lwip/Kconfig new file mode 100644 index 00000000000..eb31d044197 --- /dev/null +++ b/net/lwip/Kconfig @@ -0,0 +1,34 @@ +# +# Network configuration (with lwIP stack) +# + +config LWIP_DEBUG + bool "Enable debug traces in the lwIP library" + +config LWIP_ASSERT + bool "Enable assertions in the lwIP library" + +config PROT_DHCP_LWIP + bool + select PROT_UDP_LWIP + +config PROT_DNS_LWIP + bool + select PROT_UDP_LWIP + +config PROT_RAW_LWIP + bool + +config PROT_TCP_LWIP + bool + +config PROT_TCP_SACK_LWIP + bool "TCP SACK support" + depends on PROT_TCP_LWIP + default y + help + TCP protocol with selective acknowledgements. Improves + file transfer speed in wget. + +config PROT_UDP_LWIP + bool