From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38D60C47082 for ; Tue, 8 Jun 2021 09:49:10 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2CF4E61008 for ; Tue, 8 Jun 2021 09:49:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CF4E61008 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9768E82D71; Tue, 8 Jun 2021 11:49:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.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=kernel.org header.i=@kernel.org header.b="MN05xB/E"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D9FDC82D73; Tue, 8 Jun 2021 11:49:05 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C895282E7F for ; Tue, 8 Jun 2021 11:49:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 1D7A761185; Tue, 8 Jun 2021 09:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623145739; bh=TOuYQtgR9gObjfmPM4lvd8n7rhf1ZlIB5+633zwRQA8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MN05xB/E1kKxUk25490LctybLYGQsGdYovpOajdCoQDO0gZvNh2PvDpFM9sSrsL2N +kzvDy3xPYlIh8AcfhJX8d/9uEeZHjQgFiQ3wrRs2tYzdnG3C3UFIIn4JI6gjI3r9W 1Xe3irpugzsIYBs3RBkmlpZ7Y3uKIq3X05ZMTfTiqtKMQY0GAFHRCNsYNbmqLacgP6 S+UTYEWjgkgvm2e9EDdJEa5Vm9MGqO5XDT3r31HS7Vs8sJOMlc3+RhlJERUJxdpjny BNEFnPhTYfjiTJ0zrj5nSTHAfjlW8z/6+62BZoO53dCL8LgGsXIDdDHwVaf01sEn84 vUdOAn1yCv4hQ== Received: by pali.im (Postfix) id E5FD27CC; Tue, 8 Jun 2021 11:48:56 +0200 (CEST) Date: Tue, 8 Jun 2021 11:48:56 +0200 From: Pali =?utf-8?B?Um9ow6Fy?= To: Marek =?utf-8?B?QmVow7pu?= Cc: Stefan Roese , u-boot@lists.denx.de Subject: Re: [PATCH u-boot-marvell v2 2/6] arm: mvebu: turris_mox: add support for board rescue mode Message-ID: <20210608094856.77brosdokqrw5thb@pali> References: <20210607143451.5343-1-marek.behun@nic.cz> <20210607143451.5343-3-marek.behun@nic.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210607143451.5343-3-marek.behun@nic.cz> User-Agent: NeoMutt/20180716 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.4 at phobos.denx.de X-Virus-Status: Clean On Monday 07 June 2021 16:34:47 Marek Behún wrote: > Add necessary config options and board code to support board factory > reset / rescue mode on Turris MOX. > > In order to also support invoking rescue mode from U-Boot console, > without having to press the factory reset button, put the rescue command > into `bootcmd_rescue` default environment variable. When factory reset > button is pressed, invoke rescue mode via distroboot by setting > `boot_targets` to `rescue`. > > Rescue boot from console can be invoked by running > run bootcmd_rescue > > Signed-off-by: Marek Behún Reviewed-by: Pali Rohár > --- > board/CZ.NIC/turris_mox/turris_mox.c | 71 ++++++++++++++++++++++++++++ > configs/turris_mox_defconfig | 6 +++ > include/configs/turris_mox.h | 9 ++++ > 3 files changed, 86 insertions(+) > > diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c > index 15cbf92550..a78f33661e 100644 > --- a/board/CZ.NIC/turris_mox/turris_mox.c > +++ b/board/CZ.NIC/turris_mox/turris_mox.c > @@ -10,11 +10,13 @@ > #include > #include > #include > +#include > #include > #include > #include > #include > #include > +#include > #include > #include > #include > @@ -44,6 +46,8 @@ > #define SFP_GPIO_PATH "/soc/internal-regs@d0000000/spi@10600/moxtet@1/gpio@0" > #define PCIE_PATH "/soc/pcie@d0070000" > #define SFP_PATH "/sfp" > +#define LED_PATH "/leds/led" > +#define BUTTON_PATH "/gpio-keys/reset" > > DECLARE_GLOBAL_DATA_PTR; > > @@ -373,6 +377,71 @@ int misc_init_r(void) > return 0; > } > > +static bool read_reset_button(void) > +{ > + struct udevice *button, *led; > + int i; > + > + if (device_get_global_by_ofnode(ofnode_path(BUTTON_PATH), &button)) { > + printf("Cannot find reset button!\n"); > + return false; > + } > + > + if (device_get_global_by_ofnode(ofnode_path(LED_PATH), &led)) { > + printf("Cannot find status LED!\n"); > + return false; > + } > + > + led_set_state(led, LEDST_ON); > + > + for (i = 0; i < 21; ++i) { > + if (button_get_state(button) != BUTTON_ON) > + return false; > + if (i < 20) > + mdelay(50); > + } > + > + led_set_state(led, LEDST_OFF); > + > + return true; > +} > + > +static void handle_reset_button(void) > +{ > + if (read_reset_button()) { > + const char * const vars[3] = { > + "bootcmd", > + "bootcmd_rescue", > + "distro_bootcmd", > + }; > + > + /* > + * Set the above envs to their default values, in case the user > + * managed to break them. > + */ > + env_set_default_vars(3, (char * const *)vars, 0); > + > + /* Ensure bootcmd_rescue is used by distroboot */ > + env_set("boot_targets", "rescue"); > + > + printf("RESET button was pressed, overwriting boot_targets!\n"); > + } else { > + /* > + * In case the user somehow managed to save environment with > + * boot_targets=rescue, reset boot_targets to default value. > + * This could happen in subsequent commands if bootcmd_rescue > + * failed. > + */ > + if (!strcmp(env_get("boot_targets"), "rescue")) { > + const char * const vars[1] = { > + "boot_targets", > + }; > + > + env_set_default_vars(1, (char * const *)vars, 0); > + } > + } > +} > + > static void mox_print_info(void) > { > int ret, board_version, ram_size; > @@ -543,6 +612,8 @@ int last_stage_init(void) > > printf("\n"); > > + handle_reset_button(); > + > return 0; > } > > diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig > index 75524babbc..d6d37a3d7d 100644 > --- a/configs/turris_mox_defconfig > +++ b/configs/turris_mox_defconfig > @@ -23,10 +23,14 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_ARCH_EARLY_INIT_R=y > CONFIG_MISC_INIT_R=y > +CONFIG_BUTTON=y > +CONFIG_BUTTON_GPIO=y > +CONFIG_CMD_BUTTON=y > CONFIG_CMD_CLK=y > # CONFIG_CMD_FLASH is not set > CONFIG_CMD_GPIO=y > CONFIG_CMD_I2C=y > +CONFIG_CMD_LED=y > CONFIG_CMD_MMC=y > CONFIG_CMD_PCI=y > CONFIG_CMD_SPI=y > @@ -46,6 +50,8 @@ CONFIG_CLK=y > CONFIG_CLK_MVEBU=y > # CONFIG_MVEBU_GPIO is not set > CONFIG_DM_I2C=y > +CONFIG_LED=y > +CONFIG_LED_GPIO=y > CONFIG_MISC=y > CONFIG_MMC_SDHCI=y > CONFIG_MMC_SDHCI_SDMA=y > diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h > index 51445ec60a..b148b1621a 100644 > --- a/include/configs/turris_mox.h > +++ b/include/configs/turris_mox.h > @@ -75,12 +75,21 @@ > > #include > > +#define TURRIS_MOX_BOOTCMD_RESCUE \ > + "setenv bootargs \"console=ttyMV0,115200 " \ > + "earlycon=ar3700_uart,0xd0012000\" && " \ > + "sf probe && " \ > + "sf read 0x5000000 0x190000 && " \ > + "lzmadec 0x5000000 0x5800000 && " \ > + "bootm 0x5800000" > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > "scriptaddr=0x4d00000\0" \ > "pxefile_addr_r=0x4e00000\0" \ > "fdt_addr_r=0x4f00000\0" \ > "kernel_addr_r=0x5000000\0" \ > "ramdisk_addr_r=0x8000000\0" \ > + "bootcmd_rescue=" TURRIS_MOX_BOOTCMD_RESCUE "\0" \ > BOOTENV > > #endif /* _CONFIG_TURRIS_MOX_H */ > -- > 2.31.1 >