From patchwork Thu Jun 4 07:55:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Kovalivskyi X-Patchwork-Id: 1303351 X-Patchwork-Delegate: lukma@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=globallogic.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=globallogic.com header.i=@globallogic.com header.a=rsa-sha256 header.s=google header.b=Sksqjx/f; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49cylr522Dz9sSc for ; Thu, 4 Jun 2020 17:56:40 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A4C0B81E5A; Thu, 4 Jun 2020 09:56:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=globallogic.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=globallogic.com header.i=@globallogic.com header.b="Sksqjx/f"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3287781E64; Thu, 4 Jun 2020 09:56:22 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (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 E742081E58 for ; Thu, 4 Jun 2020 09:56:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=globallogic.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=roman.kovalivskyi@globallogic.com Received: by mail-lj1-x243.google.com with SMTP id z9so6039044ljh.13 for ; Thu, 04 Jun 2020 00:56:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=globallogic.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=+Q+d6914xL21nNRXZa37r4pJdTTnyGrSku9o75+WSuc=; b=Sksqjx/frO5T/khhEc8XsbL5tzKK8+fVzQqbRa5+ykSaVa2E/9SX3hwvE1fyQt9URr 9Lk1FzBdF27u3MQgjUbsQkXCUoWCilc6p7u3wxAEcWqp1eSwRSqOA7QgnkKeRM5s/Daf jntjreWHdmQb2yQ9zeOgducuziiqbVXqnFk+Bb+U2/Qh5WSf+h4kxnsGiVzWq1UGNT5w 7fh8wWEdS5bIY5WEdxWyjyfSYOmNHAUAICrHRAk6fi/HKGXqJ4qx/RmcN/Wmi/QUr2MC 7nXj1WVOervpfkIWSSVF03Oa8ghWUuLUCFyQk1JEtZSopJ41ce1Ny+V6xmMF2UjpQ74X bZEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=+Q+d6914xL21nNRXZa37r4pJdTTnyGrSku9o75+WSuc=; b=Bze/QYxTM1qST2BqvH0Q9iwYGXdp6FHaJbdFFwmUxIewxfvtE7ebRfm/Q+GqONWxxl eyp8AhbxFWCaW1Y0PqJFDArhvQaEcO1AEUludbH9JQWE5wviVPP07SqajEjsbyvSH+tn LajfpsYALMfJ2V+yjanMH6EBVwautr164YxO0WhOUrla96WyO/PwNED2RERRy5nL2nry E6UJtS5HwgWMw4kz0o5z3HkfExU8GZbqPRWWu6Em0dGY02tKtse8fuIRtWTOOvMA8vg4 jIhGZ7IrFIztwHrBhv3TFZivQ4tphXG2rRwjzE/O6uARRnihvM5OawFpNbvE2D4BqV9l 0Afw== X-Gm-Message-State: AOAM530E0usN2QlDj6kVS+MgaJhui2v8FeC3EuiGUYV/e5Upz9oDnCp0 Rp/ADHMxxBd5cpt3rmFSXGJdgyRKQ1E= X-Google-Smtp-Source: ABdhPJwCPfZQOIG3bkkG+7rbRekYWzTV5tUMEfIGnjLv9PbCfqvkV6G6u5IFdYnTjsYiHyQZnqj46Q== X-Received: by 2002:a2e:8e97:: with SMTP id z23mr1431379ljk.399.1591257378029; Thu, 04 Jun 2020 00:56:18 -0700 (PDT) Received: from localhost.localdomain ([159.224.5.60]) by smtp.googlemail.com with ESMTPSA id w17sm1250391ljj.108.2020.06.04.00.56.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2020 00:56:17 -0700 (PDT) From: Roman Kovalivskyi To: u-boot@lists.denx.de Cc: Roman Stratiienko , Joe Hershberger , Roman Kovalivskyi , Simon Glass , Marek Vasut , Lukasz Majewski , Eugeniu Rosca , Alex Kiernan , Sam Protsenko , Neil Armstrong , Philipp Tomsich , Kever Yang , Paul Kocialkowski , Lokesh Vutla , Jagan Teki , Miquel Raynal , Boris Brezillon , Tom Rini , Igor Opaniuk Subject: [PATCH v2 2/2] fastboot: add default fastboot_set_reboot_flag implementation Date: Thu, 4 Jun 2020 10:55:49 +0300 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Default implementation of fastboot_set_reboot_flag function that depends on "bcb" commands could be used in general case if there are no need to make any platform-specific implementation, otherwise it could be disabled via Kconfig option FASTBOOT_USE_BCB_SET_REBOOT_FLAG. Please note that FASTBOOT_USE_BCB_SET_REBOOT_FLAG is mutually exclusive with some platforms which already have their own implementation of this function. Signed-off-by: Roman Kovalivskyi --- drivers/fastboot/Kconfig | 9 +++++++++ drivers/fastboot/fb_common.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index d4436dfc9173..bcb43bc5d556 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -165,6 +165,15 @@ config FASTBOOT_CMD_OEM_FORMAT relies on the env variable partitions to contain the list of partitions as required by the gpt command. +config FASTBOOT_USE_BCB_SET_REBOOT_FLAG + bool "Enable default fastboot_set_reboot_flag implementation" + depends on CMD_BCB && !ARCH_MESON && !ARCH_ROCKCHIP && !TARGET_KC1 && \ + !TARGET_SNIPER && !TARGET_AM57XX_EVM && !TARGET_DRA7XX_EVM + default 1 + help + Add default implementation of fastboot_set_reboot_flag that uses + "bcb" commands. + endif # FASTBOOT endmenu diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 012a6288c187..77fe22e88f3d 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -88,6 +88,41 @@ void fastboot_okay(const char *reason, char *response) * which sets whatever flag your board specific Android bootloader flow * requires in order to re-enter the bootloader. */ +#if CONFIG_IS_ENABLED(FASTBOOT_USE_BCB_SET_REBOOT_FLAG) +int fastboot_set_reboot_flag(int reason) +{ + char cmd[32]; + + snprintf(cmd, sizeof(cmd), "bcb load %d misc", + CONFIG_FASTBOOT_FLASH_MMC_DEV); + + if (run_command(cmd, 0)) + return -ENODEV; + + switch (reason) { + case FASTBOOT_REBOOT_BOOTLOADER: + snprintf(cmd, sizeof(cmd), + "bcb set command bootonce-bootloader"); + break; + case FASTBOOT_REBOOT_FASTBOOTD: + snprintf(cmd, sizeof(cmd), "bcb set command boot-fastboot"); + break; + case FASTBOOT_REBOOT_RECOVERY: + snprintf(cmd, sizeof(cmd), "bcb set command boot-recovery"); + break; + default: + return -EINVAL; + } + + if (run_command(cmd, 0)) + return -ENOEXEC; + + if (run_command("bcb store", 0)) + return -EIO; + + return 0; +} +#else int __weak fastboot_set_reboot_flag(int reason) { if (reason != FASTBOOT_REBOOT_BOOTLOADER) @@ -95,6 +130,7 @@ int __weak fastboot_set_reboot_flag(int reason) return -ENOSYS; } +#endif /** * fastboot_get_progress_callback() - Return progress callback