From patchwork Sat Jul 25 12:13:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph East X-Patchwork-Id: 499958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0EC1A140306 for ; Sat, 25 Jul 2015 22:17:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Lub5ugdA; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIyM4-0002Vo-W2; Sat, 25 Jul 2015 12:15:05 +0000 Received: from mail-pd0-x22d.google.com ([2607:f8b0:400e:c02::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIyLx-0002N1-Eo for linux-mtd@lists.infradead.org; Sat, 25 Jul 2015 12:15:01 +0000 Received: by pdrg1 with SMTP id g1so26746818pdr.2 for ; Sat, 25 Jul 2015 05:14: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; bh=c08wAhwBD6rpbKWEAIkvpEBcN4o8iRTuNn53ODaBrU4=; b=Lub5ugdAgugaO1aTd1kCpWRlnwfRs26C9vVe7PbgUFEFRlnkR63yaffrTKB4MX/4MQ q1FpYfI2lNIN7ILuMSF/aJ12/QIuQ6O1oVeybwULqU01aK93O2Rrd9lJUHBqBqVWbbyB kV2id935DlpLgcamRp/arleCkxonNRsExTVpp6asQgwWs91A0mjAKf1cfcj9mq1bhfPD Z7/0+QpJtC4nWMxVlzXpIDrhpB0D7+bOizkVTwkpFnNMG2j7P9mHWzfIe8udd3fqD+JQ X4nUGUIpI2OgffJv0+U113JoI2YW8/fKEx5ngDtqBHmeY+FZk7AB7g5gchMBfUbNB3BY y80w== X-Received: by 10.70.93.36 with SMTP id cr4mr42397859pdb.68.1437826475967; Sat, 25 Jul 2015 05:14:35 -0700 (PDT) Received: from VVMXDEB8001.kodiak.naracoorte.wan (124-169-185-158.dyn.iinet.net.au. [124.169.185.158]) by smtp.gmail.com with ESMTPSA id cz1sm19675824pdb.44.2015.07.25.05.14.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jul 2015 05:14:35 -0700 (PDT) From: Joseph East To: linux-mtd@lists.infradead.org Subject: [PATCH] mtd: bcm47xxpart.c: Extra TRX magics, NVRAM part handling Date: Sat, 25 Jul 2015 21:43:37 +0930 Message-Id: <1437826417-8200-1-git-send-email-eastyjr@gmail.com> X-Mailer: git-send-email 2.4.6 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150725_051457_870242_63FCC384 X-CRM114-Status: GOOD ( 15.91 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c02:0:0:0:22d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (eastyjr[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Joseph East MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org A combination of four patches from the OpenWRT project: 1) Add Xaiomi TRX signatures 2) Detect T-Meter partitions 3) Block reservation if NVRAM partition not found 4) Add Belkin TRX signatures (Play max series) Based off of dev.openwrt.org repo @44854 431-mtd-bcm47xx.part-support-for-Xaiomi-specific-board_da.patch 432-mtd-bcm47xx.part-detect-T_Meter_partition_da.patch 400-mtd-bcm47xxpart-get-nvram.patch Signed-off-by: Joseph East --- drivers/mtd/bcm47xxpart.c | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index c0720c1..aa9e425 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -33,16 +33,22 @@ /* Magics */ #define BOARD_DATA_MAGIC 0x5246504D /* MPFR */ #define BOARD_DATA_MAGIC2 0xBD0D0BBD +#define BOARD_DATA_XIAOMI_MAGIC 0x474D4442Q /* GMDB */ #define CFE_MAGIC 0x43464531 /* 1EFC */ #define FACTORY_MAGIC 0x59544346 /* FCTY */ #define NVRAM_HEADER 0x48534C46 /* FLSH */ #define POT_MAGIC1 0x54544f50 /* POTT */ #define POT_MAGIC2 0x504f /* OP */ +#define T_METER_MAGIC 0x4D540000 /* MT */ #define ML_MAGIC1 0x39685a42 #define ML_MAGIC2 0x26594131 #define TRX_MAGIC 0x30524448 #define SHSQ_MAGIC 0x71736873 /* shsq (weird ZTE H218N endianness) */ #define UBI_EC_MAGIC 0x23494255 /* UBI# */ +#define BELKIN_F7D3301_MAGIC 0x20100322 /* Belkin TRX */ +#define BELKIN_F7D3302_MAGIC 0x20090928 +#define BELKIN_F7D4302_MAGIC 0x20101006 +#define BELKIN_F7D4401_MAGIC 0x00018517 struct trx_header { uint32_t magic; @@ -53,6 +59,19 @@ struct trx_header { uint32_t offset[3]; } __packed; +static bool is_trx_magic(uint32_t magic) { + switch (magic) { + case TRX_MAGIC: + case BELKIN_F7D3301_MAGIC: + case BELKIN_F7D3302_MAGIC: + case BELKIN_F7D4302_MAGIC: + case BELKIN_F7D4401_MAGIC: + return true; + default: + return false; + } +} + static void bcm47xxpart_add_part(struct mtd_partition *part, const char *name, u64 offset, uint32_t mask_flags) { @@ -95,6 +114,7 @@ static int bcm47xxpart_parse(struct mtd_info *master, int trx_part = -1; int last_trx_part = -1; int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; + bool found_nvram = false; /* * Some really old flashes (like AT45DB*) had smaller erasesize-s, but @@ -176,8 +196,17 @@ static int bcm47xxpart_parse(struct mtd_info *master, continue; } + /* T_Meter */ + if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC && + (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC && + (le32_to_cpu(buf[0x060 / 4]) & 0xFFFF0000) == T_METER_MAGIC) { + bcm47xxpart_add_part(&parts[curr_part++], "T_Meter", offset, + MTD_WRITEABLE); + continue; + } + /* TRX */ - if (buf[0x000 / 4] == TRX_MAGIC) { + if (is_trx_magic(buf[0x000 / 4])) { if (BCM47XXPART_MAX_PARTS - curr_part < 4) { pr_warn("Not enough partitions left to register trx, scanning stopped!\n"); break; @@ -262,7 +291,8 @@ static int bcm47xxpart_parse(struct mtd_info *master, } /* Some devices (ex. WNDR3700v3) don't have a standard 'MPFR' */ - if (buf[0x000 / 4] == BOARD_DATA_MAGIC2) { + if (buf[0x000 / 4] == BOARD_DATA_MAGIC2 || + le32_to_cpu(buf[0x000 / 4]) == BOARD_DATA_XIAOMI_MAGIC) { bcm47xxpart_add_part(&parts[curr_part++], "board_data", offset, MTD_WRITEABLE); continue; @@ -288,12 +318,23 @@ static int bcm47xxpart_parse(struct mtd_info *master, if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0); + found_nvram = true; break; } } kfree(buf); + if (!found_nvram) { + pr_err("can not find a nvram partition reserve last block\n"); + bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess", + master->size - blocksize * 2, MTD_WRITEABLE); + for (i = 0; i < curr_part; i++) { + if (parts[i].size + parts[i].offset == master->size) + parts[i].offset -= blocksize * 2; + } + } + /* * Assume that partitions end at the beginning of the one they are * followed by.