From patchwork Thu Mar 28 14:19:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 1068249 X-Patchwork-Delegate: richard@nod.at 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="eabBqeZX"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ic/l5UNe"; 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 44VRnr5g9Kz9sRR for ; Fri, 29 Mar 2019 01:19:28 +1100 (AEDT) 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=f3vzvaoibN+wBB8+2OrI1Se0Z/gwWAPyl6YNGL+MqGU=; b=eabBqeZXyImumaiN3SUpONTVop 32wXiNK6KObNl9MHFS2xbmvBl8C0xGtEZLZCTNBJ4ay7Cvv5l+jRLbVZuKl1y0FNmMKVLVxUCmaUG 4tNo15/Gbd2QwzlmkDklqjgAc/ZPT1E25I9yKz11KRFchkFyTHqJHh+/Qysizm6nOQDX2E6VYCBxD fvZtzo5DKp7b+aeGOegc6caaIxEKwHj00JaZmO+nY2Jk7GeuupTBvJzFCt9gRT6L5eEMV2mD4NtkS lfi6SGoJZN9KGzpQDl4D3655OHq6y9UoguzVYOxbA7Vjf7qixBtcfJaHzb4NRvIfiMqCm0k/AQ7TX F6OirEjA==; 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 1h9VsJ-00022M-5t; Thu, 28 Mar 2019 14:19:23 +0000 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9VsA-0001sj-KQ for linux-mtd@lists.infradead.org; Thu, 28 Mar 2019 14:19:15 +0000 Received: by mail-wm1-x343.google.com with SMTP id f3so3786226wmj.4 for ; Thu, 28 Mar 2019 07:19:14 -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=viIckbTkgF0tqHSzDsKQ/EGpdVoMTV3xTNPJQk3jHto=; b=ic/l5UNeBWuyYo+4+r4rMYSb+IxtVARZD8EKpS2uwnUUPe1sHyf09E2puP0eHPerTs 9rfP29iHCCGCeB1Dw4XtxS0LajxgY73oTSpav+wsaqDiq2NksoYOPlObqZvZUlCWXh4E oyY4XtWz/U5xUFAlrEqeW6EgXzP4witlCDOOUApeyi5nTchNOsEMMH75VLTnApNfKJ++ MtH9b5jdgFNdBUO4v/b7vpYjR0SKsTAxIreiznyf0jjlBaZK0ojBgL85iI/bDzTAOwCI qZjSjSg1JxBfNO1GPadUyoXYXcKBWbaqMCex0RU2RbsI1LT2swO2hdN8j1zwEmHwwxaH 6TDg== 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=viIckbTkgF0tqHSzDsKQ/EGpdVoMTV3xTNPJQk3jHto=; b=Oie6oFEzzkfH2gazAMBhus7U7Ql4nX/hsDSPdGiLeJmaX4eYQ5JLExAeXu+6vd228i s3meu8CXNRMp3FncuoH1v15OrftKmGkGefvSJRWIeLNHJQ5kzKQBoY93WVA3dJEyVqtX tBO/SlwTA/wQD3qXt74tJBIIUzQTY9yw/xd7ILw8wfWciAI5nYsaoe42qIZ7ZLdlWN9w 6g2gBUrpCXZDbVPw6bXkTdcobwImdoZCyGv+foqSdOpO6s94AXJKQ5bBs0MO8bqcu/Oc 2g7orlZ2TW5dLRNdylKi/RbserV6BKkQJ4jyRfz7xVN9CJCUapFKUHErPu+3OyvV24qk YyiQ== X-Gm-Message-State: APjAAAVbNhmcbP6+7GPnuCUTV4ek6ut6MoEZspm1Rif+msgRWGDN6iuz to2XRYgvz+qv1PxdT8ar7yuLB86L X-Google-Smtp-Source: APXvYqzcnKwCe6ffrgtV/J5sepfVDrSATJkGA8+tVWffSOJaUsJdFyl5t1AuGQU7HT9gf6J0w6TYUA== X-Received: by 2002:a1c:cb0e:: with SMTP id b14mr129642wmg.149.1553782752855; Thu, 28 Mar 2019 07:19:12 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id t2sm51802879wra.9.2019.03.28.07.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:19:12 -0700 (PDT) From: Jonas Gorski To: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH V2 1/5] dt-bindings: mtd: describe the simple BCM963XX NOR flash layout Date: Thu, 28 Mar 2019 15:19:06 +0100 Message-Id: <20190328141910.5723-2-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20190328141910.5723-1-jonas.gorski@gmail.com> References: <20190328141910.5723-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190328_071914_665620_30DD0BB6 X-CRM114-Status: GOOD ( 17.73 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:343 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Boris Brezillon , Richard Weinberger , Marek Vasut , Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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. Reviewed-by: Rob Herring Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- .../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 Thu Mar 28 14:19:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 1068250 X-Patchwork-Delegate: richard@nod.at 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="YK33D9Zd"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="R242xSv+"; 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 44VRp621kSz9sRG for ; Fri, 29 Mar 2019 01:19:42 +1100 (AEDT) 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=GMDi6PwOVwdQkrbbnCEQIbsTwCbultAppGmtlolAduo=; b=YK33D9ZdSUa+/s80ybiYITibfr 4o9rsp2xujHTQXinHCVVnw36YEjW1d0d5d6dJInJPdNV77w+dEnuIu4MAsZBDj5amQjQi+fDMOPUq EFJrpYURGEBY8h5Dm9BHdT2B7LJVryX84N73FWpJKreBENqKp5O28/BHN9rFqt8/U9vD3u/3XQxad 7JlCEvDMP2m0FpRa+niYYJ3gyz3cDXhpQn2nDqDugqVhosxgVoDzdqttFmC1D8XR60VKB71ZbwMCl 0OwGSX4y29JPF+i6onCjr/7IqzJ9hWi7LOTzzLOp24vkIrxlVF/YHOkN5ugZhprX8yCvgPIFJc1mD 741TTxpw==; 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 1h9VsT-0002Hq-T9; Thu, 28 Mar 2019 14:19:33 +0000 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9VsB-0001sx-T0 for linux-mtd@lists.infradead.org; Thu, 28 Mar 2019 14:19:17 +0000 Received: by mail-wm1-x342.google.com with SMTP id v14so4246067wmf.2 for ; Thu, 28 Mar 2019 07:19:15 -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=18PdCS+h0jg7d2YDUbKu9gpKAStep0UWRuYUhQxXlf8=; b=R242xSv+rkHubKrj0+YfknL8bhjZTfilbT18zrhLhqimSb9HP7hICt9nAQwyoAsqNd 6KGqdlV01kkv+OqdbWjqlN5MUN7x+qGjfkTvz8g17eY+JJjgul35dY6KdUHQwted4bNZ o3+VlJ+dmuGvrj5mozY0R5D5zYWT2RE3hDbF3NimcJb8qSnUMu2mGpD1QhfmWGI05QvI byOgZc7+rZctpYXtXZPPZmlQ+R/7lsQtJPQrwnOeStZQyYwJzqeJ2GpsD8xuJCSBBD+A rH6zkBdYWO7gg/VzbvyDqTbJ7Du/BwegYlbKD+XUJkAM4ObLKClX6m66/Dp4eHSygfO1 tItw== 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=18PdCS+h0jg7d2YDUbKu9gpKAStep0UWRuYUhQxXlf8=; b=ZaqfWX2v1xO0tsV6IY2aK44xuBVjahI1mcDXrfqH/0ncpPlrIriKCn4CKKV0VwZlmv CqaO/AC96iPYamoUNjhNdTwMLt9Mo3GEiraPBj/0X1H3hJZMieKil6PHvXMl7hYXXpwe ow8g3FSZjvS6Kevehq6AhfXyN0Sm0hfYzMzfALbGj5RGMmr74mKEZxCvHEFREK8WBvqe n6fET65ID7DQFcD2YS421uXzFofxYeAXn+8kRBQAWBi8hvrH5lnZzwWCJjMb9cdH8rkg W6jwkP+KMvATDNlv6CaibM9FOt/FdBKLAZDSkBz/sspr0Y9pno8Td9KTcBaGT8Qgxx2A xEyQ== X-Gm-Message-State: APjAAAW5A6rZ+KBzhdUdHIe3mn/JZfXd45vCprepKAgR80E8QiZBKQIZ 29trFld2HjcNL7S26EKbxGg= X-Google-Smtp-Source: APXvYqyeTHuU4hN36Ngd2KFZvSiV+v8cH5kVdYDrNxNsXG7OxgHORgRrirYXAtLLKzRtB3HNq99xAQ== X-Received: by 2002:a1c:b702:: with SMTP id h2mr161980wmf.94.1553782754164; Thu, 28 Mar 2019 07:19:14 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id t2sm51802879wra.9.2019.03.28.07.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:19:13 -0700 (PDT) From: Jonas Gorski To: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH V2 2/5] mtd: bcm63xxpart: add of_match_table support Date: Thu, 28 Mar 2019 15:19:07 +0100 Message-Id: <20190328141910.5723-3-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20190328141910.5723-1-jonas.gorski@gmail.com> References: <20190328141910.5723-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190328_071915_976605_FDF681E3 X-CRM114-Status: GOOD ( 17.63 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:342 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Boris Brezillon , Richard Weinberger , Marek Vasut , Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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. Reviewed-by: Rob Herring Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- 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 Thu Mar 28 14:19:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 1068253 X-Patchwork-Delegate: richard@nod.at 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="PaXfiFXj"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QbaRTwnD"; 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 44VRpq6FQMz9sRG for ; Fri, 29 Mar 2019 01:20:19 +1100 (AEDT) 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=cxDiH0L0YwIuTQmtkle8bxuIQr/xcuGPDTBgDFq5zF0=; b=PaXfiFXjXgoM0z BOLNQqGPaj9G+N6zfaZrlDaDrOdUbF5L988QOKyc8H6f2aj3IZQiW8+nxFBwITmVC5W7BK/edR2+G WGg8fcqiT/+kKuF+lgog0qu9qEmwRxX+Sh9kv3t6/z7HD1ke2Gh1j7rFz+gN3M9GIgjJkKeFVKrNW ZnNSE5ouGRswlr+iYGvY4SWum/WVJB0tdvBY0SlfAEY1UnAGGTyHHXaFAw89m+91haMr14mRZkhnh TFuuytiHBociqKkX2/UVXE1PEf/paqgLdXNIE1MdjCjmM8mWHiyLj42CGLXbD+N1brytldHsKoXkj OJ/7Jwor/CdD3naII8sQ==; 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 1h9Vt1-0003CV-9d; Thu, 28 Mar 2019 14:20:07 +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 1h9VsD-0001tj-KB for linux-mtd@lists.infradead.org; Thu, 28 Mar 2019 14:19:26 +0000 Received: by mail-wr1-x441.google.com with SMTP id y7so18981581wrn.11 for ; Thu, 28 Mar 2019 07:19:17 -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=VEt5FYpOHIwKBNp4F/pL3mSdmZr7sy2s5Y7ZwLB2wdg=; b=QbaRTwnDC7PkYf5erilRmwCkUA2gBkwY9DhH7FvYS7F2Qn05ueiEuVzUe7AS9IwkYW JcXVpKkV54W8ceHRhB5u/dqt43xXXlFWQp9YGIOaQwxl+vPbpsGWfWAG0tJAj8yHhy3C NCNqPAzIHbrOS1inPAm7KaLEo0ExKejMfoVLTf9g5Su86cZp0toQ1R7k0agfO1MGTJpL vV2ml7ELQM5ZNtUThHAv1oHQ7crTAZeMcGI8VeBrd2rW2aUQqSfghsabPqXJ8pWn8QCs wr5wY1hHXOqH8mlikOsZ+tGMqnmSxMyZVYthTLpliGkITzD69Zj5yL7oZbthh3U5M9Ve wyqA== 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=VEt5FYpOHIwKBNp4F/pL3mSdmZr7sy2s5Y7ZwLB2wdg=; b=W4FvKTYobB8cMMWJYqP1VR2EHD/S/lhmjR+dIwuLgn8tYUOVrGLsdIJs1HnHf0ZTOY LsE/fldi+WaD99IncNXOqSs+Gw9G8uHlDS0U1mNMmacXc2KXT+VNipX+TnFawAaP8YEl bi56xHeO8LtmYZ95Oy2y60plQ3meheVDhBbntdMWE8xGrbCaaXuPtcAhbbnFHPB0g8A8 V6kfTahxrGpkJm+ERkIzUVzjt0rKBU6REysOcxb6e0cBWvA8EXkmb+youzKz8O2vsfTC 1o4zlZVKj3t7Cbq11NLN5S7+iwgaUDkBjvCHJnWQywufAt1KDplo+t/sLtRqyGhm1Y70 pzRw== X-Gm-Message-State: APjAAAUcHkZv0psysiEtT4ExoJ/kzeiHA3SVcwq0nIau1prpt4GL7mDX Nchjrnbz3T5kdezMTMvkyWI= X-Google-Smtp-Source: APXvYqwUCA8Iiz0AnD4blvf0q2Mr2OnvEJc1L+ay576lOBLtkpMGx/LYqHgrwB8YVVh4KFpQllFRlg== X-Received: by 2002:a5d:644a:: with SMTP id d10mr26106940wrw.308.1553782755755; Thu, 28 Mar 2019 07:19:15 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id t2sm51802879wra.9.2019.03.28.07.19.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:19:15 -0700 (PDT) From: Jonas Gorski To: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH V2 3/5] mtd: bcm63xxpart: move imagetag parsing to its own parser Date: Thu, 28 Mar 2019 15:19:08 +0100 Message-Id: <20190328141910.5723-4-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20190328141910.5723-1-jonas.gorski@gmail.com> References: <20190328141910.5723-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-20190328_071917_921766_60C4CC5E X-CRM114-Status: GOOD ( 32.11 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Boris Brezillon , Richard Weinberger , Marek Vasut , Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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. Reviewed-by: Rob Herring Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- 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 79a8ff542883..e5e33c4fde45 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -94,6 +94,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 partition 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 fccf1950e92d..c8be3f1507ca 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 d8418bf6804a..3860c4464c63 100644 --- a/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile @@ -1,3 +1,4 @@ +obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o diff --git a/drivers/mtd/parsers/parser_imagetag.c b/drivers/mtd/parsers/parser_imagetag.c new file mode 100644 index 000000000000..74b66d009b5c --- /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 "); +MODULE_DESCRIPTION("MTD parser for BCM963XX CFE Image Tag partitions"); From patchwork Thu Mar 28 14:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 1068251 X-Patchwork-Delegate: richard@nod.at 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="IQ1xeLpH"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Gvs+l9wn"; 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 44VRpJ4Vtjz9sRR for ; Fri, 29 Mar 2019 01:19:52 +1100 (AEDT) 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=3IPU0ECFOqUnNiWf+u+KOaeubY9oSRf6PNQdV4H24Xo=; b=IQ1xeLpHK3IuU/Rt1junJ4FSd8 giAYxDINejaD1VodOvTCBpUZjwvvmS6811iWdEg07Mukh8XP9lXRccD9InE9dpvzegccDyLDas/dD rSycwAelPKbgBWBah9NRUoPtx/xmFba7qvEw92J+0+gKnglNP8X8SJ+YSxsYJFsLUaMMwnDZzwRiV VnhfH+2QtUkBZdmYhX6R6JDBifPUq0Dkpy10bq7ASmLyRssTWF+8k6lXKLBwOKBg/dJTrNvBHrQ5v Z0T1n8yCShNQreuK92PdeY1oVGDqHcepuaB4e3h6QdSnB/Mb/17zd1k5+MRdl5HhemjgH8IM55LBz oiUO0ccg==; 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 1h9Vsd-0002UZ-PY; Thu, 28 Mar 2019 14:19:43 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9VsE-0001uN-SG for linux-mtd@lists.infradead.org; Thu, 28 Mar 2019 14:19:22 +0000 Received: by mail-wm1-x344.google.com with SMTP id q16so3771067wmj.3 for ; Thu, 28 Mar 2019 07:19:18 -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=I4NBnrPcBLSmBLDLCMVl3UePqPRGaV+p6WB2tvNcQqI=; b=Gvs+l9wnTKifah4+ommEMdCF3VyDMDjGXizrqqKCOYZK/7aEwDCAXuUu4qPgMCdAZE hpaOAf4eYDuFj9bfpAR2rHQy5NACX+B8QHwfWqLVVZ++hcl/l8WKsQW4tzP7cb5OYrMx jzkqiSXDXLQWEdYetcyTmd7c0Md4usPnC/WLFS/Y2Qyel+uRhM+Lgs31gkseKsMnL8WX mu0ysgSNuzu6O6FAgzwn0ZDAqzrkIGD+V/xQcBRBR4rUp7s3486FhHxg0ufbG57U2h1r hWwZLycAgb/c4+YALbuH37rMlWIXcDj0TDm7SrGUUQCSwWcYCRCpy7wNpjWGuTg9ksJ+ bpnA== 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=I4NBnrPcBLSmBLDLCMVl3UePqPRGaV+p6WB2tvNcQqI=; b=sqHgZH3FDcEsw2Oif2r2OOaPkitblrMwT6knZ8CdP0+kGnvxVXNsM5HgfsfX1Gb4iT jgtAJQ/glOyNH8a8OcTRKRlCbbN10CjbL7D+tp9e0SlwcQ1ayDHnn6npuRRZIXvmWDNA rkAOKfSd++srgaoHLgjM9M4SloNiqroiDWuwIOtGLH2i5LrgRKRQexkfdFScvVenNDAV 3V3OOz/5fm784zf80bF/T8vDXB5y/tB96pL5UkhJFgWJrGk+uIyG1gTPrF0HuGV97QhM Z8lik58YTjRTYEMCC+loFWYcmth04/TE/kidy/506czKUztVeSbvT/+nccb1L5lyJ9fK dnkg== X-Gm-Message-State: APjAAAV8mT42479lJNKQrh2ediBn2nUDIM+WpjMq5LGimg7Qymkuhnyt uPnjibtCiqKdUuuL8Nno1rY= X-Google-Smtp-Source: APXvYqxj4yMMTwGZN3jZrKa2nblQ2yJaLcEzHuCyH5j8jBTWePtOYkl+bCKoeKihHUVa8ZZqop8AiA== X-Received: by 2002:a1c:7dcc:: with SMTP id y195mr156864wmc.13.1553782756991; Thu, 28 Mar 2019 07:19:16 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id t2sm51802879wra.9.2019.03.28.07.19.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:19:16 -0700 (PDT) From: Jonas Gorski To: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH V2 4/5] dt-bindings: mtd: describe BCM963XX ImageTag format and usage Date: Thu, 28 Mar 2019 15:19:09 +0100 Message-Id: <20190328141910.5723-5-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20190328141910.5723-1-jonas.gorski@gmail.com> References: <20190328141910.5723-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190328_071919_289876_79D9B7AF X-CRM114-Status: GOOD ( 16.94 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:344 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Boris Brezillon , Richard Weinberger , Marek Vasut , Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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. Reviewed-by: Rob Herring Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- .../mtd/partitions/brcm,bcm963xx-imagetag.txt | 45 ++++++++++++++++++++++ 1 file changed, 45 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..f8b7418ed817 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt @@ -0,0 +1,45 @@ +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" + +Example: + +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>; + }; + }; +}; From patchwork Thu Mar 28 14:19:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Gorski X-Patchwork-Id: 1068252 X-Patchwork-Delegate: richard@nod.at 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="S5WKM0Uq"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eejvCUol"; 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 44VRpS3Mr3z9sRG for ; Fri, 29 Mar 2019 01:20:00 +1100 (AEDT) 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=YBUAlDJ5Jyn+o7p92DEo3QborwfAk0r72OhxVKgP840=; b=S5WKM0Uq14SV5gWzfPP+kG/tES I1wB/dNfMbsaFqA2NAEIVq+gEmZKVm9dq8C9IUJBMoGpH+a6cQ7yQvhJFkDMaqmzdnFBMdvuyJJeV mwBk2YsYdDMsF5OY1BEm3BRSnk43752QSHM0BSYabRKOO+lYkVkhJjeWXbzjTvQeNaungzGtNsEv+ s2+29q8PY+MnlkTC26Lc8RHRa4B8pq7/j9Z6SMccZtLWAoK8RTkftnJNcBQ0g3MQuEWHTJoimI6tP 4HTgb7h0ZGMqhQvMALtthLhM5loxMPtJ8d9dGmykPada7QA91UVua8E29Jtqj5miO5wZmcuRgu+GQ pXofTTfg==; 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 1h9Vsn-0002hG-6z; Thu, 28 Mar 2019 14:19:53 +0000 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9VsF-0001vl-P9 for linux-mtd@lists.infradead.org; Thu, 28 Mar 2019 14:19:25 +0000 Received: by mail-wm1-x341.google.com with SMTP id n25so1473848wmk.4 for ; Thu, 28 Mar 2019 07:19:19 -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=5SDmaay2PipicUYSZvHglq+HG44PekQJ0piwteiL9L0=; b=eejvCUolEysHGqzH8de5mqsot14FOnHV6FOzGR/b97GQ1j19aui7unMT/aP6uKDp5u L87rtTxdr2TDbnNXJEGjWVFPWBlUw9L4SzmbWjGT+M36gQKu6IttCTp573TCRagw6Ghj xWdbqf6xEnjWThgSoKiH5FrihFdrS9iA2fxjYCujEZCLjmHIYdtGHJGhM35uPmflkPjK rKhxhNX0PBRkD9N6g9H1bbnBmlv+sPYK5/LmMaPw15IGov8p5N80xJaedlhlrXhb+4ev NA9rmLnDi6hd75snjBzeGWhgLKYPHffvuHXXWLd+OWtOYd54dYtyGugKSQt+mN9WNdVh eN7w== 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=5SDmaay2PipicUYSZvHglq+HG44PekQJ0piwteiL9L0=; b=oY0opIJPMIHP33JEcHjRG05TiJWOC7+gyabaJPZK5LmaAiOjRVPEel57WkN22nAZsU DhHAo0KSz694mbvf6TU4OrGturw6915opg8eHrWtCoRSUPk4RVGf1JRJcBeGxdG6totB Y5wbi/af+8OBmA2ErGPAY1l5zod0vmcmzZw7euColQx97Z+JLG5muq/rpbbWjFHfDW1y JVlXoVgI0woj5PM+JFANkHE3aTeSwaonnmdHWwjIeePNMf005qNkhBJIBLyWZTdFXbpA JTsc4ytk9CbRR6hbqTL+XwYnnoB5FeAJ4l1eZs6jJyoTbFZEjwlJBn2syLSvchA3tKIB yjPw== X-Gm-Message-State: APjAAAVrDNcLlBpRXoH97yHkT7hBuaIVgoKt5iyHv3WPYt3zY+MZaQ2L DOPjIUdSZs6go2d75zhUWUk= X-Google-Smtp-Source: APXvYqw3064co9Xwn6q2uRwBFf+tRlmYmV6nGwG5EfVRz48DXRUZ9f14iDxVaBgHK3/IkBCubSsFHA== X-Received: by 2002:a7b:c382:: with SMTP id s2mr177301wmj.56.1553782758255; Thu, 28 Mar 2019 07:19:18 -0700 (PDT) Received: from localhost.localdomain ([2001:470:9e39::64]) by smtp.gmail.com with ESMTPSA id t2sm51802879wra.9.2019.03.28.07.19.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Mar 2019 07:19:17 -0700 (PDT) From: Jonas Gorski To: devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH V2 5/5] mtd: parser_imagetag: add of_match_table support Date: Thu, 28 Mar 2019 15:19:10 +0100 Message-Id: <20190328141910.5723-6-jonas.gorski@gmail.com> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20190328141910.5723-1-jonas.gorski@gmail.com> References: <20190328141910.5723-1-jonas.gorski@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190328_071920_369975_A1AB806F X-CRM114-Status: GOOD ( 17.73 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:341 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_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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 , Boris Brezillon , Richard Weinberger , Marek Vasut , Rob Herring , bcm-kernel-feedback-list@broadcom.com, 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. Reviewed-by: Rob Herring Signed-off-by: Jonas Gorski Reviewed-by: Florian Fainelli --- 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 74b66d009b5c..9537c183a3be 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);