target/linux/sunxi/patches-4.1/121-mtd-print-full-chipid.patch

   1 From fb177d5b534f263735dc6955703e3c711b950f35 Mon Sep 17 00:00:00 2001
   2 From: Michal Suchanek <hramrach@gmail.com>
   3 Date: Thu, 1 Jan 2015 00:57:46 +0100
   4 Subject: [PATCH] mtd: nand: print full chip ID
   5
   6 Full chip ID is printed so user has data to paste from syslog in case
   7 of chip misidentification.
   8
   9 Signed-off-by: Michal Suchanek <hramrach@gmail.com>
  10 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  11 ---
  12  drivers/mtd/nand/nand_base.c | 23 ++++++++++++++++++-----
  13  1 file changed, 18 insertions(+), 5 deletions(-)
  14
  15 diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
  16 index 5c6f465..05ec786 100644
  17 --- a/drivers/mtd/nand/nand_base.c
  18 +++ b/drivers/mtd/nand/nand_base.c
  19 @@ -4247,7 +4247,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type)
  20  }
  21
  22  static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
  23 -                  struct nand_flash_dev *type, u8 *id_data, int *busw)
  24 +                  struct nand_flash_dev *type, const u8 *id_data, int *busw)
  25  {
  26         if (!strncmp(type->id, id_data, type->id_len)) {
  27                 mtd->writesize = type->pagesize;
  28 @@ -4273,6 +4273,21 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip,
  29  }
  30
  31  /*
  32 + * Print full detail of chip ID read from chip.
  33 + */
  34 +static void print_nand_chip_info(int maf_id, int dev_id, u8 id_data[8])
  35 +{
  36 +       u8 delim[8] = { [0 ... 7] = ',' };
  37 +       pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", maf_id, dev_id);
  38 +       delim[7] = ' ';
  39 +       delim[nand_id_len(id_data, 8) - 1] = ';';
  40 +       /* This sucks. Kernel seems to insert newline after every other printk so format in one go. */
  41 +       pr_info("chip id data: 0x%02x%c 0x%02x%c 0x%02x%c 0x%02x%c 0x%02x%c 0x%02x%c 0x%02x%c 0x%02x%c\n",
  42 +               id_data[0], delim[0], id_data[1], delim[1], id_data[2], delim[2], id_data[3], delim[3],
  43 +               id_data[4], delim[4], id_data[5], delim[5], id_data[6], delim[6], id_data[7], delim[7]);
  44 +}
  45 +
  46 +/*
  47   * Get the flash and manufacturer id and lookup if the type is supported.
  48   */
  49  static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
  50 @@ -4385,8 +4400,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
  51                  * Check, if buswidth is correct. Hardware drivers should set
  52                  * chip correct!
  53                  */
  54 -               pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
  55 -                       *maf_id, *dev_id);
  56 +               print_nand_chip_info(*maf_id, *dev_id, id_data);
  57                 pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name);
  58                 pr_warn("bus width %d instead %d bit\n",
  59                            (chip->options & NAND_BUSWIDTH_16) ? 16 : 8,
  60 @@ -4424,8 +4438,7 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
  61                         return ERR_PTR(err);
  62         }
  63
  64 -       pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n",
  65 -               *maf_id, *dev_id);
  66 +       print_nand_chip_info(*maf_id, *dev_id, id_data);
  67
  68         if (chip->onfi_version)
  69                 pr_info("%s %s\n", nand_manuf_ids[maf_idx].name,