From patchwork Thu Nov 16 17:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 165904 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp3369757vqg; Thu, 16 Nov 2023 09:29:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHmoYu6dfJBOFfzIOC84C/qLDbXwlt/TwVt4lCGAyBrTIhqtsRv+yteOc08adK2+8FyEuY X-Received: by 2002:aca:1707:0:b0:3b5:655b:2f62 with SMTP id j7-20020aca1707000000b003b5655b2f62mr17885140oii.31.1700155761912; Thu, 16 Nov 2023 09:29:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700155761; cv=none; d=google.com; s=arc-20160816; b=YXVrL5qWuL2wdrt7C57XUYBeBJSRnlEwIVFT99zTVIe9oCx94xs4inOs712wqWNkGS COeCK/TmGGb27JtV5cXxEpvcRwxB9WFi+BBn6Vp/RFRGwrMrKUDDkiFMbByqEcjfCVmq C4NpQupbXQLUSmUegvISgppf5QR7EJXU/qPCwOGTNuErtN3hWbhkAejINnrSdqFo6407 BC20bjCLPl2knvwrT2EtNk454clqfaYLmSEWwqEk09PjeBtYQscURslF8rFOLAbZkqjB HI9OY6rxkpy0MxC6Bzzn/H1OMS70LhaR4q4vZHOoV3JMXmzVBcXZw/8MRjX+t/rYcuFC vVMw== 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=Sbuu/h0AoaC0z3nDtNhgNQ0tUOdrcyZNu90tL3+QkP8=; fh=d3lsfQ0a7J9xedzK6BJn7RtDOG1vmUF6URDbb6+k7p8=; b=Tf+F50w2nXETcMGddnWckPocYnlbZ98qFKePJIjBKtl30TIVUYs15SJ9hkzy3hq1wT ZxBczbtwelJNitOUpl3tUpoFT2pgsY7gKD4T++IlIq4naQTtWlWC0xYsEJOi0XNFM1mg s+UJ/+1OKbT8KDHPah/yQOI3vK5MvWTbVs0PqjeWIwTCO+o5Wu+OFYzk6bE3OOVVW51C zbweLNU8ioyUqYq984sVD79LegWu9pkIvtEQMlUm2QjprVprhBcxuGcfSrilNDghcmiQ 43W7SiYz+tKT4JJJkHAb/wU7u+hqOMSAsds5LAQE4QWvs7cmtQZbKMf0L+dkoYJ9ZIp2 qtGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=h0aSbLlh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id p24-20020a634f58000000b0057776b67494si12645066pgl.887.2023.11.16.09.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=h0aSbLlh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id EF5CE81DA3B7; Thu, 16 Nov 2023 09:29:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231347AbjKPR3S (ORCPT + 30 others); Thu, 16 Nov 2023 12:29:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231294AbjKPR3K (ORCPT ); Thu, 16 Nov 2023 12:29:10 -0500 Received: from mail-il1-x133.google.com (mail-il1-x133.google.com [IPv6:2607:f8b0:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E813F1A7 for ; Thu, 16 Nov 2023 09:29:06 -0800 (PST) Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-35937f2fadeso3992375ab.2 for ; Thu, 16 Nov 2023 09:29:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700155746; x=1700760546; 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=Sbuu/h0AoaC0z3nDtNhgNQ0tUOdrcyZNu90tL3+QkP8=; b=h0aSbLlhIZZ4V11+3ftA1McXAc+4N8q0mE3pBF188lL0rR7Z0Qn2zxoAl2Cp0vzkYa SpWv/o0JIkFXZHpZQ+dOfWv0n0FRv/kpGtOvor1cMRF1LpgVBfCVeTY4fsJVanlIrzoT ZIwwHcvrv9WGeEhYNv2RLtVvxeqfT8EAk5YNI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700155746; x=1700760546; 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=Sbuu/h0AoaC0z3nDtNhgNQ0tUOdrcyZNu90tL3+QkP8=; b=SVDNxbDvmukTZvWkvHyEf/jzVixEkhOGVFW1wvPwP65v5P6cxTH18rvaBMfi7EusXw nb0q+YHYxj8MrsTMaqc6IBR62eh0U7eqzWaOX1VJNBgLZ+WsBgMGy0Jm7eSNmoQY7dJr hgdd9TYa/A6TAbhz+uRmz5coFSpAOFCN7DlSYIz+juybsLryzXqPifzrkOADlulwzU8p jEUgrDxjc2K3MOdnQ6iEC6x0JkdNfT+QuppWaOTtC70THY5jIYLSzzHsLB9jrQYKbA0b pzgcRF0+sL4M52CyEry7RvqwBmn4TYOvRth7kdDcfdT2FbC9wPORE6+eR/enbZ9vy/57 qtCQ== X-Gm-Message-State: AOJu0Yy/PrMYS17OhZPCPf1oBDSAWDnqDP6F/VgCMFxHm4IJ8OCOse++ 5lt0sHhaCdOq26Jdivg4I/ynIA== X-Received: by 2002:a05:6e02:216a:b0:357:a049:91c4 with SMTP id s10-20020a056e02216a00b00357a04991c4mr17861655ilv.22.1700155746310; Thu, 16 Nov 2023 09:29:06 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id o8-20020a056e02092800b0035ab8cc4a4bsm1914348ilt.17.2023.11.16.09.29.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:06 -0800 (PST) From: Simon Glass To: devicetree@vger.kernel.org Cc: Miquel Raynal , linux-mtd@lists.infradead.org, Tom Rini , Rob Herring , Michael Walle , U-Boot Mailing List , Simon Glass , Conor Dooley , Krzysztof Kozlowski , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v6 3/3] dt-bindings: mtd: binman-partitions: Add alignment properties Date: Thu, 16 Nov 2023 10:28:52 -0700 Message-ID: <20231116172859.393744-3-sjg@chromium.org> X-Mailer: git-send-email 2.43.0.rc0.421.g78406f8d94-goog In-Reply-To: <20231116172859.393744-1-sjg@chromium.org> References: <20231116172859.393744-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Thu, 16 Nov 2023 09:29:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782742528079152329 X-GMAIL-MSGID: 1782742528079152329 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 --- Changes in v6: - Correct schema-validation errors missed due to older dt-schema (enum fix and reg addition) Changes in v5: - Add value ranges - Consistently mention alignment must be power-of-2 - Mention that alignment refers to bytes Changes in v2: - Fix 'a' typo in commit message .../mtd/partitions/binman-partition.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml index 83222ac9aa78..2bc80c24bb9b 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -33,6 +33,57 @@ properties: minItems: 1 maxItems: 2 + align: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 0x80000000 + multipleOf: 2 + description: + This sets the alignment of the entry in bytes. + + 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 + must be a power of 2. If ‘align’ is not provided, no alignment is + performed. + + align-size: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 0x80000000 + multipleOf: 2 + description: + This sets the alignment of the entry size in bytes. It must be a power + of 2. + + 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 + minimum: 1 + maximum: 0x80000000 + multipleOf: 2 + description: + This sets the alignment (in bytes) of the end of an entry with respect + to the containing section. It must be a power of 2. + + 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: @@ -45,10 +96,13 @@ examples: partition@100000 { compatible = "u-boot"; reg = <0x100000 0xf00000>; + align-size = <0x1000>; + align-end = <0x10000>; }; partition@200000 { compatible = "tfa-bl31"; reg = <0x200000 0x100000>; + align = <0x4000>; }; };