From patchwork Mon Aug 27 06:15:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 180128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F1E742C00D7 for ; Mon, 27 Aug 2012 16:08:58 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T5sUB-0002kV-3R; Mon, 27 Aug 2012 06:07:43 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T5sU7-0002kH-T3 for linux-mtd@lists.infradead.org; Mon, 27 Aug 2012 06:07:40 +0000 Received: by wgbdt14 with SMTP id dt14so1533219wgb.18 for ; Sun, 26 Aug 2012 23:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=0SDQZWZLkec5WAuWrVNXS2+8Gem2rsy+ZsW8ZEgFrMM=; b=lPWn6mtAvfcVm8rQJM4KlUFTJx6DO1EmOL+ayXnJW4xzHcZoxn0Ihl/BO4Jn7b/X7d wXxJdBhHXSbsuDqgjxddjEy9d5xmEzg5VVVTYsUlBJ5/jfva4Si3Z0YXwyS+/n0lbQ9b Vk6NYSr5pNTJltgc1gvDJ0X8+vuA60KS0MjG2bTJPmHJsKXTdR1qo3hU9s5YZ4pCF3R7 apo1OmRHmNqFK0k2EkKz7qKXwwqbx+UrlyqUkFLu9AqFvQBVaeWZK48+GDdAPfrnWJC0 U7r6gHvuWLzZCShtBL7zJnFpvDE8CW8Kg+RnnhPbiBTHSu2qi5U6UtBGQBQjlZxBQgTB sLUw== Received: by 10.180.77.34 with SMTP id p2mr23020012wiw.0.1346047655927; Sun, 26 Aug 2012 23:07:35 -0700 (PDT) Received: from localhost.localdomain (gw.bas.roche.com. [196.3.50.254]) by mx.google.com with ESMTPS id fu8sm13430889wib.5.2012.08.26.23.07.34 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 26 Aug 2012 23:07:35 -0700 (PDT) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: linux-mtd@lists.infradead.org Subject: [PATCH V3] mtd: bcm47part driver for BCM47XX chipsets Date: Mon, 27 Aug 2012 08:15:55 +0200 Message-Id: <1346048155-28829-1-git-send-email-zajec5@gmail.com> X-Mailer: git-send-email 1.7.7 MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -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 Cc: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This driver provides parser detecting partitions on BCM47XX flash memories. It has many differences in comparision to older BCM63XX, like: 1) Different CFE with no more trivial MAGICs 2) More partitions types (board_data, ML, POT) 3) Supporting more than 1 flash on a device which resulted in decision of writing new parser. It uses generic mtd interface and was successfully tested with Netgear WNDR4500 router which has 2 flash memories: serial one and NAND one. Signed-off-by: Rafał Miłecki --- After talking with OpenWRT guys, it's now clear behaviour of this patch is correct. We register partitions like they are, without any additional garbage. Re-sending V3 without RFC. V2: 1) Add support for more partitinos (ML and POT) 2) Optimize: don't scan whole flash (like up to 128 MiB) 3) Optimize: don't scan TRX partitions after detecting header V3: 1) More defines less magic numbers 2) Less duplication by adding bcm47part_add_part 3) Mask out MTD_WRITEABLE only when needed --- drivers/mtd/Kconfig | 4 + drivers/mtd/Makefile | 1 + drivers/mtd/bcm47part.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 0 deletions(-) create mode 100644 drivers/mtd/bcm47part.c diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index ee2330f..b7db855 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -156,6 +156,10 @@ config MTD_BCM63XX_PARTS This provides partions parsing for BCM63xx devices with CFE bootloaders. +config MTD_BCM47_PARTS + tristate "BCM47XX partitioning support" + depends on BCM47XX + comment "User Modules And Translation Layers" config MTD_CHAR diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index f901354..dac90e6 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o obj-$(CONFIG_MTD_BCM63XX_PARTS) += bcm63xxpart.o +obj-$(CONFIG_MTD_BCM47_PARTS) += bcm47part.o # 'Users' - code which presents functionality to userspace. obj-$(CONFIG_MTD_CHAR) += mtdchar.o diff --git a/drivers/mtd/bcm47part.c b/drivers/mtd/bcm47part.c new file mode 100644 index 0000000..2a9c027 --- /dev/null +++ b/drivers/mtd/bcm47part.c @@ -0,0 +1,188 @@ +/* + * BCM47XX MTD partitioning + * + * Copyright (C) 2012 Rafał Miłecki + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include + +/* 10 parts were found on sflash on Netgear WNDR4500 */ +#define BCM47PART_MAX_PARTS 12 + +/* Amount of bytes we read when analyzing each block of flash memory. + * Set it big enough to allow detecting partition and reading important data. */ +#define BCM47PART_BYTES_TO_READ 0x401 + +/* Magics */ +#define BOARD_DATA_MAGIC 0x5246504D /* MPFR */ +#define POT_MAGIC1 0x54544f50 /* POTT */ +#define POT_MAGIC2 0x504f /* OP */ +#define ML_MAGIC1 0x39685a42 +#define ML_MAGIC2 0x26594131 +#define TRX_MAGIC 0x30524448 + +struct trx_header { + u32 magic; + u32 length; + u32 crc32; + u16 flags; + u16 version; + u32 offset[3]; +} __packed; + +static void bcm47part_add_part(struct mtd_partition *part, char *name, + u64 offset, u32 mask_flags) +{ + part->name = name; + part->offset = offset; + part->mask_flags = mask_flags; +} + +static int bcm47part_parse(struct mtd_info *master, + struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +{ + struct mtd_partition *parts; + u8 i, curr_part = 0; + u8 *buf; + u32 *fourcc, *fourcc2; + size_t bytes_read; + u32 offset; + u32 blocksize = 0x10000; + struct trx_header *trx; + + /* Alloc */ + parts = kzalloc(sizeof(struct mtd_partition) * BCM47PART_MAX_PARTS, + GFP_KERNEL); + buf = kzalloc(sizeof(*buf) * BCM47PART_BYTES_TO_READ, GFP_KERNEL); + + /* Parse block by block looking for magics */ + for (offset = 0; offset <= master->size - blocksize; + offset += blocksize) { + /* Nothing more in higher memory */ + if (offset >= 0x2000000) + break; + + /* Read beginning of the block */ + if (mtd_read(master, offset, BCM47PART_BYTES_TO_READ, + &bytes_read, buf) < 0) { + pr_err("mtd_read error while parsing (offset: 0x%X)!\n", + offset); + continue; + } + + /* CFE has small NVRAM at 0x400 */ + fourcc = (u32 *)&buf[0x400]; + if (*fourcc == NVRAM_HEADER) + bcm47part_add_part(&parts[curr_part++], "boot", offset, + MTD_WRITEABLE); + + /* Standard NVRAM */ + fourcc = (u32 *)&buf[0x000]; + if (*fourcc == NVRAM_HEADER) + bcm47part_add_part(&parts[curr_part++], "nvram", offset, + 0); + + /* board_data starts with board_id which differs across boards, + * but we can use 'MPFR' (hopefully) magic at 0x100 */ + fourcc = (u32 *)&buf[0x100]; + if (*fourcc == BOARD_DATA_MAGIC) + bcm47part_add_part(&parts[curr_part++], "board_data", + offset, MTD_WRITEABLE); + + /* POT(TOP) */ + fourcc = (u32 *)&buf[0x000]; + fourcc2 = (u32 *)&buf[0x004]; + if (*fourcc == POT_MAGIC1 && + (*fourcc2 & 0xFFFF) == POT_MAGIC2) + bcm47part_add_part(&parts[curr_part++], "POT", offset, + MTD_WRITEABLE); + + /* ML */ + fourcc = (u32 *)&buf[0x010]; + fourcc2 = (u32 *)&buf[0x014]; + if (*fourcc == ML_MAGIC1 && *fourcc2 == ML_MAGIC2) + bcm47part_add_part(&parts[curr_part++], "ML", offset, + MTD_WRITEABLE); + + /* TRX */ + fourcc = (u32 *)&buf[0x000]; + if (*fourcc == TRX_MAGIC) { + trx = (struct trx_header *)buf; + + i = 0; + /* We have LZMA loader if offset[2] points to sth */ + if (trx->offset[2]) { + /* TODO: should we add LZMA loader partition? */ + i++; + } + + bcm47part_add_part(&parts[curr_part++], "linux", + offset + trx->offset[i], 0); + i++; + + /* Pure rootfs size is known and can be calculated as: + * trx->length - trx->offset[i]. We don't fill it as + * we want to have jffs2 (overlay) in the same mtd. */ + bcm47part_add_part(&parts[curr_part++], "rootfs", + offset + trx->offset[i], 0); + i++; + + /* We have whole TRX scanned, skip to the next part. Use + * roundown (not roundup), as the loop will increase + * offset in next step. */ + offset = rounddown(offset + trx->length, blocksize); + } + + if (curr_part == BCM47PART_MAX_PARTS) { + pr_warn("Reached maximum number of partitions, scanning stopped!\n"); + break; + } + } + + /* We can't read sizes of some (most of) partitions. Assume that + * these partitions end at the beginning of the one they are + * followed by. */ + for (i = 0; i < curr_part - 1; i++) { + if (parts[i].size == 0) + parts[i].size = parts[i + 1].offset - parts[i].offset; + } + if (curr_part > 0 && parts[curr_part - 1].size == 0) + parts[curr_part - 1].size = + master->size - parts[curr_part - 1].offset; + + *pparts = parts; + return curr_part; +}; + +static struct mtd_part_parser bcm47part_mtd_parser = { + .owner = THIS_MODULE, + .parse_fn = bcm47part_parse, + .name = "bcm47part", +}; + +static int __init bcm47part_init(void) +{ + return register_mtd_parser(&bcm47part_mtd_parser); +} + +static void __exit bcm47part_exit(void) +{ + deregister_mtd_parser(&bcm47part_mtd_parser); +} + +module_init(bcm47part_init); +module_exit(bcm47part_exit); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MTD partitioning for BCM47XX flash memories");