Merge tag 'u-boot-atmel-fixes-2021.01-b' of https://gitlab.denx.de/u-boot/custodians...

[platform/kernel/u-boot.git] / lib / efi_selftest / efi_selftest.c

diff --git a/lib/efi_selftest/efi_selftest.c b/lib/efi_selftest/efi_selftest.c
index 165fa26..b8eed04 100644 (file)
--- a/lib/efi_selftest/efi_selftest.c
+++ b/lib/efi_selftest/efi_selftest.c
@@ -38,6 +38,9 @@ void efi_st_exit_boot_services(void)
        efi_status_t ret;
        struct efi_mem_desc *memory_map;
 
+       /* Do not detach devices in ExitBootServices. We need the console. */
+       efi_st_keep_devices = true;
+
        ret = boottime->get_memory_map(&map_size, NULL, &map_key, &desc_size,
                                       &desc_version);
        if (ret != EFI_BUFFER_TOO_SMALL) {
@@ -143,6 +146,27 @@ static int teardown(struct efi_unit_test *test, unsigned int *failures)
 }
 
 /*
+ * Check that a test requiring reset exists.
+ *
+ * @testname:  name of the test
+ * @return:    test, or NULL if not found
+ */
+static bool need_reset(const u16 *testname)
+{
+       struct efi_unit_test *test;
+
+       for (test = ll_entry_start(struct efi_unit_test, efi_unit_test);
+            test < ll_entry_end(struct efi_unit_test, efi_unit_test); ++test) {
+               if (testname && efi_st_strcmp_16_8(testname, test->name))
+                       continue;
+               if (test->phase == EFI_SETUP_BEFORE_BOOTTIME_EXIT ||
+                   test->phase == EFI_SETUP_AFTER_BOOTTIME_EXIT)
+                       return true;
+       }
+       return false;
+}
+
+/*
  * Check that a test exists.
  *
  * @testname:  name of the test
@@ -290,6 +314,16 @@ efi_status_t EFIAPI efi_selftest(efi_handle_t image_handle,
                        EFI_ST_SETUP | EFI_ST_EXECUTE | EFI_ST_TEARDOWN,
                        &failures);
 
+       if (!need_reset(testname)) {
+               if (failures)
+                       ret = EFI_PROTOCOL_ERROR;
+
+               /* Give feedback */
+               efi_st_printc(EFI_WHITE, "\nSummary: %u failures\n\n",
+                             failures);
+               return ret;
+       }
+
        /* Execute mixed tests */
        efi_st_do_tests(testname, EFI_SETUP_BEFORE_BOOTTIME_EXIT,
                        EFI_ST_SETUP, &failures);