Skip to contentSkip to conversation

Revert "ARM: tegra: reserve unmapped RAM so EFI doesn't use it"

PATCH New Mian Yousaf Kaukab 3 participants 3 messages Sep 24, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "ARM: tegra: reserve unmapped RAM so EFI doesn't use it"

This reverts commit 0797f7f0b7e1d7853e2842ddc235ffef139fa792.

Tegra specific solution is not required any more as efi core has been made aware of ram_top with the following commit:
7b78d6438a efi_loader: Reserve unaccessible memory

---
 arch/arm/mach-tegra/board2.c | 14 --------------
 1 file changed, 14 deletions(-)
arch/arm/mach-tegra/board2.c +0 -14
index f13bd256cc..07f54f0684 100644
@@ -6,7 +6,6 @@
 
 #include <common.h>
 #include <dm.h>
-#include <efi_loader.h>
 #include <env.h>
 #include <errno.h>
 #include <ns16550.h>
@@ -224,19 +223,6 @@ int board_early_init_f(void)
 
 int board_late_init(void)
 {
-#if CONFIG_IS_ENABLED(EFI_LOADER)
-	if (gd->bd->bi_dram[1].start) {
-		/*
-		 * Only bank 0 is below board_get_usable_ram_top(), so all of
-		 * bank 1 is not mapped by the U-Boot MMU configuration, and so
-		 * we must prevent EFI from using it.
-		 */
-		efi_add_memory_map(gd->bd->bi_dram[1].start,
-				   gd->bd->bi_dram[1].size >> EFI_PAGE_SHIFT,
-				   EFI_BOOT_SERVICES_DATA, false);
-	}
-#endif
-
 #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
 	if (tegra_cpu_is_non_secure()) {
 		printf("CPU is in NS mode\n");
Signature · 1 line
2.16.4
#1 lore raw

PATCH 1/1 Revert "ARM: tegra: reserve unmapped RAM so EFI doesn't use it"

Quoted 7 lines · Mian Yousaf Kaukab

This reverts commit 0797f7f0b7e1d7853e2842ddc235ffef139fa792.

Tegra specific solution is not required any more as efi core has been made aware of ram_top with the following commit:
7b78d6438a efi_loader: Reserve unaccessible memory

Looks ok to me but I have no board to test. You can use the command

efidebug memmap

to verify that the memory map matches your expectations.

CONFIG_CMD_EFIDEBUG=y is needed for the command.

Best regards

Heinrich

Quoted 37 lines
---
  arch/arm/mach-tegra/board2.c | 14 --------------
  1 file changed, 14 deletions(-)
arch/arm/mach-tegra/board2.c +0 -14
index f13bd256cc..07f54f0684 100644
@@ -6,7 +6,6 @@
 
  #include <common.h>
  #include <dm.h>
-#include <efi_loader.h>
  #include <env.h>
  #include <errno.h>
  #include <ns16550.h>
@@ -224,19 +223,6 @@ int board_early_init_f(void)
 
  int board_late_init(void)
  {
-#if CONFIG_IS_ENABLED(EFI_LOADER)
-	if (gd->bd->bi_dram[1].start) {
-		/*
-		 * Only bank 0 is below board_get_usable_ram_top(), so all of
-		 * bank 1 is not mapped by the U-Boot MMU configuration, and so
-		 * we must prevent EFI from using it.
-		 */
-		efi_add_memory_map(gd->bd->bi_dram[1].start,
-				   gd->bd->bi_dram[1].size >> EFI_PAGE_SHIFT,
-				   EFI_BOOT_SERVICES_DATA, false);
-	}
-#endif
-
  #if defined(CONFIG_TEGRA_SUPPORT_NON_SECURE)
  	if (tegra_cpu_is_non_secure()) {
  		printf("CPU is in NS mode\n");
#2 lore raw

PATCH 1/1 Revert "ARM: tegra: reserve unmapped RAM so EFI doesn't use it"

In reply to Mian Yousaf Kaukab
Quoted 5 lines · Mian Yousaf Kaukab

This reverts commit 0797f7f0b7e1d7853e2842ddc235ffef139fa792.

Tegra specific solution is not required any more as efi core has been made aware of ram_top with the following commit:
7b78d6438a efi_loader: Reserve unaccessible memory