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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 17468C001DE for ; Tue, 25 Jul 2023 21:37:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D95186823; Tue, 25 Jul 2023 23:36:59 +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="EX+KCrw+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 50CD5867DF; Tue, 25 Jul 2023 23:36:49 +0200 (CEST) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 F10708636F for ; Tue, 25 Jul 2023 23:36:45 +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-xd32.google.com with SMTP id ca18e2360f4ac-7866189cff1so313505439f.0 for ; Tue, 25 Jul 2023 14:36:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1690321004; x=1690925804; 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=eeDeR7UX7qu5T1LSGmK/gQd0+T8W1/K23fvoCpYQTa8=; b=EX+KCrw+2SiKdWD4sQmWY2n92vTRw/k+4znm7rAMIue4qIG5K4FYKgaiQy8YKKtXry WNklLvrXBUsftuIhNcmWYP2vKs9L34wefVD+XoIZX8ET6TXpnFIRpPOnW90OBaU/i1aW sr1A4pApGvzqCxSO/iGajA5QpT38VYVFOu3FI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690321004; x=1690925804; 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=eeDeR7UX7qu5T1LSGmK/gQd0+T8W1/K23fvoCpYQTa8=; b=iuawXF5CTBtwQxcTnJ0eKV4eiTUM7OEpxn8QY7OKMlPzwpjxG/GcyajZ6WsqBOLtZJ AW7HldTiu0P8ZHIGkeQ0RhSrnpv/K6v6I3xOSAyBSn0YDIJELsAJ/PljV9NtfugG9z1d LSvPpOnhnTNfB6BN/Z7gID9I01dftEX8SrwtwnqrsT0bMFyWiPaj8b51Mjw2Jc7Q3W6+ Mr1+o6pYgdYpxfDuFOBw8az7mX61c4S6bEEeiKvO3SdaDfuocAslh+vUjNMxMewryZoV HikGtiTJj4ENvwzr90+4ukxwDVba/io81NJIj4f996Sap4mEEpx8GE761yTDq5UWrh2P LsnQ== X-Gm-Message-State: ABy/qLZybFSiJFiAJ0Z02dRse2t62N5oMubbGuPY5MkdSuWQA/ytZU63 2mb9GkFfLUu00kWEj87rm9W6RgMOVAUpKRLfocQ= X-Google-Smtp-Source: APBJJlGctxg1jKAZQ5+XcR1xLLVPcooRVotulu81gSA6kt6XHHJLNBi+diV6pRWjSVanCV/ivRDvyg== X-Received: by 2002:a6b:d90f:0:b0:786:f47b:c063 with SMTP id r15-20020a6bd90f000000b00786f47bc063mr120785ioc.21.1690321004481; Tue, 25 Jul 2023 14:36:44 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:ce78:3dad:1309:8d43]) by smtp.gmail.com with ESMTPSA id ep18-20020a0566384e1200b0042b2d43ee3fsm3891987jab.82.2023.07.25.14.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jul 2023 14:36:44 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Tom Rini , Julius Werner , Dan Handley , Jose Marinho , Simon Glass , Bin Meng , Nikhil M Jain Subject: [PATCH 01/14] bloblist: Update the tag numbering Date: Tue, 25 Jul 2023 15:36:13 -0600 Message-ID: <20230725213634.255345-2-sjg@chromium.org> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog In-Reply-To: <20230725213634.255345-1-sjg@chromium.org> References: <20230725213634.255345-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Align this with the new v0.9 spec. It only has a single area for all non-standard tags. Signed-off-by: Simon Glass --- common/bloblist.c | 2 +- include/bloblist.h | 37 +++++++++++++------------------------ test/bloblist.c | 2 +- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/common/bloblist.c b/common/bloblist.c index 2144b10e1d0..ca3e6efa800 100644 --- a/common/bloblist.c +++ b/common/bloblist.c @@ -36,7 +36,7 @@ static struct tag_name { enum bloblist_tag_t tag; const char *name; } tag_name[] = { - { BLOBLISTT_NONE, "(none)" }, + { BLOBLISTT_VOID, "(void)" }, /* BLOBLISTT_AREA_FIRMWARE_TOP */ diff --git a/include/bloblist.h b/include/bloblist.h index 7ea72c6bd46..bad5fbbb889 100644 --- a/include/bloblist.h +++ b/include/bloblist.h @@ -81,7 +81,7 @@ enum { /* Supported tags - add new ones to tag_name in bloblist.c */ enum bloblist_tag_t { - BLOBLISTT_NONE = 0, + BLOBLISTT_VOID = 0, /* * Standard area to allocate blobs used across firmware components, for @@ -105,37 +105,26 @@ enum bloblist_tag_t { BLOBLISTT_VBOOT_CTX = 0x106, /* Chromium OS verified boot context */ /* + * Tags from here are on reserved for private use within a single + * firmware binary (i.e. a single executable or phase of a project). + * These tags can be passed between binaries within a local + * implementation, but cannot be used in upstream code. Allocate a + * tag in one of the areas above if you want that. + * * Project-specific tags are permitted here. Projects can be open source * or not, but the format of the data must be fuily documented in an * open source project, including all fields, bits, etc. Naming should * be: BLOBLISTT__ - */ - BLOBLISTT_PROJECT_AREA = 0x8000, - BLOBLISTT_U_BOOT_SPL_HANDOFF = 0x8000, /* Hand-off info from SPL */ - BLOBLISTT_VBE = 0x8001, /* VBE per-phase state */ - BLOBLISTT_U_BOOT_VIDEO = 0x8002, /* Video information from SPL */ - - /* - * Vendor-specific tags are permitted here. Projects can be open source + * + * Vendor-specific tags are also permitted. Projects can be open source * or not, but the format of the data must be fuily documented in an * open source project, including all fields, bits, etc. Naming should * be BLOBLISTT__ */ - BLOBLISTT_VENDOR_AREA = 0xc000, - - /* Tags after this are not allocated for now */ - BLOBLISTT_EXPANSION = 0x10000, - - /* - * Tags from here are on reserved for private use within a single - * firmware binary (i.e. a single executable or phase of a project). - * These tags can be passed between binaries within a local - * implementation, but cannot be used in upstream code. Allocate a - * tag in one of the areas above if you want that. - * - * This area may move in future. - */ - BLOBLISTT_PRIVATE_AREA = 0xffff0000, + BLOBLISTT_PRIVATE_AREA = 0xfff000, + BLOBLISTT_U_BOOT_SPL_HANDOFF = 0xfff000, /* Hand-off info from SPL */ + BLOBLISTT_VBE = 0xfff001, /* VBE per-phase state */ + BLOBLISTT_U_BOOT_VIDEO = 0xfff002, /* Video info from SPL */ }; /** diff --git a/test/bloblist.c b/test/bloblist.c index 720be7e244f..df9a99d7bd2 100644 --- a/test/bloblist.c +++ b/test/bloblist.c @@ -291,7 +291,7 @@ static int bloblist_test_cmd_list(struct unit_test_state *uts) console_record_reset(); run_command("bloblist list", 0); ut_assert_nextline("Address Size Tag Name"); - ut_assert_nextline("%08lx %8x 8000 SPL hand-off", + ut_assert_nextline("%08lx %8x fff000 SPL hand-off", (ulong)map_to_sysmem(data), TEST_SIZE); ut_assert_nextline("%08lx %8x 106 Chrome OS vboot context", (ulong)map_to_sysmem(data2), TEST_SIZE2); -- 2.41.0.487.g6d72f3e995-goog