Skip to contentSkip to conversation

mtd: ubi debug: Remove the pid print from ubi_assert

PATCH New Eran Matityahu 2 participants 6 messages Feb 13, 2019 – Apr 9, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
 drivers/mtd/ubi/debug.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
drivers/mtd/ubi/debug.h +10 -0
index 8ad0c62..d853520 100644
@@ -18,6 +18,7 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
 
 #include <hexdump.h>
 
+#ifndef __UBOOT__
 #define ubi_assert(expr)  do {                                               \
 	if (unlikely(!(expr))) {                                             \
 		pr_crit("UBI assert failed in %s at %u (pid %d)\n",          \
@@ -25,6 +26,15 @@ void ubi_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
 		dump_stack();                                                \
 	}                                                                    \
 } while (0)
+#else
+#define ubi_assert(expr)  do {                                               \
+	if (unlikely(!(expr))) {                                             \
+		pr_crit("UBI assert failed in %s at %u\n",                   \
+		       __func__, __LINE__);                                  \
+		dump_stack();                                                \
+	}                                                                    \
+} while (0)
+#endif
 
 #define ubi_dbg_print_hex_dump(ps, pt, r, g, b, len, a)                      \
 		print_hex_dump(ps, pt, r, g, b, len, a)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

Hello Eran,

Am 13.02.2019 um 19:55 schrieb Eran Matityahu:

Quoted 7 lines

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
  drivers/mtd/ubi/debug.h | 10 ++++++++++
  1 file changed, 10 insertions(+)

Is there any reason for this change?

If I see it correct, pid is for U-Boot always set to one in ./lib/linux_compat.c ... so I see no reason for introducing here an U-Boot specific version of ubi_assert() ...

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#2 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

Hi Heiko.

Quoted 18 lines · Heiko Schocher

Hello Eran,

Am 13.02.2019 um 19:55 schrieb Eran Matityahu:

Quoted 7 lines

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
  drivers/mtd/ubi/debug.h | 10 ++++++++++
  1 file changed, 10 insertions(+)

Is there any reason for this change?

If I see it correct, pid is for U-Boot always set to one in ./lib/linux_compat.c ... so I see no reason for introducing here an U-Boot specific version of ubi_assert() ...

Quoted 6 lines

bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de

Sure, it works with the pid print, however:
1. The pid print is useless in U-Boot.
2. I wanted to align it with ubifs_assert() and the rest of the macros in fs/ubifs/debug.h, which also have U-Boot specific versions without the pid print.
3. If you agree with the next patch I sent (using pr_debug), then it's probably best to have a U-Boot specific version for ubi_assert() anyway.

Regards,
Eran

Signature · 2 lines
Eran Matityahu  |  Software manager
Website |  www.variscite.com        Variscite wiki | www.variwiki.com
#3 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

Hello Eran,

Am 18.02.2019 um 08:44 schrieb Eran Matityahu:

Quoted 28 lines

Hi Heiko.

Quoted 18 lines · Heiko Schocher

Hello Eran,

Am 13.02.2019 um 19:55 schrieb Eran Matityahu:

Quoted 7 lines

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
   drivers/mtd/ubi/debug.h | 10 ++++++++++
   1 file changed, 10 insertions(+)

Is there any reason for this change?

If I see it correct, pid is for U-Boot always set to one in ./lib/linux_compat.c ... so I see no reason for introducing here an U-Boot specific version of ubi_assert() ...

Quoted 6 lines

bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs at denx.de

Quoted 8 lines

Sure, it works with the pid print, however:
1. The pid print is useless in U-Boot.
2. I wanted to align it with ubifs_assert() and the rest of the macros in fs/ubifs/debug.h, which also have U-Boot specific versions without the pid print.
3. If you agree with the next patch I sent (using pr_debug), then it's probably best to have a U-Boot specific version for ubi_assert() anyway.

Ah, I see. Ok, I have no objections.

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#4 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

In reply to Eran Matityahu

Hello Eran,

Am 13.02.2019 um 19:55 schrieb Eran Matityahu:

Quoted 7 lines

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
  drivers/mtd/ubi/debug.h | 10 ++++++++++
  1 file changed, 10 insertions(+)

queued for next merge window.

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de
#5 lore raw

PATCH 1/2 mtd: ubi debug: Remove the pid print from ubi_assert

In reply to Eran Matityahu

Hello Eran,

Am 13.02.2019 um 19:55 schrieb Eran Matityahu:

Quoted 7 lines

Add a new definition for ubi_assert and keep
the original one in an ifndef __UBOOT__.

---
  drivers/mtd/ubi/debug.h | 10 ++++++++++
  1 file changed, 10 insertions(+)

Applied to uboot-ubi.git master

bye,
Heiko

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-52   Fax: +49-8142-66989-80   Email: hs at denx.de