From patchwork Thu Nov 16 17:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 165905 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp3369915vqg; Thu, 16 Nov 2023 09:29:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbtJAx2dy3pBDL+Q1aeN+dzdUKZHzGJjq7LZ1Rd0qGMwfcKmPJyAU2ookhSF9Yv9GQ4T4a X-Received: by 2002:a05:6a00:93a0:b0:6c4:d615:2169 with SMTP id ka32-20020a056a0093a000b006c4d6152169mr3632281pfb.10.1700155777162; Thu, 16 Nov 2023 09:29:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700155777; cv=none; d=google.com; s=arc-20160816; b=YEOG07sVHVouxlqhWbaU1nwWlhKFunGcLIDbRVwReYEAAuYr5YC+HZrhVRBnAIAOxS RDcb/vtGldJt1YnKKVy4NGHeo8mhHuKbJxaI4KLimB+5hwAeQUZ1aEhNDeh330C447xj jZmkzBFDlKyLl3euj16ZpWGgdRzMPkEWa82HdivjrTsVWrrhud3aPP7TjKa/GD06HQN/ UjVKGDIijZMMGiYGwOKHPEbNVzL6mm9yzmTWim4BvPqEpQSHYrTxK8FIDbg4u6lBVk0L mJiFzGcCgTFYZaj3HOuthDOrIRF/SfxVhyb4n6PaQ6RjQiP1A4naWrVhNJj598xzHBV+ +JFg== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=zObDJyyApj+o5rWei7TBUNVUgsvLA6WxzS7aiu366ig=; fh=Cy0ihUaoQXa+UKXX/WpMlczb0FGnvlu4JoSEwGrmeu4=; b=oU9+YqTMi/YjEOKrNsaLKB0J/BnEoRqmWmUN0O+eVZGMTvy4d1kgs1ec6eH+9xQLvl eXxGocp0XC9c/8+3ShXA/UZ+4ox7VE9QRWfU7U5NKRxy7xVVItX+4QZsQEgjBzQ0vIGu y+HnS+7FTaQgniUOT/zwWaqTMuNT0jIkQf4cE0sUppVrrTUlOH+RtokVGRcKBNg8wyMw 24peKCG6CzAE2d4igq8EzskteieEkrUz29eUY5gKfwgGWulqjSRNlrkZH9zv+MGC3HKo xp4Uuo/UeVbvG7zFH22LBU1MrriX5XDXAQ+zy5zRokEJegQup1d1QtJmYPvB0Lxi8MmT HaRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ljbhwOdE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id by4-20020a056a02058400b005c1cd1e03d9si4429040pgb.112.2023.11.16.09.29.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ljbhwOdE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id A6D9281C527F; Thu, 16 Nov 2023 09:29:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231181AbjKPR3J (ORCPT + 30 others); Thu, 16 Nov 2023 12:29:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjKPR3I (ORCPT ); Thu, 16 Nov 2023 12:29:08 -0500 Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1396A6 for ; Thu, 16 Nov 2023 09:29:04 -0800 (PST) Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7a689bd4928so57872039f.0 for ; Thu, 16 Nov 2023 09:29:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700155744; x=1700760544; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=zObDJyyApj+o5rWei7TBUNVUgsvLA6WxzS7aiu366ig=; b=ljbhwOdEVK4gOjDfaVhdMjQzJkV1GSL0684P+G65/geu6qKcxxUIfa8pXDwgbbmVXJ nLTGKcOQYfJCLsZlKWTrIy39X2g168F/53cWCTmwP5EwaY5Qs0gXmaIFy+luzFf9nH/a wndqRnKjCjjMPVOj2Do4J05SZfo+llU+tllq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700155744; x=1700760544; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=zObDJyyApj+o5rWei7TBUNVUgsvLA6WxzS7aiu366ig=; b=GNYE+sMjr0TfOjaKzDJQvkT12gUPZixW1gdSaEyBbkyS+S2OvAKMiVWk0ADxknzz7b o2l7gxf4jEM2LI1j6Ku7XMj+khnvF7nDDksCHapqf+1NqtwOn+cXoQ85Xlnk+0MYMZ9b d6RJpqDeeQT3hOdKSbWBMpBnRsHS28RGAD4nvE5nYs/jGabH+Wd2WSLkvK96KcUHvXf6 dxRVB0LuE99YfP63gqWVdmLpkgY8T0wnnxsKLxcDCj45Nuos555nLRKxeJiDZnug2UUd 8tYG/DsALA1a4w5FvpP8N0eCQdJgPUS8FIPmrAyuXYPnsrKNxmij/+wlsjyHmMVn5PJy Nrfw== X-Gm-Message-State: AOJu0YwyZUQhjA3h52VsPrig72XsPJMyPZ6H43x/30Y8FkWISRxXOSN3 hEf095Jq+NvJvYwPNQ4YJiSxTw== X-Received: by 2002:a05:6e02:1a0b:b0:359:3294:91a9 with SMTP id s11-20020a056e021a0b00b00359329491a9mr2835390ild.14.1700155744300; Thu, 16 Nov 2023 09:29:04 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:04 -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 , Pratyush Yadav , =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Richard Weinberger , Rob Herring , Vignesh Raghavendra , linux-kernel@vger.kernel.org Subject: [PATCH v6 1/3] dt-bindings: mtd: partitions: Add binman compatible Date: Thu, 16 Nov 2023 10:28:50 -0700 Message-ID: <20231116172859.393744-1-sjg@chromium.org> X-Mailer: git-send-email 2.43.0.rc0.421.g78406f8d94-goog MIME-Version: 1.0 X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.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 (lipwig.vger.email [0.0.0.0]); Thu, 16 Nov 2023 09:29:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782742544235186250 X-GMAIL-MSGID: 1782742544235186250 Add a compatible string for binman, so we can extend fixed-partitions in various ways. Signed-off-by: Simon Glass --- (no changes since v5) Changes in v5: - Add #address/size-cells and parternProperties - Drop $ref to fixed-partitions.yaml - Drop 'select: false' Changes in v4: - Change subject line Changes in v3: - Drop fixed-partition additional compatible string - Drop fixed-partitions from the example - Mention use of compatible instead of label Changes in v2: - Drop mention of 'enhanced features' in fixed-partitions.yaml - Mention Binman input and output properties - Use plain partition@xxx for the node name .../bindings/mtd/partitions/binman.yaml | 68 +++++++++++++++++++ .../bindings/mtd/partitions/partitions.yaml | 1 + MAINTAINERS | 5 ++ 3 files changed, 74 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml new file mode 100644 index 000000000000..329217550a98 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman.yaml @@ -0,0 +1,68 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman firmware layout + +maintainers: + - Simon Glass + +description: | + The binman node provides a layout for firmware, used when packaging firmware + from multiple projects. It is based on fixed-partitions, with some + extensions, but uses 'compatible' to indicate the contents of the node, to + avoid perturbing or confusing existing installations which use 'label' for a + particular purpose. + + Binman supports properties used as inputs to the firmware-packaging process, + such as those which control alignment of partitions. This binding addresses + these 'input' properties. For example, it is common for the 'reg' property + (an 'output' property) to be set by Binman, based on the alignment requested + in the input. + + Once processing is complete, input properties have mostly served their + purpose, at least until the firmware is repacked later, e.g. due to a + firmware update. The 'fixed-partitions' binding should provide enough + information to read the firmware at runtime, including decompression if + needed. + + Documentation for Binman is available at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html + + with the current image-description format at: + + https://u-boot.readthedocs.io/en/latest/develop/package/binman.html#image-description-format + +properties: + compatible: + const: binman + + "#address-cells": + const: 1 + + "#size-cells": + const: 1 + +patternProperties: + "^partition(-.+|@[0-9a-f]+)$": + $ref: partition.yaml + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + label = "u-boot"; + reg = <0x100000 0xf00000>; + }; + }; diff --git a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml index 1dda2c80747b..849fd15d085c 100644 --- a/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml +++ b/Documentation/devicetree/bindings/mtd/partitions/partitions.yaml @@ -15,6 +15,7 @@ maintainers: oneOf: - $ref: arm,arm-firmware-suite.yaml + - $ref: binman.yaml - $ref: brcm,bcm4908-partitions.yaml - $ref: brcm,bcm947xx-cfe-partitions.yaml - $ref: fixed-partitions.yaml diff --git a/MAINTAINERS b/MAINTAINERS index b294edaf5698..8704eefe6e2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3550,6 +3550,11 @@ F: Documentation/filesystems/bfs.rst F: fs/bfs/ F: include/uapi/linux/bfs_fs.h +BINMAN +M: Simon Glass +S: Supported +F: Documentation/devicetree/bindings/mtd/partitions/binman* + BITMAP API M: Yury Norov R: Andy Shevchenko From patchwork Thu Nov 16 17:28:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 165903 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp3369743vqg; Thu, 16 Nov 2023 09:29:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IFl4WYbojxZhuwVqI8ywdpZXkw99ETkEMraSQZGYIQ8rO+OjimGjNBz6rEOyaV3UXn/IsrQ X-Received: by 2002:a17:90b:4b8d:b0:280:215e:7ae2 with SMTP id lr13-20020a17090b4b8d00b00280215e7ae2mr17550994pjb.2.1700155759725; Thu, 16 Nov 2023 09:29:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700155759; cv=none; d=google.com; s=arc-20160816; b=dskgdTYdueyyQ1KuE9rJ7TFTyPzWSgOM95mU3DyVQF+9BfQoPVA7Oi0miyvqpizrhO 2BuJ9YZHjlyOzBFDPZLPLWiz4Wh25Q89I8q+L5oogm3lmu5wR70Jh+GUkB9k3bbESQ1E N8OkXtlyyvePSW1u1R8FPbz9tdcY0aHheGLd7GwfjLTvn/M5SOFV5lvBrJS4vxs8G5jH 7YXT0UIr7Y8v02O3kehU0p1wWKDGb5rnmfnPAUmGGM95+WWN9kqKQhcxWIK0+ys6YQ1B Kt97xHiGSON86ZbcJ2bJi5OegyZa9CztsCbBqoOj27zA3Nxb/VPVDSBmD1nA19krYsBb mFfw== 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=5SiGKNWTogg5s8I4hI4hsWN1in2XeMZfNUWjSe8vt1c=; fh=d3lsfQ0a7J9xedzK6BJn7RtDOG1vmUF6URDbb6+k7p8=; b=NrDgAhkGn1DmLZKfqG8YJ/HY+AKwbcyRn/gg2VLDCz7bnKTVzzd5IgMgv4sgPYweKA JpznWipPfVxIZKXE1W//JQz53KDVAW/bYRuW0ToB79IC+0E00nbfnlN3ZHjZNZXgWxPD nKySjMj/2AHDwvjuglCYDWjwGsblq6LObWaFrgw0ZMup7yvojSZcJ1DVZcJPrnQI0xk7 DbdBs6uI0ykynZsarpMR0o3AsMIY2Y5l4TaaOu1ssRizwI0Xiv3zuIAzBz7Sgl47fy3d /iN8FON+PdcOB292P77e2z4CWH3Ln4wmQfDJ9YmWIsFyQlrDlZeDnzGEYFXBHA08WTyE 1ZSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jIFRM3qw; 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 lp17-20020a17090b4a9100b00280479459f7si2615796pjb.50.2023.11.16.09.29.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:19 -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=jIFRM3qw; 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 3B8B181D7A73; Thu, 16 Nov 2023 09:29:17 -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 S1345303AbjKPR3L (ORCPT + 30 others); Thu, 16 Nov 2023 12:29:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjKPR3J (ORCPT ); Thu, 16 Nov 2023 12:29:09 -0500 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF4AA8F for ; Thu, 16 Nov 2023 09:29:05 -0800 (PST) Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-3594cb642beso3998125ab.3 for ; Thu, 16 Nov 2023 09:29:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700155745; x=1700760545; 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=5SiGKNWTogg5s8I4hI4hsWN1in2XeMZfNUWjSe8vt1c=; b=jIFRM3qwDoyoo3N1LoVtfOKJsz1vDTCy5a0/CPK80hdJT93q1xBuB58DRx9yogNppD RSqSYolEiEBeQ/VjDBsJ6LmiFULs46xJ+zA2Npw0ml7TlgzY5v2EoJ2DLypiEKiYTjix h2tSPtylu5/AejIFQIygOAA8UR/zhYjFoTiCo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700155745; x=1700760545; 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=5SiGKNWTogg5s8I4hI4hsWN1in2XeMZfNUWjSe8vt1c=; b=AtFB6Lv0PJ9u6l3EX0fp8vHNJQ+GTDJYII1JbYuEXgyfJfzrJXCKsCaseVtdFAWiRv y6EM+HjHefkv6sfvLuaRZVzxN6sNL/ATWGYKuwtz3OzhKuuT0HqTP+BoUzN6DZNbLfK4 GPVfInmLH2Hy1l8RindXo2K9TwwYg9qPDwS8Ay7DA3Y7I50AAmGOE+T1O0jsT4wCEMns psxMG7YHGnSvtJjU5ZXisA3ZFkEjaSDDvzjlELNW3mEfuJj5xEtwb7wfcLLMSkND4WLA 4LPPpa+RVGxjysTjpx2/lQBzVTzrYBf/5Fp+NFsA4tl64KybWST+LwW5SHnaQk4Gt0zU AE6Q== X-Gm-Message-State: AOJu0YwWQJpl5s00gvZ6ITzH+r1C5x2X6A8OoxGHipRdu6YL9i5MpMbZ p2SDp3f50uKPvjFrpsru+uJSug== X-Received: by 2002:a05:6e02:1c07:b0:359:5b5c:9ce4 with SMTP id l7-20020a056e021c0700b003595b5c9ce4mr22860439ilh.19.1700155745274; Thu, 16 Nov 2023 09:29:05 -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.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 09:29:05 -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 2/3] dt-bindings: mtd: binman-partition: Add binman compatibles Date: Thu, 16 Nov 2023 10:28:51 -0700 Message-ID: <20231116172859.393744-2-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:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782742526269071050 X-GMAIL-MSGID: 1782742526269071050 Add two compatible for binman entries, as a starting point for the schema. Note that, after discussion on v2, we decided to keep the existing meaning of label so as not to require changes to existing userspace software when moving to use binman nodes to specify the firmware layout. Signed-off-by: Simon Glass --- (no changes since v5) Changes in v5: - Add mention of why 'binman' is the vendor - Drop 'select: false' - Tidy up the compatible setings - Use 'tfa-bl31' instead of 'atf-bl31' Changes in v4: - Correct selection of multiple compatible strings Changes in v3: - Drop fixed-partitions from the example - Use compatible instead of label Changes in v2: - Use plain partition@xxx for the node name .../mtd/partitions/binman-partition.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml diff --git a/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml new file mode 100644 index 000000000000..83222ac9aa78 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/binman-partition.yaml @@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2023 Google LLC + +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mtd/partitions/binman-partition.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Binman partition + +maintainers: + - Simon Glass + +description: | + This corresponds to a binman 'entry'. It is a single partition which holds + data of a defined type. + + The vendor is specified as binman since there are quite a number + of binman-specific entry types, such as section, fill and files, + to be added later. + +allOf: + - $ref: /schemas/mtd/partitions/partition.yaml# + +properties: + compatible: + enum: + - binman,entry # generic binman entry + - u-boot # u-boot.bin from U-Boot project + - tfa-bl31 # bl31.bin or bl31.elf from TF-A project + + reg: + minItems: 1 + maxItems: 2 + +additionalProperties: false + +examples: + - | + partitions { + compatible = "binman"; + #address-cells = <1>; + #size-cells = <1>; + + partition@100000 { + compatible = "u-boot"; + reg = <0x100000 0xf00000>; + }; + + partition@200000 { + compatible = "tfa-bl31"; + reg = <0x200000 0x100000>; + }; + }; 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>; }; };