efi_loader: assign HII protocols to root node
PATCH 1/1 efi_loader: assign HII protocols to root node
We should not install the HII protocols on every loaded image. It is sufficient to install them once on the root node.
--- lib/efi_loader/efi_boottime.c | 20 -------------------- lib/efi_loader/efi_root_node.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-)
lib/efi_loader/efi_boottime.c +0 -20
@@ -1569,26 +1569,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,if (ret !=EFI_SUCCESS ) goto failure; -#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_string_protocol, - (void *)&efi_hii_string); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_database_protocol, - (void *)&efi_hii_database); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_config_routing_protocol, - (void *)&efi_hii_config_routing); -if (ret !=EFI_SUCCESS ) - goto failure; -#endif - *info_ptr = info; *handle_ptr = obj;
lib/efi_loader/efi_root_node.c +20 -0
@@ -74,6 +74,26 @@ efi_status_t efi_root_node_register(void)if (ret !=EFI_SUCCESS ) goto failure; +#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) +/* Install HII string protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_string_protocol, + (void *)&efi_hii_string); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII database protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_database_protocol, + (void *)&efi_hii_database); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII configuration routing protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_config_routing_protocol, + (void *)&efi_hii_config_routing); +if (ret !=EFI_SUCCESS ) + goto failure; +#endif + failure:return ret; }
--
2.20.1
PATCH 1/1 efi_loader: assign HII protocols to root node
Quoted 2 lines · Heinrich Schuchardt
We should not install the HII protocols on every loaded image. It is sufficient to install them once on the root node.
First time I submitted HII patch, we didn't have root node :) Anyhow, why not use efi_install_multiple_protocol_interfaces()? It would make the code smart.
Thanks,
-Takahiro Akashi
Quoted 71 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- lib/efi_loader/efi_boottime.c | 20 -------------------- lib/efi_loader/efi_root_node.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-)lib/efi_loader/efi_boottime.c +0
-20@@ -1569,26 +1569,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,if (ret !=EFI_SUCCESS ) goto failure; -#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_string_protocol, - (void *)&efi_hii_string); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_database_protocol, - (void *)&efi_hii_database); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_config_routing_protocol, - (void *)&efi_hii_config_routing); -if (ret !=EFI_SUCCESS ) - goto failure; -#endif - *info_ptr = info; *handle_ptr = obj;lib/efi_loader/efi_root_node.c +20
-1@@ -74,6 +74,26 @@ efi_status_t efi_root_node_register(void)if (ret !=EFI_SUCCESS ) goto failure; +#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) +/* Install HII string protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_string_protocol, + (void *)&efi_hii_string); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII database protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_database_protocol, + (void *)&efi_hii_database); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII configuration routing protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_config_routing_protocol, + (void *)&efi_hii_config_routing); +if (ret !=EFI_SUCCESS ) + goto failure; +#endif + failure:return ret; } --2.20.1
PATCH 1/1 efi_loader: assign HII protocols to root node
Quoted 7 lines · AKASHI Takahiro
Quoted 2 lines · Heinrich Schuchardt
We should not install the HII protocols on every loaded image. It is sufficient to install them once on the root node.
First time I submitted HII patch, we didn't have root node :) Anyhow, why not use
efi_install_multiple_protocol_interfaces()? It would make the code smart.
I fully agree. This should also involve other protocols. I suggest to do such a change in a follow up patch. This makes reviewing much easier.
We also should think about moving the console IO protocols and the GOP protocol to the root node and using the root device path to initialize the ConIn, ConInDev, ConOut, ConOutDev variables. Currently the console IO protocols and the GOP protocol are installed on handles without device path.
Best regards
Heinrich
Quoted 76 lines
Thanks,
-Takahiro AkashiQuoted 71 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- lib/efi_loader/efi_boottime.c | 20 -------------------- lib/efi_loader/efi_root_node.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-)lib/efi_loader/efi_boottime.c +0
-20@@ -1569,26 +1569,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,if (ret !=EFI_SUCCESS ) goto failure; -#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_string_protocol, - (void *)&efi_hii_string); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_database_protocol, - (void *)&efi_hii_database); -if (ret !=EFI_SUCCESS ) - goto failure; - - ret =efi_add_protocol (&obj->header, - &efi_guid_hii_config_routing_protocol, - (void *)&efi_hii_config_routing); -if (ret !=EFI_SUCCESS ) - goto failure; -#endif - *info_ptr = info; *handle_ptr = obj;lib/efi_loader/efi_root_node.c +20
-1@@ -74,6 +74,26 @@ efi_status_t efi_root_node_register(void)if (ret !=EFI_SUCCESS ) goto failure; +#if CONFIG_IS_ENABLED (EFI_LOADER_HII ) +/* Install HII string protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_string_protocol, + (void *)&efi_hii_string); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII database protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_database_protocol, + (void *)&efi_hii_database); +if (ret !=EFI_SUCCESS ) + goto failure; + +/* Install HII configuration routing protocol */ + ret =efi_add_protocol (root, &efi_guid_hii_config_routing_protocol, + (void *)&efi_hii_config_routing); +if (ret !=EFI_SUCCESS ) + goto failure; +#endif + failure:return ret; } --2.20.1