target/linux/brcm47xx/patches-3.10/024-mtd-bcm47xxpart-alternative-MAGIC-for-board_data-par.patch

   1 From f0501e81fbaa51cfc8c28c60bc3fc7965fde94f4 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Sat, 21 Dec 2013 19:39:12 +0100
   4 Subject: [PATCH] mtd: bcm47xxpart: alternative MAGIC for board_data partition
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Some devices (like WNDR3700v3) have board_data without MPFR magic, some
  10 extra header or extra NVRAM around 0x100. In such case we have to look
  11 for another magic which is BD 0B 0D BD (BD probably stands for Board
  12 Data). It's located "far far away", so instead of extending buffer add
  13 another mtd_read.
  14
  15 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  16 Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  17 ---
  18  drivers/mtd/bcm47xxpart.c |   16 ++++++++++++++++
  19  1 file changed, 16 insertions(+)
  20
  21 --- a/drivers/mtd/bcm47xxpart.c
  22 +++ b/drivers/mtd/bcm47xxpart.c
  23 @@ -27,6 +27,7 @@
  24
  25  /* Magics */
  26  #define BOARD_DATA_MAGIC               0x5246504D      /* MPFR */
  27 +#define BOARD_DATA_MAGIC2              0xBD0D0BBD
  28  #define CFE_MAGIC                      0x43464531      /* 1EFC */
  29  #define FACTORY_MAGIC                  0x59544346      /* FCTY */
  30  #define POT_MAGIC1                     0x54544f50      /* POTT */
  31 @@ -192,6 +193,21 @@ static int bcm47xxpart_parse(struct mtd_
  32                                              offset, 0);
  33                         continue;
  34                 }
  35 +
  36 +               /* Read middle of the block */
  37 +               if (mtd_read(master, offset + 0x8000, 0x4,
  38 +                            &bytes_read, (uint8_t *)buf) < 0) {
  39 +                       pr_err("mtd_read error while parsing (offset: 0x%X)!\n",
  40 +                              offset);
  41 +                       continue;
  42 +               }
  43 +
  44 +               /* Some devices (ex. WNDR3700v3) don't have a standard 'MPFR' */
  45 +               if (buf[0x000 / 4] == BOARD_DATA_MAGIC2) {
  46 +                       bcm47xxpart_add_part(&parts[curr_part++], "board_data",
  47 +                                            offset, MTD_WRITEABLE);
  48 +                       continue;
  49 +               }
  50         }
  51
  52         /* Look for NVRAM at the end of the last block. */