mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 12/30] efi: factor out errno translation
Date: Mon, 22 Nov 2021 09:47:14 +0100	[thread overview]
Message-ID: <20211122084732.2597109-13-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20211122084732.2597109-1-a.fatoum@pengutronix.de>

The errno translation will come in handy for the EFI loader support, so
factor that out.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 common/efi/Makefile       |  1 +
 common/efi/errno.c        | 90 +++++++++++++++++++++++++++++++++++++++
 common/efi/payload/init.c | 86 -------------------------------------
 include/efi/efi-util.h    | 10 +++++
 include/efi/efi.h         |  5 +--
 5 files changed, 102 insertions(+), 90 deletions(-)
 create mode 100644 common/efi/errno.c
 create mode 100644 include/efi/efi-util.h

diff --git a/common/efi/Makefile b/common/efi/Makefile
index 1ed5d45c1f5e..ed110f5a6899 100644
--- a/common/efi/Makefile
+++ b/common/efi/Makefile
@@ -3,3 +3,4 @@
 obj-$(CONFIG_EFI_BOOTUP)	+= payload/
 obj-$(CONFIG_EFI_GUID)		+= guid.o
 obj-$(CONFIG_EFI_DEVICEPATH)	+= devicepath.o
+obj-y				+= errno.o
diff --git a/common/efi/errno.c b/common/efi/errno.c
new file mode 100644
index 000000000000..3bb68e7781e6
--- /dev/null
+++ b/common/efi/errno.c
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include <efi/efi-util.h>
+#include <errno.h>
+
+const char *efi_strerror(efi_status_t err)
+{
+	const char *str;
+
+	switch (err) {
+	case EFI_SUCCESS: str = "Success"; break;
+	case EFI_LOAD_ERROR: str = "Load Error"; break;
+	case EFI_INVALID_PARAMETER: str = "Invalid Parameter"; break;
+	case EFI_UNSUPPORTED: str = "Unsupported"; break;
+	case EFI_BAD_BUFFER_SIZE: str = "Bad Buffer Size"; break;
+	case EFI_BUFFER_TOO_SMALL: str = "Buffer Too Small"; break;
+	case EFI_NOT_READY: str = "Not Ready"; break;
+	case EFI_DEVICE_ERROR: str = "Device Error"; break;
+	case EFI_WRITE_PROTECTED: str = "Write Protected"; break;
+	case EFI_OUT_OF_RESOURCES: str = "Out of Resources"; break;
+	case EFI_VOLUME_CORRUPTED: str = "Volume Corrupt"; break;
+	case EFI_VOLUME_FULL: str = "Volume Full"; break;
+	case EFI_NO_MEDIA: str = "No Media"; break;
+	case EFI_MEDIA_CHANGED: str = "Media changed"; break;
+	case EFI_NOT_FOUND: str = "Not Found"; break;
+	case EFI_ACCESS_DENIED: str = "Access Denied"; break;
+	case EFI_NO_RESPONSE: str = "No Response"; break;
+	case EFI_NO_MAPPING: str = "No mapping"; break;
+	case EFI_TIMEOUT: str = "Time out"; break;
+	case EFI_NOT_STARTED: str = "Not started"; break;
+	case EFI_ALREADY_STARTED: str = "Already started"; break;
+	case EFI_ABORTED: str = "Aborted"; break;
+	case EFI_ICMP_ERROR: str = "ICMP Error"; break;
+	case EFI_TFTP_ERROR: str = "TFTP Error"; break;
+	case EFI_PROTOCOL_ERROR: str = "Protocol Error"; break;
+	case EFI_INCOMPATIBLE_VERSION: str = "Incompatible Version"; break;
+	case EFI_SECURITY_VIOLATION: str = "Security Violation"; break;
+	case EFI_CRC_ERROR: str = "CRC Error"; break;
+	case EFI_END_OF_MEDIA: str = "End of Media"; break;
+	case EFI_END_OF_FILE: str = "End of File"; break;
+	case EFI_INVALID_LANGUAGE: str = "Invalid Language"; break;
+	case EFI_COMPROMISED_DATA: str = "Compromised Data"; break;
+	default: str = "unknown error";
+	}
+
+	return str;
+}
+
+int efi_errno(efi_status_t err)
+{
+	int ret;
+
+	switch (err) {
+	case EFI_SUCCESS: ret = 0; break;
+	case EFI_LOAD_ERROR: ret = EIO; break;
+	case EFI_INVALID_PARAMETER: ret = EINVAL; break;
+	case EFI_UNSUPPORTED: ret = ENOTSUPP; break;
+	case EFI_BAD_BUFFER_SIZE: ret = EINVAL; break;
+	case EFI_BUFFER_TOO_SMALL: ret = EINVAL; break;
+	case EFI_NOT_READY: ret = EAGAIN; break;
+	case EFI_DEVICE_ERROR: ret = EIO; break;
+	case EFI_WRITE_PROTECTED: ret = EROFS; break;
+	case EFI_OUT_OF_RESOURCES: ret = ENOMEM; break;
+	case EFI_VOLUME_CORRUPTED: ret = EIO; break;
+	case EFI_VOLUME_FULL: ret = ENOSPC; break;
+	case EFI_NO_MEDIA: ret = ENOMEDIUM; break;
+	case EFI_MEDIA_CHANGED: ret = ENOMEDIUM; break;
+	case EFI_NOT_FOUND: ret = ENODEV; break;
+	case EFI_ACCESS_DENIED: ret = EACCES; break;
+	case EFI_NO_RESPONSE: ret = ETIMEDOUT; break;
+	case EFI_NO_MAPPING: ret = EINVAL; break;
+	case EFI_TIMEOUT: ret = ETIMEDOUT; break;
+	case EFI_NOT_STARTED: ret = EINVAL; break;
+	case EFI_ALREADY_STARTED: ret = EINVAL; break;
+	case EFI_ABORTED: ret = EINTR; break;
+	case EFI_ICMP_ERROR: ret = EINVAL; break;
+	case EFI_TFTP_ERROR: ret = EINVAL; break;
+	case EFI_PROTOCOL_ERROR: ret = EPROTO; break;
+	case EFI_INCOMPATIBLE_VERSION: ret = EINVAL; break;
+	case EFI_SECURITY_VIOLATION: ret = EINVAL; break;
+	case EFI_CRC_ERROR: ret = EINVAL; break;
+	case EFI_END_OF_MEDIA: ret = EINVAL; break;
+	case EFI_END_OF_FILE: ret = EINVAL; break;
+	case EFI_INVALID_LANGUAGE: ret = EINVAL; break;
+	case EFI_COMPROMISED_DATA: ret = EINVAL; break;
+	default: ret = EINVAL;
+	}
+
+	return ret;
+}
diff --git a/common/efi/payload/init.c b/common/efi/payload/init.c
index 0e672a6b56d2..5149b5b5d0d3 100644
--- a/common/efi/payload/init.c
+++ b/common/efi/payload/init.c
@@ -163,92 +163,6 @@ static int misc_init(void)
 }
 late_initcall(misc_init);
 
-const char *efi_strerror(efi_status_t err)
-{
-	const char *str;
-
-	switch (err) {
-	case EFI_SUCCESS: str = "Success"; break;
-	case EFI_LOAD_ERROR: str = "Load Error"; break;
-	case EFI_INVALID_PARAMETER: str = "Invalid Parameter"; break;
-	case EFI_UNSUPPORTED: str = "Unsupported"; break;
-	case EFI_BAD_BUFFER_SIZE: str = "Bad Buffer Size"; break;
-	case EFI_BUFFER_TOO_SMALL: str = "Buffer Too Small"; break;
-	case EFI_NOT_READY: str = "Not Ready"; break;
-	case EFI_DEVICE_ERROR: str = "Device Error"; break;
-	case EFI_WRITE_PROTECTED: str = "Write Protected"; break;
-	case EFI_OUT_OF_RESOURCES: str = "Out of Resources"; break;
-	case EFI_VOLUME_CORRUPTED: str = "Volume Corrupt"; break;
-	case EFI_VOLUME_FULL: str = "Volume Full"; break;
-	case EFI_NO_MEDIA: str = "No Media"; break;
-	case EFI_MEDIA_CHANGED: str = "Media changed"; break;
-	case EFI_NOT_FOUND: str = "Not Found"; break;
-	case EFI_ACCESS_DENIED: str = "Access Denied"; break;
-	case EFI_NO_RESPONSE: str = "No Response"; break;
-	case EFI_NO_MAPPING: str = "No mapping"; break;
-	case EFI_TIMEOUT: str = "Time out"; break;
-	case EFI_NOT_STARTED: str = "Not started"; break;
-	case EFI_ALREADY_STARTED: str = "Already started"; break;
-	case EFI_ABORTED: str = "Aborted"; break;
-	case EFI_ICMP_ERROR: str = "ICMP Error"; break;
-	case EFI_TFTP_ERROR: str = "TFTP Error"; break;
-	case EFI_PROTOCOL_ERROR: str = "Protocol Error"; break;
-	case EFI_INCOMPATIBLE_VERSION: str = "Incompatible Version"; break;
-	case EFI_SECURITY_VIOLATION: str = "Security Violation"; break;
-	case EFI_CRC_ERROR: str = "CRC Error"; break;
-	case EFI_END_OF_MEDIA: str = "End of Media"; break;
-	case EFI_END_OF_FILE: str = "End of File"; break;
-	case EFI_INVALID_LANGUAGE: str = "Invalid Language"; break;
-	case EFI_COMPROMISED_DATA: str = "Compromised Data"; break;
-	default: str = "unknown error";
-	}
-
-	return str;
-}
-
-int efi_errno(efi_status_t err)
-{
-	int ret;
-
-	switch (err) {
-	case EFI_SUCCESS: ret = 0; break;
-	case EFI_LOAD_ERROR: ret = EIO; break;
-	case EFI_INVALID_PARAMETER: ret = EINVAL; break;
-	case EFI_UNSUPPORTED: ret = ENOTSUPP; break;
-	case EFI_BAD_BUFFER_SIZE: ret = EINVAL; break;
-	case EFI_BUFFER_TOO_SMALL: ret = EINVAL; break;
-	case EFI_NOT_READY: ret = EAGAIN; break;
-	case EFI_DEVICE_ERROR: ret = EIO; break;
-	case EFI_WRITE_PROTECTED: ret = EROFS; break;
-	case EFI_OUT_OF_RESOURCES: ret = ENOMEM; break;
-	case EFI_VOLUME_CORRUPTED: ret = EIO; break;
-	case EFI_VOLUME_FULL: ret = ENOSPC; break;
-	case EFI_NO_MEDIA: ret = ENOMEDIUM; break;
-	case EFI_MEDIA_CHANGED: ret = ENOMEDIUM; break;
-	case EFI_NOT_FOUND: ret = ENODEV; break;
-	case EFI_ACCESS_DENIED: ret = EACCES; break;
-	case EFI_NO_RESPONSE: ret = ETIMEDOUT; break;
-	case EFI_NO_MAPPING: ret = EINVAL; break;
-	case EFI_TIMEOUT: ret = ETIMEDOUT; break;
-	case EFI_NOT_STARTED: ret = EINVAL; break;
-	case EFI_ALREADY_STARTED: ret = EINVAL; break;
-	case EFI_ABORTED: ret = EINTR; break;
-	case EFI_ICMP_ERROR: ret = EINVAL; break;
-	case EFI_TFTP_ERROR: ret = EINVAL; break;
-	case EFI_PROTOCOL_ERROR: ret = EPROTO; break;
-	case EFI_INCOMPATIBLE_VERSION: ret = EINVAL; break;
-	case EFI_SECURITY_VIOLATION: ret = EINVAL; break;
-	case EFI_CRC_ERROR: ret = EINVAL; break;
-	case EFI_END_OF_MEDIA: ret = EINVAL; break;
-	case EFI_END_OF_FILE: ret = EINVAL; break;
-	case EFI_INVALID_LANGUAGE: ret = EINVAL; break;
-	case EFI_COMPROMISED_DATA: ret = EINVAL; break;
-	default: ret = EINVAL;
-	}
-
-	return ret;
-}
-
 static struct NS16550_plat ns16550_plat = {
 	.clock = 115200 * 16,
 };
diff --git a/include/efi/efi-util.h b/include/efi/efi-util.h
new file mode 100644
index 000000000000..0645af270769
--- /dev/null
+++ b/include/efi/efi-util.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef __EFI_UTIL_H
+#define __EFI_UTIL_H
+
+#include <efi.h>
+
+const char *efi_strerror(efi_status_t err);
+int efi_errno(efi_status_t err);
+
+#endif
diff --git a/include/efi/efi.h b/include/efi/efi.h
index c7679b4b8f28..e77b1c5feb52 100644
--- a/include/efi/efi.h
+++ b/include/efi/efi.h
@@ -3,16 +3,13 @@
 #define __MACH_EFI_H
 
 #include <efi.h>
-
-const char *efi_strerror(efi_status_t err);
+#include <efi/efi-util.h>
 
 extern efi_system_table_t *efi_sys_table;
 extern efi_handle_t efi_parent_image;
 extern struct efi_device_path *efi_device_path;
 extern efi_loaded_image_t *efi_loaded_image;
 
-int efi_errno(efi_status_t err);
-
 void *efi_get_variable(char *name, efi_guid_t *vendor, int *var_size);
 
 static inline void *efi_get_global_var(char *name, int *var_size)
-- 
2.30.2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox


  parent reply	other threads:[~2021-11-22  8:52 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-22  8:47 [PATCH 00/30] efi: refactor for upcoming loader support Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 01/30] fs: remove useless AT_FDCWD references Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 02/30] fs: remove unused struct node_d in struct dir Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 03/30] block : efi: rename driver variable from efi_fs_driver to efi_bio_driver Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 04/30] include: <linux/types.h>: wrap in #ifndef __ASSEMBLY__ Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 05/30] hw_random: stm32: propagate error codes from rng read Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 06/30] efi: align LOAD_FILE_PROTOCOL_GUID's name with other PROTOCOL_GUIDs Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 07/30] asm-generic: move sync_caches_for_execution declaration to <asm/cache.h> Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 08/30] common: move EFI code into new efi/ top level directory Ahmad Fatoum
2021-11-23  8:55   ` Jules Maselbas
2021-11-22  8:47 ` [PATCH 09/30] serial: efi-stdio: move efi-stdio.h header to central location Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 10/30] efi: use SPDX-License-Identifier where appropriate Ahmad Fatoum
2021-11-23  8:52   ` Jules Maselbas
2021-11-22  8:47 ` [PATCH 11/30] drivers: efi: move Kconfig options to new menu Ahmad Fatoum
2021-11-22  8:47 ` Ahmad Fatoum [this message]
2021-11-22  8:47 ` [PATCH 13/30] efi: rename <efi/efi.h> to <efi/efi-payload.h> Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 14/30] efi: centralize efivarfs_parse_filename Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 15/30] kbuild: force 16-bit wchar_t treewide Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 16/30] include: <linux/nls.h>: remove duplicate wchar_t typedef Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 17/30] lib: wchar: add wctomb and mbtowc Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 18/30] lib: implement wcsnlen Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 19/30] vsprintf: add optional support for %ls format modifier Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 20/30] libfile: null-terminate read_file of wchar_t buffer Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 21/30] commands: echo: add wide file output via wecho alias Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 22/30] efi: make efi_main __noreturn Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 23/30] efi: define and use new EFI_ERROR_MASK macro Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 24/30] common: move CONFIG_ELF into General Settings Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 25/30] efi: don't zero executable buffer before freeing Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 26/30] partitions: efi: move header to central location Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 27/30] efi: print early efi_main string on CONFIG_DEBUG_LL=y Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 28/30] ARM64: board-dt-2nd: remove no longer needed noinline function split Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 29/30] bus: acpi: register bus even if without ACPI EFI table Ahmad Fatoum
2021-11-22  8:47 ` [PATCH 30/30] efi: guid: fix typos Ahmad Fatoum
2021-11-25  7:44 ` [PATCH 00/30] efi: refactor for upcoming loader support Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211122084732.2597109-13-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --subject='Re: [PATCH 12/30] efi: factor out errno translation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox