efi_loader: move efi_save_gd() call to board_r.c

The first functions of the UEFI sub-system are invoked before reaching the U-Boot shell, e.g. efi_set_bootdev(), efi_dp_from_name(), efi_dp_from_file(). We should be able to print out device paths for debugging purposes here. When printing device paths via printf("%pD\n", dp) this invokes functions defined as EFIAPI. So efi_save_gd() must be called beforehand. So let's move the efi_save_gd() call to function initr_reloc_global_data(() in board_r.c. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

efi_loader: move efi_save_gd() call to board_r.c
The first functions of the UEFI sub-system are invoked before reaching the U-Boot shell, e.g. efi_set_bootdev(), efi_dp_from_name(), efi_dp_from_file(). We should be able to print out device paths for debugging purposes here. When printing device paths via printf("%pD\n", dp) this invokes functions defined as EFIAPI. So efi_save_gd() must be called beforehand. So let's move the efi_save_gd() call to function initr_reloc_global_data(() in board_r.c. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Heinrich Schuchardt
1 parent 2337741fb4
Showing 3 changed files with 7 additions and 10 deletions Side-by-side Diff
common/board_r.c
lib/efi_driver/efi_uclass.c
lib/efi_loader/efi_setup.c
@@ -154,6 +154,13 @@
 	gd->fdt_blob += gd->reloc_off;
 #endif
 #ifdef CONFIG_EFI_LOADER
+	/*
+	 * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
+	 * As this register may be overwritten by an EFI payload we save it here
+	 * and restore it on every callback entered.
+	 */
+	efi_save_gd();
+
 	efi_runtime_relocate(gd->relocaddr, NULL);
 #endif
  
@@ -300,9 +300,6 @@
 	struct driver *drv;
 	efi_status_t ret = EFI_SUCCESS;
  
-	/* Save 'gd' pointer */
-	efi_save_gd();
-
 	debug("EFI: Initializing EFI driver framework\n");
 	for (drv = ll_entry_start(struct driver, driver);
 	     drv < ll_entry_end(struct driver, driver); ++drv) {
@@ -21,13 +21,6 @@
 	efi_status_t ret = EFI_SUCCESS;
  
 	/*
-	 * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
-	 * As this register may be overwritten by an EFI payload we save it here
-	 * and restore it on every callback entered.
-	 */
-	efi_save_gd();
-
-	/*
 	 * Variable PlatformLang defines the language that the machine has been
 	 * configured for.
 	 */
...	...	@@ -154,6 +154,13 @@
154	154	gd->fdt_blob += gd->reloc_off;
155	155	#endif
156	156	#ifdef CONFIG_EFI_LOADER
	157	+ /*
	158	+ * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
	159	+ * As this register may be overwritten by an EFI payload we save it here
	160	+ * and restore it on every callback entered.
	161	+ */
	162	+ efi_save_gd();
	163	+
157	164	efi_runtime_relocate(gd->relocaddr, NULL);
158	165	#endif
159	166
...	...	@@ -300,9 +300,6 @@
300	300	struct driver *drv;
301	301	efi_status_t ret = EFI_SUCCESS;
302	302
303		- /* Save 'gd' pointer */
304		- efi_save_gd();
305		-
306	303	debug("EFI: Initializing EFI driver framework\n");
307	304	for (drv = ll_entry_start(struct driver, driver);
308	305	drv < ll_entry_end(struct driver, driver); ++drv) {
...	...	@@ -21,13 +21,6 @@
21	21	efi_status_t ret = EFI_SUCCESS;
22	22
23	23	/*
24		- * On the ARM architecture gd is mapped to a fixed register (r9 or x18).
25		- * As this register may be overwritten by an EFI payload we save it here
26		- * and restore it on every callback entered.
27		- */
28		- efi_save_gd();
29		-
30		- /*
31	24	* Variable PlatformLang defines the language that the machine has been
32	25	* configured for.
33	26	*/