From patchwork Tue Aug 28 11:19:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 962852 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ghd3adln"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LGPO5uME"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205sx0gWqz9s4V for ; Tue, 28 Aug 2018 21:21:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mU4FwtDzl8T+gH0cIhukbrleEGI7bClFVlaVOAMGN48=; b=ghd3adlncPP2L3hpwoP0VJyObk dHsphcFOXvmVagKmly3qp11ZgAfi3bayjIdZugxMchszBa6ejyQV27X6E8ezOkZD+0NOfMW0UB+f6 8fzoT5kCh3PL3EdGALtZ+I5sOrAV5vxU9WjzF5XO9pZcwluw5hbiFVB1fB+6qkJFhjiyIyA9TDtBp KgEgHHbQD6oqcy+MEHcL+tIio4kFdSs5CpLAtBj9A+7R4EkG/BAxG9xgYeSV88tRkLgRDs4RVFJFU g6574C0zy+NZgPHxx8nGcb39w2Kes0ijdMNyGDGptpngP7VaKomkPsbFn5x9nAAGHXpldNsQnRMf9 gibsPq6g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc3G-0005KM-At; Tue, 28 Aug 2018 11:20:50 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2f-0003rY-B8 for linux-mtd@lists.infradead.org; Tue, 28 Aug 2018 11:20:15 +0000 Received: by mail-wr1-x441.google.com with SMTP id n2-v6so1205468wrw.7 for ; Tue, 28 Aug 2018 04:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FA4LHoYrwI9N5Fqi8+5cCwgMGFmlAXyyzASAeV7PlNo=; b=LGPO5uMET6NXIfa+D1/9RfvnyV3q9vL7Dl9SFJW0qNDEKPqwTgfpT6HMcp1DLLQZbL Y5RUA0dc2ZX9x2NElY6OkuPLFgThuz/mcUf8G+C79edZ6PxMXgU/zG2V/OcxU4o8mw9h HAtciS+sNpM8PKcLtbDQpELLwPbasu9oYzemmUX+B5guczv0FxJ36cbFBlDZBdd5wA5b bPctIzDIHl61t+pQAUeJfuWE504rAEXOiPt/isjtp8Dz+X+y8pkmX2NBmtBQUYMUdf/N jzF8sFf2b0gXPqHEyeQ+BiQWSpOw/KTPJGUQkqzeDForLfEuhwW7p2BV8G98iyFym+fW 1oSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FA4LHoYrwI9N5Fqi8+5cCwgMGFmlAXyyzASAeV7PlNo=; b=Yf2BNtgQXcjvc7kzbnf6puwFtoa6zaDHVLwPfJuwHPG3F/O6ptYOtaYJGk9VmPh0cV It1Eu4lvvLk6CMbgn7D7B96Lisp3alUhgNZQistkavAc4GLA8vdtwBmwBYE9rl8VT2cF 2hgcnts0CzIIICeqt8k8MfpdS5OGHsd1IwFcgwWmORzvdPrhMLPYuv8ex/AUsiK1QPxY 3TWDSJdDgp0DE/XiUYC9n/p44G9qg7HVs1+P6sIPe5JhgoARZLpV2Lt4lioXdOn4tvYU /ewIxMWgnEi1/33q5bnsBrcod9mVbPQEXOH9YL5oBiF2EfqF6aaPZ/H+54k4/NH4OcQn bJrw== X-Gm-Message-State: APzg51By/UpJk4GmtB9lpdbBFmyhqbDd0IbWSsIqVfRU+BZQpmSRdkkU mFUn0raCwYOheWzUJFILFoA7lvcq X-Google-Smtp-Source: ANB0VdY3QW4zRKlmqm/CwUl8Sq0oWoZW1hUjCteWMELVAd1ze4/9hNvtTbEq+SQ6WMeMJRNvs8SPPA== X-Received: by 2002:adf:8504:: with SMTP id 4-v6mr829652wrh.72.1535455201335; Tue, 28 Aug 2018 04:20:01 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id e141-v6sm1520282wmd.32.2018.08.28.04.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 04:20:00 -0700 (PDT) From: Jonas Gorski To: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 1/5] dt-bindings: mtd: describe the simple BCM963XX NOR flash layout Date: Tue, 28 Aug 2018 13:19:40 +0200 Message-Id: <20180828111944.5956-2-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180828111944.5956-1-jonas.gorski@gmail.com> References: <20180828111944.5956-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_042013_425136_913889F1 X-CRM114-Status: GOOD ( 17.33 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Marek Vasut , Richard Weinberger , Boris Brezillon , Rob Herring , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add binding documentation for the standard CFE based BCM963XX flash layout, found in most devices using a BCM63XX SoC with NOR flash. Signed-off-by: Jonas Gorski Reviewed-by: Rob Herring --- .../brcm,bcm963xx-cfe-nor-partitions.txt | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt diff --git a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt new file mode 100644 index 000000000000..9f630e95f180 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt @@ -0,0 +1,24 @@ +Broadcom BCM963XX CFE Loader NOR Flash Partitions +================================================= + +Most Broadcom BCM63XX SoC based devices follow the Broadcom reference layout for +NOR. The first erase block used for the CFE bootloader, the last for an +NVRAM partition, and the remainder in-between for one to two firmware partitions +at fixed offsets. A valid firmware partition is identified by the ImageTag +header found at beginning of the second erase block, containing the rootfs and +kernel offsets and sizes within the firmware partition. + +Required properties: +- compatible : must be "brcm,bcm963xx-cfe-nor-partitions" + +Example: + +flash@1fc00000 { + compatible = "cfi-flash"; + reg = <0x1fc00000 0x400000>; + bank-width = <2>; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; +}; From patchwork Tue Aug 28 11:19:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 962850 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PgDzIv9E"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G6O/nL+O"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205sB5br2z9rvt for ; Tue, 28 Aug 2018 21:20:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=mjzjiogjJPX5MbOyaBIT/Vsxz9EPY6sy4b9aDj13Gbw=; b=PgDzIv9EYHoSjtNndggprB7ZBR I1ZhTIwuuJLMPBOJjZ7nnMW0FJAa3cSUn52HR8XVkfDosMhW+VlRFlyF52Oe2h9VG7nTRg5R6eZ7p RTfQOmgI5d4md0xPja5WJUe9UsbyZTYdiHCpAWjL8UQ+ck68xxze0+5EILWyCpMlPLXNrdiWq39D8 d/JeCJqlap+o/kwWwUu+Dy0omfagJzxHVnTrzHfPXPP7FWY7WPLOPob/lWZPfQlOMYEYmx/Va3R+L 1eM8bEze27Ix1PBDLFrMtxIzmOUQW5amQbWAvk3jF/vAFBO7/Qy86Rf7y8uYuGxzb7m8I2YbVISlC G9TLxy+g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2j-0004o3-Va; Tue, 28 Aug 2018 11:20:18 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2f-0003tD-Az for linux-mtd@lists.infradead.org; Tue, 28 Aug 2018 11:20:15 +0000 Received: by mail-wr1-x441.google.com with SMTP id v16-v6so1198854wro.11 for ; Tue, 28 Aug 2018 04:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SgmOE2rOO2VP+WLTqwoHef4fywlydmvPwN6JXO45moM=; b=G6O/nL+OcrLxUgITSM2+qmndNrPxlmuq9jqos0B8e1zLM61jIHRYZLwTBRNeCPI3sY eDvp5sHyiiMJFFsLSAYK599c46DT/A4Mt5SYsjTiMcj8weT21JceNNvawWbhF20zO0bF hs6rfopkLH1t6JvSsR8/21DVbDKL2foF+v/S513W4RlRL5lvBpMDkxcMkNRRDT3jELP5 pxlPMi32SYMv9xSKwsLSXx35ertVJcqb5hvnC4NGfno03NLmwhN3Z0MLvkIbUcH7kr8q q1/P9HBmfvxTb1SYWjNLoQkZQX9pxyrKOB/CmXD0Q0kmiDbtw/Ctn4YaqqiS5nyBQOfM 4HHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SgmOE2rOO2VP+WLTqwoHef4fywlydmvPwN6JXO45moM=; b=qSRa336S+hLRWTumI15eP+WkZnEvf+kiklYXttW9LbmTmplKdv90lsCi2l47zARuYf owgbAycASKrN+SnJIR+WVhRomwlcz1vmRAJ5HiGCKafDNn66bsHMbGsX56OMMG2yNetB iSIOhVjt6JG+xfcdzS8S+RXMvye7DQWsCaqlIAgWQ1m1yTzFenNb85nlV0uSww8NuS80 umiggHf+oDlPlA8qYNk7lEVZVhQ+Ktjt54GVz0fdfZqpbQ3DjCQ2aF2uC0TFJU3MakvE knaW9zytTUZ3QXjHEyxwyMqoEAGhVpbVab2MRJZ4liyvSNaQkp3K4N7Wabbx+IwqMqrG e0Sw== X-Gm-Message-State: APzg51AAYQVWDN6RjQ2fDK8qrrmDFoy71thIJNtvJo2KwTwU0o/fNM1k S0tMwOzoXFX+cfHc0F1WfcVHc5ES X-Google-Smtp-Source: ANB0VdaV77cJ45KCVkrAdqeLewvEYH28adPHevCcUPsIRX/qJc5Mk167x1zzBLahBfA1v+Ks9yA0Ow== X-Received: by 2002:a5d:4250:: with SMTP id s16-v6mr805681wrr.260.1535455202655; Tue, 28 Aug 2018 04:20:02 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id e141-v6sm1520282wmd.32.2018.08.28.04.20.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 04:20:01 -0700 (PDT) From: Jonas Gorski To: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 2/5] mtd: bcm63xxpart: add of_match_table support Date: Tue, 28 Aug 2018 13:19:41 +0200 Message-Id: <20180828111944.5956-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180828111944.5956-1-jonas.gorski@gmail.com> References: <20180828111944.5956-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_042013_398377_3F1C1A06 X-CRM114-Status: GOOD ( 17.12 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Marek Vasut , Richard Weinberger , Boris Brezillon , Rob Herring , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Add of_match_table support to allow using bcm63xxpart as a full flash layout parser from device tree. Signed-off-by: Jonas Gorski --- drivers/mtd/bcm63xxpart.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c index 41d1d3149c61..f639b4c960f0 100644 --- a/drivers/mtd/bcm63xxpart.c +++ b/drivers/mtd/bcm63xxpart.c @@ -34,6 +34,7 @@ #include #include #include +#include #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ @@ -311,9 +312,16 @@ static int bcm63xx_parse_cfe_partitions(struct mtd_info *master, return ret; }; +static const struct of_device_id parse_bcm63xx_cfe_match_table[] = { + { .compatible = "brcm,bcm963xx-cfe-nor-partitions" }, + {}, +}; +MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table); + static struct mtd_part_parser bcm63xx_cfe_parser = { .parse_fn = bcm63xx_parse_cfe_partitions, .name = "bcm63xxpart", + .of_match_table = parse_bcm63xx_cfe_match_table, }; module_mtd_part_parser(bcm63xx_cfe_parser); From patchwork Tue Aug 28 11:19:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 962861 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="osbZS6kF"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LNbHtXMV"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205x56dHMz9rvt for ; Tue, 28 Aug 2018 21:23:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Q3JMx3Y9xrkCRvmsDiwGctjhU+1wYFDUm33Vz4TosMc=; b=osbZS6kFxyjB/V Gfazqb70pqnXMfFplJp627tvcW1R7Bu94iHkJny6bZhv4Zvip+smHa4kJJ68k/KJD4rO/roLfvKH+ mHLfNAlyaqKemcmmrQKVHT9hLvvYg5uihHBTQb1rK2yR2keXg+s/eztY4e3h2Y1IRbD88djJdbWb+ r6lDqP40zJ94XWq3PJ5DDCfNoz8js2PP+OhGyU+NpxILT1z9OnS76Gtd+NSa6RfJh2V2dNIsoZRJ1 KlYerufV06qydEoGdyYhBLw45R2UvIy95MuiaH6vXjtVDpcJEGyynsqACdoj6Xczt5agSoOLIoqhT NjGTXRbGPMFsFUIbEkcw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc62-0006cM-4n; Tue, 28 Aug 2018 11:23:42 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2j-000416-Gv for linux-mtd@lists.infradead.org; Tue, 28 Aug 2018 11:20:21 +0000 Received: by mail-wr1-x442.google.com with SMTP id w11-v6so1212242wrc.5 for ; Tue, 28 Aug 2018 04:20:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+HhwXkvwVpQItceT4xlmRY8I0uezXtP439YMWAJzQAQ=; b=LNbHtXMVN20Ka4lNYg39GoG+Ls2ud2DvSNSyP8uOYIbYd6F9UxJlSnbguibBxd/wcc ogNDa2/FdlKJ/eAMCeNYiSKXsqMnyboTwLDjrZk7hUrkhpMLb2xwyWbJGhmsyQM6xFhL rqE2/kCbvdQ1oObB4HULvaFknuv7oEuEH3e37ntMfZqem7fQQOB6xPu+W9btEQAE+F/W qfiW4tZOuWqcWnpmGPA/uN1faWWkgZR1RSMEfbendMrnBnVq7JsyXuJEANkNIPEIUhkK BfGS6IBpEUz70MiDJdDudOA519ByiLkAIYDVLhVCgni7LR52crKIoTfDVKEiulAu+SFx wkrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+HhwXkvwVpQItceT4xlmRY8I0uezXtP439YMWAJzQAQ=; b=k4tfZzG1PpFdlHy5bYsKHpArq4VkY2hh3ef87ByIB64IuafMXacRf5pIcF2SYHjP8Q /2urw+eQAOfNbVH67MTrit5ibptUuKFe95xHgO+a7b+eYJenlIIW33INJdhm4I8ZjXDJ akDdwBAcEtN48VWllrpqPGQb0KRUfHk/8Ed2SmVdpcxDhHamyQVpfyYE0uRXosOVbaG9 liPVwMRzcWcuV7mfObEX+Mh/CNPKBjAdu4d6f8ou4R5iYnoUtbkACazaonE8lHf5r42y d1p5xD+GT0h/lcCLeGMA81ZCXeW+O0QPfCGkBmiZGhGSHV5nbS7hVb2+B/XywROHXmmw jK8Q== X-Gm-Message-State: APzg51DTx6PRZ8oeC/TW5yB0VT1PV+d4WuLlLUU4wuRM+bTIH+fksGRC 7IDF8oABu7va3tGqLRoPg/kINugw X-Google-Smtp-Source: ANB0VdZa02Hgcjn1CgXENgXC10Hz4ap9DOww74tlCNkVGkAfbEc1GxjiKXqGhnmpACjmADF+19YgkA== X-Received: by 2002:a5d:4684:: with SMTP id u4-v6mr870631wrq.76.1535455204337; Tue, 28 Aug 2018 04:20:04 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id e141-v6sm1520282wmd.32.2018.08.28.04.20.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 04:20:03 -0700 (PDT) From: Jonas Gorski To: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 3/5] mtd: bcm63xxpart: move imagetag parsing to its own parser Date: Tue, 28 Aug 2018 13:19:42 +0200 Message-Id: <20180828111944.5956-4-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180828111944.5956-1-jonas.gorski@gmail.com> References: <20180828111944.5956-1-jonas.gorski@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_042017_635493_408ED1B9 X-CRM114-Status: GOOD ( 31.69 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Marek Vasut , Richard Weinberger , Boris Brezillon , Rob Herring , Brian Norris , David Woodhouse Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Move the bcm963xx Image Tag parsing into its own partition parser. This Allows reusing the parser with different full flash parsers. While moving it, rename it to bcm963* to better reflect it isn't chip, but reference implementation specific. Signed-off-by: Jonas Gorski --- drivers/mtd/Kconfig | 1 + drivers/mtd/bcm63xxpart.c | 155 ++---------------------- drivers/mtd/parsers/Kconfig | 11 ++ drivers/mtd/parsers/Makefile | 1 + drivers/mtd/parsers/parser_imagetag.c | 214 ++++++++++++++++++++++++++++++++++ 5 files changed, 235 insertions(+), 147 deletions(-) create mode 100644 drivers/mtd/parsers/parser_imagetag.c diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index c77f537323ec..a3bd0e315990 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -143,6 +143,7 @@ config MTD_BCM63XX_PARTS tristate "BCM63XX CFE partitioning support" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST select CRC32 + select MTD_PARSER_IMAGETAG help This provides partions parsing for BCM63xx devices with CFE bootloaders. diff --git a/drivers/mtd/bcm63xxpart.c b/drivers/mtd/bcm63xxpart.c index f639b4c960f0..b2bd04764e95 100644 --- a/drivers/mtd/bcm63xxpart.c +++ b/drivers/mtd/bcm63xxpart.c @@ -94,51 +94,19 @@ static int bcm63xx_read_nvram(struct mtd_info *master, return 0; } -static int bcm63xx_read_image_tag(struct mtd_info *master, const char *name, - loff_t tag_offset, struct bcm_tag *buf) -{ - int ret; - size_t retlen; - u32 computed_crc; - - ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); - if (ret) - return ret; - - if (retlen != sizeof(*buf)) - return -EIO; - - computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, - offsetof(struct bcm_tag, header_crc)); - if (computed_crc == buf->header_crc) { - STR_NULL_TERMINATE(buf->board_id); - STR_NULL_TERMINATE(buf->tag_version); - - pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", - name, tag_offset, buf->tag_version, buf->board_id); - - return 0; - } - - pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", - name, tag_offset, buf->header_crc, computed_crc); - return 1; -} +static const char * const bcm63xx_cfe_part_types[] = { + "bcm963xx-imagetag", + NULL, +}; static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram) { - /* CFE, NVRAM and global Linux are always present */ - int nrparts = 3, curpart = 0; - struct bcm_tag *buf = NULL; struct mtd_partition *parts; - int ret; - unsigned int rootfsaddr, kerneladdr, spareaddr; - unsigned int rootfslen, kernellen, sparelen, totallen; + int nrparts = 3, curpart = 0; unsigned int cfelen, nvramlen; unsigned int cfe_erasesize; int i; - bool rootfs_first = false; cfe_erasesize = max_t(uint32_t, master->erasesize, BCM963XX_CFE_BLOCK_SIZE); @@ -147,83 +115,9 @@ static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, nvramlen = nvram->psi_size * SZ_1K; nvramlen = roundup(nvramlen, cfe_erasesize); - buf = vmalloc(sizeof(struct bcm_tag)); - if (!buf) - return -ENOMEM; - - /* Get the tag */ - ret = bcm63xx_read_image_tag(master, "rootfs", cfelen, buf); - if (!ret) { - STR_NULL_TERMINATE(buf->flash_image_start); - if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || - rootfsaddr < BCM963XX_EXTENDED_SIZE) { - pr_err("invalid rootfs address: %*ph\n", - (int)sizeof(buf->flash_image_start), - buf->flash_image_start); - goto invalid_tag; - } - - STR_NULL_TERMINATE(buf->kernel_address); - if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || - kerneladdr < BCM963XX_EXTENDED_SIZE) { - pr_err("invalid kernel address: %*ph\n", - (int)sizeof(buf->kernel_address), - buf->kernel_address); - goto invalid_tag; - } - - STR_NULL_TERMINATE(buf->kernel_length); - if (kstrtouint(buf->kernel_length, 10, &kernellen)) { - pr_err("invalid kernel length: %*ph\n", - (int)sizeof(buf->kernel_length), - buf->kernel_length); - goto invalid_tag; - } - - STR_NULL_TERMINATE(buf->total_length); - if (kstrtouint(buf->total_length, 10, &totallen)) { - pr_err("invalid total length: %*ph\n", - (int)sizeof(buf->total_length), - buf->total_length); - goto invalid_tag; - } - - kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE; - rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE; - spareaddr = roundup(totallen, master->erasesize) + cfelen; - - if (rootfsaddr < kerneladdr) { - /* default Broadcom layout */ - rootfslen = kerneladdr - rootfsaddr; - rootfs_first = true; - } else { - /* OpenWrt layout */ - rootfsaddr = kerneladdr + kernellen; - rootfslen = spareaddr - rootfsaddr; - } - } else if (ret > 0) { -invalid_tag: - kernellen = 0; - rootfslen = 0; - rootfsaddr = 0; - spareaddr = cfelen; - } else { - goto out; - } - sparelen = master->size - spareaddr - nvramlen; - - /* Determine number of partitions */ - if (rootfslen > 0) - nrparts++; - - if (kernellen > 0) - nrparts++; - parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); - if (!parts) { - ret = -ENOMEM; - goto out; - } + if (!parts) + return -ENOMEM; /* Start building partition list */ parts[curpart].name = "CFE"; @@ -231,30 +125,6 @@ static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, parts[curpart].size = cfelen; curpart++; - if (kernellen > 0) { - int kernelpart = curpart; - - if (rootfslen > 0 && rootfs_first) - kernelpart++; - parts[kernelpart].name = "kernel"; - parts[kernelpart].offset = kerneladdr; - parts[kernelpart].size = kernellen; - curpart++; - } - - if (rootfslen > 0) { - int rootfspart = curpart; - - if (kernellen > 0 && rootfs_first) - rootfspart--; - parts[rootfspart].name = "rootfs"; - parts[rootfspart].offset = rootfsaddr; - parts[rootfspart].size = rootfslen; - if (sparelen > 0 && !rootfs_first) - parts[rootfspart].size += sparelen; - curpart++; - } - parts[curpart].name = "nvram"; parts[curpart].offset = master->size - nvramlen; parts[curpart].size = nvramlen; @@ -264,22 +134,13 @@ static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, parts[curpart].name = "linux"; parts[curpart].offset = cfelen; parts[curpart].size = master->size - cfelen - nvramlen; + parts[curpart].types = bcm63xx_cfe_part_types; for (i = 0; i < nrparts; i++) pr_info("Partition %d is %s offset %llx and length %llx\n", i, parts[i].name, parts[i].offset, parts[i].size); - pr_info("Spare partition is offset %x and length %x\n", spareaddr, - sparelen); - *pparts = parts; - ret = 0; - -out: - vfree(buf); - - if (ret) - return ret; return nrparts; } diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig index ee5ab994132f..a17d751af8da 100644 --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -1,3 +1,14 @@ +config MTD_PARSER_IMAGETAG + tristate "Parser for BCM963XX Image Tag format partitions" + depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST + select CRC32 + help + Image Tag is the firmware header used by broadcom on their xDSL line + of devices. It is used to describe the offsets and lengths of kernel + and rootfs partitions. + This driver adds support for parsing a partition with an Image Tag + header and creates up to two partitions, kernel and rootfs. + config MTD_PARSER_TRX tristate "Parser for TRX format partitions" depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile index 5b1bcc3d90d9..02d7a9db8370 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,2 +1,3 @@ +obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o diff --git a/drivers/mtd/parsers/parser_imagetag.c b/drivers/mtd/parsers/parser_imagetag.c new file mode 100644 index 000000000000..81e2fc70c889 --- /dev/null +++ b/drivers/mtd/parsers/parser_imagetag.c @@ -0,0 +1,214 @@ +/* + * BCM63XX CFE image tag parser + * + * Copyright © 2006-2008 Florian Fainelli + * Mike Albon + * Copyright © 2009-2010 Daniel Dickinson + * Copyright © 2011-2013 Jonas Gorski + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Ensure strings read from flash structs are null terminated */ +#define STR_NULL_TERMINATE(x) \ + do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) + +static int bcm963xx_read_imagetag(struct mtd_info *master, const char *name, + loff_t tag_offset, struct bcm_tag *buf) +{ + int ret; + size_t retlen; + u32 computed_crc; + + ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); + if (ret) + return ret; + + if (retlen != sizeof(*buf)) + return -EIO; + + computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, + offsetof(struct bcm_tag, header_crc)); + if (computed_crc == buf->header_crc) { + STR_NULL_TERMINATE(buf->board_id); + STR_NULL_TERMINATE(buf->tag_version); + + pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", + name, tag_offset, buf->tag_version, buf->board_id); + + return 0; + } + + pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", + name, tag_offset, buf->header_crc, computed_crc); + return -EINVAL; +} + +static int bcm963xx_parse_imagetag_partitions(struct mtd_info *master, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +{ + /* CFE, NVRAM and global Linux are always present */ + int nrparts = 0, curpart = 0; + struct bcm_tag *buf = NULL; + struct mtd_partition *parts; + int ret; + unsigned int rootfsaddr, kerneladdr, spareaddr, offset; + unsigned int rootfslen, kernellen, sparelen, totallen; + int i; + bool rootfs_first = false; + + buf = vmalloc(sizeof(struct bcm_tag)); + if (!buf) + return -ENOMEM; + + /* Get the tag */ + ret = bcm963xx_read_imagetag(master, "rootfs", 0, buf); + if (!ret) { + STR_NULL_TERMINATE(buf->flash_image_start); + if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || + rootfsaddr < BCM963XX_EXTENDED_SIZE) { + pr_err("invalid rootfs address: %*ph\n", + (int)sizeof(buf->flash_image_start), + buf->flash_image_start); + goto out; + } + + STR_NULL_TERMINATE(buf->kernel_address); + if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || + kerneladdr < BCM963XX_EXTENDED_SIZE) { + pr_err("invalid kernel address: %*ph\n", + (int)sizeof(buf->kernel_address), + buf->kernel_address); + goto out; + } + + STR_NULL_TERMINATE(buf->kernel_length); + if (kstrtouint(buf->kernel_length, 10, &kernellen)) { + pr_err("invalid kernel length: %*ph\n", + (int)sizeof(buf->kernel_length), + buf->kernel_length); + goto out; + } + + STR_NULL_TERMINATE(buf->total_length); + if (kstrtouint(buf->total_length, 10, &totallen)) { + pr_err("invalid total length: %*ph\n", + (int)sizeof(buf->total_length), + buf->total_length); + goto out; + } + + /* + * Addresses are flash absolute, so convert to partition + * relative addresses. Assume either kernel or rootfs will + * directly follow the image tag. + */ + if (rootfsaddr < kerneladdr) + offset = rootfsaddr - sizeof(struct bcm_tag); + else + offset = kerneladdr - sizeof(struct bcm_tag); + + kerneladdr = kerneladdr - offset; + rootfsaddr = rootfsaddr - offset; + spareaddr = roundup(totallen, master->erasesize); + + if (rootfsaddr < kerneladdr) { + /* default Broadcom layout */ + rootfslen = kerneladdr - rootfsaddr; + rootfs_first = true; + } else { + /* OpenWrt layout */ + rootfsaddr = kerneladdr + kernellen; + rootfslen = spareaddr - rootfsaddr; + } + } else { + goto out; + } + sparelen = master->size - spareaddr; + + /* Determine number of partitions */ + if (rootfslen > 0) + nrparts++; + + if (kernellen > 0) + nrparts++; + + parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); + if (!parts) { + ret = -ENOMEM; + goto out; + } + + /* Start building partition list */ + if (kernellen > 0) { + int kernelpart = curpart; + + if (rootfslen > 0 && rootfs_first) + kernelpart++; + parts[kernelpart].name = "kernel"; + parts[kernelpart].offset = kerneladdr; + parts[kernelpart].size = kernellen; + curpart++; + } + + if (rootfslen > 0) { + int rootfspart = curpart; + + if (kernellen > 0 && rootfs_first) + rootfspart--; + parts[rootfspart].name = "rootfs"; + parts[rootfspart].offset = rootfsaddr; + parts[rootfspart].size = rootfslen; + if (sparelen > 0 && !rootfs_first) + parts[rootfspart].size += sparelen; + curpart++; + } + + for (i = 0; i < nrparts; i++) + pr_info("Partition %d is %s offset %llx and length %llx\n", i, + parts[i].name, parts[i].offset, parts[i].size); + + pr_info("Spare partition is offset %x and length %x\n", spareaddr, + sparelen); + + *pparts = parts; + ret = 0; + +out: + vfree(buf); + + if (ret) + return ret; + + return nrparts; +} + +static struct mtd_part_parser bcm963xx_imagetag_parser = { + .parse_fn = bcm963xx_parse_imagetag_partitions, + .name = "bcm963xx-imagetag", +}; +module_mtd_part_parser(bcm963xx_imagetag_parser); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Daniel Dickinson "); +MODULE_AUTHOR("Florian Fainelli "); +MODULE_AUTHOR("Mike Albon "); +MODULE_AUTHOR("Jonas Gorski X-Patchwork-Id: 962855 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="b7FEKBY9"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qEAopsPE"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205tm2pGmz9rvt for ; Tue, 28 Aug 2018 21:21:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=VniNpTLc3pZyH2BUikNLySR7kfKcVogQ3S9+cGiX8ZQ=; b=b7FEKBY9Pfch+SzfRMQ2crcnSf 61nZwYs7ku42BtaQTWcH7642fCAm/L5/HK/M8ULJaWIMALo/uSVoWs3Z/7sYqNTC1aE+jVkv3HmCz 1z/Lzx7LpKV/I7Ny9zbg56yjx9mFTJpmJHIy0bFwflp2gjPjHAF6bKS1TwU5KO6gksVJXycXZy3E6 OMLdvpGi1Ygtfer5DLaV+VFv0pNDvUGguvOq7GZO6Lxcl1pCzN22AQ9+R1G1fT+D5ETUeUU6T2Kbh bFMJv7cB1OoeN0N8SVIU4V2S1xPlPyVOzBXH3+U/L/gmTYjJtI9VQMlM43VHKWsnPXUx3TW/657yb Fyur42mg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc45-0005hN-FI; Tue, 28 Aug 2018 11:21:41 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2f-00045a-Cn for linux-mtd@lists.infradead.org; Tue, 28 Aug 2018 11:20:16 +0000 Received: by mail-wr1-x441.google.com with SMTP id z96-v6so1209398wrb.8 for ; Tue, 28 Aug 2018 04:20:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sp7tdRbq7xHl3fmuesQSXf3FVzLU0TAectp9Ieuy97o=; b=qEAopsPEORNrH7fhdzgZwVqAnYrMfER3h8IHk7I5uqMVJDzVtg2NVqyNJq0sI/O7gD b7pTNeuILuKDfaTn1na0i+vMrQuowsST1WtyxRtooIB4aWyTXMPNiVfwKR4VTJhKNEte QOrqkSCd+ZkNleY+nte6sghTd/x4LZc3RwD61X16Ncuc5UoFeljL6ucM51x+2nVJ+WSM XBouShUjNqTe6YsRNv/Qoye5dfI/OVMoNSNk6AxrV8qMp4I6PVjtfM+UrpS6vp9Iewys /uCzOhBdBix7tVM5XJTmGbtHYb1dgB/AUnaND7pp2bvKok0WpElNaOhwu7m8pUHo+5ew Fx5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Sp7tdRbq7xHl3fmuesQSXf3FVzLU0TAectp9Ieuy97o=; b=mjZUohDXldDxsP75o9PHDymKo7FuLBZQrLnLv2mbxLhm2qyplreNQuljrvVz1Ai6eQ J/5YbLn7Z6Wbjktikz7MXIVsrhYrKagbtR4yrE9MwFyReIQACLGsf8UOZj8io0hgdcXe z7BFtybtRXhnHVXy1iWrMl6BA/qYvwuaMmNjOujt5z0g7HYXzH/6OyEes3UoRJb88oq9 S0TSnaGM6QKrLmcOqDpQBAYjyOkIHNL2FHfEkdbesDIC7R4Sa/8zG3Gde6yMGepXgjQK zcXb7/wLGlxE3KDDWjZIDeV0uTzZ0+FCO096G96NXcSRLnXDAwfx2NdZM3QjRSAyT6vi M3QQ== X-Gm-Message-State: APzg51DGi0jzU3kAQmaaRme9vPKloHf1X3GVhJBKKOs38Y/ErYFQsM6w XrDcUywKrYF6WwSCh0I+RNkCnb/O X-Google-Smtp-Source: ANB0VdZ2AuZKwYhavww/9Wv5azz8WNvxQZowriSxD1UMU7WiQUR5Zi7MPLxx1sKNuhliE9bGCN6Y8Q== X-Received: by 2002:a5d:6347:: with SMTP id b7-v6mr781517wrw.163.1535455205753; Tue, 28 Aug 2018 04:20:05 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id e141-v6sm1520282wmd.32.2018.08.28.04.20.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 04:20:05 -0700 (PDT) From: Jonas Gorski To: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 4/5] dt-bindings: mtd: describe BCM963XX ImageTag format and usage Date: Tue, 28 Aug 2018 13:19:43 +0200 Message-Id: <20180828111944.5956-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180828111944.5956-1-jonas.gorski@gmail.com> References: <20180828111944.5956-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_042013_451159_EF31FE06 X-CRM114-Status: GOOD ( 17.28 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Marek Vasut , Richard Weinberger , Boris Brezillon , Rob Herring , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Describe how to use the BCM963XX ImageTag format in a mixed flash layout environment. Signed-off-by: Jonas Gorski --- .../mtd/partitions/brcm,bcm963xx-imagetag.txt | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt diff --git a/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt new file mode 100644 index 000000000000..f4a444d69d9a --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt @@ -0,0 +1,78 @@ +Broadcom BCM963XX ImageTag Partition Container +============================================== + +Some Broadcom BCM63XX SoC based devices contain additional, non discoverable +partitions or non standard bootloader partition sizes. For these a mixed layout +needs to be used with an explicit firmware partition. + +The BCM963XX ImageTag is a simple firmware header describing the offsets and +sizes of the rootfs and kernel parts contained in the firmware. + +Required properties: +- compatible : must be "brcm,bcm963xx-imagetag" + +Examples: + +flash@1e000000 { + compatible = "cfi-flash"; + reg = <0x1e000000 0x2000000>; + bank-width = <2>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x0 0x10000>; + read-only; + }; + + firmware@10000 { + reg = <0x10000 0x7d0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + caldata@7e0000 { + reg = <0x7e0000 0x10000>; + read-only; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x10000>; + }; + }; +}; + + +flash@1e000000 { + compatible = "cfi-flash"; + reg = <0x1e000000 0x2000000>; + bank-width = <2>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* + * Some devices use a flash chip with 64k erase blocks, some + * use one with 128k erase blocks, so the vendor decided to + * always use 128k as the firmware offset. + */ + + cfe@0 { + reg = <0x0 0x20000>; + read-only; + }; + + firmware@20000 { + reg = <0x20000 0x7c0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7e0000 { + reg = <0x7e0000 0x20000>; + }; + }; +}; From patchwork Tue Aug 28 11:19:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 962859 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PlV/LUPk"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y0CrJpKn"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4205wQ2S0Kz9rvt for ; Tue, 28 Aug 2018 21:23:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=620mzKNp1FVhUWemspmPYqYbGBs4cy2OuVsPoOpApSI=; b=PlV/LUPkLV3kpX2NyYpUyRMXAZ uKPsxYb5jzDJ7M3YEdweIiHniY3IX22PNwQUylJOsOJFC7XAtnlh3b5O5ZTSvLiR8bXQfGqUZtmKf 7BpfB0H7NUMECyM2ZQhQn2um2L6Snq8JsHdfhlYkMq9je0tO/n5wFjzFTin5VboaDXgYV68eb/ogE EYo9gkuXShGHkTewpchhlmiTxkSvtfn9GMr/78umGDQ8wcRNB0CCZRNwqbWK70Q5D4/BCYnw6KNUM 1V7WyxVcDkKw2JdCee0F39xQvXSWMeYywSBLxafi24InSzJryjRgQpN3fYjX6WykV+pqvJrhRU6KL 0cH5IgsA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc5Q-0006Jh-9L; Tue, 28 Aug 2018 11:23:04 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fuc2k-0004AZ-Mt for linux-mtd@lists.infradead.org; Tue, 28 Aug 2018 11:20:20 +0000 Received: by mail-wm0-x243.google.com with SMTP id t25-v6so1598753wmi.3 for ; Tue, 28 Aug 2018 04:20:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wAILSko6tStjuaAtOxnRoYMJgO/Mn9Jwh6XtEjBqmSQ=; b=Y0CrJpKnMQllJdGB0TYCyDnZE6oK2pQlfidfT0/F/AC62QHau1mWIl9uKEMWwUhb33 Yjcp5M4eGqYd6kQyCgmucTJg7qosnTOCbOAx9A11VOy52RA0mfWooKZ4lxFexY0omN1g tDIRfmaTWmIfBLw7//qaDofeYnb9E5HxQURf6FeclynAZ3xoVsaJJrUCLuG6tEILkg5s 3v9ydHP477YgTzmIT+Bk9K59pJJdlex4+C5I4j9JRjAa5ova9QbMGzLhNFCXp1ihrmgH lrcVw9zLIcPdtFsuljr87O8T8qiwjhvmXMWQHuCYMt6SeQ88rFG6ntJYwkFbZH4C9a0w Mc9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wAILSko6tStjuaAtOxnRoYMJgO/Mn9Jwh6XtEjBqmSQ=; b=hHG8IbFjiR6jcCzjLCn21C6RTeoW98J4fOMcUmRwGR0aeMqIxbaEWaiSIQ/OhttEHx hNNtgqxHMKdfnS6bJipNkSUuunDmHkacvxwJJpIjnhYpOweiT4cl0wttQI1bbxrKXS5J ivscNqa5lMATiOQD5xs9oG5l/gVhCniJjbvyLw43joJK051OZI8TNF7jHWNMvvfsKVVe DQcRhZMMSC6PGOcOPgoy9TuHfKxw4FxhJMchJuTPDJ/HNmynIpeOBxYXY9CynGt6b4zi mNDUhAeHaH0EsPN9bEd8pmZk4kF/OeJjoL4VqKjABr6J4nRKj/Dis4ST5rfHnd1MBtW6 ZuvA== X-Gm-Message-State: APzg51BbgG95hyjAM1vBCzSbg9kO+8s22eYjWvjPw2HlE9QzX82174tb 9V5SP+drzThXosjvmnYcZk55e5Zy X-Google-Smtp-Source: ANB0VdYJTd3nDuSe79EXLpM3S6YZX7kdG0hdRQ8axqqZjfQ0XPCEiPM7sHJj4KeVk9MN92mQvcsU7g== X-Received: by 2002:a1c:3413:: with SMTP id b19-v6mr1108847wma.21.1535455207060; Tue, 28 Aug 2018 04:20:07 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id e141-v6sm1520282wmd.32.2018.08.28.04.20.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 04:20:06 -0700 (PDT) From: Jonas Gorski To: linux-mtd@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 5/5] mtd: parser_imagetag: add of_match_table support Date: Tue, 28 Aug 2018 13:19:44 +0200 Message-Id: <20180828111944.5956-6-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20180828111944.5956-1-jonas.gorski@gmail.com> References: <20180828111944.5956-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180828_042018_805143_65FFB862 X-CRM114-Status: GOOD ( 17.39 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:400c:c09:0:0:0:243 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (jonas.gorski[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Marek Vasut , Richard Weinberger , Boris Brezillon , Rob Herring , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Allow matching the imagetag parser for fixed partitions defined in the device tree. Signed-off-by: Jonas Gorski --- drivers/mtd/parsers/parser_imagetag.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/mtd/parsers/parser_imagetag.c b/drivers/mtd/parsers/parser_imagetag.c index 81e2fc70c889..6897a8c37142 100644 --- a/drivers/mtd/parsers/parser_imagetag.c +++ b/drivers/mtd/parsers/parser_imagetag.c @@ -24,6 +24,7 @@ #include #include #include +#include /* Ensure strings read from flash structs are null terminated */ #define STR_NULL_TERMINATE(x) \ @@ -200,9 +201,16 @@ static int bcm963xx_parse_imagetag_partitions(struct mtd_info *master, return nrparts; } +static const struct of_device_id parse_bcm963xx_imagetag_match_table[] = { + { .compatible = "brcm,bcm963xx-imagetag" }, + {}, +}; +MODULE_DEVICE_TABLE(of, parse_bcm963xx_imagetag_match_table); + static struct mtd_part_parser bcm963xx_imagetag_parser = { .parse_fn = bcm963xx_parse_imagetag_partitions, .name = "bcm963xx-imagetag", + .of_match_table = parse_bcm963xx_imagetag_match_table, }; module_mtd_part_parser(bcm963xx_imagetag_parser);