narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Include protocol interface address in debug output 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/968/head
Michael Brown 2023-06-08 11:15:27 +01:00
parent 12776acce5
commit 8ab9bdca4f
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/include/ipxe/efi/efi.h
View File

@ -269,6 +269,7 @@ efi_handle_name ( EFI_HANDLE handle );
extern void dbg_efi_opener ( EFI_HANDLE handle, EFI_GUID *protocol, extern void dbg_efi_opener ( EFI_HANDLE handle, EFI_GUID *protocol,
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *opener ); EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *opener );
extern void dbg_efi_openers ( EFI_HANDLE handle, EFI_GUID *protocol ); extern void dbg_efi_openers ( EFI_HANDLE handle, EFI_GUID *protocol );
extern void dbg_efi_protocol ( EFI_HANDLE handle, EFI_GUID *protocol );
extern void dbg_efi_protocols ( EFI_HANDLE handle ); extern void dbg_efi_protocols ( EFI_HANDLE handle );
#define DBG_EFI_OPENER_IF( level, handle, protocol, \ #define DBG_EFI_OPENER_IF( level, handle, protocol, \
@ -303,6 +304,12 @@ extern void dbg_efi_protocols ( EFI_HANDLE handle );
DBG_DC_IF ( level ); \ DBG_DC_IF ( level ); \
} while ( 0 ) } while ( 0 )
#define DBGC_EFI_PROTOCOL_IF( level, id, ... ) do { \
DBG_AC_IF ( level, id ); \
DBG_EFI_PROTOCOL_IF ( level, __VA_ARGS__ ); \
DBG_DC_IF ( level ); \
} while ( 0 )
#define DBGC_EFI_PROTOCOLS_IF( level, id, ... ) do { \ #define DBGC_EFI_PROTOCOLS_IF( level, id, ... ) do { \
DBG_AC_IF ( level, id ); \ DBG_AC_IF ( level, id ); \
DBG_EFI_PROTOCOLS_IF ( level, __VA_ARGS__ ); \ DBG_EFI_PROTOCOLS_IF ( level, __VA_ARGS__ ); \
@ -313,6 +320,8 @@ extern void dbg_efi_protocols ( EFI_HANDLE handle );
DBGC_EFI_OPENER_IF ( LOG, ##__VA_ARGS__ ) DBGC_EFI_OPENER_IF ( LOG, ##__VA_ARGS__ )
#define DBGC_EFI_OPENERS( ... ) \ #define DBGC_EFI_OPENERS( ... ) \
DBGC_EFI_OPENERS_IF ( LOG, ##__VA_ARGS__ ) DBGC_EFI_OPENERS_IF ( LOG, ##__VA_ARGS__ )
#define DBGC_EFI_PROTOCOL( ... ) \
DBGC_EFI_PROTOCOL_IF ( LOG, ##__VA_ARGS__ )
#define DBGC_EFI_PROTOCOLS( ... ) \ #define DBGC_EFI_PROTOCOLS( ... ) \
DBGC_EFI_PROTOCOLS_IF ( LOG, ##__VA_ARGS__ ) DBGC_EFI_PROTOCOLS_IF ( LOG, ##__VA_ARGS__ )
@ -320,6 +329,8 @@ extern void dbg_efi_protocols ( EFI_HANDLE handle );
DBGC_EFI_OPENER_IF ( EXTRA, ##__VA_ARGS__ ) DBGC_EFI_OPENER_IF ( EXTRA, ##__VA_ARGS__ )
#define DBGC2_EFI_OPENERS( ... ) \ #define DBGC2_EFI_OPENERS( ... ) \
DBGC_EFI_OPENERS_IF ( EXTRA, ##__VA_ARGS__ ) DBGC_EFI_OPENERS_IF ( EXTRA, ##__VA_ARGS__ )
#define DBGC2_EFI_PROTOCOL( ... ) \
DBGC_EFI_PROTOCOL_IF ( EXTRA, ##__VA_ARGS__ )
#define DBGC2_EFI_PROTOCOLS( ... ) \ #define DBGC2_EFI_PROTOCOLS( ... ) \
DBGC_EFI_PROTOCOLS_IF ( EXTRA, ##__VA_ARGS__ ) DBGC_EFI_PROTOCOLS_IF ( EXTRA, ##__VA_ARGS__ )
@ -327,6 +338,8 @@ extern void dbg_efi_protocols ( EFI_HANDLE handle );
DBGC_EFI_OPENER_IF ( PROFILE, ##__VA_ARGS__ ) DBGC_EFI_OPENER_IF ( PROFILE, ##__VA_ARGS__ )
#define DBGCP_EFI_OPENERS( ... ) \ #define DBGCP_EFI_OPENERS( ... ) \
DBGC_EFI_OPENERS_IF ( PROFILE, ##__VA_ARGS__ ) DBGC_EFI_OPENERS_IF ( PROFILE, ##__VA_ARGS__ )
#define DBGCP_EFI_PROTOCOL( ... ) \
DBGC_EFI_PROTOCOL_IF ( PROFILE, ##__VA_ARGS__ )
#define DBGCP_EFI_PROTOCOLS( ... ) \ #define DBGCP_EFI_PROTOCOLS( ... ) \
DBGC_EFI_PROTOCOLS_IF ( PROFILE, ##__VA_ARGS__ ) DBGC_EFI_PROTOCOLS_IF ( PROFILE, ##__VA_ARGS__ )

34
src/interface/efi/efi_debug.c
View File

@ -386,6 +386,34 @@ void dbg_efi_openers ( EFI_HANDLE handle, EFI_GUID *protocol ) {
bs->FreePool ( openers ); bs->FreePool ( openers );
} }
/**
* Print protocol information on a given handle
*
* @v handle EFI handle
* @v protocol Protocol GUID
*/
void dbg_efi_protocol ( EFI_HANDLE handle, EFI_GUID *protocol ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
VOID *interface;
EFI_STATUS efirc;
int rc;
/* Get protocol instance */
if ( ( efirc = bs->HandleProtocol ( handle, protocol,
&interface ) ) != 0 ) {
rc = -EEFI ( efirc );
printf ( "HANDLE %s could not identify %s: %s\n",
efi_handle_name ( handle ),
efi_guid_ntoa ( protocol ), strerror ( rc ) );
return;
}
printf ( "HANDLE %s %s at %p\n", efi_handle_name ( handle ),
efi_guid_ntoa ( protocol ), interface );
/* Dump list of openers */
dbg_efi_openers ( handle, protocol );
}
/** /**
* Print list of protocol handlers attached to a handle * Print list of protocol handlers attached to a handle
* *
@ -394,7 +422,6 @@ void dbg_efi_openers ( EFI_HANDLE handle, EFI_GUID *protocol ) {
void dbg_efi_protocols ( EFI_HANDLE handle ) { void dbg_efi_protocols ( EFI_HANDLE handle ) {
EFI_BOOT_SERVICES *bs = efi_systab->BootServices; EFI_BOOT_SERVICES *bs = efi_systab->BootServices;
EFI_GUID **protocols; EFI_GUID **protocols;
EFI_GUID *protocol;
UINTN count; UINTN count;
unsigned int i; unsigned int i;
EFI_STATUS efirc; EFI_STATUS efirc;
@ -417,10 +444,7 @@ void dbg_efi_protocols ( EFI_HANDLE handle ) {
/* Dump list of protocols */ /* Dump list of protocols */
for ( i = 0 ; i < count ; i++ ) { for ( i = 0 ; i < count ; i++ ) {
protocol = protocols[i]; dbg_efi_protocol ( handle, protocols[i] );
printf ( "HANDLE %s %s supported\n", efi_handle_name ( handle ),
efi_guid_ntoa ( protocol ) );
dbg_efi_openers ( handle, protocol );
} }
/* Free list */ /* Free list */