diff options
| author | Peng Fan <peng.fan@nxp.com> | 2022-10-10 11:23:16 +0800 |
|---|---|---|
| committer | Peng Fan <peng.fan@nxp.com> | 2022-10-11 17:08:55 +0800 |
| commit | e1ed0611b5e8a54690c5fd2711e1cfd04e857672 (patch) | |
| tree | ec44014d2a0182d7626388316939385c27ec47b1 /lib | |
| parent | 4998fef38a58037e35bd3d6ed0c47295768c21aa (diff) | |
Revert "MLK-25478-2 efi: clean memory and reset MemoryOverwriteRequestControl"
SR-IR-2.0 not need this patch
This reverts commit 88068edd5f50462970aad47e0f53b463fc94b60e.
Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_setup.c | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/lib/efi_loader/efi_setup.c b/lib/efi_loader/efi_setup.c index 366c219f53..617f4fda9d 100644 --- a/lib/efi_loader/efi_setup.c +++ b/lib/efi_loader/efi_setup.c @@ -8,16 +8,12 @@ #define LOG_CATEGORY LOGC_EFI #include <common.h> -#include <mapmem.h> #include <efi_loader.h> #include <efi_variable.h> #include <log.h> -#include <asm/global_data.h> #define OBJ_LIST_NOT_INITIALIZED 1 -DECLARE_GLOBAL_DATA_PTR; - efi_status_t efi_obj_list_initialized = OBJ_LIST_NOT_INITIALIZED; /* @@ -193,43 +189,12 @@ static efi_status_t efi_init_memory_only_reset_control(void) efi_status_t ret; efi_uintn_t data_size = 0; - data_size = sizeof(memory_only_reset_control); ret = efi_get_variable_int(L"MemoryOverwriteRequestControl", &efi_memory_only_reset_control_guid, NULL, &data_size, &memory_only_reset_control, NULL); - if (ret == EFI_SUCCESS) { - if (memory_only_reset_control & 0x01) { - struct bd_info *bd = gd->bd; - int i; - void *start, *buf; - ulong count; - - memory_only_reset_control = memory_only_reset_control & (~(0x01)); - ret = efi_set_variable_int(L"MemoryOverwriteRequestControl", - &efi_memory_only_reset_control_guid, - EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_RUNTIME_ACCESS | - EFI_VARIABLE_NON_VOLATILE, - sizeof(memory_only_reset_control), - &memory_only_reset_control, 0); - - for (i = CONFIG_NR_DRAM_BANKS - 1; i > 0; --i) { - count = bd->bi_dram[i].size; - if (!count) - continue; - start = map_sysmem(bd->bi_dram[i].start, count); - buf = start; - while (count > 0) { - *((u8 *)buf) = 0; - buf += 1; - count--; - } - unmap_sysmem(start); - } - } + if (ret == EFI_SUCCESS) return ret; - } ret = efi_set_variable_int(L"MemoryOverwriteRequestControl", &efi_memory_only_reset_control_guid, |