From patchwork Fri Aug 17 12:06:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 958788 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.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="UMSibdRD"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j6VQca+e"; 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 41sMPQ2MYkz9s3Z for ; Fri, 17 Aug 2018 22:06:34 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=TbPv7IV6nYVKyNGcIo9aujrcwjYeZgLvrp4oJPBmZtY=; b=UMSibdRDL5Mja5 XCFgUomMkuTbc9BnRQioZWtUCVc07U/lQROoVgzVH9XVzbiumZFAUofCADrphMKP9vCBOrkzXgIp/ 7TDxjJktIbPadoJZO2PrFSpxEOQhWpTvgQp0CW1uSAb1FbDRF9nFmCD8R1AhmqlBeer5jDkBLqzLI 5MVRAU/v+KgdJJdTIT/vHO3l8bqzKlcmtWFHNfhXTwDZJwdP3hHnU1T3XtOMIJ1UFrIux1HEs2jQh 0grn7HTaeuKP9G3WCbalMVIM/UvVTJt8Wf50sZduVd8wJM/qo0Szsy5F2T9sQxFppyCKJ/7nC+RjX 0a+uiHynHKPEUEpp+jhQ==; 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 1fqdWQ-0001nf-Vl; Fri, 17 Aug 2018 12:06:30 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fqdWN-0001kB-I5 for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 12:06:29 +0000 Received: by mail-wr1-x444.google.com with SMTP id w11-v6so4317403wrc.5 for ; Fri, 17 Aug 2018 05:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=YIwdUeBt4D6N4y2h5xz7dQLwbmgeb/dUWefySI0b1JQ=; b=j6VQca+eW0sZXv0smuzHmQFxjgctI+Ma4R1dSmhe9IgrngpQbqNgmlHsgrrciyk5IE lLARsEQQe4DDetbrtZ81iJ3teRjOx1Au33Obmm2z99/OqiJNlzd/eLQnlvLT/06kE5Oe 6vfia77k6aOGOUInHxPe34RC0bUVao8PxQuplVeb0L5RyDaycZosqq6JYmQR6lM7q4fv oVMR8zYqfshPRSTxo3gRki69rt9P26ulPVCbsTXocWmG3nFgdrG+YgsYkCaSOZX0eOHQ z6qdBxfUP2ymXjnq4LRCI9jtKDFMQOI1jXDZgPSOsA7NojUjY5eA7roTlpK6zPm/28Vb zhFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=YIwdUeBt4D6N4y2h5xz7dQLwbmgeb/dUWefySI0b1JQ=; b=a6GpvZNMqS/5PdmXlDpg1jFGipSj40ueq9vl28K6hxxwRsRULdZ0ymf8FWQcXph0/k VfNL0coXGJZW/YZhOROpZ63Znxf2syY6aC9qIAp2JVLnTPohnNukpXD5wNNfWJVW/mrb 7Oon4Xu1AOcoJnjNYaWZrr6YQ0IjXJ2PI6+bDSE0ivSfW1Iy4GMnWYj8VJKqCVidinI4 eNtb6rdROicwjGNMZaqAbg1q6CCXbiTa8PtTs2sNqew5XHb5RnQuXxSCk8Isf/vR7gOo Y3F4bVxmgY6sXl1B0zEQ9hl3y5jKJw3vAXpSggrUPHIQYuniQApmpvRTwJbPHnM5CRa+ oyng== X-Gm-Message-State: AOUpUlFYIuo+lRslviRMsJ0bFVJ2thjYNZEmjeQPRqXqB8urTNtfxptA oti5VG97VqCuLqCc1MxB55ctKV4a X-Google-Smtp-Source: AA+uWPx1443MKN+C2oSH6tpvQkRrVoW5bauLsVvNI6LnAXhTltJ7+5PoqA8faXDy20O9iOgFZ6XNng== X-Received: by 2002:adf:f58f:: with SMTP id f15-v6mr3631848wro.59.1534507575466; Fri, 17 Aug 2018 05:06:15 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC409FCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbc4:9fc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id p11-v6sm1475730wrs.51.2018.08.17.05.06.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 Aug 2018 05:06:14 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1fqdW9-0006mt-A6 for openwrt-devel@lists.openwrt.org; Fri, 17 Aug 2018 14:06:13 +0200 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Fri, 17 Aug 2018 14:06:12 +0200 Message-Id: <13ba08fd1ee20335a04c638e8bb47ff30997e3ad.1534507308.git.chunkeey@gmail.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180817_050627_700740_252D20A8 X-CRM114-Status: GOOD ( 22.75 ) 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:444 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[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 Subject: [OpenWrt-Devel] [PATCH v2 1/2] ath79: port cybertan_part from ar71xx X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch ports the cybertan_part code from ar71xx and converts the driver to a DT-supported mtd parser. As a result, it will no longer add the u-boot, nvram and art partitions, which were never part of the special Cybertan header. Instead these partitions have to be specified in the DT, which has the upside of making it possible to add properties (i.e.: read-only), labels and references to these important partitions. Signed-off-by: Christian Lamparter --- target/linux/ath79/config-4.14 | 1 + .../drivers/mtd/parsers/parser_cybertan.c | 163 ++++++++++++++++++ .../404-mtd-cybertan-trx-parser.patch | 19 ++ 3 files changed, 183 insertions(+) create mode 100644 target/linux/ath79/files/drivers/mtd/parsers/parser_cybertan.c create mode 100644 target/linux/ath79/patches-4.14/404-mtd-cybertan-trx-parser.patch diff --git a/target/linux/ath79/config-4.14 b/target/linux/ath79/config-4.14 index a8349040a1..6f273e1bcd 100644 --- a/target/linux/ath79/config-4.14 +++ b/target/linux/ath79/config-4.14 @@ -163,6 +163,7 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_M25P80=y # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set +CONFIG_MTD_PARSER_CYBERTAN=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y diff --git a/target/linux/ath79/files/drivers/mtd/parsers/parser_cybertan.c b/target/linux/ath79/files/drivers/mtd/parsers/parser_cybertan.c new file mode 100644 index 0000000000..7b67e31b05 --- /dev/null +++ b/target/linux/ath79/files/drivers/mtd/parsers/parser_cybertan.c @@ -0,0 +1,163 @@ +/* + * Copyright (C) 2009 Christian Daniel + * Copyright (C) 2009 Gabor Juhos + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * TRX flash partition table. + * Based on ar7 map by Felix Fietkau + * + */ + +#include +#include +#include +#include + +#include +#include +#include + +struct cybertan_header { + char magic[4]; + u8 res1[4]; + char fw_date[3]; + char fw_ver[3]; + char id[4]; + char hw_ver; + char unused; + u8 flags[2]; + u8 res2[10]; +} __packed; + +#define TRX_PARTS 3 +#define TRX_MAGIC 0x30524448 +#define TRX_MAX_OFFSET 3 + +struct trx_header { + __le32 magic; /* "HDR0" */ + __le32 len; /* Length of file including header */ + __le32 crc32; /* 32-bit CRC from flag_version to end of file */ + __le32 flag_version; /* 0:15 flags, 16:31 version */ + __le32 offsets[TRX_MAX_OFFSET]; /* Offsets of partitions from start of header */ +} __packed; + +#define IH_MAGIC 0x27051956 /* Image Magic Number */ +#define IH_NMLEN 32 /* Image Name Length */ + +struct uimage_header { + __be32 ih_magic; /* Image Header Magic Number */ + __be32 ih_hcrc; /* Image Header CRC Checksum */ + __be32 ih_time; /* Image Creation Timestamp */ + __be32 ih_size; /* Image Data Size */ + __be32 ih_load; /* Data» Load Address */ + __be32 ih_ep; /* Entry Point Address */ + __be32 ih_dcrc; /* Image Data CRC Checksum */ + uint8_t ih_os; /* Operating System */ + uint8_t ih_arch; /* CPU architecture */ + uint8_t ih_type; /* Image Type */ + uint8_t ih_comp; /* Compression Type */ + uint8_t ih_name[IH_NMLEN]; /* Image Name */ +} __packed; + +struct firmware_header { + struct cybertan_header cybertan; + struct trx_header trx; + struct uimage_header uimage; +} __packed; + +static int cybertan_parse_partitions(struct mtd_info *master, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +{ + struct firmware_header header; + struct trx_header *theader; + struct uimage_header *uheader; + struct mtd_partition *trx_parts; + size_t retlen; + unsigned int kernel_len; + int ret; + + trx_parts = kcalloc(TRX_PARTS, sizeof(struct mtd_partition), + GFP_KERNEL); + if (!trx_parts) { + ret = -ENOMEM; + goto out; + } + + ret = mtd_read(master, 0, sizeof(header), + &retlen, (uint8_t *)&header); + if (ret) + goto free_parts; + + if (retlen != sizeof(header)) { + ret = -EIO; + goto free_parts; + } + + theader = &header.trx; + if (theader->magic != cpu_to_le32(TRX_MAGIC)) { + printk(KERN_NOTICE "%s: no TRX header found\n", master->name); + goto free_parts; + } + + uheader = &header.uimage; + if (uheader->ih_magic != cpu_to_be32(IH_MAGIC)) { + printk(KERN_NOTICE "%s: no uImage found\n", master->name); + goto free_parts; + } + + kernel_len = le32_to_cpu(theader->offsets[1]) + + sizeof(struct cybertan_header); + + trx_parts[0].name = "header"; + trx_parts[0].offset = 0; + trx_parts[0].size = offsetof(struct firmware_header, uimage); + trx_parts[0].mask_flags = 0; + + trx_parts[1].name = "kernel"; + trx_parts[1].offset = trx_parts[0].offset + trx_parts[0].size; + trx_parts[1].size = kernel_len - trx_parts[0].size; + trx_parts[1].mask_flags = 0; + + trx_parts[2].name = "rootfs"; + trx_parts[2].offset = trx_parts[1].offset + trx_parts[1].size; + trx_parts[2].size = master->size - trx_parts[1].size - trx_parts[0].size; + trx_parts[2].mask_flags = 0; + + *pparts = trx_parts; + return TRX_PARTS; + +free_parts: + kfree(trx_parts); +out: + return ret; +} + +static const struct of_device_id mtd_parser_cybertan_of_match_table[] = { + { .compatible = "cybertan,trx" }, + {}, +}; +MODULE_DEVICE_TABLE(of, mtd_parser_cybertan_of_match_table); + +static struct mtd_part_parser mtd_parser_cybertan = { + .parse_fn = cybertan_parse_partitions, + .name = "cybertan-trx", + .of_match_table = mtd_parser_cybertan_of_match_table, +}; +module_mtd_part_parser(mtd_parser_cybertan); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Christian Daniel "); diff --git a/target/linux/ath79/patches-4.14/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-4.14/404-mtd-cybertan-trx-parser.patch new file mode 100644 index 0000000000..2d2a042b04 --- /dev/null +++ b/target/linux/ath79/patches-4.14/404-mtd-cybertan-trx-parser.patch @@ -0,0 +1,19 @@ +--- a/drivers/mtd/parsers/Makefile 2018-08-12 02:32:47.951243067 +0200 ++++ b/drivers/mtd/parsers/Makefile 2018-08-12 02:33:09.844626814 +0200 +@@ -1 +1,2 @@ ++obj-$(CONFIG_MTD_PARSER_CYBERTAN) += parser_cybertan.o + obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o +--- a/drivers/mtd/parsers/Kconfig 2018-08-12 02:28:43.987357803 +0200 ++++ b/drivers/mtd/parsers/Kconfig 2018-08-12 02:32:23.237852972 +0200 +@@ -1,3 +1,11 @@ ++config MTD_PARSER_CYBERTAN ++ tristate "Parser for Cybertan format partitions" ++ depends on MTD && (ATH79 || COMPILE_TEST) ++ help ++ Cybertan has a proprietory header than encompasses a Broadcom trx ++ header. This driver will parse the header and take care of the ++ special offsets that result in the extra headers. ++ + config MTD_PARSER_TRX + tristate "Parser for TRX format partitions" + depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST)