From patchwork Fri Apr 28 19:18:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1775129 X-Patchwork-Delegate: bmeng.cn@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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: 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=B0HN+Jwd; 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 ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Q7Ms216zKz23tZ for ; Sat, 29 Apr 2023 05:20:54 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4A815862CC; Fri, 28 Apr 2023 21:19:10 +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="B0HN+Jwd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E46685FE9; Fri, 28 Apr 2023 21:18:59 +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-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (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 53AFB8617A for ; Fri, 28 Apr 2023 21:18:56 +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-io1-xd35.google.com with SMTP id ca18e2360f4ac-763ae18986cso4560039f.3 for ; Fri, 28 Apr 2023 12:18:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1682709525; x=1685301525; 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=zaf9ANxwEcUVleVoDFTbN/oMz3JGjgSI4d+g96+IISM=; b=B0HN+JwdPozOeVWRsR3C6zS0y1uM6nwzmmOOgiBN2pKyGIGFzSpBFa+dzPtYV688LY Rupbnj3pnCj2FI8jN2kl0UOBprBCujZZMYNhHT2+hg2tCmDzzMFKd6mxMEwZPlq+w+0T p7VxgYjh0E4IjtfEoA/RWwPH7+a8lt1eHM0d8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682709525; x=1685301525; 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=zaf9ANxwEcUVleVoDFTbN/oMz3JGjgSI4d+g96+IISM=; b=PoCRyj3/iQu0gHv2AsWf0jgf37oM2c/3mLrpK5Glpq7CeX5GshaEQSqheMH2Ahex7n N/UD9vD5N12hDOYIuY8YJAW2n9agklQT97vXZY2/9EUz0EQDrOCRChayG26GVat1yyZU alHMBbXjphU3F4s1XhmKe5YQk2rYcxHydcVwciwHR5j/4sIQcVqs8WmA0M1oegDeDHZ2 m83UTozUceqBLwfaWdXS0BjqE5/H/aL6rMfqVTno6bjtBremrAAaHBVZuTYYwJFy/GBW 7CnijVoH3P6rEjYzt72jZwPPEz+55CKc3LSjDmwZlF6FYXYKJTr4T5Hivx0uQEqe6wcF eELw== X-Gm-Message-State: AC+VfDzd919/kbIWiuayJuRooNgp07OEmZ78xmBUDsvqlFYBTziMxQi7 wSkEpZ5KwKwcKNzi4RQwGV1NKM+D7va6xtb4EjM= X-Google-Smtp-Source: ACHHUZ5lTMnR7OsrLlqTtv+WnkIriPzhVHY2hdIJBKK4Zg5roRrISjPDrvXIlXW8Zk9Y11tNeQCFmA== X-Received: by 2002:a6b:d002:0:b0:758:917b:c313 with SMTP id x2-20020a6bd002000000b00758917bc313mr3386842ioa.13.1682709524847; Fri, 28 Apr 2023 12:18:44 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:9261:21dc:edb:e426]) by smtp.gmail.com with ESMTPSA id l12-20020a0566380d8c00b0041407c67451sm1698811jaj.165.2023.04.28.12.18.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Apr 2023 12:18:44 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Andrew Davis , Heinrich Schuchardt , John Keeping Subject: [PATCH 16/18] bootstd: Add a simple bootmeth for ChromiumOS Date: Fri, 28 Apr 2023 13:18:16 -0600 Message-ID: <20230428191819.3070393-12-sjg@chromium.org> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog In-Reply-To: <20230428191819.3070393-1-sjg@chromium.org> References: <20230428191819.3070393-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 It is possible to boot x86-based ChromeOS machines by parsing a table and locating the kernel and command line. Add a bootmeth for this. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- boot/Kconfig | 11 ++ boot/Makefile | 1 + boot/bootmeth_cros.c | 212 +++++++++++++++++++++++++++++++++++ configs/tools-only_defconfig | 1 + 4 files changed, 225 insertions(+) create mode 100644 boot/bootmeth_cros.c diff --git a/boot/Kconfig b/boot/Kconfig index d95a2a70266..1dadd42f15e 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -462,6 +462,17 @@ config BOOTMETH_GLOBAL EFI bootmgr, since they take full control over which bootdevs are selected to boot. +config BOOTMETH_CROS + bool "Bootdev support for Chromium OS" + depends on X86 || SANDBOX + default y + help + Enables support for booting Chromium OS using bootdevs. This uses the + kernel A slot and obtains the kernel command line from the parameters + provided there. + + Note that only x86 devices are supported at present. + config BOOTMETH_DISTRO bool "Bootdev support for distro boot" select PXE_UTILS diff --git a/boot/Makefile b/boot/Makefile index 88193a1b60e..998a7f9c684 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootstd-uclass.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_DISTRO) += bootmeth_distro.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_DISTRO_PXE) += bootmeth_pxe.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_EFILOADER) += bootmeth_efi.o +obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_CROS) += bootmeth_cros.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL diff --git a/boot/bootmeth_cros.c b/boot/bootmeth_cros.c new file mode 100644 index 00000000000..440737060fd --- /dev/null +++ b/boot/bootmeth_cros.c @@ -0,0 +1,212 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Bootmethod for ChromiumOS + * + * Copyright 2023 Google LLC + * Written by Simon Glass + */ + +#define LOG_CATEGORY UCLASS_BOOTSTD + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef CONFIG_X86 +#include +#endif +#include + +enum { + /* Offsets in the kernel-partition header */ + KERN_START = 0x4f0, + KERN_SIZE = 0x518, + + SETUP_OFFSET = 0x1000, /* bytes before base */ + CMDLINE_OFFSET = 0x2000, /* bytes before base */ + OFFSET_BASE = 0x100000, /* assumed kernel load-address */ +}; + +static int cros_check(struct udevice *dev, struct bootflow_iter *iter) +{ + /* This only works on block and network devices */ + if (bootflow_iter_check_blk(iter)) + return log_msg_ret("blk", -ENOTSUPP); + + return 0; +} + +static int copy_cmdline(const char *from, const char *uuid, char **bufp) +{ + const int maxlen = 2048; + char buf[maxlen]; + char *cmd, *to, *end; + int len; + + /* Allow space for cmdline + UUID */ + len = strnlen(from, sizeof(buf)); + if (len >= maxlen) + return -E2BIG; + + log_debug("uuid %d %s\n", uuid ? (int)strlen(uuid) : 0, uuid); + for (to = buf, end = buf + maxlen - UUID_STR_LEN - 1; *from; from++) { + if (to >= end) + return -E2BIG; + if (from[0] == '%' && from[1] == 'U' && uuid && + strlen(uuid) == UUID_STR_LEN) { + strcpy(to, uuid); + to += UUID_STR_LEN; + from++; + } else { + *to++ = *from; + } + } + *to = '\0'; + len = to - buf; + cmd = strdup(buf); + if (!cmd) + return -ENOMEM; + free(*bufp); + *bufp = cmd; + + return 0; +} + +static int cros_read_bootflow(struct udevice *dev, struct bootflow *bflow) +{ + struct blk_desc *desc = dev_get_uclass_plat(bflow->blk); + ulong base, start, size, setup, cmdline, num_blks, kern_base; + struct disk_partition info; + const char *uuid = NULL; + void *buf, *hdr; + int ret; + + log_debug("starting, part=%d\n", bflow->part); + + /* We consider the whole disk, not any one partition */ + if (bflow->part) + return log_msg_ret("max", -ENOENT); + + /* Check partition 2 */ + ret = part_get_info(desc, 2, &info); + if (ret) + return log_msg_ret("part", ret); + + /* Make a buffer for the header information */ + num_blks = SZ_4K >> desc->log2blksz; + log_debug("Reading header, blk=%s, start=%lx, blocks=%lx\n", + bflow->blk->name, (ulong)info.start, num_blks); + hdr = memalign(SZ_1K, SZ_4K); + if (!hdr) + return log_msg_ret("hdr", -ENOMEM); + ret = blk_read(bflow->blk, info.start, num_blks, hdr); + if (ret != num_blks) + return log_msg_ret("inf", ret); + + if (memcmp("CHROMEOS", hdr, 8)) + return -ENOENT; + + log_debug("Header at %lx\n", (ulong)map_to_sysmem(hdr)); + start = *(u32 *)(hdr + KERN_START); + size = ALIGN(*(u32 *)(hdr + KERN_SIZE), desc->blksz); + log_debug("Reading start %lx size %lx\n", start, size); + bflow->size = size; + + buf = memalign(SZ_1K, size); + if (!buf) + return log_msg_ret("buf", -ENOMEM); + num_blks = size >> desc->log2blksz; + log_debug("Reading data, blk=%s, start=%lx, blocks=%lx\n", + bflow->blk->name, (ulong)info.start, num_blks); + ret = blk_read(bflow->blk, (ulong)info.start + 0x80, num_blks, buf); + if (ret != num_blks) + return log_msg_ret("inf", ret); + base = map_to_sysmem(buf); + + setup = base + start - OFFSET_BASE - SETUP_OFFSET; + cmdline = base + start - OFFSET_BASE - CMDLINE_OFFSET; + kern_base = base + start - OFFSET_BASE + SZ_16K; + log_debug("base %lx setup %lx, cmdline %lx, kern_base %lx\n", base, + setup, cmdline, kern_base); + +#ifdef CONFIG_X86 + const char *version; + + version = zimage_get_kernel_version(map_sysmem(setup, 0), + map_sysmem(kern_base, 0)); + log_debug("version %s\n", version); + if (version) + bflow->name = strdup(version); +#endif + if (!bflow->name) + bflow->name = strdup("ChromeOS"); + if (!bflow->name) + return log_msg_ret("nam", -ENOMEM); + bflow->os_name = strdup("ChromeOS"); + if (!bflow->os_name) + return log_msg_ret("os", -ENOMEM); + +#if CONFIG_IS_ENABLED(PARTITION_UUIDS) + uuid = info.uuid; +#endif + ret = copy_cmdline(map_sysmem(cmdline, 0), uuid, &bflow->cmdline); + if (ret) + return log_msg_ret("cmd", ret); + + bflow->state = BOOTFLOWST_READY; + bflow->buf = buf; + bflow->x86_setup = map_sysmem(setup, 0); + + return 0; +} + +static int cros_read_file(struct udevice *dev, struct bootflow *bflow, + const char *file_path, ulong addr, ulong *sizep) +{ + return -ENOSYS; +} + +static int cros_boot(struct udevice *dev, struct bootflow *bflow) +{ +#ifdef CONFIG_X86 + zboot_start(map_to_sysmem(bflow->buf), bflow->size, 0, 0, + map_to_sysmem(bflow->x86_setup), + bflow->cmdline); +#endif + + return log_msg_ret("go", -EFAULT); +} + +static int cros_bootmeth_bind(struct udevice *dev) +{ + struct bootmeth_uc_plat *plat = dev_get_uclass_plat(dev); + + plat->desc = "ChromiumOS boot"; + + return 0; +} + +static struct bootmeth_ops cros_bootmeth_ops = { + .check = cros_check, + .read_bootflow = cros_read_bootflow, + .read_file = cros_read_file, + .boot = cros_boot, +}; + +static const struct udevice_id cros_bootmeth_ids[] = { + { .compatible = "u-boot,cros" }, + { } +}; + +U_BOOT_DRIVER(bootmeth_cros) = { + .name = "bootmeth_cros", + .id = UCLASS_BOOTMETH, + .of_match = cros_bootmeth_ids, + .ops = &cros_bootmeth_ops, + .bind = cros_bootmeth_bind, +}; diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 23e1f0e9dba..7b6c07ffb02 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -9,6 +9,7 @@ CONFIG_FIT=y CONFIG_TIMESTAMP=y CONFIG_FIT_SIGNATURE=y # CONFIG_BOOTSTD_FULL is not set +# CONFIG_BOOTMETH_CROS is not set # CONFIG_BOOTMETH_VBE is not set CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run distro_bootcmd"