[U-Boot] [PATCH v2 0/3] efi_loader: OpenProtocol, CloseProtocol
The implementation of OpenProtocol was incomplete up to now. CloseProtocol and OpenProtocolInformation were not implemented.
The first patch prints a debug message with the protocol GUID in OpenProtocol.
The second patch adds a table of efi_open_protocol_info_entry to keep track of locks to each protocol entry of each handle. This table is maintained in OpenProtocol and CloseProtocol.
The third patch implements OpenProtocolInformation which returns said table. --- v2 Fixed typo in 1st patch which is resubmitted. Added 2nd and 3rd patch. --- Heinrich Schuchardt (3): efi_loader: write protocol GUID in OpenProtocol efi_loader: open_info in OpenProtocol, CloseProtocol efi_loader: implement OpenProtocolInformation
include/efi_loader.h | 15 +++ lib/efi_loader/efi_boottime.c | 257 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 262 insertions(+), 10 deletions(-)
To understand what happens in OpenProtocol it is necessary to know the protocol interface GUID. Let's write a debug message.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- v2: fix typo in commit message --- include/efi_loader.h | 14 ++++++++++++++ lib/efi_loader/efi_boottime.c | 2 ++ 2 files changed, 16 insertions(+)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 037cc7c543..553c615f11 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -51,6 +51,20 @@ const char *__efi_nesting_dec(void); debug("%sEFI: Return From: %s\n", __efi_nesting_dec(), #exp); \ } while(0)
+/* + * Write GUID + */ +#define EFI_PRINT_GUID(txt, guid) ({ \ + debug("EFI: %s %02x%02x%02x%02x-%02x%02x-%02x%02x-" \ + "%02x%02x%02x%02x%02x%02x%02x%02x\n", \ + txt, ((u8 *)guid)[3], \ + ((u8 *)guid)[2], ((u8 *)guid)[1], ((u8 *)guid)[0], \ + ((u8 *)guid)[5], ((u8 *)guid)[4], ((u8 *)guid)[7], \ + ((u8 *)guid)[6], ((u8 *)guid)[8], ((u8 *)guid)[9], \ + ((u8 *)guid)[10], ((u8 *)guid)[11], ((u8 *)guid)[12], \ + ((u8 *)guid)[13], ((u8 *)guid)[14], ((u8 *)guid)[15]); \ + }) + extern struct efi_runtime_services efi_runtime_services; extern struct efi_system_table systab;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fb05c9e093..ebb557abb2 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1138,6 +1138,8 @@ static efi_status_t EFIAPI efi_open_protocol( goto out; }
+ EFI_PRINT_GUID("protocol:", protocol); + switch (attributes) { case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: case EFI_OPEN_PROTOCOL_GET_PROTOCOL:
On Sat, Aug 5, 2017 at 12:58 PM, Heinrich Schuchardt xypron.glpk@gmx.de wrote:
To understand what happens in OpenProtocol it is necessary to know the protocol interface GUID. Let's write a debug message.
btw, my "efi_loader: add guidstr helper" patch could make this a bit simpler I suppose.. either way it would be nice to have a macro like this.. I had been using something similar for debug locally
Reviewed-by: Rob Clark robdclark@gmail.com
BR, -R
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2: fix typo in commit message
include/efi_loader.h | 14 ++++++++++++++ lib/efi_loader/efi_boottime.c | 2 ++ 2 files changed, 16 insertions(+)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 037cc7c543..553c615f11 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -51,6 +51,20 @@ const char *__efi_nesting_dec(void); debug("%sEFI: Return From: %s\n", __efi_nesting_dec(), #exp); \ } while(0)
+/*
- Write GUID
- */
+#define EFI_PRINT_GUID(txt, guid) ({ \
debug("EFI: %s %02x%02x%02x%02x-%02x%02x-%02x%02x-" \"%02x%02x%02x%02x%02x%02x%02x%02x\n", \txt, ((u8 *)guid)[3], \((u8 *)guid)[2], ((u8 *)guid)[1], ((u8 *)guid)[0], \((u8 *)guid)[5], ((u8 *)guid)[4], ((u8 *)guid)[7], \((u8 *)guid)[6], ((u8 *)guid)[8], ((u8 *)guid)[9], \((u8 *)guid)[10], ((u8 *)guid)[11], ((u8 *)guid)[12], \((u8 *)guid)[13], ((u8 *)guid)[14], ((u8 *)guid)[15]); \})extern struct efi_runtime_services efi_runtime_services; extern struct efi_system_table systab;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fb05c9e093..ebb557abb2 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1138,6 +1138,8 @@ static efi_status_t EFIAPI efi_open_protocol( goto out; }
EFI_PRINT_GUID("protocol:", protocol);switch (attributes) { case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: case EFI_OPEN_PROTOCOL_GET_PROTOCOL:-- 2.11.0
On Sat, Aug 5, 2017 at 1:28 PM, Rob Clark robdclark@gmail.com wrote:
On Sat, Aug 5, 2017 at 12:58 PM, Heinrich Schuchardt xypron.glpk@gmx.de wrote:
To understand what happens in OpenProtocol it is necessary to know the protocol interface GUID. Let's write a debug message.
btw, my "efi_loader: add guidstr helper" patch could make this a bit simpler I suppose.. either way it would be nice to have a macro like this.. I had been using something similar for debug locally
on second thought.. linux kernel's printk has a format modifier for printing guid ptrs.. maybe this is a better idea than both EFI_PRINT_GUID() and my 'add guidstr helper' patch, since it would work with both printf and sprintf.
(I think the conclusion was anything that actually needed tiny-printf didn't need EFI_LOADER.)
BR, -R
Reviewed-by: Rob Clark robdclark@gmail.com
BR, -R
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2: fix typo in commit message
include/efi_loader.h | 14 ++++++++++++++ lib/efi_loader/efi_boottime.c | 2 ++ 2 files changed, 16 insertions(+)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 037cc7c543..553c615f11 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -51,6 +51,20 @@ const char *__efi_nesting_dec(void); debug("%sEFI: Return From: %s\n", __efi_nesting_dec(), #exp); \ } while(0)
+/*
- Write GUID
- */
+#define EFI_PRINT_GUID(txt, guid) ({ \
debug("EFI: %s %02x%02x%02x%02x-%02x%02x-%02x%02x-" \"%02x%02x%02x%02x%02x%02x%02x%02x\n", \txt, ((u8 *)guid)[3], \((u8 *)guid)[2], ((u8 *)guid)[1], ((u8 *)guid)[0], \((u8 *)guid)[5], ((u8 *)guid)[4], ((u8 *)guid)[7], \((u8 *)guid)[6], ((u8 *)guid)[8], ((u8 *)guid)[9], \((u8 *)guid)[10], ((u8 *)guid)[11], ((u8 *)guid)[12], \((u8 *)guid)[13], ((u8 *)guid)[14], ((u8 *)guid)[15]); \})extern struct efi_runtime_services efi_runtime_services; extern struct efi_system_table systab;
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index fb05c9e093..ebb557abb2 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1138,6 +1138,8 @@ static efi_status_t EFIAPI efi_open_protocol( goto out; }
EFI_PRINT_GUID("protocol:", protocol);switch (attributes) { case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: case EFI_OPEN_PROTOCOL_GET_PROTOCOL:-- 2.11.0
efi_open_protocol and close_protocol have to keep track of opened protocols.
So we add an array open_info to each protocol of each handle.
OpenProtocol has to call DisconnectController internally so we need a wrapper efi_disconnect_controller.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- v2: new patch --- include/efi_loader.h | 1 + lib/efi_loader/efi_boottime.c | 178 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 170 insertions(+), 9 deletions(-)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 553c615f11..222b251a38 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -88,6 +88,7 @@ extern unsigned int __efi_runtime_rel_start, __efi_runtime_rel_stop; struct efi_handler { const efi_guid_t *guid; void *protocol_interface; + struct efi_open_protocol_info_entry open_info[4]; };
/* diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ebb557abb2..65a7a79dc1 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -902,9 +902,42 @@ static efi_status_t EFIAPI efi_disconnect_controller(void *controller_handle, void *driver_image_handle, void *child_handle) { + return EFI_INVALID_PARAMETER; +} + +static efi_status_t EFIAPI efi_disconnect_controller_ext( + void *controller_handle, + void *driver_image_handle, + void *child_handle) +{ EFI_ENTRY("%p, %p, %p", controller_handle, driver_image_handle, child_handle); - return EFI_EXIT(EFI_INVALID_PARAMETER); + return EFI_EXIT(efi_disconnect_controller(controller_handle, + driver_image_handle, + child_handle)); +} + +static efi_status_t efi_close_protocol_int(struct efi_handler *protocol, + void *agent_handle, + void *controller_handle) +{ + size_t i; + + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (!open_info->open_count) + continue; + + if (open_info->agent_handle == agent_handle && + open_info->controller_handle == + controller_handle) { + open_info->open_count--; + return EFI_SUCCESS; + } + } + return EFI_NOT_FOUND; }
static efi_status_t EFIAPI efi_close_protocol(void *handle, @@ -912,9 +945,43 @@ static efi_status_t EFIAPI efi_close_protocol(void *handle, void *agent_handle, void *controller_handle) { + struct efi_object *efiobj; + size_t i; + struct list_head *lhandle; + efi_status_t r = EFI_NOT_FOUND; + EFI_ENTRY("%p, %p, %p, %p", handle, protocol, agent_handle, controller_handle); - return EFI_EXIT(EFI_NOT_FOUND); + + if (!handle || !protocol || !agent_handle) { + r = EFI_INVALID_PARAMETER; + goto out; + } + + EFI_PRINT_GUID("protocol:", protocol); + + list_for_each(lhandle, &efi_obj_list) { + efiobj = list_entry(lhandle, struct efi_object, link); + + if (efiobj->handle != handle) + continue; + + for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) { + struct efi_handler *handler = &efiobj->protocols[i]; + const efi_guid_t *hprotocol = handler->guid; + if (!hprotocol) + continue; + if (!guidcmp(hprotocol, protocol)) { + r = efi_close_protocol_int(handler, + agent_handle, + controller_handle); + goto out; + } + } + goto out; + } +out: + return EFI_EXIT(r); }
static efi_status_t EFIAPI efi_open_protocol_information(efi_handle_t handle, @@ -1119,6 +1186,100 @@ static void EFIAPI efi_set_mem(void *buffer, unsigned long size, uint8_t value) memset(buffer, value, size); }
+static efi_status_t efi_open_protocol_int( + struct efi_handler *protocol, + void **protocol_interface, void *agent_handle, + void *controller_handle, uint32_t attributes) +{ + bool opened_exclusive = false; + bool opened_by_driver = false; + int i; + struct efi_open_protocol_info_entry *match = NULL; + + if (attributes != + EFI_OPEN_PROTOCOL_TEST_PROTOCOL) { + *protocol_interface = NULL; + } + + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (!open_info->open_count) + continue; + if (open_info->agent_handle == agent_handle) { + if ((attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) && + (open_info->attributes == attributes)) + return EFI_ALREADY_STARTED; + if (open_info->controller_handle == controller_handle) + match = open_info; + } + if (open_info->attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) + opened_exclusive = true; + } + + if (attributes & + (EFI_OPEN_PROTOCOL_EXCLUSIVE | EFI_OPEN_PROTOCOL_BY_DRIVER) && + opened_exclusive) + return EFI_ACCESS_DENIED; + + if (attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) { + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &open_info[i]; + + if (!open_info->open_count) + continue; + if (open_info->attributes == + EFI_OPEN_PROTOCOL_BY_DRIVER) { + efi_disconnect_controller( + open_info->controller_handle, + open_info->agent_handle, + NULL); + } + } + opened_by_driver = false; + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (!open_info->open_count) + continue; + if (open_info->attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) + opened_by_driver = true; + } + if (opened_by_driver) + return EFI_ACCESS_DENIED; + if (match && !match->open_count) + match = NULL; + } + + /* + * Find an empty slot. + */ + if (!match) { + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (!open_info->open_count) { + match = open_info; + break; + } + } + } + if (!match) + return EFI_OUT_OF_RESOURCES; + + match->agent_handle = agent_handle; + match->controller_handle = controller_handle; + match->attributes = attributes; + match->open_count++; + *protocol_interface = protocol->protocol_interface; + + return EFI_SUCCESS; +} + static efi_status_t EFIAPI efi_open_protocol( void *handle, efi_guid_t *protocol, void **protocol_interface, void *agent_handle, @@ -1173,12 +1334,11 @@ static efi_status_t EFIAPI efi_open_protocol( if (!hprotocol) continue; if (!guidcmp(hprotocol, protocol)) { - if (attributes != - EFI_OPEN_PROTOCOL_TEST_PROTOCOL) { - *protocol_interface = - handler->protocol_interface; - } - r = EFI_SUCCESS; + r = efi_open_protocol_int(handler, + protocol_interface, + agent_handle, + controller_handle, + attributes); goto out; } } @@ -1234,7 +1394,7 @@ static const struct efi_boot_services efi_boot_services = { .stall = efi_stall, .set_watchdog_timer = efi_set_watchdog_timer, .connect_controller = efi_connect_controller, - .disconnect_controller = efi_disconnect_controller, + .disconnect_controller = efi_disconnect_controller_ext, .open_protocol = efi_open_protocol, .close_protocol = efi_close_protocol, .open_protocol_information = efi_open_protocol_information,
On Sat, Aug 5, 2017 at 12:58 PM, Heinrich Schuchardt xypron.glpk@gmx.de wrote:
efi_open_protocol and close_protocol have to keep track of opened protocols.
So we add an array open_info to each protocol of each handle.
OpenProtocol has to call DisconnectController internally so we need a wrapper efi_disconnect_controller.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2: new patch
include/efi_loader.h | 1 + lib/efi_loader/efi_boottime.c | 178 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 170 insertions(+), 9 deletions(-)
diff --git a/include/efi_loader.h b/include/efi_loader.h index 553c615f11..222b251a38 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -88,6 +88,7 @@ extern unsigned int __efi_runtime_rel_start, __efi_runtime_rel_stop; struct efi_handler { const efi_guid_t *guid; void *protocol_interface;
struct efi_open_protocol_info_entry open_info[4];};
/* diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index ebb557abb2..65a7a79dc1 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -902,9 +902,42 @@ static efi_status_t EFIAPI efi_disconnect_controller(void *controller_handle, void *driver_image_handle, void *child_handle) {
return EFI_INVALID_PARAMETER;+}
+static efi_status_t EFIAPI efi_disconnect_controller_ext(
void *controller_handle,void *driver_image_handle,void *child_handle)+{ EFI_ENTRY("%p, %p, %p", controller_handle, driver_image_handle, child_handle);
return EFI_EXIT(EFI_INVALID_PARAMETER);
return EFI_EXIT(efi_disconnect_controller(controller_handle,driver_image_handle,child_handle));+}
Now that we have EFI_CALL(), we don't *really* need to have separate efi_disconnect_controller() and efi_disconnect_controller_ext()..
(Keeping the two versions seems easier for things like efi_allocate_pool() which are used in a number of places internally, but that doesn't seem to be the case here..)
+static efi_status_t efi_close_protocol_int(struct efi_handler *protocol,
void *agent_handle,void *controller_handle)+{
size_t i;for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (!open_info->open_count)continue;if (open_info->agent_handle == agent_handle &&open_info->controller_handle ==controller_handle) {open_info->open_count--;return EFI_SUCCESS;}}return EFI_NOT_FOUND;}
static efi_status_t EFIAPI efi_close_protocol(void *handle, @@ -912,9 +945,43 @@ static efi_status_t EFIAPI efi_close_protocol(void *handle, void *agent_handle, void *controller_handle) {
struct efi_object *efiobj;size_t i;struct list_head *lhandle;efi_status_t r = EFI_NOT_FOUND;EFI_ENTRY("%p, %p, %p, %p", handle, protocol, agent_handle, controller_handle);
return EFI_EXIT(EFI_NOT_FOUND);
if (!handle || !protocol || !agent_handle) {r = EFI_INVALID_PARAMETER;goto out;}EFI_PRINT_GUID("protocol:", protocol);list_for_each(lhandle, &efi_obj_list) {
list_for_each_entry?
(I noticed a lot of the existing code uses list_for_each() + list_entry().. so this isn't inconsistent with existing code but it does seem cleaner to use list_for_each_entry())
efiobj = list_entry(lhandle, struct efi_object, link);if (efiobj->handle != handle)continue;for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) {struct efi_handler *handler = &efiobj->protocols[i];const efi_guid_t *hprotocol = handler->guid;if (!hprotocol)continue;if (!guidcmp(hprotocol, protocol)) {r = efi_close_protocol_int(handler,agent_handle,controller_handle);goto out;}}goto out;}+out:
return EFI_EXIT(r);}
static efi_status_t EFIAPI efi_open_protocol_information(efi_handle_t handle, @@ -1119,6 +1186,100 @@ static void EFIAPI efi_set_mem(void *buffer, unsigned long size, uint8_t value) memset(buffer, value, size); }
+static efi_status_t efi_open_protocol_int(
struct efi_handler *protocol,void **protocol_interface, void *agent_handle,void *controller_handle, uint32_t attributes)+{
bool opened_exclusive = false;bool opened_by_driver = false;int i;struct efi_open_protocol_info_entry *match = NULL;if (attributes !=EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {*protocol_interface = NULL;}for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (!open_info->open_count)continue;if (open_info->agent_handle == agent_handle) {if ((attributes & EFI_OPEN_PROTOCOL_BY_DRIVER) &&(open_info->attributes == attributes))return EFI_ALREADY_STARTED;if (open_info->controller_handle == controller_handle)match = open_info;}if (open_info->attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE)opened_exclusive = true;}if (attributes &(EFI_OPEN_PROTOCOL_EXCLUSIVE | EFI_OPEN_PROTOCOL_BY_DRIVER) &&opened_exclusive)return EFI_ACCESS_DENIED;if (attributes & EFI_OPEN_PROTOCOL_EXCLUSIVE) {for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&open_info[i];if (!open_info->open_count)continue;if (open_info->attributes ==EFI_OPEN_PROTOCOL_BY_DRIVER) {efi_disconnect_controller(open_info->controller_handle,open_info->agent_handle,NULL);}}opened_by_driver = false;for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (!open_info->open_count)continue;if (open_info->attributes & EFI_OPEN_PROTOCOL_BY_DRIVER)opened_by_driver = true;}if (opened_by_driver)return EFI_ACCESS_DENIED;if (match && !match->open_count)match = NULL;}/** Find an empty slot.*/if (!match) {for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (!open_info->open_count) {match = open_info;break;}}}if (!match)return EFI_OUT_OF_RESOURCES;match->agent_handle = agent_handle;match->controller_handle = controller_handle;match->attributes = attributes;match->open_count++;*protocol_interface = protocol->protocol_interface;
This will collide slightly with my "efi_loader: add back optional efi_handler::open()" patch. Although in the end looking up device-paths on file handles (which was the biggest reason I wanted that patch) turned out to be a bug in fallback[1] so I could probably re-work things to drop that patch in my patchset. It means always constructing an simple-filesystem object for each partition "device", but that isn't such a heavyweight operation (ie. just amounts to an extra malloc + populate + insert into list).
I haven't looked closely at the UEFI spec about these interfaces, but apart from those couple minor nits this looks good.
BR, -R
[1] https://github.com/rhboot/shim/commit/a8f3dc82be8e16d24ceab416c1b0af897c083f...
return EFI_SUCCESS;+}
static efi_status_t EFIAPI efi_open_protocol( void *handle, efi_guid_t *protocol, void **protocol_interface, void *agent_handle, @@ -1173,12 +1334,11 @@ static efi_status_t EFIAPI efi_open_protocol( if (!hprotocol) continue; if (!guidcmp(hprotocol, protocol)) {
if (attributes !=EFI_OPEN_PROTOCOL_TEST_PROTOCOL) {*protocol_interface =handler->protocol_interface;}r = EFI_SUCCESS;
r = efi_open_protocol_int(handler,protocol_interface,agent_handle,controller_handle,attributes); goto out; } }@@ -1234,7 +1394,7 @@ static const struct efi_boot_services efi_boot_services = { .stall = efi_stall, .set_watchdog_timer = efi_set_watchdog_timer, .connect_controller = efi_connect_controller,
.disconnect_controller = efi_disconnect_controller,
.disconnect_controller = efi_disconnect_controller_ext, .open_protocol = efi_open_protocol, .close_protocol = efi_close_protocol, .open_protocol_information = efi_open_protocol_information,-- 2.11.0
efi_open_protocol_information provides the agent and controller handles as well as the attributes and open count of an protocol on a handle.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de --- v2: new patch --- lib/efi_loader/efi_boottime.c | 77 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 65a7a79dc1..941d07192d 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -984,14 +984,89 @@ out: return EFI_EXIT(r); }
+static efi_status_t efi_copy_open_protocol_information( + struct efi_handler *protocol, + struct efi_open_protocol_info_entry **entry_buffer, + unsigned long *entry_count) +{ + unsigned long buffer_size; + unsigned long count = 0; + size_t i; + efi_status_t r; + + *entry_buffer = NULL; + + /* Count entries */ + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (open_info->open_count) + ++count; + } + *entry_count = count; + if (!count) + return EFI_SUCCESS; + + /* Copy entries */ + buffer_size = count * sizeof(struct efi_open_protocol_info_entry); + r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, buffer_size, + (void **)entry_buffer); + if (r != EFI_SUCCESS) + return r; + count = 0; + for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) { + struct efi_open_protocol_info_entry *open_info = + &protocol->open_info[i]; + + if (!open_info->open_count) + continue; + (*entry_buffer)[count] = *open_info; + ++count; + } + + return EFI_SUCCESS; +} + static efi_status_t EFIAPI efi_open_protocol_information(efi_handle_t handle, efi_guid_t *protocol, struct efi_open_protocol_info_entry **entry_buffer, unsigned long *entry_count) { + struct efi_object *efiobj; + size_t i; + struct list_head *lhandle; + efi_status_t r = EFI_NOT_FOUND; + EFI_ENTRY("%p, %p, %p, %p", handle, protocol, entry_buffer, entry_count); - return EFI_EXIT(EFI_NOT_FOUND); + + if (!handle || !protocol || !entry_buffer) + EFI_EXIT(EFI_INVALID_PARAMETER); + + EFI_PRINT_GUID("protocol:", protocol); + + list_for_each(lhandle, &efi_obj_list) { + efiobj = list_entry(lhandle, struct efi_object, link); + + if (efiobj->handle != handle) + continue; + + for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) { + struct efi_handler *handler = &efiobj->protocols[i]; + const efi_guid_t *hprotocol = handler->guid; + if (!hprotocol) + continue; + if (!guidcmp(hprotocol, protocol)) { + r = efi_copy_open_protocol_information( + handler, entry_buffer, entry_count); + goto out; + } + } + goto out; + } +out: + return EFI_EXIT(r); }
static efi_status_t EFIAPI efi_protocols_per_handle(void *handle,
On Sat, Aug 5, 2017 at 12:58 PM, Heinrich Schuchardt xypron.glpk@gmx.de wrote:
efi_open_protocol_information provides the agent and controller handles as well as the attributes and open count of an protocol on a handle.
Signed-off-by: Heinrich Schuchardt xypron.glpk@gmx.de
v2: new patch
lib/efi_loader/efi_boottime.c | 77 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 65a7a79dc1..941d07192d 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -984,14 +984,89 @@ out: return EFI_EXIT(r); }
+static efi_status_t efi_copy_open_protocol_information(
struct efi_handler *protocol,struct efi_open_protocol_info_entry **entry_buffer,unsigned long *entry_count)+{
unsigned long buffer_size;unsigned long count = 0;size_t i;efi_status_t r;*entry_buffer = NULL;/* Count entries */for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (open_info->open_count)++count;}*entry_count = count;if (!count)return EFI_SUCCESS;/* Copy entries */buffer_size = count * sizeof(struct efi_open_protocol_info_entry);r = efi_allocate_pool(EFI_ALLOCATE_ANY_PAGES, buffer_size,(void **)entry_buffer);if (r != EFI_SUCCESS)return r;
looks like something went awry with the indentation here?
(btw, one could wish UEFI was more consistent with caller vs callee allocations... sigh..)
count = 0;for (i = 0; i < ARRAY_SIZE(protocol->open_info); ++i) {struct efi_open_protocol_info_entry *open_info =&protocol->open_info[i];if (!open_info->open_count)continue;(*entry_buffer)[count] = *open_info;++count;}return EFI_SUCCESS;+}
static efi_status_t EFIAPI efi_open_protocol_information(efi_handle_t handle, efi_guid_t *protocol, struct efi_open_protocol_info_entry **entry_buffer, unsigned long *entry_count) {
struct efi_object *efiobj;size_t i;struct list_head *lhandle;efi_status_t r = EFI_NOT_FOUND;EFI_ENTRY("%p, %p, %p, %p", handle, protocol, entry_buffer, entry_count);
return EFI_EXIT(EFI_NOT_FOUND);
if (!handle || !protocol || !entry_buffer)EFI_EXIT(EFI_INVALID_PARAMETER);EFI_PRINT_GUID("protocol:", protocol);list_for_each(lhandle, &efi_obj_list) {efiobj = list_entry(lhandle, struct efi_object, link);
list_for_each_entry()?
with those minor nits addressed, you can add my r-b
BR, -R
if (efiobj->handle != handle)continue;for (i = 0; i < ARRAY_SIZE(efiobj->protocols); i++) {struct efi_handler *handler = &efiobj->protocols[i];const efi_guid_t *hprotocol = handler->guid;if (!hprotocol)continue;if (!guidcmp(hprotocol, protocol)) {r = efi_copy_open_protocol_information(handler, entry_buffer, entry_count);goto out;}}goto out;}+out:
return EFI_EXIT(r);}
static efi_status_t EFIAPI efi_protocols_per_handle(void *handle,
2.11.0
participants (2)
-
Heinrich Schuchardt -
Rob Clark