[libc] Redefine low 8 bits of error code as "platform error code"

The low 8 bits of an iPXE error code are currently defined as the
closest equivalent PXE error code.  Generalise this scheme to
platforms other than PC-BIOS by extending this definition to "closest
equivalent platform error code".  This allows for the possibility of
returning meaningful errors via EFI APIs.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

7 files changed, 648 insertions, 234 deletions

diff --git a/src/arch/i386/include/ipxe/errno/pcbios.h b/src/arch/i386/include/ipxe/errno/pcbios.h
new file mode 100644
index 000000000..3a9eb2495
--- /dev/null
+++ b/src/arch/i386/include/ipxe/errno/pcbios.h
@@ -0,0 +1,115 @@
+#ifndef _IPXE_ERRNO_PCBIOS_H
+#define _IPXE_ERRNO_PCBIOS_H
+
+/**
+ * @file
+ *
+ * PC-BIOS platform error codes
+ *
+ * We use the PXE-specified error codes as the platform error codes
+ * for the PC-BIOS platform.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <pxe_error.h>
+
+/**
+ * Convert platform error code to platform component of iPXE error code
+ *
+ * @v platform		Platform error code
+ * @ret errno		Platform component of iPXE error code
+ */
+#define PLATFORM_TO_ERRNO( platform ) ( (platform) & 0xff )
+
+/**
+ * Convert iPXE error code to platform error code
+ *
+ * @v errno		iPXE error code
+ * @ret platform	Platform error code
+ */
+#define ERRNO_TO_PLATFORM( errno ) ( (errno) & 0xff )
+
+/* Platform-specific error codes */
+#define PLATFORM_ENOERR		PXENV_STATUS_SUCCESS
+#define PLATFORM_E2BIG		PXENV_STATUS_BAD_FUNC
+#define PLATFORM_EACCES		PXENV_STATUS_TFTP_ACCESS_VIOLATION
+#define PLATFORM_EADDRINUSE	PXENV_STATUS_UDP_OPEN
+#define PLATFORM_EADDRNOTAVAIL	PXENV_STATUS_UDP_OPEN
+#define PLATFORM_EAFNOSUPPORT	PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_EAGAIN		PXENV_STATUS_FAILURE
+#define PLATFORM_EALREADY	PXENV_STATUS_UDP_OPEN
+#define PLATFORM_EBADF		PXENV_STATUS_TFTP_CLOSED
+#define PLATFORM_EBADMSG	PXENV_STATUS_FAILURE
+#define PLATFORM_EBUSY		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ECANCELED	PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE
+#define PLATFORM_ECHILD		PXENV_STATUS_TFTP_FILE_NOT_FOUND
+#define PLATFORM_ECONNABORTED	PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION
+#define PLATFORM_ECONNREFUSED	PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION
+#define PLATFORM_ECONNRESET	PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION
+#define PLATFORM_EDEADLK	PXENV_STATUS_FAILURE
+#define PLATFORM_EDESTADDRREQ	PXENV_STATUS_BAD_FUNC
+#define PLATFORM_EDOM		PXENV_STATUS_FAILURE
+#define PLATFORM_EDQUOT		PXENV_STATUS_FAILURE
+#define PLATFORM_EEXIST		PXENV_STATUS_FAILURE
+#define PLATFORM_EFAULT		PXENV_STATUS_MCOPY_PROBLEM
+#define PLATFORM_EFBIG		PXENV_STATUS_MCOPY_PROBLEM
+#define PLATFORM_EHOSTUNREACH	PXENV_STATUS_ARP_TIMEOUT
+#define PLATFORM_EIDRM		PXENV_STATUS_FAILURE
+#define PLATFORM_EILSEQ		PXENV_STATUS_FAILURE
+#define PLATFORM_EINPROGRESS	PXENV_STATUS_FAILURE
+#define PLATFORM_EINTR		PXENV_STATUS_FAILURE
+#define PLATFORM_EINVAL		PXENV_STATUS_BAD_FUNC
+#define PLATFORM_EIO		PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION
+#define PLATFORM_EISCONN	PXENV_STATUS_UDP_OPEN
+#define PLATFORM_EISDIR		PXENV_STATUS_FAILURE
+#define PLATFORM_ELOOP		PXENV_STATUS_FAILURE
+#define PLATFORM_EMFILE		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_EMLINK		PXENV_STATUS_FAILURE
+#define PLATFORM_EMSGSIZE	PXENV_STATUS_BAD_FUNC
+#define PLATFORM_EMULTIHOP	PXENV_STATUS_FAILURE
+#define PLATFORM_ENAMETOOLONG	PXENV_STATUS_FAILURE
+#define PLATFORM_ENETDOWN	PXENV_STATUS_ARP_TIMEOUT
+#define PLATFORM_ENETRESET	PXENV_STATUS_FAILURE
+#define PLATFORM_ENETUNREACH	PXENV_STATUS_ARP_TIMEOUT
+#define PLATFORM_ENFILE		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ENOBUFS	PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ENODATA	PXENV_STATUS_FAILURE
+#define PLATFORM_ENODEV		PXENV_STATUS_TFTP_FILE_NOT_FOUND
+#define PLATFORM_ENOENT		PXENV_STATUS_TFTP_FILE_NOT_FOUND
+#define PLATFORM_ENOEXEC	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOLCK		PXENV_STATUS_FAILURE
+#define PLATFORM_ENOLINK	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOMEM		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ENOMSG		PXENV_STATUS_FAILURE
+#define PLATFORM_ENOPROTOOPT	PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_ENOSPC		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ENOSR		PXENV_STATUS_OUT_OF_RESOURCES
+#define PLATFORM_ENOSTR		PXENV_STATUS_FAILURE
+#define PLATFORM_ENOSYS		PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_ENOTCONN	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOTDIR	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOTEMPTY	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOTSOCK	PXENV_STATUS_FAILURE
+#define PLATFORM_ENOTSUP	PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_ENOTTY		PXENV_STATUS_FAILURE
+#define PLATFORM_ENXIO		PXENV_STATUS_TFTP_FILE_NOT_FOUND
+#define PLATFORM_EOPNOTSUPP	PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_EOVERFLOW	PXENV_STATUS_FAILURE
+#define PLATFORM_EPERM		PXENV_STATUS_TFTP_ACCESS_VIOLATION
+#define PLATFORM_EPIPE		PXENV_STATUS_FAILURE
+#define PLATFORM_EPROTO		PXENV_STATUS_FAILURE
+#define PLATFORM_EPROTONOSUPPORT PXENV_STATUS_UNSUPPORTED
+#define PLATFORM_EPROTOTYPE	PXENV_STATUS_FAILURE
+#define PLATFORM_ERANGE		PXENV_STATUS_FAILURE
+#define PLATFORM_EROFS		PXENV_STATUS_FAILURE
+#define PLATFORM_ESPIPE		PXENV_STATUS_FAILURE
+#define PLATFORM_ESRCH		PXENV_STATUS_TFTP_FILE_NOT_FOUND
+#define PLATFORM_ESTALE		PXENV_STATUS_FAILURE
+#define PLATFORM_ETIME		PXENV_STATUS_FAILURE
+#define PLATFORM_ETIMEDOUT	PXENV_STATUS_TFTP_READ_TIMEOUT
+#define PLATFORM_ETXTBSY	PXENV_STATUS_FAILURE
+#define PLATFORM_EWOULDBLOCK	PXENV_STATUS_TFTP_OPEN
+#define PLATFORM_EXDEV		PXENV_STATUS_FAILURE
+
+#endif /* _IPXE_ERRNO_PCBIOS_H */
diff --git a/src/arch/i386/include/pxe.h b/src/arch/i386/include/pxe.h
index 0206f683a..b95b0cce5 100644
--- a/src/arch/i386/include/pxe.h
+++ b/src/arch/i386/include/pxe.h
@@ -4,6 +4,7 @@
 FILE_LICENCE ( GPL2_OR_LATER );
 
 #include "pxe_types.h"
+#include "pxe_error.h"
 #include "pxe_api.h"
 #include <ipxe/device.h>
 #include <ipxe/tables.h>
diff --git a/src/arch/i386/include/pxe_error.h b/src/arch/i386/include/pxe_error.h
new file mode 100644
index 000000000..a1398cbd4
--- /dev/null
+++ b/src/arch/i386/include/pxe_error.h
@@ -0,0 +1,123 @@
+#ifndef PXE_ERROR_H
+#define PXE_ERROR_H
+
+/** @file
+ *
+ * Preboot eXecution Environment (PXE) error definitions
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+/**
+ * @defgroup pxeerrors PXE error codes
+ *
+ * @{
+ */
+
+/* Generic errors */
+#define	PXENV_STATUS_SUCCESS					       0x0000
+#define	PXENV_STATUS_FAILURE					       0x0001
+#define	PXENV_STATUS_BAD_FUNC					       0x0002
+#define	PXENV_STATUS_UNSUPPORTED				       0x0003
+#define	PXENV_STATUS_KEEP_UNDI					       0x0004
+#define	PXENV_STATUS_KEEP_ALL					       0x0005
+#define	PXENV_STATUS_OUT_OF_RESOURCES				       0x0006
+
+/* ARP errors (0x0010 to 0x001f) */
+#define	PXENV_STATUS_ARP_TIMEOUT				       0x0011
+
+/* Base-Code state errors */
+#define	PXENV_STATUS_UDP_CLOSED					       0x0018
+#define	PXENV_STATUS_UDP_OPEN					       0x0019
+#define	PXENV_STATUS_TFTP_CLOSED				       0x001a
+#define	PXENV_STATUS_TFTP_OPEN					       0x001b
+
+/* BIOS/system errors (0x0020 to 0x002f) */
+#define	PXENV_STATUS_MCOPY_PROBLEM				       0x0020
+#define	PXENV_STATUS_BIS_INTEGRITY_FAILURE			       0x0021
+#define	PXENV_STATUS_BIS_VALIDATE_FAILURE			       0x0022
+#define	PXENV_STATUS_BIS_INIT_FAILURE				       0x0023
+#define	PXENV_STATUS_BIS_SHUTDOWN_FAILURE			       0x0024
+#define	PXENV_STATUS_BIS_GBOA_FAILURE				       0x0025
+#define	PXENV_STATUS_BIS_FREE_FAILURE				       0x0026
+#define	PXENV_STATUS_BIS_GSI_FAILURE				       0x0027
+#define	PXENV_STATUS_BIS_BAD_CKSUM				       0x0028
+
+/* TFTP/MTFTP errors (0x0030 to 0x003f) */
+#define	PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS			       0x0030
+#define	PXENV_STATUS_TFTP_OPEN_TIMEOUT				       0x0032
+#define	PXENV_STATUS_TFTP_UNKNOWN_OPCODE			       0x0033
+#define	PXENV_STATUS_TFTP_READ_TIMEOUT				       0x0035
+#define	PXENV_STATUS_TFTP_ERROR_OPCODE				       0x0036
+#define	PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION		       0x0038
+#define	PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION		       0x0039
+#define	PXENV_STATUS_TFTP_TOO_MANY_PACKAGES			       0x003a
+#define	PXENV_STATUS_TFTP_FILE_NOT_FOUND			       0x003b
+#define	PXENV_STATUS_TFTP_ACCESS_VIOLATION			       0x003c
+#define	PXENV_STATUS_TFTP_NO_MCAST_ADDRESS			       0x003d
+#define	PXENV_STATUS_TFTP_NO_FILESIZE				       0x003e
+#define	PXENV_STATUS_TFTP_INVALID_PACKET_SIZE			       0x003f
+
+/* Reserved errors 0x0040 to 0x004f) */
+
+/* DHCP/BOOTP errors (0x0050 to 0x005f) */
+#define	PXENV_STATUS_DHCP_TIMEOUT				       0x0051
+#define	PXENV_STATUS_DHCP_NO_IP_ADDRESS				       0x0052
+#define	PXENV_STATUS_DHCP_NO_BOOTFILE_NAME			       0x0053
+#define	PXENV_STATUS_DHCP_BAD_IP_ADDRESS			       0x0054
+
+/* Driver errors (0x0060 to 0x006f) */
+#define	PXENV_STATUS_UNDI_INVALID_FUNCTION			       0x0060
+#define	PXENV_STATUS_UNDI_MEDIATEST_FAILED			       0x0061
+#define	PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST		       0x0062
+#define	PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC			       0x0063
+#define	PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY			       0x0064
+#define	PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA		       0x0065
+#define	PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA			       0x0066
+#define	PXENV_STATUS_UNDI_BAD_MAC_ADDRESS			       0x0067
+#define	PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM			       0x0068
+#define	PXENV_STATUS_UNDI_ERROR_SETTING_ISR			       0x0069
+#define	PXENV_STATUS_UNDI_INVALID_STATE				       0x006a
+#define	PXENV_STATUS_UNDI_TRANSMIT_ERROR			       0x006b
+#define	PXENV_STATUS_UNDI_INVALID_PARAMETER			       0x006c
+
+/* ROM and NBP bootstrap errors (0x0070 to 0x007f) */
+#define	PXENV_STATUS_BSTRAP_PROMPT_MENU				       0x0074
+#define	PXENV_STATUS_BSTRAP_MCAST_ADDR				       0x0076
+#define	PXENV_STATUS_BSTRAP_MISSING_LIST			       0x0077
+#define	PXENV_STATUS_BSTRAP_NO_RESPONSE				       0x0078
+#define	PXENV_STATUS_BSTRAP_FILE_TOO_BIG			       0x0079
+
+/* Environment NBP errors (0x0080 to 0x008f) */
+
+/* Reserved errors (0x0090 to 0x009f) */
+
+/* Miscellaneous errors (0x00a0 to 0x00af) */
+#define	PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE			       0x00a0
+#define	PXENV_STATUS_BINL_NO_PXE_SERVER				       0x00a1
+#define	PXENV_STATUS_NOT_AVAILABLE_IN_PMODE			       0x00a2
+#define	PXENV_STATUS_NOT_AVAILABLE_IN_RMODE			       0x00a3
+
+/* BUSD errors (0x00b0 to 0x00bf) */
+#define	PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED			       0x00b0
+
+/* Loader errors (0x00c0 to 0x00cf) */
+#define	PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY			       0x00c0
+#define	PXENV_STATUS_LOADER_NO_BC_ROMID				       0x00c1
+#define	PXENV_STATUS_LOADER_BAD_BC_ROMID			       0x00c2
+#define	PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE		       0x00c3
+#define	PXENV_STATUS_LOADER_NO_UNDI_ROMID			       0x00c4
+#define	PXENV_STATUS_LOADER_BAD_UNDI_ROMID			       0x00c5
+#define	PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE		       0x00c6
+#define	PXENV_STATUS_LOADER_NO_PXE_STRUCT			       0x00c8
+#define	PXENV_STATUS_LOADER_NO_PXENV_STRUCT			       0x00c9
+#define	PXENV_STATUS_LOADER_UNDI_START				       0x00ca
+#define	PXENV_STATUS_LOADER_BC_START				       0x00cb
+
+/** @} */
+
+/** Derive PXENV_STATUS code from iPXE error number */
+#define PXENV_STATUS( rc ) ( (-(rc)) & 0x00ff )
+
+#endif /* PXE_ERROR_H */
diff --git a/src/include/errno.h b/src/include/errno.h
index bb70136bd..bcc4a8816 100644
--- a/src/include/errno.h
+++ b/src/include/errno.h
@@ -30,16 +30,16 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * maximum visibility into the source of an error even in an end-user
  * build with no debugging.  They are constructed as follows:
  *
- * Bits 7-0 : PXE error code
+ * Bits 7-0 : Platform-specific error code
  *
- * This is the closest equivalent PXE error code
- * (e.g. PXENV_STATUS_OUT_OF_RESOURCES), and is the only part of the
- * error that will be returned via the PXE API, since PXE has
- * predefined error codes.
+ * This is a losslessly compressed representation of the closest
+ * equivalent error code defined by the platform (e.g. BIOS/PXE or
+ * EFI).  It is used to generate errors to be returned to external
+ * code.
  *
  * Bits 12-8 : Per-file disambiguator
  *
- * When the same error number can be generated from multiple points
+ * When the same error code can be generated from multiple points
  * within a file, this field can be used to identify the unique
  * instance.
  *
@@ -54,7 +54,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  * Bit 31 : Reserved
  *
- * Errors are usually return as negative error numbers (e.g. -EINVAL);
+ * Errors are usually return as negative error codes (e.g. -EINVAL);
  * bit 31 is therefore unusable.
  *
  *
@@ -63,9 +63,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  *     return -EINVAL;
  *
- * By various bits of preprocessor magic, the PXE error code and file
- * identifier are already incorporated into the definition of the
- * POSIX error macro, which keeps the code relatively clean.
+ * By various bits of preprocessor magic, the platform-specific error
+ * code and file identifier are already incorporated into the
+ * definition of the POSIX error macro, which keeps the code
+ * relatively clean.
  *
  *
  * Functions that wish to return failures should be declared as
@@ -99,6 +100,10 @@ FILE_LICENCE ( GPL2_OR_LATER );
  *
  */
 
+/* Get definitions for platform-specific error codes */
+#define PLATFORM_ERRNO(_platform) <ipxe/errno/_platform.h>
+#include PLATFORM_ERRNO(PLATFORM)
+
 /* Get definitions for file identifiers */
 #include <ipxe/errfile.h>
 
@@ -110,37 +115,37 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #if ! ERRFILE
 extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
 #undef ERRFILE
-#define ERRFILE ( 0 * ( ( int ) missing_errfile_declaration ) )
+#define ERRFILE ( ( int ) ( 0 * ( ( intptr_t ) missing_errfile_declaration ) ) )
 #endif
 
 /**
  * Declare error information
  *
- * @v pxe		PXE error number (0x00-0xff)
- * @v posix		POSIX error number (0x00-0x7f)
+ * @v platform		Platform error code (uncompressed)
+ * @v posix		POSIX error code (0x00-0x7f)
  * @v uniq		Error disambiguator (0x00-0x1f)
  * @v desc		Error description
  * @ret einfo		Error information
  */
-#define __einfo( pxe, posix, uniq, desc ) ( pxe, posix, uniq, desc )
+#define __einfo( platform, posix, uniq, desc ) ( platform, posix, uniq, desc )
 
 /**
- * Get PXE error number
+ * Get platform error code
  *
  * @v einfo		Error information
- * @ret pxe		PXE error number
+ * @ret platform	Platform error code (uncompressed)
  */
-#define __einfo_pxe( einfo ) __einfo_extract_pxe einfo
-#define __einfo_extract_pxe( pxe, posix, uniq, desc ) pxe
+#define __einfo_platform( einfo ) __einfo_extract_platform einfo
+#define __einfo_extract_platform( platform, posix, uniq, desc ) platform
 
 /**
- * Get POSIX error number
+ * Get POSIX error code
  *
  * @v einfo		Error information
- * @ret posix		POSIX error number
+ * @ret posix		POSIX error code
  */
 #define __einfo_posix( einfo ) __einfo_extract_posix einfo
-#define __einfo_extract_posix( pxe, posix, uniq, desc ) posix
+#define __einfo_extract_posix( platform, posix, uniq, desc ) posix
 
 /**
  * Get error disambiguator
@@ -149,7 +154,7 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
  * @ret uniq		Error disambiguator
  */
 #define __einfo_uniq( einfo ) __einfo_extract_uniq einfo
-#define __einfo_extract_uniq( pxe, posix, uniq, desc ) uniq
+#define __einfo_extract_uniq( platform, posix, uniq, desc ) uniq
 
 /**
  * Get error description
@@ -158,31 +163,44 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
  * @ret desc		Error description
  */
 #define __einfo_desc( einfo ) __einfo_extract_desc einfo
-#define __einfo_extract_desc( pxe, posix, uniq, desc ) desc
+#define __einfo_extract_desc( platform, posix, uniq, desc ) desc
 
 /**
  * Declare disambiguated error
  *
  * @v einfo_base	Base error information
- * @v uniq		Error disambiguator
+ * @v uniq		Error disambiguator (0x00-0x1f)
  * @v desc		Error description
  * @ret einfo		Error information
  */
 #define __einfo_uniqify( einfo_base, uniq, desc )			\
-	__einfo ( __einfo_pxe ( einfo_base ),				\
+	__einfo ( __einfo_platform ( einfo_base ),			\
 		  __einfo_posix ( einfo_base ),				\
 		  uniq, desc )
 
 /**
- * Get error number
+ * Declare platform-generated error
+ *
+ * @v einfo_base	Base error information
+ * @v platform		Platform error code (uncompressed)
+ * @v desc		Error description
+ * @ret einfo		Error information
+ */
+#define __einfo_platformify( einfo_base, platform, desc )		\
+	__einfo ( platform, __einfo_posix ( einfo_base ),		\
+		  __einfo_uniq ( einfo_base ), desc )
+
+/**
+ * Get error code
  *
  * @v einfo		Error information
- * @ret errno		Error number
+ * @ret errno		Error code
  */
 #define __einfo_errno( einfo )						\
-	( ( __einfo_posix ( einfo ) << 24 ) | ( ERRFILE ) |		\
-	  ( __einfo_uniq ( einfo ) << 8 ) |				\
-	  ( __einfo_pxe ( einfo ) << 0 ) )
+	( ( int )							\
+	  ( ( __einfo_posix ( einfo ) << 24 ) | ( ERRFILE ) |		\
+	    ( __einfo_uniq ( einfo ) << 8 ) |				\
+	    ( PLATFORM_TO_ERRNO ( __einfo_platform ( einfo ) ) << 0 ) ) )
 
 /**
  * Disambiguate a base error based on non-constant information
@@ -207,6 +225,29 @@ extern char missing_errfile_declaration[] __attribute__ (( deprecated ));
 static inline void euniq_discard ( int dummy __unused, ... ) {}
 
 /**
+ * Generate an error based on an external platform error code
+ *
+ * @v einfo_base	Base error information
+ * @v platform		Platform error code (uncompressed)
+ * @v ...		List of expected possible platform-generated errors
+ * @ret error		Error
+ *
+ * EPLATFORM() should be used when a platform error code resulting
+ * from an external platform API call is being incorporated into an
+ * error.  For example, EFI code uses EPLATFORM() to generate errors
+ * resulting from calls to EFI APIs such as
+ * InstallMultipleProtocolInterfaces().
+ *
+ * EPLATFORM() should not be used for constant platform-generated
+ * errors; use __einfo_platformify() instead.
+ */
+#define EPLATFORM( einfo_base, platform, ... ) ( {			\
+	eplatform_discard ( 0, ##__VA_ARGS__ );				\
+	( ( int ) ( __einfo_error ( einfo_base ) |			\
+		    PLATFORM_TO_ERRNO ( platform ) ) ); } )
+static inline void eplatform_discard ( int dummy __unused, ... ) {}
+
+/**
  * Declare error
  *
  * @v einfo		Error information
@@ -226,125 +267,11 @@ static inline void euniq_discard ( int dummy __unused, ... ) {}
 		  ".align 8\n\t"					\
 		  "\n4:\n\t"						\
 		  ".previous\n\t" : :					\
-		  "i" ( __einfo_errno ( einfo) ),			\
+		  "i" ( __einfo_errno ( einfo ) ),			\
 		  "i" ( __LINE__ ) );					\
 	__einfo_errno ( einfo ); } )
 
 /**
- * @defgroup pxeerrors PXE error codes
- *
- * The names, meanings and values of these error codes are defined by
- * the PXE specification.
- *
- * @{
- */
-
-/* Generic errors */
-#define	PXENV_STATUS_SUCCESS					       0x0000
-#define	PXENV_STATUS_FAILURE					       0x0001
-#define	PXENV_STATUS_BAD_FUNC					       0x0002
-#define	PXENV_STATUS_UNSUPPORTED				       0x0003
-#define	PXENV_STATUS_KEEP_UNDI					       0x0004
-#define	PXENV_STATUS_KEEP_ALL					       0x0005
-#define	PXENV_STATUS_OUT_OF_RESOURCES				       0x0006
-
-/* ARP errors (0x0010 to 0x001f) */
-#define	PXENV_STATUS_ARP_TIMEOUT				       0x0011
-
-/* Base-Code state errors */
-#define	PXENV_STATUS_UDP_CLOSED					       0x0018
-#define	PXENV_STATUS_UDP_OPEN					       0x0019
-#define	PXENV_STATUS_TFTP_CLOSED				       0x001a
-#define	PXENV_STATUS_TFTP_OPEN					       0x001b
-
-/* BIOS/system errors (0x0020 to 0x002f) */
-#define	PXENV_STATUS_MCOPY_PROBLEM				       0x0020
-#define	PXENV_STATUS_BIS_INTEGRITY_FAILURE			       0x0021
-#define	PXENV_STATUS_BIS_VALIDATE_FAILURE			       0x0022
-#define	PXENV_STATUS_BIS_INIT_FAILURE				       0x0023
-#define	PXENV_STATUS_BIS_SHUTDOWN_FAILURE			       0x0024
-#define	PXENV_STATUS_BIS_GBOA_FAILURE				       0x0025
-#define	PXENV_STATUS_BIS_FREE_FAILURE				       0x0026
-#define	PXENV_STATUS_BIS_GSI_FAILURE				       0x0027
-#define	PXENV_STATUS_BIS_BAD_CKSUM				       0x0028
-
-/* TFTP/MTFTP errors (0x0030 to 0x003f) */
-#define	PXENV_STATUS_TFTP_CANNOT_ARP_ADDRESS			       0x0030
-#define	PXENV_STATUS_TFTP_OPEN_TIMEOUT				       0x0032
-#define	PXENV_STATUS_TFTP_UNKNOWN_OPCODE			       0x0033
-#define	PXENV_STATUS_TFTP_READ_TIMEOUT				       0x0035
-#define	PXENV_STATUS_TFTP_ERROR_OPCODE				       0x0036
-#define	PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION		       0x0038
-#define	PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION		       0x0039
-#define	PXENV_STATUS_TFTP_TOO_MANY_PACKAGES			       0x003a
-#define	PXENV_STATUS_TFTP_FILE_NOT_FOUND			       0x003b
-#define	PXENV_STATUS_TFTP_ACCESS_VIOLATION			       0x003c
-#define	PXENV_STATUS_TFTP_NO_MCAST_ADDRESS			       0x003d
-#define	PXENV_STATUS_TFTP_NO_FILESIZE				       0x003e
-#define	PXENV_STATUS_TFTP_INVALID_PACKET_SIZE			       0x003f
-
-/* Reserved errors 0x0040 to 0x004f) */
-
-/* DHCP/BOOTP errors (0x0050 to 0x005f) */
-#define	PXENV_STATUS_DHCP_TIMEOUT				       0x0051
-#define	PXENV_STATUS_DHCP_NO_IP_ADDRESS				       0x0052
-#define	PXENV_STATUS_DHCP_NO_BOOTFILE_NAME			       0x0053
-#define	PXENV_STATUS_DHCP_BAD_IP_ADDRESS			       0x0054
-
-/* Driver errors (0x0060 to 0x006f) */
-#define	PXENV_STATUS_UNDI_INVALID_FUNCTION			       0x0060
-#define	PXENV_STATUS_UNDI_MEDIATEST_FAILED			       0x0061
-#define	PXENV_STATUS_UNDI_CANNOT_INIT_NIC_FOR_MCAST		       0x0062
-#define	PXENV_STATUS_UNDI_CANNOT_INITIALIZE_NIC			       0x0063
-#define	PXENV_STATUS_UNDI_CANNOT_INITIALIZE_PHY			       0x0064
-#define	PXENV_STATUS_UNDI_CANNOT_READ_CONFIG_DATA		       0x0065
-#define	PXENV_STATUS_UNDI_CANNOT_READ_INIT_DATA			       0x0066
-#define	PXENV_STATUS_UNDI_BAD_MAC_ADDRESS			       0x0067
-#define	PXENV_STATUS_UNDI_BAD_EEPROM_CHECKSUM			       0x0068
-#define	PXENV_STATUS_UNDI_ERROR_SETTING_ISR			       0x0069
-#define	PXENV_STATUS_UNDI_INVALID_STATE				       0x006a
-#define	PXENV_STATUS_UNDI_TRANSMIT_ERROR			       0x006b
-#define	PXENV_STATUS_UNDI_INVALID_PARAMETER			       0x006c
-
-/* ROM and NBP bootstrap errors (0x0070 to 0x007f) */
-#define	PXENV_STATUS_BSTRAP_PROMPT_MENU				       0x0074
-#define	PXENV_STATUS_BSTRAP_MCAST_ADDR				       0x0076
-#define	PXENV_STATUS_BSTRAP_MISSING_LIST			       0x0077
-#define	PXENV_STATUS_BSTRAP_NO_RESPONSE				       0x0078
-#define	PXENV_STATUS_BSTRAP_FILE_TOO_BIG			       0x0079
-
-/* Environment NBP errors (0x0080 to 0x008f) */
-
-/* Reserved errors (0x0090 to 0x009f) */
-
-/* Miscellaneous errors (0x00a0 to 0x00af) */
-#define	PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE			       0x00a0
-#define	PXENV_STATUS_BINL_NO_PXE_SERVER				       0x00a1
-#define	PXENV_STATUS_NOT_AVAILABLE_IN_PMODE			       0x00a2
-#define	PXENV_STATUS_NOT_AVAILABLE_IN_RMODE			       0x00a3
-
-/* BUSD errors (0x00b0 to 0x00bf) */
-#define	PXENV_STATUS_BUSD_DEVICE_NOT_SUPPORTED			       0x00b0
-
-/* Loader errors (0x00c0 to 0x00cf) */
-#define	PXENV_STATUS_LOADER_NO_FREE_BASE_MEMORY			       0x00c0
-#define	PXENV_STATUS_LOADER_NO_BC_ROMID				       0x00c1
-#define	PXENV_STATUS_LOADER_BAD_BC_ROMID			       0x00c2
-#define	PXENV_STATUS_LOADER_BAD_BC_RUNTIME_IMAGE		       0x00c3
-#define	PXENV_STATUS_LOADER_NO_UNDI_ROMID			       0x00c4
-#define	PXENV_STATUS_LOADER_BAD_UNDI_ROMID			       0x00c5
-#define	PXENV_STATUS_LOADER_BAD_UNDI_DRIVER_IMAGE		       0x00c6
-#define	PXENV_STATUS_LOADER_NO_PXE_STRUCT			       0x00c8
-#define	PXENV_STATUS_LOADER_NO_PXENV_STRUCT			       0x00c9
-#define	PXENV_STATUS_LOADER_UNDI_START				       0x00ca
-#define	PXENV_STATUS_LOADER_BC_START				       0x00cb
-
-/** @} */
-
-/** Derive PXENV_STATUS code from iPXE error number */
-#define PXENV_STATUS( rc ) ( (-(rc)) & 0x00ff )
-
-/**
  * @defgroup posixerrors POSIX error codes
  *
  * The names and meanings (but not the values) of these error codes
@@ -355,409 +282,410 @@ static inline void euniq_discard ( int dummy __unused, ... ) {}
 
 /** Operation completed successfully */
 #define ENOERR __einfo_error ( EINFO_ENOERR )
-#define EINFO_ENOERR __einfo ( PXENV_STATUS_SUCCESS, 0x00, 0, \
+#define EINFO_ENOERR __einfo ( PLATFORM_ENOERR, 0x00, 0, \
 			       "Operation completed successfully" )
 
 /** Argument list too long */
 #define E2BIG __einfo_error ( EINFO_E2BIG )
-#define EINFO_E2BIG __einfo ( PXENV_STATUS_BAD_FUNC, 0x01, 0, \
+#define EINFO_E2BIG __einfo ( PLATFORM_E2BIG, 0x01, 0, \
 			      "Argument list too long" )
 
 /** Permission denied */
 #define EACCES __einfo_error ( EINFO_EACCES )
-#define EINFO_EACCES __einfo ( PXENV_STATUS_TFTP_ACCESS_VIOLATION, 0x02, 0, \
+#define EINFO_EACCES __einfo ( PLATFORM_EACCES, 0x02, 0, \
 			       "Permission denied" )
 
 /** Address already in use */
 #define EADDRINUSE __einfo_error ( EINFO_EADDRINUSE )
-#define EINFO_EADDRINUSE __einfo ( PXENV_STATUS_UDP_OPEN, 0x03, 0, \
+#define EINFO_EADDRINUSE __einfo ( PLATFORM_EADDRINUSE, 0x03, 0, \
 				   "Address already in use" )
 
 /** Address not available */
 #define EADDRNOTAVAIL __einfo_error ( EINFO_EADDRNOTAVAIL )
-#define EINFO_EADDRNOTAVAIL __einfo ( PXENV_STATUS_UDP_OPEN, 0x04, 0, \
+#define EINFO_EADDRNOTAVAIL __einfo ( PLATFORM_EADDRNOTAVAIL, 0x04, 0, \
 				      "Address not available" )
 
 /** Address family not supported */
 #define EAFNOSUPPORT __einfo_error ( EINFO_EAFNOSUPPORT )
-#define EINFO_EAFNOSUPPORT __einfo ( PXENV_STATUS_UNSUPPORTED, 0x05, 0, \
+#define EINFO_EAFNOSUPPORT __einfo ( PLATFORM_EAFNOSUPPORT, 0x05, 0, \
 				     "Address family not supported" )
 
 /** Resource temporarily unavailable */
 #define EAGAIN __einfo_error ( EINFO_EAGAIN )
-#define EINFO_EAGAIN __einfo ( PXENV_STATUS_FAILURE, 0x06, 0, \
+#define EINFO_EAGAIN __einfo ( PLATFORM_EAGAIN, 0x06, 0, \
 			       "Resource temporarily unavailable" )
 
 /** Connection already in progress */
 #define EALREADY __einfo_error ( EINFO_EALREADY )
-#define EINFO_EALREADY __einfo ( PXENV_STATUS_UDP_OPEN, 0x07, 0, \
+#define EINFO_EALREADY __einfo ( PLATFORM_EALREADY, 0x07, 0, \
 				 "Connection already in progress" )
 
 /** Bad file descriptor */
 #define EBADF __einfo_error ( EINFO_EBADF )
-#define EINFO_EBADF __einfo ( PXENV_STATUS_TFTP_CLOSED, 0x08, 0, \
+#define EINFO_EBADF __einfo ( PLATFORM_EBADF, 0x08, 0, \
 			      "Bad file descriptor" )
 
 /** Bad message */
 #define EBADMSG __einfo_error ( EINFO_EBADMSG )
-#define EINFO_EBADMSG __einfo ( PXENV_STATUS_FAILURE, 0x09, 0, \
+#define EINFO_EBADMSG __einfo ( PLATFORM_EBADMSG, 0x09, 0, \
 				"Bad message" )
 
 /** Device or resource busy */
 #define EBUSY __einfo_error ( EINFO_EBUSY )
-#define EINFO_EBUSY __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x0a, 0, \
+#define EINFO_EBUSY __einfo ( PLATFORM_EBUSY, 0x0a, 0, \
 			      "Device or resource busy" )
 
 /** Operation canceled */
 #define ECANCELED __einfo_error ( EINFO_ECANCELED )
-#define EINFO_ECANCELED __einfo ( PXENV_STATUS_BINL_CANCELED_BY_KEYSTROKE, \
-				  0x0b, 0, "Operation canceled" )
+#define EINFO_ECANCELED __einfo ( PLATFORM_ECANCELED, 0x0b, 0, \
+				  "Operation canceled" )
 
 /** No child processes */
 #define ECHILD __einfo_error ( EINFO_ECHILD )
-#define EINFO_ECHILD __einfo ( PXENV_STATUS_TFTP_FILE_NOT_FOUND, 0x0c, 0, \
+#define EINFO_ECHILD __einfo ( PLATFORM_ECHILD, 0x0c, 0, \
 			       "No child processes" )
 
 /** Connection aborted */
 #define ECONNABORTED __einfo_error ( EINFO_ECONNABORTED )
-#define EINFO_ECONNABORTED						  \
-	__einfo ( PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION, 0x0d, 0, \
-		  "Connection aborted" )
+#define EINFO_ECONNABORTED __einfo ( PLATFORM_ECONNABORTED, 0x0d, 0, \
+				     "Connection aborted" )
 
 /** Connection refused */
 #define ECONNREFUSED __einfo_error ( EINFO_ECONNREFUSED )
-#define EINFO_ECONNREFUSED __einfo ( PXENV_STATUS_TFTP_CANNOT_OPEN_CONNECTION, \
-				     0x0e, 0, "Connection refused" )
+#define EINFO_ECONNREFUSED __einfo ( PLATFORM_ECONNREFUSED, 0x0e, 0, \
+				     "Connection refused" )
 
 /** Connection reset */
 #define ECONNRESET __einfo_error ( EINFO_ECONNRESET )
-#define EINFO_ECONNRESET						  \
-	__einfo ( PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION, 0x0f, 0, \
-		  "Connection reset" )
+#define EINFO_ECONNRESET __einfo ( PLATFORM_ECONNRESET, 0x0f, 0, \
+				   "Connection reset" )
 
 /** Resource deadlock avoided */
 #define EDEADLK __einfo_error ( EINFO_EDEADLK )
-#define EINFO_EDEADLK __einfo ( PXENV_STATUS_FAILURE, 0x10, 0, \
+#define EINFO_EDEADLK __einfo ( PLATFORM_EDEADLK, 0x10, 0, \
 				"Resource deadlock avoided" )
 
 /** Destination address required */
 #define EDESTADDRREQ __einfo_error ( EINFO_EDESTADDRREQ )
-#define EINFO_EDESTADDRREQ __einfo ( PXENV_STATUS_BAD_FUNC, 0x11, 0, \
+#define EINFO_EDESTADDRREQ __einfo ( PLATFORM_EDESTADDRREQ, 0x11, 0, \
 				     "Destination address required" )
 
 /** Mathematics argument out of domain of function */
 #define EDOM __einfo_error ( EINFO_EDOM )
-#define EINFO_EDOM __einfo ( PXENV_STATUS_FAILURE, 0x12, 0, \
+#define EINFO_EDOM __einfo ( PLATFORM_EDOM, 0x12, 0, \
 			     "Mathematics argument out of domain of function" )
 
 /** Disk quota exceeded */
 #define EDQUOT __einfo_error ( EINFO_EDQUOT )
-#define EINFO_EDQUOT __einfo ( PXENV_STATUS_FAILURE, 0x13, 0, \
+#define EINFO_EDQUOT __einfo ( PLATFORM_EDQUOT, 0x13, 0, \
 			       "Disk quote exceeded" )
 
 /** File exists */
 #define EEXIST __einfo_error ( EINFO_EEXIST )
-#define EINFO_EEXIST __einfo ( PXENV_STATUS_FAILURE, 0x14, 0, \
+#define EINFO_EEXIST __einfo ( PLATFORM_EEXIST, 0x14, 0, \
 			       "File exists" )
 
 /** Bad address */
 #define EFAULT __einfo_error ( EINFO_EFAULT )
-#define EINFO_EFAULT __einfo ( PXENV_STATUS_MCOPY_PROBLEM, 0x15, 0, \
+#define EINFO_EFAULT __einfo ( PLATFORM_EFAULT, 0x15, 0, \
 			       "Bad address" )
 
 /** File too large */
 #define EFBIG __einfo_error ( EINFO_EFBIG )
-#define EINFO_EFBIG __einfo ( PXENV_STATUS_MCOPY_PROBLEM, 0x16, 0, \
+#define EINFO_EFBIG __einfo ( PLATFORM_EFBIG, 0x16, 0, \
 			      "File too large" )
 
 /** Host is unreachable */
 #define EHOSTUNREACH __einfo_error ( EINFO_EHOSTUNREACH )
-#define EINFO_EHOSTUNREACH __einfo ( PXENV_STATUS_ARP_TIMEOUT, 0x17, 0, \
+#define EINFO_EHOSTUNREACH __einfo ( PLATFORM_EHOSTUNREACH, 0x17, 0, \
 				     "Host is unreachable" )
 
 /** Identifier removed */
 #define EIDRM __einfo_error ( EINFO_EIDRM )
-#define EINFO_EIDRM __einfo ( PXENV_STATUS_FAILURE, 0x18, 0, \
+#define EINFO_EIDRM __einfo ( PLATFORM_EIDRM, 0x18, 0, \
 			      "Identifier removed" )
 
 /** Illegal byte sequence */
 #define EILSEQ __einfo_error ( EINFO_EILSEQ )
-#define EINFO_EILSEQ __einfo ( PXENV_STATUS_FAILURE, 0x19, 0, \
+#define EINFO_EILSEQ __einfo ( PLATFORM_EILSEQ, 0x19, 0, \
 			       "Illegal byte sequence" )
 
 /** Operation in progress */
 #define EINPROGRESS __einfo_error ( EINFO_EINPROGRESS )
-#define EINFO_EINPROGRESS __einfo ( PXENV_STATUS_FAILURE, 0x1a, 0, \
+#define EINFO_EINPROGRESS __einfo ( PLATFORM_EINPROGRESS, 0x1a, 0, \
 				    "Operation in progress" )
 
 /** Interrupted function call */
 #define EINTR __einfo_error ( EINFO_EINTR )
-#define EINFO_EINTR __einfo ( PXENV_STATUS_FAILURE, 0x1b, 0, \
+#define EINFO_EINTR __einfo ( PLATFORM_EINTR, 0x1b, 0, \
 			      "Interrupted function call" )
 
 /** Invalid argument */
 #define EINVAL __einfo_error ( EINFO_EINVAL )
-#define EINFO_EINVAL __einfo ( PXENV_STATUS_BAD_FUNC, 0x1c, 0, \
+#define EINFO_EINVAL __einfo ( PLATFORM_EINVAL, 0x1c, 0, \
 			       "Invalid argument" )
 
 /** Input/output error */
 #define EIO __einfo_error ( EINFO_EIO )
-#define EINFO_EIO __einfo ( PXENV_STATUS_TFTP_CANNOT_READ_FROM_CONNECTION, \
-			    0x1d, 0, "Input/output error" )
+#define EINFO_EIO __einfo ( PLATFORM_EIO, 0x1d, 0, \
+			    "Input/output error" )
 
 /** Socket is connected */
 #define EISCONN __einfo_error ( EINFO_EISCONN )
-#define EINFO_EISCONN __einfo ( PXENV_STATUS_UDP_OPEN, 0x1e, 0, \
+#define EINFO_EISCONN __einfo ( PLATFORM_EISCONN, 0x1e, 0, \
 				"Socket is connected" )
 
 /** Is a directory */
 #define EISDIR __einfo_error ( EINFO_EISDIR )
-#define EINFO_EISDIR __einfo ( PXENV_STATUS_FAILURE, 0x1f, 0, \
+#define EINFO_EISDIR __einfo ( PLATFORM_EISDIR, 0x1f, 0, \
 			       "Is a directory" )
 
 /** Too many levels of symbolic links */
 #define ELOOP __einfo_error ( EINFO_ELOOP )
-#define EINFO_ELOOP __einfo ( PXENV_STATUS_FAILURE, 0x20, 0, \
+#define EINFO_ELOOP __einfo ( PLATFORM_ELOOP, 0x20, 0, \
 			      "Too many levels of symbolic links" )
 
 /** Too many open files */
 #define EMFILE __einfo_error ( EINFO_EMFILE )
-#define EINFO_EMFILE __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x21, 0, \
+#define EINFO_EMFILE __einfo ( PLATFORM_EMFILE, 0x21, 0, \
 			       "Too many open files" )
 
 /** Too many links */
 #define EMLINK __einfo_error ( EINFO_EMLINK )
-#define EINFO_EMLINK __einfo ( PXENV_STATUS_FAILURE, 0x22, 0, \
+#define EINFO_EMLINK __einfo ( PLATFORM_EMLINK, 0x22, 0, \
 			       "Too many links" )
 
 /** Message too long */
 #define EMSGSIZE __einfo_error ( EINFO_EMSGSIZE )
-#define EINFO_EMSGSIZE __einfo ( PXENV_STATUS_BAD_FUNC, 0x23, 0, \
+#define EINFO_EMSGSIZE __einfo ( PLATFORM_EMSGSIZE, 0x23, 0, \
 				 "Message too long" )
 
 /** Multihop attempted */
 #define EMULTIHOP __einfo_error ( EINFO_EMULTIHOP )
-#define EINFO_EMULTIHOP __einfo ( PXENV_STATUS_FAILURE, 0x24, 0, \
+#define EINFO_EMULTIHOP __einfo ( PLATFORM_EMULTIHOP, 0x24, 0, \
 				  "Multihop attempted" )
 
 /** Filename too long */
 #define ENAMETOOLONG __einfo_error ( EINFO_ENAMETOOLONG )
-#define EINFO_ENAMETOOLONG __einfo ( PXENV_STATUS_FAILURE, 0x25, 0, \
+#define EINFO_ENAMETOOLONG __einfo ( PLATFORM_ENAMETOOLONG, 0x25, 0, \
 				     "Filename too long" )
 
 /** Network is down */
 #define ENETDOWN __einfo_error ( EINFO_ENETDOWN )
-#define EINFO_ENETDOWN __einfo ( PXENV_STATUS_ARP_TIMEOUT, 0x26, 0, \
+#define EINFO_ENETDOWN __einfo ( PLATFORM_ENETDOWN, 0x26, 0, \
 				 "Network is down" )
 
 /** Connection aborted by network */
 #define ENETRESET __einfo_error ( EINFO_ENETRESET )
-#define EINFO_ENETRESET __einfo ( PXENV_STATUS_FAILURE, 0x27, 0, \
+#define EINFO_ENETRESET __einfo ( PLATFORM_ENETRESET, 0x27, 0, \
 				  "Connection aborted by network" )
 
 /** Network unreachable */
 #define ENETUNREACH __einfo_error ( EINFO_ENETUNREACH )
-#define EINFO_ENETUNREACH __einfo ( PXENV_STATUS_ARP_TIMEOUT, 0x28, 0, \
+#define EINFO_ENETUNREACH __einfo ( PLATFORM_ENETUNREACH, 0x28, 0, \
 				    "Network unreachable" )
 
 /** Too many open files in system */
 #define ENFILE __einfo_error ( EINFO_ENFILE )
-#define EINFO_ENFILE __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x29, 0, \
+#define EINFO_ENFILE __einfo ( PLATFORM_ENFILE, 0x29, 0, \
 			       "Too many open files in system" )
 
 /** No buffer space available */
 #define ENOBUFS __einfo_error ( EINFO_ENOBUFS )
-#define EINFO_ENOBUFS __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x2a, 0, \
+#define EINFO_ENOBUFS __einfo ( PLATFORM_ENOBUFS, 0x2a, 0, \
 				"No buffer space available" )
 
 /** No message is available on the STREAM head read queue */
 #define ENODATA __einfo_error ( EINFO_ENODATA )
-#define EINFO_ENODATA				 \
-	__einfo ( PXENV_STATUS_FAILURE, 0x2b, 0, \
-		  "No message is available on the STREAM head read queue" )
+#define EINFO_ENODATA __einfo ( PLATFORM_ENODATA, 0x2b, 0, \
+				"No message is available on the STREAM " \
+				"head read queue" )
 
 /** No such device */
 #define ENODEV __einfo_error ( EINFO_ENODEV )
-#define EINFO_ENODEV __einfo ( PXENV_STATUS_TFTP_FILE_NOT_FOUND, 0x2c, 0, \
+#define EINFO_ENODEV __einfo ( PLATFORM_ENODEV, 0x2c, 0, \
 			       "No such device" )
 
 /** No such file or directory */
 #define ENOENT __einfo_error ( EINFO_ENOENT )
-#define EINFO_ENOENT __einfo ( PXENV_STATUS_TFTP_FILE_NOT_FOUND, 0x2d, 0, \
+#define EINFO_ENOENT __einfo ( PLATFORM_ENOENT, 0x2d, 0, \
 			       "No such file or directory" )
 
 /** Exec format error */
 #define ENOEXEC __einfo_error ( EINFO_ENOEXEC )
-#define EINFO_ENOEXEC __einfo ( PXENV_STATUS_FAILURE, 0x2e, 0, \
+#define EINFO_ENOEXEC __einfo ( PLATFORM_ENOEXEC, 0x2e, 0, \
 				"Exec format error" )
 
 /** No locks available */
 #define ENOLCK __einfo_error ( EINFO_ENOLCK )
-#define EINFO_ENOLCK __einfo ( PXENV_STATUS_FAILURE, 0x2f, 0, \
+#define EINFO_ENOLCK __einfo ( PLATFORM_ENOLCK, 0x2f, 0, \
 			       "No locks available" )
 
 /** Link has been severed */
 #define ENOLINK __einfo_error ( EINFO_ENOLINK )
-#define EINFO_ENOLINK __einfo ( PXENV_STATUS_FAILURE, 0x30, 0, \
+#define EINFO_ENOLINK __einfo ( PLATFORM_ENOLINK, 0x30, 0, \
 				"Link has been severed" )
 
 /** Not enough space */
 #define ENOMEM __einfo_error ( EINFO_ENOMEM )
-#define EINFO_ENOMEM __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x31, 0, \
+#define EINFO_ENOMEM __einfo ( PLATFORM_ENOMEM, 0x31, 0, \
 			       "Not enough space" )
 
 /** No message of the desired type */
 #define ENOMSG __einfo_error ( EINFO_ENOMSG )
-#define EINFO_ENOMSG __einfo ( PXENV_STATUS_FAILURE, 0x32, 0, \
+#define EINFO_ENOMSG __einfo ( PLATFORM_ENOMSG, 0x32, 0, \
 			       "No message of the desired type" )
 
 /** Protocol not available */
 #define ENOPROTOOPT __einfo_error ( EINFO_ENOPROTOOPT )
-#define EINFO_ENOPROTOOPT __einfo ( PXENV_STATUS_UNSUPPORTED, 0x33, 0, \
+#define EINFO_ENOPROTOOPT __einfo ( PLATFORM_ENOPROTOOPT, 0x33, 0, \
 				    "Protocol not available" )
 
 /** No space left on device */
 #define ENOSPC __einfo_error ( EINFO_ENOSPC )
-#define EINFO_ENOSPC __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x34, 0, \
+#define EINFO_ENOSPC __einfo ( PLATFORM_ENOSPC, 0x34, 0, \
 			       "No space left on device" )
 
 /** No STREAM resources */
 #define ENOSR __einfo_error ( EINFO_ENOSR )
-#define EINFO_ENOSR __einfo ( PXENV_STATUS_OUT_OF_RESOURCES, 0x35, 0, \
+#define EINFO_ENOSR __einfo ( PLATFORM_ENOSR, 0x35, 0, \
 			      "No STREAM resources" )
 
 /** Not a STREAM */
 #define ENOSTR __einfo_error ( EINFO_ENOSTR )
-#define EINFO_ENOSTR __einfo ( PXENV_STATUS_FAILURE, 0x36, 0, \
+#define EINFO_ENOSTR __einfo ( PLATFORM_ENOSTR, 0x36, 0, \
 			       "Not a STREAM" )
 
 /** Function not implemented */
 #define ENOSYS __einfo_error ( EINFO_ENOSYS )
-#define EINFO_ENOSYS __einfo ( PXENV_STATUS_UNSUPPORTED, 0x37, 0, \
+#define EINFO_ENOSYS __einfo ( PLATFORM_ENOSYS, 0x37, 0, \
 			       "Function not implemented" )
 
 /** The socket is not connected */
 #define ENOTCONN __einfo_error ( EINFO_ENOTCONN )
-#define EINFO_ENOTCONN __einfo ( PXENV_STATUS_FAILURE, 0x38, 0, \
+#define EINFO_ENOTCONN __einfo ( PLATFORM_ENOTCONN, 0x38, 0, \
 				 "The socket is not connected" )
 
 /** Not a directory */
 #define ENOTDIR __einfo_error ( EINFO_ENOTDIR )
-#define EINFO_ENOTDIR __einfo ( PXENV_STATUS_FAILURE, 0x39, 0, \
+#define EINFO_ENOTDIR __einfo ( PLATFORM_ENOTDIR, 0x39, 0, \
 				"Not a directory" )
 
 /** Directory not empty */
 #define ENOTEMPTY __einfo_error ( EINFO_ENOTEMPTY )
-#define EINFO_ENOTEMPTY __einfo ( PXENV_STATUS_FAILURE, 0x3a, 0, \
+#define EINFO_ENOTEMPTY __einfo ( PLATFORM_ENOTEMPTY, 0x3a, 0, \
 				  "Directory not empty" )
 
 /** Not a socket */
 #define ENOTSOCK __einfo_error ( EINFO_ENOTSOCK )
-#define EINFO_ENOTSOCK __einfo ( PXENV_STATUS_FAILURE, 0x3b, 0, \
+#define EINFO_ENOTSOCK __einfo ( PLATFORM_ENOTSOCK, 0x3b, 0, \
 				 "Not a socket" )
 
 /** Operation not supported */
 #define ENOTSUP __einfo_error ( EINFO_ENOTSUP )
-#define EINFO_ENOTSUP __einfo ( PXENV_STATUS_UNSUPPORTED, 0x3c, 0, \
+#define EINFO_ENOTSUP __einfo ( PLATFORM_ENOTSUP, 0x3c, 0, \
 				"Operation not supported" )
 
 /** Inappropriate I/O control operation */
 #define ENOTTY __einfo_error ( EINFO_ENOTTY )
-#define EINFO_ENOTTY __einfo ( PXENV_STATUS_FAILURE, 0x3d, 0, \
+#define EINFO_ENOTTY __einfo ( PLATFORM_ENOTTY, 0x3d, 0, \
 			       "Inappropriate I/O control operation" )
 
 /** No such device or address */
 #define ENXIO __einfo_error ( EINFO_ENXIO )
-#define EINFO_ENXIO __einfo ( PXENV_STATUS_TFTP_FILE_NOT_FOUND, 0x3e, 0, \
+#define EINFO_ENXIO __einfo ( PLATFORM_ENXIO, 0x3e, 0, \
 			      "No such device or address" )
 
 /** Operation not supported on socket */
 #define EOPNOTSUPP __einfo_error ( EINFO_EOPNOTSUPP )
-#define EINFO_EOPNOTSUPP __einfo ( PXENV_STATUS_UNSUPPORTED, 0x3f, 0, \
+#define EINFO_EOPNOTSUPP __einfo ( PLATFORM_EOPNOTSUPP, 0x3f, 0, \
 				   "Operation not supported on socket" )
 
 /** Value too large to be stored in data type */
 #define EOVERFLOW __einfo_error ( EINFO_EOVERFLOW )
-#define EINFO_EOVERFLOW __einfo ( PXENV_STATUS_FAILURE, 0x40, 0, \
+#define EINFO_EOVERFLOW __einfo ( PLATFORM_EOVERFLOW, 0x40, 0, \
 				  "Value too large to be stored in data type" )
 
 /** Operation not permitted */
 #define EPERM __einfo_error ( EINFO_EPERM )
-#define EINFO_EPERM __einfo ( PXENV_STATUS_TFTP_ACCESS_VIOLATION, 0x41, 0, \
+#define EINFO_EPERM __einfo ( PLATFORM_EPERM, 0x41, 0, \
 			      "Operation not permitted" )
 
 /** Broken pipe */
 #define EPIPE __einfo_error ( EINFO_EPIPE )
-#define EINFO_EPIPE __einfo ( PXENV_STATUS_FAILURE, 0x42, 0, \
+#define EINFO_EPIPE __einfo ( PLATFORM_EPIPE, 0x42, 0, \
 			      "Broken pipe" )
 
 /** Protocol error */
 #define EPROTO __einfo_error ( EINFO_EPROTO )
-#define EINFO_EPROTO __einfo ( PXENV_STATUS_FAILURE, 0x43, 0, \
+#define EINFO_EPROTO __einfo ( PLATFORM_EPROTO, 0x43, 0, \
 			       "Protocol error" )
 
 /** Protocol not supported */
 #define EPROTONOSUPPORT __einfo_error ( EINFO_EPROTONOSUPPORT )
-#define EINFO_EPROTONOSUPPORT __einfo ( PXENV_STATUS_UNSUPPORTED, 0x44, 0, \
+#define EINFO_EPROTONOSUPPORT __einfo ( PLATFORM_EPROTONOSUPPORT, 0x44, 0, \
 					"Protocol not supported" )
 
 /** Protocol wrong type for socket */
 #define EPROTOTYPE __einfo_error ( EINFO_EPROTOTYPE )
-#define EINFO_EPROTOTYPE __einfo ( PXENV_STATUS_FAILURE, 0x45, 0, \
+#define EINFO_EPROTOTYPE __einfo ( PLATFORM_EPROTOTYPE, 0x45, 0, \
 				   "Protocol wrong type for socket" )
 
 /** Result too large */
 #define ERANGE __einfo_error ( EINFO_ERANGE )
-#define EINFO_ERANGE __einfo ( PXENV_STATUS_FAILURE, 0x46, 0, \
+#define EINFO_ERANGE __einfo ( PLATFORM_ERANGE, 0x46, 0, \
 			       "Result too large" )
 
 /** Read-only file system */
 #define EROFS __einfo_error ( EINFO_EROFS )
-#define EINFO_EROFS __einfo ( PXENV_STATUS_FAILURE, 0x47, 0, \
+#define EINFO_EROFS __einfo ( PLATFORM_EROFS, 0x47, 0, \
 			      "Read-only file system" )
 
 /** Invalid seek */
 #define ESPIPE __einfo_error ( EINFO_ESPIPE )
-#define EINFO_ESPIPE __einfo ( PXENV_STATUS_FAILURE, 0x48, 0, \
+#define EINFO_ESPIPE __einfo ( PLATFORM_ESPIPE, 0x48, 0, \
 			       "Invalid seek" )
 
 /** No such process */
 #define ESRCH __einfo_error ( EINFO_ESRCH )
-#define EINFO_ESRCH __einfo ( PXENV_STATUS_TFTP_FILE_NOT_FOUND, 0x49, 0, \
+#define EINFO_ESRCH __einfo ( PLATFORM_ESRCH, 0x49, 0, \
 			      "No such process" )
 
 /** Stale file handle */
 #define ESTALE __einfo_error ( EINFO_ESTALE )
-#define EINFO_ESTALE __einfo ( PXENV_STATUS_FAILURE, 0x4a, 0, \
+#define EINFO_ESTALE __einfo ( PLATFORM_ESTALE, 0x4a, 0, \
 			       "Stale file handle" )
 
 /** Timer expired */
 #define ETIME __einfo_error ( EINFO_ETIME )
-#define EINFO_ETIME __einfo ( PXENV_STATUS_FAILURE, 0x4b, 0, \
+#define EINFO_ETIME __einfo ( PLATFORM_ETIME, 0x4b, 0, \
 			      "Timer expired" )
 
 /** Connection timed out */
 #define ETIMEDOUT __einfo_error ( EINFO_ETIMEDOUT )
-#define EINFO_ETIMEDOUT __einfo ( PXENV_STATUS_TFTP_READ_TIMEOUT, 0x4c, 0, \
+#define EINFO_ETIMEDOUT __einfo ( PLATFORM_ETIMEDOUT, 0x4c, 0, \
 				  "Connection timed out" )
 
 /** Text file busy */
 #define ETXTBSY __einfo_error ( EINFO_ETXTBSY )
-#define EINFO_ETXTBSY __einfo ( PXENV_STATUS_FAILURE, 0x4d, 0, \
+#define EINFO_ETXTBSY __einfo ( PLATFORM_ETXTBSY, 0x4d, 0, \
 				"Text file busy" )
 
 /** Operation would block */
 #define EWOULDBLOCK __einfo_error ( EINFO_EWOULDBLOCK )
-#define EINFO_EWOULDBLOCK __einfo ( PXENV_STATUS_TFTP_OPEN, 0x4e, 0, \
+#define EINFO_EWOULDBLOCK __einfo ( PLATFORM_EWOULDBLOCK, 0x4e, 0, \
 				    "Operation would block" )
 
 /** Improper link */
 #define EXDEV __einfo_error ( EINFO_EXDEV )
-#define EINFO_EXDEV __einfo ( PXENV_STATUS_FAILURE, 0x4f, 0, \
+#define EINFO_EXDEV __einfo ( PLATFORM_EXDEV, 0x4f, 0, \
 			      "Improper link" )
 
 /** @} */
 
+/** Platform-generated base error */
+#define EINFO_EPLATFORM __einfo ( 0, 0x7f, 0, "Platform-generated error" )
+
 extern int errno;
 
 #endif /* ERRNO_H */
diff --git a/src/include/ipxe/errno/efi.h b/src/include/ipxe/errno/efi.h
new file mode 100644
index 000000000..e4f9e5fe1
--- /dev/null
+++ b/src/include/ipxe/errno/efi.h
@@ -0,0 +1,129 @@
+#ifndef _IPXE_ERRNO_EFI_H
+#define _IPXE_ERRNO_EFI_H
+
+/**
+ * @file
+ *
+ * EFI platform error codes
+ *
+ * We derive our platform error codes from the possible values for
+ * EFI_STATUS defined in the UEFI specification.
+ *
+ * EFI_STATUS codes are 32-bit values consisting of a top bit which is
+ * set for errors and clear for warnings, and a mildly undefined
+ * code of low bits indicating the precise error/warning code.
+ * Errors and warnings have completely separate namespaces.
+ *
+ * We assume that no EFI_STATUS code will ever be defined which uses
+ * more than bits 0-6 of the low bits.  We then choose to encode our
+ * platform-specific error by mapping bit 31 of the EFI_STATUS to bit
+ * 7 of the platform-specific error code, and preserving bits 0-6
+ * as-is.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+#include <ipxe/efi/efi.h>
+#include <ipxe/efi/Uefi/UefiBaseType.h>
+
+/**
+ * Convert platform error code to platform component of iPXE error code
+ *
+ * @v platform		Platform error code
+ * @ret errno		Platform component of iPXE error code
+ */
+#define PLATFORM_TO_ERRNO( platform ) \
+	( ( (platform) | ( (platform) >> 24 ) ) & 0xff )
+
+/**
+ * Convert iPXE error code to platform error code
+ *
+ * @v errno		iPXE error code
+ * @ret platform	Platform error code
+ */
+#define ERRNO_TO_PLATFORM( errno ) \
+	( ( ( (errno) << 24 ) | (errno) ) & 0x8000007f )
+
+/* Platform-specific error codes */
+#define PLATFORM_ENOERR		EFI_SUCCESS
+#define PLATFORM_E2BIG		EFI_BUFFER_TOO_SMALL
+#define PLATFORM_EACCES		EFI_ACCESS_DENIED
+#define PLATFORM_EADDRINUSE	EFI_ALREADY_STARTED
+#define PLATFORM_EADDRNOTAVAIL	EFI_NOT_READY
+#define PLATFORM_EAFNOSUPPORT	EFI_UNSUPPORTED
+#define PLATFORM_EAGAIN		EFI_NOT_READY
+#define PLATFORM_EALREADY	EFI_ALREADY_STARTED
+#define PLATFORM_EBADF		EFI_INVALID_PARAMETER
+#define PLATFORM_EBADMSG	EFI_PROTOCOL_ERROR
+#define PLATFORM_EBUSY		EFI_NO_RESPONSE
+#define PLATFORM_ECANCELED	EFI_ABORTED
+#define PLATFORM_ECHILD		EFI_NOT_FOUND
+#define PLATFORM_ECONNABORTED	EFI_ABORTED
+#define PLATFORM_ECONNREFUSED	EFI_NO_RESPONSE
+#define PLATFORM_ECONNRESET	EFI_ABORTED
+#define PLATFORM_EDEADLK	EFI_NOT_READY
+#define PLATFORM_EDESTADDRREQ	EFI_PROTOCOL_ERROR
+#define PLATFORM_EDOM		EFI_INVALID_PARAMETER
+#define PLATFORM_EDQUOT		EFI_VOLUME_FULL
+#define PLATFORM_EEXIST		EFI_WRITE_PROTECTED
+#define PLATFORM_EFAULT		EFI_INVALID_PARAMETER
+#define PLATFORM_EFBIG		EFI_END_OF_MEDIA
+#define PLATFORM_EHOSTUNREACH	EFI_NO_RESPONSE
+#define PLATFORM_EIDRM		EFI_INVALID_PARAMETER
+#define PLATFORM_EILSEQ		EFI_INVALID_PARAMETER
+#define PLATFORM_EINPROGRESS	EFI_ALREADY_STARTED
+#define PLATFORM_EINTR		EFI_NOT_READY
+#define PLATFORM_EINVAL		EFI_INVALID_PARAMETER
+#define PLATFORM_EIO		EFI_PROTOCOL_ERROR
+#define PLATFORM_EISCONN	EFI_ALREADY_STARTED
+#define PLATFORM_EISDIR		EFI_PROTOCOL_ERROR
+#define PLATFORM_ELOOP		EFI_VOLUME_CORRUPTED
+#define PLATFORM_EMFILE		EFI_OUT_OF_RESOURCES
+#define PLATFORM_EMLINK		EFI_OUT_OF_RESOURCES
+#define PLATFORM_EMSGSIZE	EFI_BAD_BUFFER_SIZE
+#define PLATFORM_EMULTIHOP	EFI_INVALID_PARAMETER
+#define PLATFORM_ENAMETOOLONG	EFI_INVALID_PARAMETER
+#define PLATFORM_ENETDOWN	EFI_NO_RESPONSE
+#define PLATFORM_ENETRESET	EFI_ABORTED
+#define PLATFORM_ENETUNREACH	EFI_NO_RESPONSE
+#define PLATFORM_ENFILE		EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENOBUFS	EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENODATA	EFI_NO_RESPONSE
+#define PLATFORM_ENODEV		EFI_DEVICE_ERROR
+#define PLATFORM_ENOENT		EFI_NOT_FOUND
+#define PLATFORM_ENOEXEC	EFI_LOAD_ERROR
+#define PLATFORM_ENOLCK		EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENOLINK	EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENOMEM		EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENOMSG		EFI_PROTOCOL_ERROR
+#define PLATFORM_ENOPROTOOPT	EFI_UNSUPPORTED
+#define PLATFORM_ENOSPC		EFI_VOLUME_FULL
+#define PLATFORM_ENOSR		EFI_OUT_OF_RESOURCES
+#define PLATFORM_ENOSTR		EFI_PROTOCOL_ERROR
+#define PLATFORM_ENOSYS		EFI_UNSUPPORTED
+#define PLATFORM_ENOTCONN	EFI_NOT_STARTED
+#define PLATFORM_ENOTDIR	EFI_VOLUME_CORRUPTED
+#define PLATFORM_ENOTEMPTY	EFI_VOLUME_CORRUPTED
+#define PLATFORM_ENOTSOCK	EFI_INVALID_PARAMETER
+#define PLATFORM_ENOTSUP	EFI_UNSUPPORTED
+#define PLATFORM_ENOTTY		EFI_UNSUPPORTED
+#define PLATFORM_ENXIO		EFI_NOT_FOUND
+#define PLATFORM_EOPNOTSUPP	EFI_UNSUPPORTED
+#define PLATFORM_EOVERFLOW	EFI_BUFFER_TOO_SMALL
+#define PLATFORM_EPERM		EFI_ACCESS_DENIED
+#define PLATFORM_EPIPE		EFI_ABORTED
+#define PLATFORM_EPROTO		EFI_PROTOCOL_ERROR
+#define PLATFORM_EPROTONOSUPPORT EFI_UNSUPPORTED
+#define PLATFORM_EPROTOTYPE	EFI_INVALID_PARAMETER
+#define PLATFORM_ERANGE		EFI_BUFFER_TOO_SMALL
+#define PLATFORM_EROFS		EFI_WRITE_PROTECTED
+#define PLATFORM_ESPIPE		EFI_END_OF_FILE
+#define PLATFORM_ESRCH		EFI_NOT_STARTED
+#define PLATFORM_ESTALE		EFI_PROTOCOL_ERROR
+#define PLATFORM_ETIME		EFI_TIMEOUT
+#define PLATFORM_ETIMEDOUT	EFI_TIMEOUT
+#define PLATFORM_ETXTBSY	EFI_MEDIA_CHANGED
+#define PLATFORM_EWOULDBLOCK	EFI_NOT_READY
+#define PLATFORM_EXDEV		EFI_VOLUME_CORRUPTED
+
+#endif /* _IPXE_ERRNO_EFI_H */
diff --git a/src/include/ipxe/errno/linux.h b/src/include/ipxe/errno/linux.h
new file mode 100644
index 000000000..11309b4ad
--- /dev/null
+++ b/src/include/ipxe/errno/linux.h
@@ -0,0 +1,113 @@
+#ifndef _IPXE_ERRNO_LINUX_H
+#define _IPXE_ERRNO_LINUX_H
+
+/**
+ * @file
+ *
+ * Linux platform error codes
+ *
+ * Linux error codes all fit inside 8 bits, so we just use them
+ * directly as our platform error codes.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER );
+
+/**
+ * Convert platform error code to platform component of iPXE error code
+ *
+ * @v platform		Platform error code
+ * @ret errno		Platform component of iPXE error code
+ */
+#define PLATFORM_TO_ERRNO( platform ) ( (platform) & 0xff )
+
+/**
+ * Convert iPXE error code to platform error code
+ *
+ * @v errno		iPXE error code
+ * @ret platform	Platform error code
+ */
+#define ERRNO_TO_PLATFORM( errno ) ( (errno) & 0xff )
+
+/* Platform-specific error codes */
+#define PLATFORM_ENOERR 0
+#define PLATFORM_E2BIG 7
+#define PLATFORM_EACCES 13
+#define PLATFORM_EADDRINUSE 98
+#define PLATFORM_EADDRNOTAVAIL 99
+#define PLATFORM_EAFNOSUPPORT 97
+#define PLATFORM_EAGAIN 11
+#define PLATFORM_EALREADY 114
+#define PLATFORM_EBADF 9
+#define PLATFORM_EBADMSG 74
+#define PLATFORM_EBUSY 16
+#define PLATFORM_ECANCELED 125
+#define PLATFORM_ECHILD 10
+#define PLATFORM_ECONNABORTED 103
+#define PLATFORM_ECONNREFUSED 111
+#define PLATFORM_ECONNRESET 104
+#define PLATFORM_EDEADLK 35
+#define PLATFORM_EDESTADDRREQ 89
+#define PLATFORM_EDOM 33
+#define PLATFORM_EDQUOT 122
+#define PLATFORM_EEXIST 17
+#define PLATFORM_EFAULT 14
+#define PLATFORM_EFBIG 27
+#define PLATFORM_EHOSTUNREACH 113
+#define PLATFORM_EIDRM 43
+#define PLATFORM_EILSEQ 84
+#define PLATFORM_EINPROGRESS 115
+#define PLATFORM_EINTR 4
+#define PLATFORM_EINVAL 22
+#define PLATFORM_EIO 5
+#define PLATFORM_EISCONN 106
+#define PLATFORM_EISDIR 21
+#define PLATFORM_ELOOP 40
+#define PLATFORM_EMFILE 24
+#define PLATFORM_EMLINK 31
+#define PLATFORM_EMSGSIZE 90
+#define PLATFORM_EMULTIHOP 72
+#define PLATFORM_ENAMETOOLONG 36
+#define PLATFORM_ENETDOWN 100
+#define PLATFORM_ENETRESET 102
+#define PLATFORM_ENETUNREACH 101
+#define PLATFORM_ENFILE 23
+#define PLATFORM_ENOBUFS 105
+#define PLATFORM_ENODATA 61
+#define PLATFORM_ENODEV 19
+#define PLATFORM_ENOENT 2
+#define PLATFORM_ENOEXEC 8
+#define PLATFORM_ENOLCK 37
+#define PLATFORM_ENOLINK 67
+#define PLATFORM_ENOMEM 12
+#define PLATFORM_ENOMSG 42
+#define PLATFORM_ENOPROTOOPT 92
+#define PLATFORM_ENOSPC 28
+#define PLATFORM_ENOSR 63
+#define PLATFORM_ENOSTR 60
+#define PLATFORM_ENOSYS 38
+#define PLATFORM_ENOTCONN 107
+#define PLATFORM_ENOTDIR 20
+#define PLATFORM_ENOTEMPTY 39
+#define PLATFORM_ENOTSOCK 88
+#define PLATFORM_ENOTSUP PLATFORM_EOPNOTSUPP
+#define PLATFORM_ENOTTY 25
+#define PLATFORM_ENXIO 6
+#define PLATFORM_EOPNOTSUPP 95
+#define PLATFORM_EOVERFLOW 75
+#define PLATFORM_EPERM 1
+#define PLATFORM_EPIPE 32
+#define PLATFORM_EPROTO 71
+#define PLATFORM_EPROTONOSUPPORT 93
+#define PLATFORM_EPROTOTYPE 91
+#define PLATFORM_ERANGE 34
+#define PLATFORM_EROFS 30
+#define PLATFORM_ESPIPE 29
+#define PLATFORM_ESRCH 3
+#define PLATFORM_ESTALE 116
+#define PLATFORM_ETIME 62
+#define PLATFORM_ETIMEDOUT 110
+#define PLATFORM_ETXTBSY 26
+#define PLATFORM_EWOULDBLOCK PLATFORM_EAGAIN
+#define PLATFORM_EXDEV 18
+
+#endif /* _IPXE_ERRNO_LINUX_H */
diff --git a/src/util/einfo.c b/src/util/einfo.c
index 354d475fa..d21558980 100644
--- a/src/util/einfo.c
+++ b/src/util/einfo.c
@@ -38,10 +38,15 @@ struct options {
 
 /** Error usage information */
 struct einfo {
+	/** Size of error information record */
 	uint32_t size;
+	/** Error number */
 	uint32_t error;
+	/** Offset to error description (NUL-terminated) */
 	uint32_t desc;
+	/** Offset to file name (NUL-terminated) */
 	uint32_t file;
+	/** Line number */
 	uint32_t line;
 } __attribute__ (( packed ));