From patchwork Mon Oct 9 22:04:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 150373 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2143436vqo; Mon, 9 Oct 2023 15:05:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH8z5XgPigk3geZ7nTB6qufgEtPNKmLYTYwW/0Bgyo5Fgcuz24GvCHwhhCu333YTkx1rKEx X-Received: by 2002:a05:6830:1083:b0:6bd:9fa:34ff with SMTP id y3-20020a056830108300b006bd09fa34ffmr16184755oto.9.1696889111543; Mon, 09 Oct 2023 15:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696889111; cv=none; d=google.com; s=arc-20160816; b=yMfhXSAtArWnT39pM/pWp0X1GUKThTlK52WjIVCFmanj5Km4MII5xtMBxZsWxJHQ6l dLGvkTZ4NDcGuwq29mBHPyNVRMC6L7WbIkB49F1LwNA/QPFs7OUrFnGpMpU1txqrt+Kt /KcKNzPQzOoB4Si6ulK/7Jb2YIR9Ieoos/7SZOHBaCflhe+UAy7q9Nnhoc5u91lbzjws Z6KDz/VCLxmX7DmFhYSEgubDAmHxZw9fLvaXeaW5g6IdY2uivC2vwskc4yMCK8Qh7KYU pYtCM9SNjxXJKuLfPzRhG6H6Z/jqf/bwUg/PCheT7iZYQxoxkUt9YhrP5bC5AF+UGJLb SdRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; fh=IFarww2qplPjrJl7hbkk+Nq7HylZz6B3JgSh2povEMA=; b=NrfMcBMNKi5N6mJulmQQyTNO8BT7hycAkRFzgpl53KW6TYqaStzyo1GLTaxeW1QqF+ +zUZbvjKphDnZ8qx4ytbL0X/JPofClf+xZhnilGQroXq646ccGE3YBHJihl+0IDktNXi lQHNii582sOnVFaBFT4dI1AS5Q/4i3oN8MgTcbQruAtaxOM3HCKyGhqz4G9t9D7gbV+3 roP8m7G71CXvj609hF+WX4eu4yBmXxIktyC1829/CdUPAYxCN3HpWCGFPmfjd0ZzrHRN GG7a4Pdh1S6Ni3KSrvRHc4fQLsmsO1C22yGsiq2zBhFztZVUqkCjZDvyTbnLbuIOSuwT ZpzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M79vWm+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id o24-20020a639218000000b005898c065015si8328111pgd.228.2023.10.09.15.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=M79vWm+R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 97E6F81C900B; Mon, 9 Oct 2023 15:05:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378855AbjJIWEx (ORCPT + 19 others); Mon, 9 Oct 2023 18:04:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378830AbjJIWEs (ORCPT ); Mon, 9 Oct 2023 18:04:48 -0400 Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0E42D6 for ; Mon, 9 Oct 2023 15:04:42 -0700 (PDT) Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-351574aca7bso16847485ab.3 for ; Mon, 09 Oct 2023 15:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1696889082; x=1697493882; darn=vger.kernel.org; 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=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; b=M79vWm+ReC50aLzytD5ElBjwafChrifxWBUUHjdM/oiwIIn0JpbNNGIOinmaCmmlVl g++16RL3lyOTQ+rG62yAA2nKNRHwZsoKflNznyq0LuEPlAt6jNbSlQICHhJDY824RVHs HrIwuuGPX3T8tp2DG4D2hWeSSGpKG9aXIidhk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696889082; x=1697493882; 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=KzMuw4I+Nd8N8oi2Xxm8m0QPQBwYQL/tbGvCzQaub7A=; b=Az/zWKF8fxBTsQuYTjC9qyglFHAl4gwIA5zleaENdeUVswsFFzQyyIrRcNcGOlx17B 2dV0lNKu/Ps7JQhOqZ4eg7e2FBb3GCds2j990s9YibFGX8Zdydvl25WpXy97sRSry25e 9pbVE6Z/LPqthwFCVtFsbXchV2sNW2ufbVXcb6uwUA8OyozBohJGt3eu/V2UqB7yPSQL DdVl+6Z5BUx8BCqOi9qvg6zg4zL69z8yE8eA3u9nHYw6zvRspGtA/7EjAQI+lGuTuHt4 PG4bqEw1u8ojIdV3oqtRJYYZCXtWTgiFXsnjnHuNEmBZsAVFR8f9ciljdkvuR+7+8Uec dF8w== X-Gm-Message-State: AOJu0YzzEKvsRi/oN9N3Bg3PVwQJlLt9Tbj8qClk0LCki3gpdFBd82/v CYGfc6zoRm07zHOutLHkgtT6IQ== X-Received: by 2002:a05:6e02:1a2e:b0:351:4f0c:b95d with SMTP id g14-20020a056e021a2e00b003514f0cb95dmr20621948ile.22.1696889082165; Mon, 09 Oct 2023 15:04:42 -0700 (PDT) Received: from kea.bld.corp.google.com ([2620:15c:183:200:138c:cf57:c18d:20f5]) by smtp.gmail.com with ESMTPSA id o3-20020a92d4c3000000b0034cd2c0afe8sm3164063ilm.56.2023.10.09.15.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 15:04:41 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: linux-mtd@lists.infradead.org, Miquel Raynal , Michael Walle , Rob Herring , U-Boot Mailing List , Tom Rini , Simon Glass , Conor Dooley , Krzysztof Kozlowski , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] dt-bindings: mtd: binman-partitions: Add alignment properties Date: Mon, 9 Oct 2023 16:04:15 -0600 Message-ID: <20231009220436.2164245-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.609.gbb76f46606-goog In-Reply-To: <20231009220436.2164245-1-sjg@chromium.org> References: <20231009220436.2164245-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Mon, 09 Oct 2023 15:05:08 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779317196656108804 X-GMAIL-MSGID: 1779317196656108804 Add three properties for controlling alignment of partitions, aka 'entries' in binman. For now there is no explicit mention of hierarchy, so a 'section' is just the 'binman' node. These new properties are inputs to the packaging process, but are also needed if the firmware is repacked, to ensure that alignment constraints are not violated. Therefore they are provided as part of the schema. Signed-off-by: Simon Glass --- (no changes since v2) Changes in v2: - Fix 'a' typo in commit message .../mtd/partitions/binman-partition.yaml | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml index 35a320359ec1..8e8a3b6d4d14 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -28,6 +28,42 @@ properties: - const: u-boot # u-boot.bin from U-Boot project - const: atf-bl31 # bl31.bin or bl31.elf from TF-A project + align: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the entry. The entry offset is adjusted + so that the entry starts on an aligned boundary within the containing + section or image. For example ‘align = <16>’ means that the entry will + start on a 16-byte boundary. This may mean that padding is added before + the entry. The padding is part of the containing section but is not + included in the entry, meaning that an empty space may be created before + the entry starts. Alignment should be a power of 2. If ‘align’ is not + provided, no alignment is performed. + + align-size: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the entry size. For example, to ensure + that the size of an entry is a multiple of 64 bytes, set this to 64. + While this does not affect the contents of the entry within binman + itself (the padding is performed only when its parent section is + assembled), the end result is that the entry ends with the padding + bytes, so may grow. If ‘align-size’ is not provided, no alignment is + performed. + + align-end: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + This sets the alignment of the end of an entry with respect to the + containing section. Some entries require that they end on an alignment + boundary, regardless of where they start. This does not move the start + of the entry, so the contents of the entry will still start at the + beginning. But there may be padding at the end. While this does not + affect the contents of the entry within binman itself (the padding is + performed only when its parent section is assembled), the end result is + that the entry ends with the padding bytes, so may grow. If ‘align-end’ + is not provided, no alignment is performed. + additionalProperties: false examples: @@ -40,10 +76,13 @@ examples: partition@100000 { compatible = "u-boot"; reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; }; partition@200000 { compatible = "atf-bl31"; reg = <0x200000 0x100000>; + align = <0x4000>; }; };