From patchwork Sun Apr 7 22:02:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 1080395 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mAEhUFhb"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44cncV6BJ0z9s7T for ; Mon, 8 Apr 2019 08:03:22 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 73C96C21E12; Sun, 7 Apr 2019 22:03:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6DDF2C21E02; Sun, 7 Apr 2019 22:02:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 89F78C21E38; Sun, 7 Apr 2019 22:02:40 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id F194CC21E3B for ; Sun, 7 Apr 2019 22:02:39 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id w1so14078420wrp.2 for ; Sun, 07 Apr 2019 15:02:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C9CBdF6kW+5gkPjKMtGs4JqsEkGmMrHxvCKaSfNrfVg=; b=mAEhUFhbTU5kHDa5RVDsNYJsIJ8aL+Bc/90chOx2Up9Zb18uM3OIyh4sYJY8irXL8I 8o8zQl99/AHbFhw6twetSRw7+ZKjHzQl6Bo8+OnTkW/wnqZ6gtsTseh5QlDjLNJubL29 zEXy77H9s6XgNklRKlJUlWvFkFtUrneXJa0hHBQWT+CDT9J1AtrhKu45Qw/CHtLq0ZUU 0I3b2pKnlfSk+knB7QZL97DjiQMuZI3fosGXG9oiuAIf4C+nONSnNcgFpy9H+uqcc838 mGcwmd7NIc7FsfOy4h94eLAdkKz8G/edS1nvVOJLkPuQCs730cwWTVP3nOimASDGXj/B rgFw== 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:mime-version:content-transfer-encoding; bh=C9CBdF6kW+5gkPjKMtGs4JqsEkGmMrHxvCKaSfNrfVg=; b=SJ5S1NRnm+3IjjYcIXLe3KSglNoIbDjMRpinElJ+BwPl8UaCDeirQQI0ejunJkcGfy 8zr14NqFtXzHyBapFOcRHHp3CLnZktOP8HyRCc0eH1or/CSGDYixDuoWrfonenJgKLhI LCQdzriwm0sId6U9QleyngCBCy2nH1W3SJtcQE+hemcOzP8ZsivK7n3G7g04oD5NDMkR bagtHURjyG9OiXHkkZPmja7FszcnzKwMqwlrYytyE8272JLQauty9Qyh/LE0FHagdQsE zTFijFPtal38dlGaJOkYvl26EMsXIGpIFDry0aLcUgF20z7wCLkNXkuYZ1dVGMyR/tQt bc1w== X-Gm-Message-State: APjAAAXZpoDxUESELTiH4DwEYpAF2ie4KzGUIYcRGDTqzSGYIPdCiglO ssXwHyigATHmiYo7M19BrZA= X-Google-Smtp-Source: APXvYqxvcUZP+t5EKLM6Pd5ZVT0yfcDwWQrafxpLIST5fgbtFdAYRT3vpe+lBAbRvnKQI3meSM0q8A== X-Received: by 2002:a5d:6a4f:: with SMTP id t15mr16183279wrw.156.1554674559379; Sun, 07 Apr 2019 15:02:39 -0700 (PDT) Received: from localhost.localdomain (ipb218f597.dynamic.kabel-deutschland.de. [178.24.245.151]) by smtp.gmail.com with ESMTPSA id 7sm96313748wrc.81.2019.04.07.15.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Apr 2019 15:02:38 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , Marek Vasut , Simon Glass , Sam Protsenko , Alex Kiernan , Alex Deymo , Praneeth Bajjuri , Alistair Strachan , Joe Hershberger , Michal Simek , Chris Packham , Heinrich Schuchardt , Miquel Raynal , Mario Six , Adam Ford , Stefan Roese , Tom Rini , u-boot@lists.denx.de Date: Mon, 8 Apr 2019 00:02:06 +0200 Message-Id: <20190407220206.7655-3-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190407220206.7655-1-erosca@de.adit-jv.com> References: <20190407220206.7655-1-erosca@de.adit-jv.com> MIME-Version: 1.0 Cc: Eugeniu Rosca , Eugeniu Rosca Subject: [U-Boot] [PATCH 2/2] cmd: Add 'bcb' command to read/modify/write BCB fields X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" 'Bootloader Control Block' (BCB) is a well established term/acronym in the Android namespace which refers to a location in a dedicated raw (i.e. FS-unaware) flash (e.g. eMMC) partition, usually called "misc", which is used as media for exchanging messages between Android userspace (particularly recovery [1]) and an Android-capable bootloader. On higher level, this allows implementing a subset of Android Bootloader Requirements [2], amongst which is the Android-specific bootloader flow [3]. Regardless how the latter is implemented in U-Boot ([3] being the most notorious example), reading/writing/dumping the BCB fields in the development process from inside the U-Boot is a convenient feature. Hence, make it available to the users. Some usage examples of the new command recorded on R-Car H3ULCB-KF ('>>>' is an overlay on top of the original console output): => bcb bcb - Load/set/clear/test/dump/store Android BCB fields Usage: bcb load - load BCB from mmc : bcb set - set BCB to bcb clear [] - clear BCB or all fields bcb test - test BCB against bcb dump - dump BCB bcb store - store BCB back to mmc Legend: - MMC device index containing the BCB partition - MMC partition index or name containing the BCB - one of {command,status,recovery,stage,reserved} - the binary operator used in 'bcb test': '=' returns true if matches the string stored in '~' returns true if matches a subset of 's string - string/text provided as input to bcb {set,test} NOTE: any ':' character in will be replaced by line feed during 'bcb set' and used as separator by upper layers => bcb dump command Error: BCB not loaded! >>> Users must specify mmc device and partition before any other call => bcb load 1 misc => bcb load 1 1 >>> The two calls are equivalent (assuming "misc" has index 1) => bcb dump command 00000000: 62 6f 6f 74 6f 6e 63 65 2d 73 68 65 6c 6c 00 72 bootonce-shell.r 00000010: 79 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 y.r............. >>> The output is in binary/string format for convenience >>> The output size matches the size of inspected BCB field >>> (32 bytes in case of 'command') => bcb test command = bootonce-shell && echo true true => bcb test command = bootonce-shell- && echo true => bcb test command = bootonce-shel && echo true >>> The '=' operator returns 'true' on perfect match => bcb test command ~ bootonce-shel && echo true true => bcb test command ~ bootonce-shell && echo true true >>> The '~' operator returns 'true' on substring match => bcb set command recovery => bcb dump command 00000000: 72 65 63 6f 76 65 72 79 00 73 68 65 6c 6c 00 72 recovery.shell.r 00000010: 79 00 72 00 00 00 00 00 00 00 00 00 00 00 00 00 y.r............. >>> The new value is NULL-terminated and stored in the BCB field => bcb set recovery "msg1:msg2:msg3" => bcb dump recovery 00000040: 6d 73 67 31 0a 6d 73 67 32 0a 6d 73 67 33 00 00 msg1.msg2.msg3.. 00000050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00000060: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ >>> --- snip --- >>> Every ':' is replaced by line-feed '\n' (0xA). The latter is used >>> as separator between individual commands by Android userspace => bcb store >>> Flush/store the BCB structure to MMC [1] https://android.googlesource.com/platform/bootable/recovery [2] https://source.android.com/devices/bootloader [3] https://patchwork.ozlabs.org/patch/746835/ ("[U-Boot,5/6] Initial support for the Android Bootloader flow") Signed-off-by: Eugeniu Rosca --- cmd/Kconfig | 17 +++ cmd/Makefile | 1 + cmd/bcb.c | 347 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 365 insertions(+) create mode 100644 cmd/bcb.c diff --git a/cmd/Kconfig b/cmd/Kconfig index 0b07b3b9d777..2c32d9b85b51 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -621,6 +621,23 @@ config CMD_ADC Shows ADC device info and permit printing one-shot analog converted data from a named Analog to Digital Converter. +config CMD_BCB + bool "bcb" + depends on MMC + depends on PARTITIONS + help + Read/modify/write the fields of Bootloader Control Block, usually + stored on the flash "misc" partition with its structure defined in: + https://android.googlesource.com/platform/bootable/recovery/+/master/ + bootloader_message/include/bootloader_message/bootloader_message.h + + Some real-life use-cases include (but are not limited to): + - Determine the "boot reason" (and act accordingly): + https://source.android.com/devices/bootloader/boot-reason + - Get/pass a list of commands from/to recovery: + https://android.googlesource.com/platform/bootable/recovery + - Inspect/dump the contents of the BCB fields + config CMD_BIND bool "bind/unbind - Bind or unbind a device to/from a driver" depends on DM diff --git a/cmd/Makefile b/cmd/Makefile index acb85f49fba8..b89d5187060b 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_CMD_ADC) += adc.o obj-$(CONFIG_CMD_ARMFLASH) += armflash.o obj-y += blk_common.o obj-$(CONFIG_CMD_SOURCE) += source.o +obj-$(CONFIG_CMD_BCB) += bcb.o obj-$(CONFIG_CMD_BDI) += bdinfo.o obj-$(CONFIG_CMD_BEDBUG) += bedbug.o obj-$(CONFIG_CMD_BIND) += bind.o diff --git a/cmd/bcb.c b/cmd/bcb.c new file mode 100644 index 000000000000..3084f5033d27 --- /dev/null +++ b/cmd/bcb.c @@ -0,0 +1,347 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Eugeniu Rosca + * + * Command to read/modify/write Android BCB fields + */ + +#include +#include +#include +#include + +enum bcb_cmd { + BCB_CMD_LOAD, + BCB_CMD_FIELD_SET, + BCB_CMD_FIELD_CLEAR, + BCB_CMD_FIELD_TEST, + BCB_CMD_FIELD_DUMP, + BCB_CMD_STORE, +}; + +static int bcb_dev = -1; +static int bcb_part = -1; +static andr_bl_msg bcb = { { 0 } }; + +static int bcb_cmd_get(char *cmd) +{ + if (!strncmp(cmd, "load", sizeof("load"))) + return BCB_CMD_LOAD; + if (!strncmp(cmd, "set", sizeof("set"))) + return BCB_CMD_FIELD_SET; + if (!strncmp(cmd, "clear", sizeof("clear"))) + return BCB_CMD_FIELD_CLEAR; + if (!strncmp(cmd, "test", sizeof("test"))) + return BCB_CMD_FIELD_TEST; + if (!strncmp(cmd, "store", sizeof("store"))) + return BCB_CMD_STORE; + if (!strncmp(cmd, "dump", sizeof("dump"))) + return BCB_CMD_FIELD_DUMP; + else + return -1; +} + +static int +bcb_load(int argc, char *const argv[], andr_bl_msg *bcb, + int *bcb_dev, int *bcb_part) +{ + struct blk_desc *desc; + disk_partition_t info; + u64 cnt; + char *endp; + int part; + + if (argc != 3) + return CMD_RET_USAGE; + + if (!bcb || !bcb_dev || !bcb_part) + return CMD_RET_FAILURE; + + if (blk_get_device_by_str("mmc", argv[1], &desc) < 0) + goto err_1; + + part = simple_strtoul(argv[2], &endp, 0); + if (*endp == '\0') { + if (part_get_info(desc, part, &info)) + goto err_1; + } else { + part = part_get_info_by_name(desc, argv[2], &info); + if (part < 0) + goto err_1; + } + + cnt = DIV_ROUND_UP(sizeof(andr_bl_msg), info.blksz); + if (cnt > info.size) + goto err_2; + + if (blk_dread(desc, info.start, cnt, bcb) != cnt) + goto err_1; + + *bcb_dev = desc->devnum; + *bcb_part = part; + debug("%s: Loaded from mmc %d:%d\n", __func__, *bcb_dev, *bcb_part); + + return CMD_RET_SUCCESS; +err_1: + printf("Failed to read from mmc %s:%s\n", argv[1], argv[2]); + goto err; +err_2: + printf("Error: mmc %s:%s too small!", argv[1], argv[2]); + goto err; +err: + *bcb_dev = *bcb_part = -1; + return CMD_RET_FAILURE; +} + +static int +bcb_is_misused(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + if (bcb_dev < 0 || bcb_part < 0) { + printf("Error: BCB not loaded!\n"); + return -1; + } + if (!bcb) { + debug("%s: Error: NULL BCB\n", __func__); + return -1; + } + + switch (bcb_cmd_get(argv[0])) { + case BCB_CMD_LOAD: + /* Dedicated arg handling */ + break; + case BCB_CMD_FIELD_SET: + if (argc != 3) + goto err; + break; + case BCB_CMD_FIELD_TEST: + if (argc != 4) + goto err; + break; + case BCB_CMD_FIELD_CLEAR: + if (argc != 1 && argc != 2) + goto err; + break; + case BCB_CMD_STORE: + if (argc != 1) + goto err; + break; + case BCB_CMD_FIELD_DUMP: + if (argc != 2) + goto err; + break; + default: + debug("%s: Error: Unexpected BCB command\n", __func__); + return -1; + } + + return 0; +err: + printf("Error: Bad usage of 'bcb %s'\n", argv[0]); + return -1; +} + +static int +bcb_field_get(char *name, andr_bl_msg *bcb, char **field, int *size) +{ + if (!strncmp(name, "command", sizeof("command"))) { + *field = bcb->command; + *size = sizeof(bcb->command); + } else if (!strncmp(name, "status", sizeof("status"))) { + *field = bcb->status; + *size = sizeof(bcb->status); + } else if (!strncmp(name, "recovery", sizeof("recovery"))) { + *field = bcb->recovery; + *size = sizeof(bcb->recovery); + } else if (!strncmp(name, "stage", sizeof("stage"))) { + *field = bcb->stage; + *size = sizeof(bcb->stage); + } else if (!strncmp(name, "reserved", sizeof("reserved"))) { + *field = bcb->reserved; + *size = sizeof(bcb->reserved); + } else { + printf("Error: Unknown field '%s'\n", name); + return -1; + } + return 0; +} + +static int +bcb_field_set(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + int size, len; + char *field, *str, *found, *keep; + + if (bcb_is_misused(argc, argv, bcb, bcb_dev, bcb_part)) + return CMD_RET_FAILURE; + + if (bcb_field_get(argv[1], bcb, &field, &size)) + return CMD_RET_FAILURE; + + len = strlen(argv[2]); + if (len >= size) { + printf("Error: sizeof('%s') = %d >= %d = sizeof(bcb.%s)\n", + argv[2], len, size, argv[1]); + return CMD_RET_FAILURE; + } + str = strdup(argv[2]); + keep = str; + + field[0] = '\0'; + while ((found = strsep(&str, ":"))) { + if (field[0] != '\0') + strcat(field, "\n"); + strcat(field, found); + } + + free(keep); + return CMD_RET_SUCCESS; +} + +static int +bcb_field_clear(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + int size; + char *field; + + if (bcb_is_misused(argc, argv, bcb, bcb_dev, bcb_part)) + return CMD_RET_FAILURE; + + if (argc == 1) { + memset(bcb, 0, sizeof(*bcb)); + return CMD_RET_SUCCESS; + } + + if (bcb_field_get(argv[1], bcb, &field, &size)) + return CMD_RET_FAILURE; + + memset(field, 0, size); + return CMD_RET_SUCCESS; +} + +static int +bcb_field_dump(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + int size; + char *field; + + if (bcb_is_misused(argc, argv, bcb, bcb_dev, bcb_part)) + return CMD_RET_FAILURE; + + if (bcb_field_get(argv[1], bcb, &field, &size)) + return CMD_RET_FAILURE; + + print_buffer((ulong)field - (ulong)bcb, (void *)field, 1, size, 16); + return CMD_RET_SUCCESS; +} + +static int +bcb_field_test(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + int size; + char *field; + + if (bcb_is_misused(argc, argv, bcb, bcb_dev, bcb_part)) + return CMD_RET_FAILURE; + + if (bcb_field_get(argv[1], bcb, &field, &size)) + return CMD_RET_FAILURE; + + if (!strncmp(argv[2], "=", sizeof("="))) { + if (!strncmp(argv[3], field, size)) + return CMD_RET_SUCCESS; + else + return CMD_RET_FAILURE; + } else if (!strncmp(argv[2], "~", sizeof("~"))) { + if (!strstr(field, argv[3])) + return CMD_RET_FAILURE; + else + return CMD_RET_SUCCESS; + } else { + printf("Error: Unknown operator '%s'\n", argv[2]); + } + return CMD_RET_FAILURE; +} + +static int +bcb_store(int argc, char *const argv[], andr_bl_msg *bcb, + int bcb_dev, int bcb_part) +{ + struct blk_desc *desc; + disk_partition_t info; + u64 cnt; + + if (bcb_is_misused(argc, argv, bcb, bcb_dev, bcb_part)) + return CMD_RET_FAILURE; + + desc = blk_get_devnum_by_type(IF_TYPE_MMC, bcb_dev); + if (!desc) + goto err; + + if (part_get_info(desc, bcb_part, &info)) + goto err; + + cnt = DIV_ROUND_UP(sizeof(andr_bl_msg), info.blksz); + + if (blk_dwrite(desc, info.start, cnt, bcb) != cnt) + goto err; + + return CMD_RET_SUCCESS; +err: + printf("Failed to write to mmc %d:%d\n", bcb_dev, bcb_part); + return CMD_RET_FAILURE; +} + +static int do_bcb(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +{ + if (argc < 2) + return CMD_RET_USAGE; + + argc--; + argv++; + + switch (bcb_cmd_get(argv[0])) { + case BCB_CMD_LOAD: + return bcb_load(argc, argv, &bcb, &bcb_dev, &bcb_part); + case BCB_CMD_FIELD_SET: + return bcb_field_set(argc, argv, &bcb, bcb_dev, bcb_part); + case BCB_CMD_FIELD_CLEAR: + return bcb_field_clear(argc, argv, &bcb, bcb_dev, bcb_part); + case BCB_CMD_FIELD_TEST: + return bcb_field_test(argc, argv, &bcb, bcb_dev, bcb_part); + case BCB_CMD_FIELD_DUMP: + return bcb_field_dump(argc, argv, &bcb, bcb_dev, bcb_part); + case BCB_CMD_STORE: + return bcb_store(argc, argv, &bcb, bcb_dev, bcb_part); + default: + return CMD_RET_USAGE; + } + + return CMD_RET_SUCCESS; +} + +U_BOOT_CMD( + bcb, CONFIG_SYS_MAXARGS, 1, do_bcb, + "Load/set/clear/test/dump/store Android BCB fields", + "load - load BCB from mmc :\n" + "bcb set - set BCB to \n" + "bcb clear [] - clear BCB or all fields\n" + "bcb test - test BCB against \n" + "bcb dump - dump BCB \n" + "bcb store - store BCB back to mmc\n" + "\n" + "Legend:\n" + " - MMC device index containing the BCB partition\n" + " - MMC partition index or name containing the BCB\n" + " - one of {command,status,recovery,stage,reserved}\n" + " - the binary operator used in 'bcb test':\n" + " '=' returns true if matches the string stored in \n" + " '~' returns true if matches a subset of 's string\n" + " - string/text provided as input to bcb {set,test}\n" + " NOTE: any ':' character in will be replaced by line feed\n" + " during 'bcb set' and used as separator by upper layers\n" +);