From patchwork Fri Aug 23 20:48:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1976266 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=PddURKPi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WrByN5xGMz1yXY for ; Sat, 24 Aug 2024 06:49:32 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8915688CCD; Fri, 23 Aug 2024 22:48:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PddURKPi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E633E88CA2; Fri, 23 Aug 2024 22:48:45 +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.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 66DA088C53 for ; Fri, 23 Aug 2024 22:48:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-39d4161c398so10277475ab.3 for ; Fri, 23 Aug 2024 13:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1724446122; x=1725050922; 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=eyhJ+R09/yj3MbPGE6e353C0s56hfCnQG2o+hVBYtlU=; b=PddURKPi6bDHpQWqszmQCRQKysqibljz+YU8tBOAjE/3HZNyzTcRU8p9iPKtzxq2Vx mXJWVNtDKoto4j0PXZeNJvR33Koka/1OA0KxyQi2zUyhsICFI16XYUhq1IvWPhtZETVs 4phnzu7lej0nRYKITpceKmAg5btzRJ50V1nso= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724446122; x=1725050922; 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=eyhJ+R09/yj3MbPGE6e353C0s56hfCnQG2o+hVBYtlU=; b=Tqvifn3FLJEWJwhnzUVjCWaa1E5AEFW0bvgMzR0KWqHlqKg//hfitTdkQ6ssnk/pUk J6HnbisaHts5qg048GhbLuVb9kuC2AAYImUNFElVMkQZ2dIE4dblxn8lMENp36K5zARu Oy/PEDLfxZUKPkQDxmOfiwqQmygCOuVCBU6ioww6dvas8R355PiNE0/fOvoRewyAC6Qu Pju0AJ1jGmiaSI0VyOxuK1Csa1irqfFQWA4qGU6zIsVe87IExZbPt2UcsfipfvHImYjg ajLGK+HvAVMslniSx5Ki2x7GcOvZ2a3YqzWnNWocaVry0aLVI2xlkFofYReIXd6G2azN MUgQ== X-Gm-Message-State: AOJu0YzpIB3vGuzCXrIKBMwD2yF2zd6gsrl+JPQmacY6D1J+vaDCjcJE TclUVXS55Le4lgM2Mi7a4WviIeX6nHy2xoTgTop4aGHRG27Clebm67qBKWkHQRqePCaQ/Zt+74c = X-Google-Smtp-Source: AGHT+IEVwVbmiY6kKP0Tja6SYe2/1Nr87o0MxKPzESS8FiUicc3//TMaidgRzPdCQv8eSLZt/38V6g== X-Received: by 2002:a05:6e02:1a66:b0:376:410b:ae69 with SMTP id e9e14a558f8ab-39e3c98dd3emr36536795ab.15.1724446121835; Fri, 23 Aug 2024 13:48:41 -0700 (PDT) Received: from chromium.org (c-107-2-138-191.hsd1.co.comcast.net. [107.2.138.191]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-39d73e67addsm15698375ab.4.2024.08.23.13.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 13:48:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Jagan Teki , Andre Przywara , Simon Glass , Mattijs Korpershoek , AKASHI Takahiro , Eddie James , Heinrich Schuchardt , Ilias Apalodimas , Julien Masson Subject: [PATCH v2 4/8] sunxi: Add a bootmeth for FEL Date: Fri, 23 Aug 2024 14:48:20 -0600 Message-Id: <20240823204824.443631-5-sjg@chromium.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240823204824.443631-1-sjg@chromium.org> References: <20240823204824.443631-1-sjg@chromium.org> MIME-Version: 1.0 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 Add support for booting from a script loaded over FEL. This mirrors the bootcmd_fel provided by distro boot. Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek --- Changes in v2: - Put the FEL bootmeth before all other global bootmeths boot/Kconfig | 14 ++++++++ boot/Makefile | 1 + boot/bootmeth_fel.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 boot/bootmeth_fel.c diff --git a/boot/Kconfig b/boot/Kconfig index 291919ea1ef..7d6e819bde6 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -585,6 +585,20 @@ config BOOTMETH_EFI_BOOTMGR the EFI binary to be launched is determined. To set the EFI variables use the eficonfig command. +config BOOTMETH_FEL + bool "Bootdev support for Sunxi FEL" + depends on ARCH_SUNXI + default y + help + Enables support for booting over USB on a Sunxi device. This uses + the FEL protocol and obtains the script address from the + 'fel_scriptaddr' environment variable. + + This method is only available if booting from FEL, i.e. the + 'fel_booted' environment variable is set. + + See https://linux-sunxi.org/FEL/Protocol for more information. + config BOOTMETH_QFW bool "Boot method using QEMU parameters" depends on QFW diff --git a/boot/Makefile b/boot/Makefile index f4675d6ffd5..295f27dfd39 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX) += bootmeth_extlinux.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EXTLINUX_PXE) += bootmeth_pxe.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootm.o bootm_os.o bootmeth_cros.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_FEL) += bootmeth_fel.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_QFW) += bootmeth_qfw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o diff --git a/boot/bootmeth_fel.c b/boot/bootmeth_fel.c new file mode 100644 index 00000000000..160ba6eb827 --- /dev/null +++ b/boot/bootmeth_fel.c @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Bootmethod for sunxi FEL loading + * + * Copyright 2024 Google LLC + * Written by Simon Glass + */ + +#define LOG_CATEGORY UCLASS_BOOTSTD + +#include +#include +#include +#include +#include +#include + +static int fel_check(struct udevice *dev, struct bootflow_iter *iter) +{ + return 0; +} + +static int fel_read_bootflow(struct udevice *dev, struct bootflow *bflow) +{ + if (!env_get("fel_booted") || !env_get("fel_scriptaddr")) + return -ENOENT; + + bflow->state = BOOTFLOWST_READY; + + return 0; +} + +static int fel_read_file(struct udevice *dev, struct bootflow *bflow, + const char *file_path, ulong addr, ulong *sizep) +{ + return -ENOSYS; +} + +static int fel_boot(struct udevice *dev, struct bootflow *bflow) +{ + ulong addr; + int ret; + + addr = env_get_hex("fel_scriptaddr", 0); + ret = cmd_source_script(addr, NULL, NULL); + if (ret) + return log_msg_ret("boot", ret); + + return 0; +} + +static int fel_bootmeth_bind(struct udevice *dev) +{ + struct bootmeth_uc_plat *plat = dev_get_uclass_plat(dev); + + plat->desc = IS_ENABLED(CONFIG_BOOTSTD_FULL) ? + "Sunxi FEL boot over USB" : "FEL"; + plat->flags = BOOTMETHF_GLOBAL; + + return 0; +} + +static struct bootmeth_ops fel_bootmeth_ops = { + .check = fel_check, + .read_bootflow = fel_read_bootflow, + .read_file = fel_read_file, + .boot = fel_boot, +}; + +static const struct udevice_id fel_bootmeth_ids[] = { + { .compatible = "u-boot,fel-bootmeth" }, + { } +}; + +U_BOOT_DRIVER(bootmeth_2fel) = { + .name = "bootmeth_fel", + .id = UCLASS_BOOTMETH, + .of_match = fel_bootmeth_ids, + .ops = &fel_bootmeth_ops, + .bind = fel_bootmeth_bind, +};