| Message ID | 1438192434-18363-4-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
Hi Hans, Michal, On Thu, Jul 30, 2015 at 3:53 AM, Hans de Goede <hdegoede@redhat.com> wrote: > From: Michal Suchanek <hramrach@gmail.com> > > Full chip ID is printed so user has data to paste from syslog in case > of chip misidentification. > > Signed-off-by: Michal Suchanek <hramrach@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/mtd/nand/nand_base.c | 28 +++++++++++++++++++++++----- > 1 file changed, 23 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index e2e2690..13e9938 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -4243,7 +4243,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) > } > > static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, > - struct nand_flash_dev *type, u8 *id_data, int *busw) > + struct nand_flash_dev *type, const u8 *id_data, int *busw) Should this be in another patch? Thanks,
On 30 July 2015 at 01:37, Julian Calaby <julian.calaby@gmail.com> wrote: > Hi Hans, Michal, > > On Thu, Jul 30, 2015 at 3:53 AM, Hans de Goede <hdegoede@redhat.com> wrote: >> From: Michal Suchanek <hramrach@gmail.com> >> >> Full chip ID is printed so user has data to paste from syslog in case >> of chip misidentification. >> >> Signed-off-by: Michal Suchanek <hramrach@gmail.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/mtd/nand/nand_base.c | 28 +++++++++++++++++++++++----- >> 1 file changed, 23 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c >> index e2e2690..13e9938 100644 >> --- a/drivers/mtd/nand/nand_base.c >> +++ b/drivers/mtd/nand/nand_base.c >> @@ -4243,7 +4243,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) >> } >> >> static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, >> - struct nand_flash_dev *type, u8 *id_data, int *busw) >> + struct nand_flash_dev *type, const u8 *id_data, int *busw) > > Should this be in another patch? > Yes, that's not needed here. Thanks Michal
Hans, Michal, On Wed, 29 Jul 2015 19:53:54 +0200 Hans de Goede <hdegoede@redhat.com> wrote: > From: Michal Suchanek <hramrach@gmail.com> > > Full chip ID is printed so user has data to paste from syslog in case > of chip misidentification. > > Signed-off-by: Michal Suchanek <hramrach@gmail.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/mtd/nand/nand_base.c | 28 +++++++++++++++++++++++----- > 1 file changed, 23 insertions(+), 5 deletions(-) > > diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c > index e2e2690..13e9938 100644 > --- a/drivers/mtd/nand/nand_base.c > +++ b/drivers/mtd/nand/nand_base.c > @@ -4243,7 +4243,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) > } > > static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, > - struct nand_flash_dev *type, u8 *id_data, int *busw) > + struct nand_flash_dev *type, const u8 *id_data, int *busw) > { > if (!strncmp(type->id, id_data, type->id_len)) { > mtd->writesize = type->pagesize; > @@ -4269,6 +4269,26 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, > } > > /* > + * Print full detail of chip ID read from chip. > + */ > +static void print_nand_chip_info(int maf_id, int dev_id, u8 id_data[8]) > +{ > + u8 delim[8] = { [0 ... 7] = ',' }; > + > + pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", > + maf_id, dev_id); > + > + delim[7] = ' '; > + delim[nand_id_len(id_data, 8) - 1] = ';'; > + > + 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", > + id_data[0], delim[0], id_data[1], delim[1], > + id_data[2], delim[2], id_data[3], delim[3], > + id_data[4], delim[4], id_data[5], delim[5], > + id_data[6], delim[6], id_data[7], delim[7]); This looks like debug information to me, how about using pr_debug ? Best Regards, Boris
Hello, On 30 July 2015 at 09:17, Boris Brezillon <boris.brezillon@free-electrons.com> wrote: > Hans, Michal, > > On Wed, 29 Jul 2015 19:53:54 +0200 > Hans de Goede <hdegoede@redhat.com> wrote: > >> From: Michal Suchanek <hramrach@gmail.com> >> >> Full chip ID is printed so user has data to paste from syslog in case >> of chip misidentification. >> >> Signed-off-by: Michal Suchanek <hramrach@gmail.com> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> drivers/mtd/nand/nand_base.c | 28 +++++++++++++++++++++++----- >> 1 file changed, 23 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c >> index e2e2690..13e9938 100644 >> --- a/drivers/mtd/nand/nand_base.c >> +++ b/drivers/mtd/nand/nand_base.c >> @@ -4243,7 +4243,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) >> } >> >> static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, >> - struct nand_flash_dev *type, u8 *id_data, int *busw) >> + struct nand_flash_dev *type, const u8 *id_data, int *busw) >> { >> if (!strncmp(type->id, id_data, type->id_len)) { >> mtd->writesize = type->pagesize; >> @@ -4269,6 +4269,26 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, >> } >> >> /* >> + * Print full detail of chip ID read from chip. >> + */ >> +static void print_nand_chip_info(int maf_id, int dev_id, u8 id_data[8]) >> +{ >> + u8 delim[8] = { [0 ... 7] = ',' }; >> + >> + pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", >> + maf_id, dev_id); >> + >> + delim[7] = ' '; >> + delim[nand_id_len(id_data, 8) - 1] = ';'; >> + >> + 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", >> + id_data[0], delim[0], id_data[1], delim[1], >> + id_data[2], delim[2], id_data[3], delim[3], >> + id_data[4], delim[4], id_data[5], delim[5], >> + id_data[6], delim[6], id_data[7], delim[7]); > > This looks like debug information to me, how about using pr_debug ? > This is informative message saying that a device was detected. The only change is that full id is printed as part of the message. The same message is printed when the device fails to identify so it should probably be shown by default. Maybe joining it into one line to avoid excessive spam would be better. Thanks Michal
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index e2e2690..13e9938 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -4243,7 +4243,7 @@ static inline bool is_full_id_nand(struct nand_flash_dev *type) } static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, - struct nand_flash_dev *type, u8 *id_data, int *busw) + struct nand_flash_dev *type, const u8 *id_data, int *busw) { if (!strncmp(type->id, id_data, type->id_len)) { mtd->writesize = type->pagesize; @@ -4269,6 +4269,26 @@ static bool find_full_id_nand(struct mtd_info *mtd, struct nand_chip *chip, } /* + * Print full detail of chip ID read from chip. + */ +static void print_nand_chip_info(int maf_id, int dev_id, u8 id_data[8]) +{ + u8 delim[8] = { [0 ... 7] = ',' }; + + pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", + maf_id, dev_id); + + delim[7] = ' '; + delim[nand_id_len(id_data, 8) - 1] = ';'; + + 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", + id_data[0], delim[0], id_data[1], delim[1], + id_data[2], delim[2], id_data[3], delim[3], + id_data[4], delim[4], id_data[5], delim[5], + id_data[6], delim[6], id_data[7], delim[7]); +} + +/* * Get the flash and manufacturer id and lookup if the type is supported. */ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd, @@ -4381,8 +4401,7 @@ ident_done: * Check, if buswidth is correct. Hardware drivers should set * chip correct! */ - pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", - *maf_id, *dev_id); + print_nand_chip_info(*maf_id, *dev_id, id_data); pr_info("%s %s\n", nand_manuf_ids[maf_idx].name, mtd->name); pr_warn("bus width %d instead %d bit\n", (chip->options & NAND_BUSWIDTH_16) ? 16 : 8, @@ -4420,8 +4439,7 @@ ident_done: return ERR_PTR(err); } - pr_info("device found, Manufacturer ID: 0x%02x, Chip ID: 0x%02x\n", - *maf_id, *dev_id); + print_nand_chip_info(*maf_id, *dev_id, id_data); if (chip->onfi_version) pr_info("%s %s\n", nand_manuf_ids[maf_idx].name,