Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 624FEC7619A for ; Sun, 2 Apr 2023 20:31:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7EA2885C52; Sun, 2 Apr 2023 22:31:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="LCGR6eNU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 44460858FF; Sun, 2 Apr 2023 22:31:12 +0200 (CEST) Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 6D68D85C52 for ; Sun, 2 Apr 2023 22:31:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mibodhi@gmail.com Received: by mail-ot1-x32c.google.com with SMTP id d22-20020a9d5e16000000b0069b5252ced7so14617197oti.13 for ; Sun, 02 Apr 2023 13:31:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680467465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=E0PVb+/N9/5xxzTzzfCs+z5hjXDS380W1kFMd+v9OmE=; b=LCGR6eNUKihhJUWMFWiMVTrcLpFzDp39AsB6hgpx3SYhrpkf99U1kdpxmwslHzAHxB 2YZPHpDdb66SOm4jzccst2nv+2Pei3UyYgv0RtVC8b+IMw4A2Y0ROdrOtBHLmphTn1Sl c65lWI4PjGe0pteeqV5jFLazE5LxYIe9q9rkEYZgKZIMrMfemufvo0SY4KDRLWIg2hEW QWxphls+hM1Su+L4ZktE5WLpyI+WTnQcYMv41yg4HdQfA4V54kpM3jDsESBYWSans05P FeQHZ93GBnenYtPEASYZnnqSF0aDppaMPP+CMkcON9yHa76Q00cQj62ugNv7wTByvOdN A9LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680467465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E0PVb+/N9/5xxzTzzfCs+z5hjXDS380W1kFMd+v9OmE=; b=X8PGikzvcPYICQS+NYkJCvuzqzvDj7QeTD8b9EkFGyDBUReCAt1kG8QTK5IsybPCz0 0pNqI/AOxkfLTcpv8oA6p+LfbHyQvRPhw2ek0EQ1o/BL3ODLIyWnnlCIrIvaJroSPrEg 2RIRV98jUjXlmmCwWHf1avsiC7PoBOD0bs+RtiLD9C+I5Ji7PH+4GwUCEy6i8iQbDRs5 jYTuOUWwKd9Erz4HHvKaCFd/2C9QQoZ6czpjKlkuIWdwSKtuGFiM0huiQ6o9u+2AmX+I TzaTpwwP29D4SNTKW6q4pxGg7pK8oH42XKeJc07FHp3KqHHZF/ZyjIUxWfu1oD9tUWX1 tyIA== X-Gm-Message-State: AAQBX9fJOvZrjcDTPIQnWWOUdZaF/NL1/AmX+S4IuVhq9sDuiL1znoSA +HIW9duZPfvLv8loUJ28AKI= X-Google-Smtp-Source: AKy350Y4HNQCSsympE7jAWHWbZC0sHW6BfJjXas+3mhmuLpqbvwsrcLXXyx/k8uLIEXHd5MrUXT1gg== X-Received: by 2002:a9d:4812:0:b0:6a1:3dfc:4e44 with SMTP id c18-20020a9d4812000000b006a13dfc4e44mr13088110otf.27.1680467465083; Sun, 02 Apr 2023 13:31:05 -0700 (PDT) Received: from localhost.localdomain (76-229-100-169.lightspeed.irvnca.sbcglobal.net. [76.229.100.169]) by smtp.gmail.com with ESMTPSA id r16-20020a9d7cd0000000b006a2cc609ddasm3222353otn.2.2023.04.02.13.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 13:31:04 -0700 (PDT) From: Tony Dinh To: Joe Hershberger , Ramon Fried , =?UTF-8?q?Pali=20Roh=E1r?= , Simon Glass , Stefan Roese , U-Boot Mailing List Cc: Tom Rini , Tony Dinh , Daniel Golle , Sean Anderson Subject: [PATCH v2] netconsole: various improvements Date: Sun, 2 Apr 2023 13:30:15 -0700 Message-Id: <20230402203016.32537-1-mibodhi@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Use CONFIG_CONSOLE_MUX for netconsole. When netconsole is running, stdin/stdout/stder must be set to some primary console, in addtion to nc. For example, stdin=serial,nc. Some recent Linux kernels will not boot with only nc on the stdout list, ie. stdout=nc. When netconsole exits, remove nc from the list of devices in stdin/stdout/stderr. Signed-off-by: Tony Dinh --- Changes in v2: - Select CONFIG_CONSOLE_MUX if CONFIG_NETCONSOLE is enabled - Add new functions in netconsole driver to support CONSOLE_MUX - Add new function to encapsulate the process of stopping netconsole from bootm - Remove unecessary net_timeout initial value = 1 boot/bootm.c | 13 ++++++--- drivers/net/Kconfig | 10 +++++++ drivers/net/netconsole.c | 60 ++++++++++++++++++++++++++++++++++++++++ include/stdio_dev.h | 1 + 4 files changed, 80 insertions(+), 4 deletions(-) diff --git a/boot/bootm.c b/boot/bootm.c index 2eec60ec7b..11203c01ec 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -472,11 +472,16 @@ ulong bootm_disable_interrupts(void) * recover from any failures any more... */ iflag = disable_interrupts(); -#ifdef CONFIG_NETCONSOLE - /* Stop the ethernet stack if NetConsole could have left it up */ - eth_halt(); -#endif + if (IS_ENABLED(CONFIG_NETCONSOLE)) { + /* + * Make sure that the starting kernel message printed out, + * stop netconsole and the ethernet stack + */ + printf("\n\nStarting kernel ...\n\n"); + drv_nc_stop(); + eth_halt(); + } #if defined(CONFIG_CMD_USB) /* * turn off USB to prevent the host controller from writing to the diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ceadee98a1..0661059dfa 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -945,4 +945,14 @@ config MDIO_MUX_MESON_G12A This driver is used for the MDIO mux found on the Amlogic G12A & compatible SoCs. +config NETCONSOLE + bool "Enable netconsole" + select CONSOLE_MUX + help + NetConsole requires CONSOLE_MUX, i.e. at least one default console such + must be specified in addition to nc console. For example, for boards that + the main console is serial, set each of the envs stdin/stdout/stderr to serial,nc. + See CONFIG_CONSOLE_MUX and CONFIG_SYS_CONSOLE_IS_IN_ENV help for detailed + description of usage. + endif # NETDEVICES diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index 151bc55e07..bb92d2e130 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,12 @@ static int output_packet_len; */ enum proto_t net_loop_last_protocol = BOOTP; +/* + * Net console helpers + */ +static void usage(void); +static void remove_nc_from(const int console); + static void nc_wait_arp_handler(uchar *pkt, unsigned dest, struct in_addr sip, unsigned src, unsigned len) @@ -111,6 +118,21 @@ static int refresh_settings_from_env(void) return 0; } +static void remove_nc_from(const int console) +{ + int ret; + + ret = iomux_replace_device(console, "nc", "nulldev"); + if (ret) { + printf("\n*** Warning: Cannot remove nc from %s Error=%d\n", + stdio_names[console], ret); + printf("%s=", stdio_names[console]); + iomux_printdevs(console); + usage(); + flush(); + } +} + /** * Called from net_loop in net/net.c before each packet */ @@ -241,6 +263,29 @@ static int nc_stdio_start(struct stdio_dev *dev) return 0; } +void nc_stdio_stop(void) +{ + if (IS_ENABLED(CONFIG_CONSOLE_MUX)) { + int ret; + struct stdio_dev *sdev; + + /* Remove nc from each stdio file */ + remove_nc_from(stdin); + remove_nc_from(stderr); + remove_nc_from(stdout); + + /* Deregister nc device */ + sdev = stdio_get_by_name("nc"); + ret = stdio_deregister_dev(sdev, true); + if (ret) + printf("\nWarning: Cannot deregister nc console Error=%d\n", ret); + } else { + printf("\n*** Warning: CONFIG_CONSOLE_MUX must be enabled for netconsole\n" + "to work properly. The nc console will be removed when\n" + "netconsole driver stops\n"); + } +} + static void nc_stdio_putc(struct stdio_dev *dev, char c) { if (output_recursion) @@ -316,6 +361,16 @@ static int nc_stdio_tstc(struct stdio_dev *dev) return input_size != 0; } +static void usage(void) +{ + printf("USAGE:\n" + "NetConsole requires CONFIG_CONSOLE_MUX. At least one default console\n" + "must be specified in addition to nc console. For example, for boards\n" + "that the main console is serial, set the each of envs stdin/stdout/stderr\n" + "to serial,nc. Some kernel might fail to boot when nc is the only device in\n" + "stdout list\n"); +} + int drv_nc_init(void) { struct stdio_dev dev; @@ -335,3 +390,8 @@ int drv_nc_init(void) return (rc == 0) ? 1 : rc; } + +void drv_nc_stop(void) +{ + nc_stdio_stop(); +} diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 3105928970..9d2375a67e 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -112,6 +112,7 @@ int drv_keyboard_init(void); int drv_usbtty_init(void); int drv_usbacm_init(void); int drv_nc_init(void); +void drv_nc_stop(void); int drv_jtag_console_init(void); int cbmemc_init(void); -- 2.30.2