From patchwork Wed Oct 25 21:06:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 158302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp238756vqb; Wed, 25 Oct 2023 14:07:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDR3nxm0AgCt8n3J2dJCSrUfDKPt4At9Xy/B9xnCgXTdwE/brxDwNK/osw9wPl7DMfo8yx X-Received: by 2002:a0d:cc8a:0:b0:5a7:e726:13f7 with SMTP id o132-20020a0dcc8a000000b005a7e72613f7mr17478678ywd.8.1698268033509; Wed, 25 Oct 2023 14:07:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698268033; cv=none; d=google.com; s=arc-20160816; b=tgdT5/ifD3DeRj5aHARrky2vzeiR/UlYYRmJaL3WSyUm1dohg0hDdsAQpvrqYIenJq mLOU0ZLwSoykTejMD33LRolVXq0XuPc+2Z/Hz9TuhMXdSr/fsbNYJhBt+69FJPsF7R0L 4BUx9JPBHVhmN16RD6EbOzpl7cYI3DRuyEo+mQKqSlNWn4HsQ8lQisRr+5LYUMwypF2p wz3kjko6d4UtNIaFivlY8l+I+Q6OpXZMZzV9SxyC9fffnBOdhvk0i0zYyQbb7nmyzgIb E+sWgCNKV+Y+vWKTtxXwGovQQmNzEv10vuLjYJeNgDkaVIx6qxrRw15T+M6BGd6Butjz dYuw== 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=+IdohqfpG/gdF3wirCpdcxePGouLjdXX9N31xMFKe2w=; fh=EE9G7yTU9fmnBslOkyu4jIX5ZdJt76O0kpIuimnBg80=; b=xYZpXKYGcSJCoXyqsBh3kg1JhEts6HZA6+tIqiB9gHKhQKPuFQ2wg6eol37w//TEAI nX+4rm/1H5wafsTVFjQqdUV6NDhE4KusguWhWaXjtlcMFUoVnXZzDVnPaXhXkFkVqNhm DoM4pRqOGyrT8Ozj7PeSjVV3JbteIGj1M6/xmDMz6u3OmYVnmvHHE3P2gou4FqOBe3vq /YKF1KVgWRT72YkBsqGujwr32hKZaL/JTtQ48joAQ8XN0PhZhRwa3HbH1uLe269OBPJ8 llwRVqjMGLZTUqVbeqEHfd3V4igoL8xNeJ/7gt/pAGM1aa1CLBDAndSkW0EPn7aSnj0J 3LlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Cxrl5Wom; 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 b63-20020a0df242000000b005958b2c7d93si13019577ywf.297.2023.10.25.14.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 14:07:13 -0700 (PDT) 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=Cxrl5Wom; 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 1F19281A3361; Wed, 25 Oct 2023 14:07:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230091AbjJYVHF (ORCPT + 25 others); Wed, 25 Oct 2023 17:07:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230162AbjJYVHC (ORCPT ); Wed, 25 Oct 2023 17:07:02 -0400 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEA90185 for ; Wed, 25 Oct 2023 14:06:59 -0700 (PDT) Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1ca72f8ff3aso1195215ad.0 for ; Wed, 25 Oct 2023 14:06:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698268019; x=1698872819; 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=+IdohqfpG/gdF3wirCpdcxePGouLjdXX9N31xMFKe2w=; b=Cxrl5WomlT0YHCrxWtMnpWW98T9vagBhfjWbFE/o/MfO/yH5O/qhPMEG0k+AFwAr6h paCPGXiPn0HE3cwhXd265qaXgK2yrQSkWFA/NUBKJ1x/KeRBcRxIObjoqqkTcBvnQeAr HIgx3BtvaNGwwcVx0i6KjErTWm90Sqlv7slaw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698268019; x=1698872819; 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=+IdohqfpG/gdF3wirCpdcxePGouLjdXX9N31xMFKe2w=; b=JSSeObRouH8aX30dfvBE3uug9yzNKi39/eSIkd0IYirj5mMNF7nrycGioiNJd/XPWP vM6Xtl21SqaTrR1YYb63x1EcT9Zu+TRNHUle2qu8ZdyAJ4oUGLqWdiIx0wEfiGbzThTf tvTFGIWSxwJ6CkWhnqjGRL+Nbdwrt2mWU51idJ2MWOeLMDU1y7Z30mHRqLCo4lsHHKag r619apvuezpWtDCWLRQFQkps2/Glgm6svEqjzsR8TvlCmBv33pRB40zT1jfaVo3h48nj d8CjJOJu7hUd+h6ufmsMUG869f3zyQ9mjkaOgXaT+AnYj/7+9Bd44Yjzju2nBp9sIM5Y l6cw== X-Gm-Message-State: AOJu0YyKasrXFLHTwTQS3GJzOq+BWyFzsSl/KnZb4blVrLfRWz6/yCqt bIjNBSBRIWgsjLpvwFHtpYWMsw== X-Received: by 2002:a17:903:110d:b0:1c9:e508:ad43 with SMTP id n13-20020a170903110d00b001c9e508ad43mr15865350plh.8.1698268019179; Wed, 25 Oct 2023 14:06:59 -0700 (PDT) Received: from sjg1.roam.corp.google.com ([202.144.206.130]) by smtp.gmail.com with ESMTPSA id ix4-20020a170902f80400b001bc5dc0cd75sm9689447plb.180.2023.10.25.14.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 14:06:58 -0700 (PDT) From: Simon Glass To: devicetree@vger.kernel.org Cc: Michael Walle , U-Boot Mailing List , Tom Rini , Rob Herring , linux-mtd@lists.infradead.org, Miquel Raynal , 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, 26 Oct 2023 10:06:12 +1300 Message-ID: <20231025210616.3201502-3-sjg@chromium.org> X-Mailer: git-send-email 2.42.0.758.gaed0368e0e-goog In-Reply-To: <20231025210616.3201502-1-sjg@chromium.org> References: <20231025210616.3201502-1-sjg@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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]); Wed, 25 Oct 2023 14:07:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780763101147755395 X-GMAIL-MSGID: 1780763101147755395 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>; }; };