Skip to contentSkip to conversation

efi_loader: Do not expose HII protocols yet

PATCH New Alexander Graf 1 participant 1 message Feb 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 efi_loader: Do not expose HII protocols yet

Heinrich ran into issues with HII and iPXE which lead to #SErrors on his Odroid-C2 system. We definitely do not want to regress just yet, so let's not expose the HII protocols just yet.

Once someone figures out, why this breaks iPXE (probably a NULL dereference), we can revert this patch again.

---

v1 -> v2:

- Remove HII selftest as well

---
 lib/efi_loader/efi_boottime.c | 18 ------------------
 lib/efi_selftest/Makefile     |  1 -
 2 files changed, 19 deletions(-)
lib/efi_loader/efi_boottime.c +0 -18
index fc26d6adc1..dbf0d56c1d 100644
@@ -1558,24 +1558,6 @@ efi_status_t efi_setup_loaded_image(struct efi_device_path *device_path,
 	if (ret != EFI_SUCCESS)
 		goto failure;
 
-	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;
-
 	return ret;
 failure:
 	printf("ERROR: Failure to install protocols for loaded image\n");
lib/efi_selftest/Makefile +0 -1
index 779f549940..b3d3dadf59 100644
@@ -25,7 +25,6 @@ efi_selftest_exception.o \
 efi_selftest_exitbootservices.o \
 efi_selftest_fdt.o \
 efi_selftest_gop.o \
-efi_selftest_hii.o \
 efi_selftest_loaded_image.o \
 efi_selftest_manageprotocols.o \
 efi_selftest_memory.o \
Signature · 1 line
2.12.3