Skip to contentSkip to conversation

Various minor patches

PATCH Superseded Simon Glass 5 participants 28 messages Sep 28, 2020 – Oct 27, 2020

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Various minor patches

This series contains a number of minor patches collected while completing the ACPI updates for U-Boot.

Simon Glass (12):
log: Add missing category names
x86: zimage: Add a little more logging
x86: zimage: Sanity-check the kernel version before printing it
x86: zimage: Quieten down the zimage boot process
syscon: Drop the logging in syscon_get_by_driver_data()
bloblist: Place on a 4KB boundary
binman: Add a way to read the ROM offset
binman: Support multiple images in the library
log: Fix the comment for struct log_driver()
board: Show memory for frame buffers
i2c: designware: Use log_debug() for debugging
tpm: cr50: Correct logging statements

 arch/x86/lib/zimage.c        | 26 +++++++++++++++++++++-----
 common/board_f.c             |  6 +++++-
 common/log.c                 |  6 ++++++
 drivers/core/syscon-uclass.c |  2 +-
 drivers/i2c/designware_i2c.c |  4 ++--
 drivers/tpm/cr50_i2c.c       | 10 +++++-----
 include/binman.h             |  7 +++++++
 include/log.h                |  6 +++++-
 lib/binman.c                 | 14 +++++++++++++-
 9 files changed, 65 insertions(+), 16 deletions(-)
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#1 lore raw

PATCH 1/12 log: Add missing category names

Add some category names that were missed in recent changes. Update the comment as a reminder.

---

 common/log.c  | 5 +++++
 include/log.h | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
common/log.c +5 -0
index 9a5f100da34..38336d84e3c 100644
@@ -21,6 +21,11 @@ static const char *log_cat_name[LOGC_COUNT - LOGC_NONE] = {
 	"driver-model",
 	"device-tree",
 	"efi",
+	"alloc",
+	"sandbox",
+	"bloblist",
+	"devres",
+	"acpi",
 };
 
 static const char *log_level_name[LOGL_COUNT] = {
include/log.h +3 -1
index 2859ce1f2e7..00885004a36 100644
@@ -39,7 +39,9 @@ enum log_level_t {
 
 /**
  * Log categories supported. Most of these correspond to uclasses (i.e.
- * enum uclass_id) but there are also some more generic categories
+ * enum uclass_id) but there are also some more generic categories.
+ *
+ * Remember to update log_cat_name[] after adding a new category.
  */
 enum log_category_t {
 	LOGC_FIRST = 0,	/* First part mirrors UCLASS_... */
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#2 lore raw

PATCH 1/12 log: Add missing category names

Am 28. September 2020 02:46:13 MESZ schrieb Simon Glass <[email protected]>:

Quoted 15 lines

Add some category names that were missed in recent changes. Update the comment as a reminder.

---

common/log.c | 5 +++++
include/log.h | 4 +++-

2 files changed, 8 insertions(+), 1 deletion(-)
common/log.c +0 -0
index 9a5f100da34..38336d84e3c 100644

common/log.c static const char *log_cat_name[LOGC_COUNT - · line 30

Quoted 10 lines
common/log.c +5 -0
@@ -21,6 +21,11 @@ static const char *log_cat_name[LOGC_COUNT -
 LOGC_NONE] = {
 	"driver-model",
 	"device-tree",
 	"efi",
+	"alloc",
+	"sandbox",
+	"bloblist",
+	"devres",
+	"acpi",
 };

Should we add a compile time check that the array size matches the number of non-uclass categories?

Best regards

Heinrich

Quoted 17 lines
common/log.c +0 -0
 static const char *log_level_name[LOGL_COUNT] = {
include/log.h +3 -1
index 2859ce1f2e7..00885004a36 100644
@@ -39,7 +39,9 @@ enum log_level_t {
 
 /**
 * Log categories supported. Most of these correspond to uclasses (i.e.
- * enum uclass_id) but there are also some more generic categories
+ * enum uclass_id) but there are also some more generic categories.
+ *
+ * Remember to update log_cat_name[] after adding a new category.
 */
 enum log_category_t {
 	LOGC_FIRST = 0,	/* First part mirrors UCLASS_... */
#3 lore raw

PATCH 1/12 log: Add missing category names

In reply to Simon Glass
Quoted 4 lines · Simon Glass

Add some category names that were missed in recent changes. Update the comment as a reminder.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/b282fc40/attachment.sig>
#4 lore raw

PATCH 2/12 x86: zimage: Add a little more logging

In reply to Simon Glass

Add logging for each part of the boot process, using a new

---

 arch/x86/lib/zimage.c | 6 ++++++
 common/log.c          | 1 +
 include/log.h         | 1 +
 3 files changed, 8 insertions(+)
arch/x86/lib/zimage.c +6 -0
index a00964cc8d9..7418c9a5fed 100644
@@ -12,10 +12,13 @@
  * linux/Documentation/i386/boot.txt
  */
 
+#define LOG_CATEGORY	LOGC_BOOT
+
 #include <common.h>
 #include <command.h>
 #include <env.h>
 #include <irq_func.h>
+#include <log.h>
 #include <malloc.h>
 #include <acpi/acpi_table.h>
 #include <asm/io.h>
@@ -292,6 +295,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 	struct setup_header *hdr = &setup_base->hdr;
 	int bootproto = get_boot_protocol(hdr, false);
 
+	log_debug("Setup E820 entries\n");
 	setup_base->e820_entries = install_e820_map(
 		ARRAY_SIZE(setup_base->e820_map), setup_base->e820_map);
 
@@ -317,6 +321,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 	}
 
 	if (cmd_line) {
+		log_debug("Setup cmdline\n");
 		if (bootproto >= 0x0202) {
 			hdr->cmd_line_ptr = (uintptr_t)cmd_line;
 		} else if (bootproto >= 0x0200) {
@@ -340,6 +345,7 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot,
 	if (IS_ENABLED(CONFIG_GENERATE_ACPI_TABLE))
 		setup_base->acpi_rsdp_addr = acpi_get_rsdp_addr();
 
+	log_debug("Setup devicetree\n");
 	setup_device_tree(hdr, (const void *)env_get_hex("fdtaddr", 0));
 	setup_video(&setup_base->screen_info);
 
common/log.c +1 -0
index 38336d84e3c..9c65688ba6d 100644
@@ -26,6 +26,7 @@ static const char *log_cat_name[LOGC_COUNT - LOGC_NONE] = {
 	"bloblist",
 	"devres",
 	"acpi",
+	"boot",
 };
 
 static const char *log_level_name[LOGL_COUNT] = {
include/log.h +1 -0
index 00885004a36..dc1b6b5e4c6 100644
@@ -59,6 +59,7 @@ enum log_category_t {
 	LOGC_DEVRES,	/* Device resources (devres_... functions) */
 	/* Advanced Configuration and Power Interface (ACPI) */
 	LOGC_ACPI,
+	LOGC_BOOT,	/* Related to boot process / boot image processing */
 
 	LOGC_COUNT,	/* Number of log categories */
 	LOGC_END,	/* Sentinel value for a list of log categories */
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#5 lore raw

PATCH 2/12 x86: zimage: Add a little more logging

Hi Simon,

Quoted 2 lines · Simon Glass

Add logging for each part of the boot process, using a new

using a new category?

Quoted 9 lines

---

 arch/x86/lib/zimage.c | 6 ++++++
 common/log.c          | 1 +
 include/log.h         | 1 +
 3 files changed, 8 insertions(+)

Regards,
Bin

#6 lore raw

PATCH 2/12 x86: zimage: Add a little more logging

Hi Simon,

Quoted 13 lines · Bin Meng

Hi Simon,

Quoted 2 lines · Simon Glass

Add logging for each part of the boot process, using a new

using a new category?

Quoted 4 lines

---

Quoted 7 lines
Quoted 5 lines
 arch/x86/lib/zimage.c | 6 ++++++
 common/log.c          | 1 +
 include/log.h         | 1 +
 3 files changed, 8 insertions(+)

Could you please rebase this series?

Applying: x86: zimage: Add a little more logging
error: patch failed: common/log.c:26
error: common/log.c: patch does not apply
Patch failed at 0001 x86: zimage: Add a little more logging The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".

Regards,
Bin

#7 lore raw

PATCH 3/12 x86: zimage: Sanity-check the kernel version before printing it

In reply to Simon Glass

With Chrome OS the kernel setup block is stored in a separate place from the kernel, so it is not possible to access the kernel version string. At present, garbage is printed.

Add a sanity check to avoid this.

---

 arch/x86/lib/zimage.c | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/x86/lib/zimage.c +9 -0
index 7418c9a5fed..d425ded596d 100644
@@ -31,6 +31,7 @@
 #include <asm/arch/timestamp.h>
 #endif
 #include <linux/compiler.h>
+#include <linux/ctype.h>
 #include <linux/libfdt.h>
 
 /*
@@ -175,11 +176,19 @@ static const char *get_kernel_version(struct boot_params *params,
 {
 	struct setup_header *hdr = &params->hdr;
 	int bootproto;
+	const char *s, *end;
 
 	bootproto = get_boot_protocol(hdr, false);
 	if (bootproto < 0x0200 || hdr->setup_sects < 15)
 		return NULL;
 
+	/* sanity-check the kernel version in case it is missing */
+	for (s = kernel_base + hdr->kernel_version + 0x200, end = s + 0x100; *s;
+	     s++) {
+		if (!isprint(*s))
+			return NULL;
+	}
+
 	return kernel_base + hdr->kernel_version + 0x200;
 }
 
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#8 lore raw

PATCH 3/12 x86: zimage: Sanity-check the kernel version before printing it

Quoted 5 lines · Simon Glass

With Chrome OS the kernel setup block is stored in a separate place from the kernel, so it is not possible to access the kernel version string. At present, garbage is printed.

Quoted 8 lines

Add a sanity check to avoid this.

---

 arch/x86/lib/zimage.c | 9 +++++++++
 1 file changed, 9 insertions(+)
#9 lore raw

PATCH 4/12 x86: zimage: Quieten down the zimage boot process

In reply to Simon Glass

Much of the output is not very useful. The bootm command is quite a bit quieter. Convert some output to use log_debug().

---

 arch/x86/lib/zimage.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
arch/x86/lib/zimage.c +6 -5
index d425ded596d..50fb16d2dac 100644
@@ -212,13 +212,13 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size,
 
 	/* determine size of setup */
 	if (0 == hdr->setup_sects) {
-		printf("Setup Sectors = 0 (defaulting to 4)\n");
+		log_warning("Setup Sectors = 0 (defaulting to 4)\n");
 		setup_size = 5 * 512;
 	} else {
 		setup_size = (hdr->setup_sects + 1) * 512;
 	}
 
-	printf("Setup Size = 0x%8.8lx\n", (ulong)setup_size);
+	log_debug("Setup Size = 0x%8.8lx\n", (ulong)setup_size);
 
 	if (setup_size > SETUP_MAX_SIZE)
 		printf("Error: Setup is too large (%d bytes)\n", setup_size);
@@ -226,8 +226,8 @@ struct boot_params *load_zimage(char *image, unsigned long kernel_size,
 	/* determine boot protocol version */
 	bootproto = get_boot_protocol(hdr, true);
 
-	printf("Using boot protocol version %x.%02x\n",
-	       (bootproto & 0xff00) >> 8, bootproto & 0xff);
+	log_debug("Using boot protocol version %x.%02x\n",
+		  (bootproto & 0xff00) >> 8, bootproto & 0xff);
 
 	version = get_kernel_version(params, image);
 	if (version)
@@ -420,7 +420,8 @@ static int do_zboot_load(struct cmd_tbl *cmdtp, int flag, int argc,
 		struct boot_params *from = (struct boot_params *)state.base_ptr;
 
 		base_ptr = (struct boot_params *)DEFAULT_SETUP_BASE;
-		printf("Building boot_params at 0x%8.8lx\n", (ulong)base_ptr);
+		log_debug("Building boot_params at 0x%8.8lx\n",
+			  (ulong)base_ptr);
 		memset(base_ptr, '\0', sizeof(*base_ptr));
 		base_ptr->hdr = from->hdr;
 	} else {
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#10 lore raw

PATCH 4/12 x86: zimage: Quieten down the zimage boot process

Quoted 10 lines · Simon Glass

Much of the output is not very useful. The bootm command is quite a bit quieter. Convert some output to use log_debug().

---

 arch/x86/lib/zimage.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
#11 lore raw

PATCH 5/12 syscon: Drop the logging in syscon_get_by_driver_data()

In reply to Simon Glass

This function can be called when it is not known whether it will find anything. This results in confusing log messages if the device is not found. It is better for the caller to log the failure, if necessary.

Drop the logging from this function.

---

 drivers/core/syscon-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/core/syscon-uclass.c +1 -1
index 9cbda4ebdae..66ac579e465 100644
@@ -140,7 +140,7 @@ int syscon_get_by_driver_data(ulong driver_data, struct udevice **devp)
 
 	ret = uclass_first_device_drvdata(UCLASS_SYSCON, driver_data, devp);
 	if (ret)
-		return log_msg_ret("find", ret);
+		return ret;
 
 	return 0;
 }
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#12 lore raw

PATCH 5/12 syscon: Drop the logging in syscon_get_by_driver_data()

Quoted 7 lines · Simon Glass

This function can be called when it is not known whether it will find anything. This results in confusing log messages if the device is not found. It is better for the caller to log the failure, if necessary.

Drop the logging from this function.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/8a778a2a/attachment.sig>
#13 lore raw

PATCH 6/12 bloblist: Place on a 4KB boundary

In reply to Simon Glass

It is much easier to read the bloblist addresses if it starts on a 4KB boundary. Update it to align it accordingly.

---

 common/board_f.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
common/board_f.c +3 -1
index 62473abf793..e99277d7e88 100644
@@ -573,7 +573,9 @@ static int reserve_stacks(void)
 static int reserve_bloblist(void)
 {
 #ifdef CONFIG_BLOBLIST
-	gd->start_addr_sp = reserve_stack_aligned(CONFIG_BLOBLIST_SIZE);
+	/* Align to a 4KB boundary for easier reading of addresses */
+	gd->start_addr_sp = ALIGN_DOWN(gd->start_addr_sp - CONFIG_BLOBLIST_SIZE,
+				       0x1000);
 	gd->new_bloblist = map_sysmem(gd->start_addr_sp, CONFIG_BLOBLIST_SIZE);
 #endif
 
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#14 lore raw

PATCH 6/12 bloblist: Place on a 4KB boundary

Quoted 4 lines · Simon Glass

It is much easier to read the bloblist addresses if it starts on a 4KB boundary. Update it to align it accordingly.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/fe1af963/attachment.sig>
#15 lore raw

PATCH 7/12 binman: Add a way to read the ROM offset

In reply to Simon Glass

Provide a function to read the ROM offset so that we can store the value in one place and clients don't need to store it themselves after calling binman_set_rom_offset().

---

 include/binman.h | 7 +++++++
 lib/binman.c     | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
include/binman.h +7 -0
index e0b92075e27..8b89a9666d5 100644
@@ -42,6 +42,13 @@ int binman_entry_map(ofnode parent, const char *name, void **bufp, int *sizep);
  */
 void binman_set_rom_offset(int rom_offset);
 
+/**
+ * binman_get_rom_offset() - Get the ROM memory-map offset
+ *
+ * @returns offset from an image_pos to the memory-mapped address
+ */
+int binman_get_rom_offset(void);
+
 /**
  * binman_entry_find() - Find a binman symbol
  *
lib/binman.c +6 -1
index 7a8ad62c4a8..79e497fc8de 100644
@@ -43,7 +43,7 @@ static int binman_entry_find_internal(ofnode node, const char *name,
 
 	ret = ofnode_read_u32(node, "image-pos", &entry->image_pos);
 	if (ret)
-		return log_msg_ret("import-pos", ret);
+		return log_msg_ret("image-pos", ret);
 	ret = ofnode_read_u32(node, "size", &entry->size);
 	if (ret)
 		return log_msg_ret("size", ret);
@@ -83,6 +83,11 @@ void binman_set_rom_offset(int rom_offset)
 	binman->rom_offset = rom_offset;
 }
 
+int binman_get_rom_offset(void)
+{
+	return binman->rom_offset;
+}
+
 int binman_init(void)
 {
 	binman = malloc(sizeof(struct binman_info));
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#16 lore raw

PATCH 7/12 binman: Add a way to read the ROM offset

Provide a function to read the ROM offset so that we can store the value in one place and clients don't need to store it themselves after calling binman_set_rom_offset().

---

 include/binman.h | 7 +++++++
 lib/binman.c     | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

Applied to u-boot-dm, thanks!

#17 lore raw

PATCH 8/12 binman: Support multiple images in the library

In reply to Simon Glass

Add support for multiple images, since these are used on x86 now. Select the first image for now, since that is generally the correct one. At some point we can add a way to determine which image is currently running.

---

 lib/binman.c | 7 +++++++
 1 file changed, 7 insertions(+)
lib/binman.c +7 -0
index 79e497fc8de..e71c1b9e992 100644
@@ -96,6 +96,13 @@ int binman_init(void)
 	binman->image = ofnode_path("/binman");
 	if (!ofnode_valid(binman->image))
 		return log_msg_ret("binman node", -EINVAL);
+	if (ofnode_read_bool(binman->image, "multiple-images")) {
+		ofnode node = ofnode_first_subnode(binman->image);
+
+		if (!ofnode_valid(node))
+			return log_msg_ret("first image", -ENOENT);
+		binman->image = node;
+	}
 	binman->rom_offset = ROM_OFFSET_NONE;
 
 	return 0;
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#18 lore raw

PATCH 8/12 binman: Support multiple images in the library

Add support for multiple images, since these are used on x86 now. Select the first image for now, since that is generally the correct one. At some point we can add a way to determine which image is currently running.

---

 lib/binman.c | 7 +++++++
 1 file changed, 7 insertions(+)

Applied to u-boot-dm, thanks!

#19 lore raw

PATCH 9/12 log: Fix the comment for struct log_driver()

In reply to Simon Glass

This is missing a comment for the 'emit' member. Add it.

---

 include/log.h | 1 +
 1 file changed, 1 insertion(+)
include/log.h +1 -0
index dc1b6b5e4c6..b49f5c99859 100644
@@ -304,6 +304,7 @@ struct log_device;
  * struct log_driver - a driver which accepts and processes log records
  *
  * @name: Name of driver
+ * @emit: Method to call to emit a log record via this device
  */
 struct log_driver {
 	const char *name;
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#20 lore raw

PATCH 9/12 log: Fix the comment for struct log_driver()

Am 28. September 2020 02:46:21 MESZ schrieb Simon Glass <[email protected]>:

Quoted 13 lines

This is missing a comment for the 'emit' member. Add it.

---

include/log.h | 1 +

1 file changed, 1 insertion(+)
include/log.h +0 -0
index dc1b6b5e4c6..b49f5c99859 100644

include/log.h struct log_device; · line 310

Quoted 7 lines
include/log.h +1 -0
@@ -304,6 +304,7 @@ struct log_device;
 * struct log_driver - a driver which accepts and processes log records
 *
 * @name: Name of driver
+ * @emit: Method to call to emit a log record via this device
 */
 struct log_driver {
 	const char *name;

log.h seems to be missing in the generated HTML documentation. Cf https://u-boot.readthedocs.io/en/latest/api/index.html

If we add it, make htmldocs will warn us of similar glitches.

Best regards

Heinrich

#21 lore raw

PATCH 10/12 board: Show memory for frame buffers

In reply to Simon Glass

When debugging is enabled, show the memory allocated to video frame buffers.

---

 common/board_f.c | 2 ++
 1 file changed, 2 insertions(+)
common/board_f.c +2 -0
index e99277d7e88..9f441c44f17 100644
@@ -392,6 +392,8 @@ static int reserve_video(void)
 	ret = video_reserve(&addr);
 	if (ret)
 		return ret;
+	debug("Reserving %luk for video at: %08lx\n",
+	      (unsigned long)gd->relocaddr - addr, addr);
 	gd->relocaddr = addr;
 #elif defined(CONFIG_LCD)
 #  ifdef CONFIG_FB_ADDR
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#22 lore raw

PATCH 10/12 board: Show memory for frame buffers

Quoted 4 lines · Simon Glass

When debugging is enabled, show the memory allocated to video frame buffers.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/498c96bf/attachment.sig>
#23 lore raw

PATCH 11/12 i2c: designware: Use log_debug() for debugging

In reply to Simon Glass

We don't want the debug output to be visible in a normal boot. Silence it.

---

 drivers/i2c/designware_i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/designware_i2c.c +2 -2
index 569a5d39b49..791f32e971c 100644
@@ -807,8 +807,8 @@ int designware_i2c_probe(struct udevice *bus)
 		return -ENXIO;
 	}
 
-	log_info("I2C bus %s version %#x\n", bus->name,
-		 readl(&priv->regs->comp_version));
+	log_debug("I2C bus %s version %#x\n", bus->name,
+		  readl(&priv->regs->comp_version));
 
 	return __dw_i2c_init(priv->regs, 0, 0);
 }
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#24 lore raw

PATCH 11/12 i2c: designware: Use log_debug() for debugging

Hello Simon,

Am 28.09.2020 um 02:46 schrieb Simon Glass:

Quoted 7 lines

We don't want the debug output to be visible in a normal boot. Silence it.

---

  drivers/i2c/designware_i2c.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

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
#25 lore raw

PATCH 11/12 i2c: designware: Use log_debug() for debugging

In reply to Simon Glass
Quoted 4 lines · Simon Glass

We don't want the debug output to be visible in a normal boot. Silence it.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/fa3aa861/attachment.sig>
#26 lore raw

PATCH 12/12 tpm: cr50: Correct logging statements

In reply to Simon Glass

Fix up some logging statements in this file. Most of them should use log_debug(), apart from one error.

---

 drivers/tpm/cr50_i2c.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/tpm/cr50_i2c.c +5 -5
index 64831a42232..a761e3d52f1 100644
@@ -494,13 +494,13 @@ static int process_reset(struct udevice *dev)
 			continue;
 		}
 
-		log_warning("TPM ready after %ld ms\n", get_timer(start));
+		log_debug("TPM ready after %ld ms\n", get_timer(start));
 
 		return 0;
 	} while (get_timer(start) < TIMEOUT_INIT_MS);
 
-	log_warning("TPM failed to reset after %ld ms, status: %#x\n",
-		    get_timer(start), access);
+	log_err("TPM failed to reset after %ld ms, status: %#x\n",
+		get_timer(start), access);
 
 	return -EPERM;
 }
@@ -539,7 +539,7 @@ static int claim_locality(struct udevice *dev, int loc)
 		log_err("Failed to claim locality\n");
 		return -EPERM;
 	}
-	log_info("Claimed locality %d\n", loc);
+	log_debug("Claimed locality %d\n", loc);
 	priv->locality = loc;
 
 	return 0;
@@ -577,7 +577,7 @@ static int cr50_i2c_cleanup(struct udevice *dev)
 {
 	struct cr50_priv *priv = dev_get_priv(dev);
 
-	printf("%s: cleanup %d\n", __func__, priv->locality);
+	log_debug("cleanup %d\n", priv->locality);
 	if (priv->locality != -1)
 		release_locality(dev, 1);
 
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#27 lore raw

PATCH 12/12 tpm: cr50: Correct logging statements

Quoted 4 lines · Simon Glass

Fix up some logging statements in this file. Most of them should use log_debug(), apart from one error.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201022/5cba47c3/attachment.sig>