ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

PATCH Superseded Petr Vorel 2 participants 4 messages Mar 19, 2018 – Mar 23, 2018

Subsystems (3)

Memory technology devices (MTD) UBI file system (UBIFS) Unsorted block images (UBI)

lore

Share & tools

lore

Petr Vorel

author

2018-03-19 10:08 UTC #0 lore raw

PATCH v2 1/3 ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Use of CONFIG_UBIFS_SILENCE_MSG was added in 147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc Joe Hershberger <[email protected]>

Cc Heiko Schocher <[email protected]>

Signed-off-by Petr Vorel <[email protected]>

---
Changes v1->v2:
Rebased to current master as requested by Heiko Schocher.

---
 fs/ubifs/ubifs.h | 4 ++++
 1 file changed, 4 insertions(+)

fs/ubifs/ubifs.h +4 -0

index 1d89465205..b4ce706a8e 100644
@@ -618,9 +618,13 @@ static inline ino_t parent_ino(struct dentry *dentry)
 #define UBIFS_VERSION 1
 
 /* Normal UBIFS messages */
+#ifdef CONFIG_UBIFS_SILENCE_MSG
+#define ubifs_msg(c, fmt, ...)
+#else
 #define ubifs_msg(c, fmt, ...)                                      \
 	pr_notice("UBIFS (ubi%d:%d): " fmt "\n",                    \
 		  (c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
+#endif
 /* UBIFS error messages */
 #ifndef __UBOOT__
 #define ubifs_err(c, fmt, ...)                                      \

Signature · 1 line

2.16.2

Petr Vorel

author

2018-03-19 10:08 UTC #1 lore raw

PATCH v2 2/3 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

Signed-off-by Petr Vorel <[email protected]>

Cc Joe Hershberger <[email protected]>

Cc Heiko Schocher <[email protected]>

---
 README                            | 6 ------
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig        | 1 +
 env/Kconfig                       | 1 -
 fs/ubifs/Kconfig                  | 7 +++++++
 include/configs/am335x_igep003x.h | 1 -
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt      | 1 -
 8 files changed, 9 insertions(+), 10 deletions(-)

README +0 -6

index 5fd6428c5c..af7fbb6561 100644
@@ -2549,12 +2549,6 @@ FIT uImage format:
 		Enable UBI fastmap debug
 		default: 0
 
-- UBIFS support
-		CONFIG_UBIFS_SILENCE_MSG
-
-		Make the verbose messages from UBIFS stop printing.  This leaves
-		warnings and errors enabled.
-
 - SPL framework
 		CONFIG_SPL
 		Enable building of SPL globally.

configs/am335x_igep003x_defconfig +1 -0

index d2026da7b3..324f6e5289 100644
@@ -38,6 +38,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ENV_IS_IN_UBI=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

configs/igep0032_defconfig +1 -0

index 0a3dff7796..0199250812 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
 # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

env/Kconfig +0 -1

index a3c6298273..36d6e799fc 100644
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
 	  It is assumed that both volumes are in the same MTD partition.
 
 	  - CONFIG_UBI_SILENCE_MSG
-	  - CONFIG_UBIFS_SILENCE_MSG
 
 	  You will probably want to define these to avoid a really noisy system
 	  when storing the env in UBI.

fs/ubifs/Kconfig +7 -0

index e69de29bb2..1a8f084e36 100644
@@ -0,0 +1,7 @@
+config UBIFS_SILENCE_MSG
+	bool "UBIFS silence verbose messages"
+	depends on CMD_UBIFS
+	default ENV_IS_IN_UBI
+	help
+	  Make the verbose messages from UBIFS stop printing. This leaves
+	  warnings and errors enabled.

include/configs/am335x_igep003x.h +0 -1

index 50fd46a589..e00c73dab3 100644
@@ -24,7 +24,6 @@
 
 /* Make the verbose messages from UBI stop printing */
 #define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

include/configs/omap3_igep00x0.h +0 -1

index 76d8e13d52..ab54a25d1a 100644
@@ -137,7 +137,6 @@
 #define CONFIG_ENV_UBI_VOLUME		"config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND	"config_r"
 #define CONFIG_UBI_SILENCE_MSG		1
-#define CONFIG_UBIFS_SILENCE_MSG	1
 #define CONFIG_ENV_SIZE			(32*1024)
 
 #endif /* __IGEP00X0_H */

scripts/config_whitelist.txt +0 -1

index b0958d7a80..84c1e4a822 100644
@@ -4629,7 +4629,6 @@ CONFIG_T_SH7706LSR
 CONFIG_UART_BR_PRELIM
 CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
 CONFIG_UBI_SILENCE_MSG

Signature · 1 line

2.16.2

Heiko Schocher

2018-03-23 19:09 UTC #2 lore raw

PATCH v2 2/3 Convert CONFIG_UBIFS_SILENCE_MSG to Kconfig

Hello Petr,

Am 19.03.2018 um 11:08 schrieb Petr Vorel:

Quoted 13 lines

Signed-off-by Petr Vorel <[email protected]>

Cc Joe Hershberger <[email protected]>

Cc Heiko Schocher <[email protected]>

---
  README                            | 6 ------
  configs/am335x_igep003x_defconfig | 1 +
  configs/igep0032_defconfig        | 1 +
  env/Kconfig                       | 1 -
  fs/ubifs/Kconfig                  | 7 +++++++
  include/configs/am335x_igep003x.h | 1 -
  include/configs/omap3_igep00x0.h  | 1 -
  scripts/config_whitelist.txt      | 1 -
  8 files changed, 9 insertions(+), 10 deletions(-)

Your patch drops an compile error for sun5i, see:

https://travis-ci.org/hsdenx/u-boot-test/jobs/357259797

Hmm ... shouldn;t be y depended on CONFIG_UBIFS_SILENCE_MSG ?

Quoted 22 lines

README +0 -6

index 5fd6428c5c..af7fbb6561 100644
@@ -2549,12 +2549,6 @@ FIT uImage format:
  		Enable UBI fastmap debug
  		default: 0
 
-- UBIFS support
-		CONFIG_UBIFS_SILENCE_MSG
-
-		Make the verbose messages from UBIFS stop printing.  This leaves
-		warnings and errors enabled.
-
  - SPL framework
  		CONFIG_SPL
  		Enable building of SPL globally.

configs/am335x_igep003x_defconfig +0 -0

index d2026da7b3..324f6e5289 100644

configs/am335x_igep003x_defconfig CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" · line 41

Quoted 4 lines

configs/am335x_igep003x_defconfig +1 -0

@@ -38,6 +38,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
  CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
  CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set

This option should be enabled for this board, or?

configs/igep0032_defconfig CONFIG_CMD_CACHE=y · line 31

Quoted 12 lines

configs/am335x_igep003x_defconfig +0 -0

  CONFIG_ENV_IS_IN_UBI=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_NAND=y

configs/igep0032_defconfig +1 -0

index 0a3dff7796..0199250812 100644
@@ -28,6 +28,7 @@ CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_UBI=y
  # CONFIG_CMD_UBIFS is not set
+# CONFIG_UBIFS_SILENCE_MSG is not set

Here too ...

Quoted 57 lines

configs/igep0032_defconfig +0 -0

  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_MMC_OMAP_HS=y
  CONFIG_NAND=y

env/Kconfig +0 -1

index a3c6298273..36d6e799fc 100644
@@ -361,7 +361,6 @@ config ENV_IS_IN_UBI
  	  It is assumed that both volumes are in the same MTD partition.
 
  	  - CONFIG_UBI_SILENCE_MSG
-	  - CONFIG_UBIFS_SILENCE_MSG
 
  	  You will probably want to define these to avoid a really noisy system
  	  when storing the env in UBI.

fs/ubifs/Kconfig +7 -0

index e69de29bb2..1a8f084e36 100644
@@ -0,0 +1,7 @@
+config UBIFS_SILENCE_MSG
+	bool "UBIFS silence verbose messages"
+	depends on CMD_UBIFS
+	default ENV_IS_IN_UBI
+	help
+	  Make the verbose messages from UBIFS stop printing. This leaves
+	  warnings and errors enabled.

include/configs/am335x_igep003x.h +0 -1

index 50fd46a589..e00c73dab3 100644
@@ -24,7 +24,6 @@
 
  /* Make the verbose messages from UBI stop printing */
  #define CONFIG_UBI_SILENCE_MSG
-#define CONFIG_UBIFS_SILENCE_MSG
 
  #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

include/configs/omap3_igep00x0.h +0 -1

index 76d8e13d52..ab54a25d1a 100644
@@ -137,7 +137,6 @@
  #define CONFIG_ENV_UBI_VOLUME		"config"
  #define CONFIG_ENV_UBI_VOLUME_REDUND	"config_r"
  #define CONFIG_UBI_SILENCE_MSG		1
-#define CONFIG_UBIFS_SILENCE_MSG	1
  #define CONFIG_ENV_SIZE			(32*1024)
 
  #endif /* __IGEP00X0_H */

scripts/config_whitelist.txt +0 -0

index b0958d7a80..84c1e4a822 100644

scripts/config_whitelist.txt CONFIG_T_SH7706LSR · line 4634

Quoted 7 lines

scripts/config_whitelist.txt +0 -1

@@ -4629,7 +4629,6 @@ CONFIG_T_SH7706LSR
  CONFIG_UART_BR_PRELIM
  CONFIG_UART_OR_PRELIM
  CONFIG_UBIBLOCK
-CONFIG_UBIFS_SILENCE_MSG
  CONFIG_UBIFS_VOLUME
  CONFIG_UBI_PART
  CONFIG_UBI_SILENCE_MSG

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

Petr Vorel

author

2018-03-19 10:08 UTC #3 lore raw

PATCH v2 3/3 Convert CONFIG_UBI_SILENCE_MSG to Kconfig

In reply to Petr Vorel

Signed-off-by Petr Vorel <[email protected]>

---
 README                            | 6 ------
 configs/am335x_igep003x_defconfig | 1 +
 configs/igep0032_defconfig        | 1 +
 drivers/mtd/ubi/Kconfig           | 8 ++++++++
 env/Kconfig                       | 5 -----
 include/configs/am335x_igep003x.h | 3 ---
 include/configs/omap3_igep00x0.h  | 1 -
 scripts/config_whitelist.txt      | 1 -
 8 files changed, 10 insertions(+), 16 deletions(-)

README +0 -6

index af7fbb6561..ed79298fd4 100644
@@ -2482,12 +2482,6 @@ FIT uImage format:
 		kernel. Needed for UBI support.
 
 - UBI support
-		CONFIG_UBI_SILENCE_MSG
-
-		Make the verbose messages from UBI stop printing.  This leaves
-		warnings and errors enabled.
-
-
 		CONFIG_MTD_UBI_WL_THRESHOLD
 		This parameter defines the maximum difference between the highest
 		erase counter value and the lowest erase counter value of eraseblocks

configs/am335x_igep003x_defconfig +1 -0

index 324f6e5289..b185d0df5a 100644
@@ -37,6 +37,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(SPL),-(UBI)"
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_ENV_IS_IN_UBI=y

configs/igep0032_defconfig +1 -0

index 0199250812..b44a56eec0 100644
@@ -27,6 +27,7 @@ CONFIG_CMD_SPI=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_UBI=y
+CONFIG_UBI_SILENCE_MSG=y
 # CONFIG_CMD_UBIFS is not set
 # CONFIG_UBIFS_SILENCE_MSG is not set
 CONFIG_NET_RANDOM_ETHADDR=y

drivers/mtd/ubi/Kconfig +8 -0

index caa5197df5..d5c656730b 100644
@@ -1,5 +1,13 @@
 menu "UBI support"
 
+config CONFIG_UBI_SILENCE_MSG
+	bool "UBI silence verbose messages"
+	depends on CMD_UBI
+	default ENV_IS_IN_UBI
+	help
+	  Make the verbose messages from UBI stop printing. This leaves
+	  warnings and errors enabled.
+
 config MTD_UBI
 	bool "Enable UBI - Unsorted block images"
 	select CRC32

env/Kconfig +0 -5

index 36d6e799fc..35548721bd 100644
@@ -360,11 +360,6 @@ config ENV_IS_IN_UBI
 	  the environment in.  This will enable redundant environments in UBI.
 	  It is assumed that both volumes are in the same MTD partition.
 
-	  - CONFIG_UBI_SILENCE_MSG
-
-	  You will probably want to define these to avoid a really noisy system
-	  when storing the env in UBI.
-
 config ENV_FAT_INTERFACE
 	string "Name of the block device for the environment"
 	depends on ENV_IS_IN_FAT

include/configs/am335x_igep003x.h +0 -3

index e00c73dab3..fe3f838598 100644
@@ -22,9 +22,6 @@
 
 #define CONFIG_ENV_SIZE			(96 << 10)	/*  96 KiB */
 
-/* Make the verbose messages from UBI stop printing */
-#define CONFIG_UBI_SILENCE_MSG
-
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
 #ifndef CONFIG_SPL_BUILD

include/configs/omap3_igep00x0.h +0 -1

index ab54a25d1a..e2a7f63e4f 100644
@@ -136,7 +136,6 @@
 #define CONFIG_ENV_UBI_PART		"UBI"
 #define CONFIG_ENV_UBI_VOLUME		"config"
 #define CONFIG_ENV_UBI_VOLUME_REDUND	"config_r"
-#define CONFIG_UBI_SILENCE_MSG		1
 #define CONFIG_ENV_SIZE			(32*1024)
 
 #endif /* __IGEP00X0_H */

scripts/config_whitelist.txt +0 -1

index 84c1e4a822..b8c1b62ab0 100644
@@ -4631,7 +4631,6 @@ CONFIG_UART_OR_PRELIM
 CONFIG_UBIBLOCK
 CONFIG_UBIFS_VOLUME
 CONFIG_UBI_PART
-CONFIG_UBI_SILENCE_MSG
 CONFIG_UBI_SIZE
 CONFIG_UBOOT1_ENV_ADDR
 CONFIG_UBOOT2_ENV_ADDR

Signature · 1 line

2.16.2