efi_loader: Move to normal debug infrastructure

We introduced special "DEBUG_EFI" defines when the efi loader
support was new. After giving it a bit of thought, turns out
we really didn't have to - the normal #define DEBUG infrastructure
works well enough for efi loader as well.

So this patch switches to the common debug() and #define DEBUG
way of printing debug information.

Signed-off-by: Alexander Graf <agraf@suse.de>

cmd/bootefi.c

@@ -206,9 +206,7 @@ static unsigned long do_bootefi_exec(void *efi, void *fdt)
 #endif
 
 	/* Call our payload! */
-#ifdef DEBUG_EFI
+	debug("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry);
-	printf("%s:%d Jumping to 0x%lx\n", __func__, __LINE__, (long)entry);
-#endif
 
 	if (setjmp(&loaded_image_info.exit_jmp)) {
 		efi_status_t status = loaded_image_info.exit_status;

include/efi_loader.h

@@ -15,18 +15,10 @@
 
 #include <linux/list.h>
 
-/* #define DEBUG_EFI */
-
-#ifdef DEBUG_EFI
 #define EFI_ENTRY(format, ...) do { \
 	efi_restore_gd(); \
-	printf("EFI: Entry %s(" format ")\n", __func__, ##__VA_ARGS__); \
+	debug("EFI: Entry %s(" format ")\n", __func__, ##__VA_ARGS__); \
 	} while(0)
-#else
-#define EFI_ENTRY(format, ...) do { \
-	efi_restore_gd(); \
-	} while(0)
-#endif
 
 #define EFI_EXIT(ret) efi_exit_func(ret);
 

lib/efi_loader/efi_boottime.c

@@ -6,8 +6,6 @@
  *  SPDX-License-Identifier:     GPL-2.0+
  */
 
-/* #define DEBUG_EFI */
-
 #include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>
@@ -76,9 +74,7 @@ efi_status_t efi_exit_func(efi_status_t ret)
 
 static efi_status_t efi_unsupported(const char *funcname)
 {
-#ifdef DEBUG_EFI
+	debug("EFI: App called into unimplemented function %s\n", funcname);
-	printf("EFI: App called into unimplemented function %s\n", funcname);
-#endif
 	return EFI_EXIT(EFI_UNSUPPORTED);
 }
 

lib/efi_loader/efi_disk.c

@@ -84,10 +84,8 @@ static efi_status_t EFIAPI efi_disk_rw_blocks(struct efi_block_io *this,
 	blocks = buffer_size / blksz;
 	lba += diskobj->offset;
 
-#ifdef DEBUG_EFI
+	debug("EFI: %s:%d blocks=%x lba=%"PRIx64" blksz=%x dir=%d\n", __func__,
-	printf("EFI: %s:%d blocks=%x lba=%"PRIx64" blksz=%x dir=%d\n", __func__,
+	      __LINE__, blocks, lba, blksz, direction);
-	       __LINE__, blocks, lba, blksz, direction);
-#endif
 
 	/* We only support full block access */
 	if (buffer_size & (blksz - 1))
@@ -101,9 +99,8 @@ static efi_status_t EFIAPI efi_disk_rw_blocks(struct efi_block_io *this,
 	/* We don't do interrupts, so check for timers cooperatively */
 	efi_timer_check();
 
-#ifdef DEBUG_EFI
+	debug("EFI: %s:%d n=%lx blocks=%x\n", __func__, __LINE__, n, blocks);
-	printf("EFI: %s:%d n=%lx blocks=%x\n", __func__, __LINE__, n, blocks);
+
-#endif
 	if (n != blocks)
 		return EFI_EXIT(EFI_DEVICE_ERROR);
 

lib/efi_loader/efi_memory.c

@@ -6,8 +6,6 @@
  *  SPDX-License-Identifier:     GPL-2.0+
  */
 
-/* #define DEBUG_EFI */
-
 #include <common.h>
 #include <efi_loader.h>
 #include <malloc.h>

lib/efi_loader/efi_runtime.c

@@ -165,9 +165,7 @@ static void efi_runtime_detach(ulong offset)
 		ulong *p = efi_runtime_detach_list[i].ptr;
 		ulong newaddr = patchto ? (patchto + patchoff) : 0;
 
-#ifdef DEBUG_EFI
+		debug("%s: Setting %p to %lx\n", __func__, p, newaddr);
-		printf("%s: Setting %p to %lx\n", __func__, p, newaddr);
-#endif
 		*p = newaddr;
 	}
 }
@@ -182,10 +180,7 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map)
 	static ulong lastoff = CONFIG_SYS_TEXT_BASE;
 #endif
 
-#ifdef DEBUG_EFI
+	debug("%s: Relocating to offset=%lx\n", __func__, offset);
-	printf("%s: Relocating to offset=%lx\n", __func__, offset);
-#endif
-
 	for (; (ulong)rel < (ulong)&__efi_runtime_rel_stop; rel++) {
 		ulong base = CONFIG_SYS_TEXT_BASE;
 		ulong *p;
@@ -212,10 +207,7 @@ void efi_runtime_relocate(ulong offset, struct efi_mem_desc *map)
 			continue;
 		}
 
-#ifdef DEBUG_EFI
+		debug("%s: Setting %p to %lx\n", __func__, p, newaddr);
-		printf("%s: Setting %p to %lx\n", __func__, p, newaddr);
-#endif
-
 		*p = newaddr;
 		flush_dcache_range((ulong)p & ~(EFI_CACHELINE_SIZE - 1),
 			ALIGN((ulong)&p[1], EFI_CACHELINE_SIZE));