From 2a29d4535036315ce62b0a6eba46b5de1d0778bb Mon Sep 17 00:00:00 2001 From: Felix Held Date: Tue, 25 May 2021 19:15:11 +0200 Subject: [PATCH] lib/hexdump: remove hexdump32 and use hexdump instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hexdump and hexdump32 do similar things, but hexdump32 is mostly a reimplementation that has additional support to configure the console log level, but has a very unexpected len parameter that isn't in bytes, but in DWORDs. With the move to hexdump() the console log level for the hexdump is changed to BIOS_DEBUG. Signed-off-by: Felix Held Change-Id: I6138d17f0ce8e4a14f22d132bf5c64d0c343b80d Reviewed-on: https://review.coreboot.org/c/coreboot/+/54925 Reviewed-by: Angel Pons Reviewed-by: Kyösti Mälkki Tested-by: build bot (Jenkins) --- src/include/lib.h | 1 - src/lib/hexdump.c | 18 ------------------ .../intel/sandybridge/raminit_mrc.c | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/include/lib.h b/src/include/lib.h index 359626c964..8e8bab55c1 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -29,7 +29,6 @@ int checkstack(void *top_of_stack, int core); * https://packages.debian.org/jessie/amd64/vim-common/filelist */ void hexdump(const void *memory, size_t length); -void hexdump32(char LEVEL, const void *d, size_t len); /* * hexstrtobin - Turn a string of ASCII hex characters into binary diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c index 90446c1481..533411f6f6 100644 --- a/src/lib/hexdump.c +++ b/src/lib/hexdump.c @@ -48,21 +48,3 @@ void hexdump(const void *memory, size_t length) } } } - -void hexdump32(char LEVEL, const void *d, size_t len) -{ - size_t count = 0; - - while (len > 0) { - if (count % 8 == 0) { - printk(LEVEL, "\n"); - printk(LEVEL, "%p:", d); - } - printk(LEVEL, " 0x%08lx", *(unsigned long *)d); - count++; - len--; - d += 4; - } - - printk(LEVEL, "\n\n"); -} diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c index 21de0b2ea4..43619cd592 100644 --- a/src/northbridge/intel/sandybridge/raminit_mrc.c +++ b/src/northbridge/intel/sandybridge/raminit_mrc.c @@ -371,7 +371,7 @@ void perform_raminit(int s3resume) } else { printk(BIOS_ERR, "Could not parse MRC_VAR data\n"); - hexdump32(BIOS_ERR, mrc_var, sizeof(*mrc_var) / sizeof(u32)); + hexdump(mrc_var, sizeof(*mrc_var)); } const int cbmem_was_initted = !cbmem_recovery(s3resume);