[PATCH V6 2/8] Add shared printk wrapper for consistent prefixing
Add a wrapper for printk to standardize the prefix for informational and
error messages from the EFI stub.
Signed-off-by: Roy Franz
---
drivers/firmware/efi/efi-stub-helper.c | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/firmware/efi/efi-stub-helper.c
b/drivers/firmware/efi/efi-stub-helper.c
index b6bffbf..eb5d2eb 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -45,6 +45,9 @@ static void efi_printk(efi_system_table_t *sys_table_arg,
char *str)
}
}
+#define pr_efi(sys_table, msg) efi_printk(sys_table, "EFI stub: "msg)
+#define pr_efi_err(sys_table, msg) efi_printk(sys_table, "EFI stub: ERROR:
"msg)
+
static efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
efi_memory_desc_t **map,
@@ -324,7 +327,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
nr_files * sizeof(*files),
(void **));
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to alloc mem for file handle
list\n");
+ pr_efi_err(sys_table_arg, "Failed to alloc mem for file handle
list\n");
goto fail;
}
@@ -376,13 +379,13 @@ static efi_status_t
handle_cmdline_files(efi_system_table_t *sys_table_arg,
image->device_handle, _proto,
(void **));
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to handle
fs_proto\n");
+ pr_efi_err(sys_table_arg, "Failed to handle
fs_proto\n");
goto free_files;
}
status = efi_call_phys2(io->open_volume, io, );
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to open
volume\n");
+ pr_efi_err(sys_table_arg, "Failed to open
volume\n");
goto free_files;
}
}
@@ -390,7 +393,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
status = efi_call_phys5(fh->open, fh, , filename_16,
EFI_FILE_MODE_READ, (u64)0);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to open file: ");
+ pr_efi_err(sys_table_arg, "Failed to open file: ");
efi_char16_printk(sys_table_arg, filename_16);
efi_printk(sys_table_arg, "\n");
goto close_handles;
@@ -402,7 +405,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
status = efi_call_phys4(h->get_info, h, _guid,
_sz, NULL);
if (status != EFI_BUFFER_TOO_SMALL) {
- efi_printk(sys_table_arg, "Failed to get file info
size\n");
+ pr_efi_err(sys_table_arg, "Failed to get file info
size\n");
goto close_handles;
}
@@ -411,7 +414,7 @@ grow:
EFI_LOADER_DATA, info_sz,
(void **));
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to alloc mem for file
info\n");
+ pr_efi_err(sys_table_arg, "Failed to alloc mem for file
info\n");
goto close_handles;
}
@@ -427,7 +430,7 @@ grow:
efi_call_phys1(sys_table_arg->boottime->free_pool, info);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to get file info\n");
+ pr_efi_err(sys_table_arg, "Failed to get file info\n");
goto close_handles;
}
@@ -446,13 +449,13 @@ grow:
status = efi_high_alloc(sys_table_arg, file_size_total, 0x1000,
_addr, max_addr);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, "Failed to alloc highmem for
files\n");
+ pr_efi_err(sys_table_arg, "Failed to alloc highmem for
files\n");
goto close_handles;
}
/* We've run out of free low memory. */
if (file_addr > max_addr) {
- efi_printk(sys_table_arg, "We've run out of free low
memory\n");
+ pr_efi_err(sys_table_arg, "We've run out of free low
memory\n");
status = EFI_INVALID_PARAMETER;
[PATCH V6 2/8] Add shared printk wrapper for consistent prefixing
Add a wrapper for printk to standardize the prefix for informational and
error messages from the EFI stub.
Signed-off-by: Roy Franz roy.fr...@linaro.org
---
drivers/firmware/efi/efi-stub-helper.c | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/drivers/firmware/efi/efi-stub-helper.c
b/drivers/firmware/efi/efi-stub-helper.c
index b6bffbf..eb5d2eb 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -45,6 +45,9 @@ static void efi_printk(efi_system_table_t *sys_table_arg,
char *str)
}
}
+#define pr_efi(sys_table, msg) efi_printk(sys_table, EFI stub: msg)
+#define pr_efi_err(sys_table, msg) efi_printk(sys_table, EFI stub: ERROR:
msg)
+
static efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg,
efi_memory_desc_t **map,
@@ -324,7 +327,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
nr_files * sizeof(*files),
(void **)files);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to alloc mem for file handle
list\n);
+ pr_efi_err(sys_table_arg, Failed to alloc mem for file handle
list\n);
goto fail;
}
@@ -376,13 +379,13 @@ static efi_status_t
handle_cmdline_files(efi_system_table_t *sys_table_arg,
image-device_handle, fs_proto,
(void **)io);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to handle
fs_proto\n);
+ pr_efi_err(sys_table_arg, Failed to handle
fs_proto\n);
goto free_files;
}
status = efi_call_phys2(io-open_volume, io, fh);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to open
volume\n);
+ pr_efi_err(sys_table_arg, Failed to open
volume\n);
goto free_files;
}
}
@@ -390,7 +393,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
status = efi_call_phys5(fh-open, fh, h, filename_16,
EFI_FILE_MODE_READ, (u64)0);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to open file: );
+ pr_efi_err(sys_table_arg, Failed to open file: );
efi_char16_printk(sys_table_arg, filename_16);
efi_printk(sys_table_arg, \n);
goto close_handles;
@@ -402,7 +405,7 @@ static efi_status_t handle_cmdline_files(efi_system_table_t
*sys_table_arg,
status = efi_call_phys4(h-get_info, h, info_guid,
info_sz, NULL);
if (status != EFI_BUFFER_TOO_SMALL) {
- efi_printk(sys_table_arg, Failed to get file info
size\n);
+ pr_efi_err(sys_table_arg, Failed to get file info
size\n);
goto close_handles;
}
@@ -411,7 +414,7 @@ grow:
EFI_LOADER_DATA, info_sz,
(void **)info);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to alloc mem for file
info\n);
+ pr_efi_err(sys_table_arg, Failed to alloc mem for file
info\n);
goto close_handles;
}
@@ -427,7 +430,7 @@ grow:
efi_call_phys1(sys_table_arg-boottime-free_pool, info);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to get file info\n);
+ pr_efi_err(sys_table_arg, Failed to get file info\n);
goto close_handles;
}
@@ -446,13 +449,13 @@ grow:
status = efi_high_alloc(sys_table_arg, file_size_total, 0x1000,
file_addr, max_addr);
if (status != EFI_SUCCESS) {
- efi_printk(sys_table_arg, Failed to alloc highmem for
files\n);
+ pr_efi_err(sys_table_arg, Failed to alloc highmem for
files\n);
goto close_handles;
}
/* We've run out of free low memory. */
if (file_addr max_addr) {
- efi_printk(sys_table_arg, We've run out of free low
memory\n);
+ pr_efi_err(sys_table_arg, We've run out of free low
memory\n);
status = EFI_INVALID_PARAMETER;
goto
