Blame SOURCES/0021-apps-Add-bltgrid-and-lfbgrid-and-add-error-checks-to.patch

d30f3b
From 5ec879ace760faacfa940a1933e0339e8f3811bd Mon Sep 17 00:00:00 2001
d30f3b
From: Peter Jones <pjones@redhat.com>
d30f3b
Date: Tue, 13 Mar 2018 15:20:31 -0400
d30f3b
Subject: [PATCH 21/25] apps: Add bltgrid and lfbgrid, and add error checks to
d30f3b
 modelist
d30f3b
d30f3b
This adds bltgrid and lfbgrid, which draw checkerboards using GOP's
d30f3b
Blt() and linear framebuffer, respectively, and adds some error checks
d30f3b
to modelist.efi.
d30f3b
d30f3b
Signed-off-by: Peter Jones <pjones@redhat.com>
d30f3b
Signed-off-by: Nigel Croxon <ncroxon@redhat.com>
d30f3b
---
d30f3b
 apps/bltgrid.c  | 131 +++++++++++++++++++++++++++++++++++++++++++
d30f3b
 apps/lfbgrid.c  | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
d30f3b
 apps/modelist.c |  56 +++++++++----------
d30f3b
 apps/Makefile   |   3 +-
d30f3b
 4 files changed, 328 insertions(+), 32 deletions(-)
d30f3b
 create mode 100644 apps/bltgrid.c
d30f3b
 create mode 100644 apps/lfbgrid.c
d30f3b
d30f3b
diff --git a/apps/bltgrid.c b/apps/bltgrid.c
d30f3b
new file mode 100644
d30f3b
index 00000000000..2adde6a3211
d30f3b
--- /dev/null
d30f3b
+++ b/apps/bltgrid.c
d30f3b
@@ -0,0 +1,131 @@
d30f3b
+#include <efi.h>
d30f3b
+#include <efilib.h>
d30f3b
+
d30f3b
+extern EFI_GUID GraphicsOutputProtocol;
d30f3b
+
d30f3b
+static void
d30f3b
+fill_boxes(UINT32 *PixelBuffer, UINT32 Width, UINT32 Height)
d30f3b
+{
d30f3b
+	UINT32 y, x = 0;
d30f3b
+	/*
d30f3b
+	 * This assums BGRR, but it doesn't really matter; we pick red and
d30f3b
+	 * green so it'll just be blue/green if the pixel format is backwards.
d30f3b
+	 */
d30f3b
+	EFI_GRAPHICS_OUTPUT_BLT_PIXEL Red = {0, 0, 0xff, 0},
d30f3b
+				      Green = {0, 0xff, 0, 0},
d30f3b
+				      *Color;
d30f3b
+
d30f3b
+	for (y = 0; y < Height; y++) {
d30f3b
+		Color = ((y / 32) % 2 == 0) ? &Red : &Gree;;
d30f3b
+		for (x = 0; x < Width; x++) {
d30f3b
+			if (x % 32 == 0 && x != 0)
d30f3b
+				Color = (Color == &Red) ? &Green : &Red;
d30f3b
+			PixelBuffer[y * Width + x] = *(UINT32 *)Color;
d30f3b
+		}
d30f3b
+	}
d30f3b
+}
d30f3b
+
d30f3b
+static void
d30f3b
+draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
d30f3b
+{
d30f3b
+	int i, imax;
d30f3b
+	EFI_STATUS rc;
d30f3b
+	EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
d30f3b
+	UINTN NumPixels;
d30f3b
+	UINT32 *PixelBuffer;
d30f3b
+	UINT32 BufferSize;
d30f3b
+
d30f3b
+	if (gop->Mode) {
d30f3b
+		imax = gop->Mode->MaxMode;
d30f3b
+	} else {
d30f3b
+		Print(L"gop->Mode is NULL\n");
d30f3b
+		return;
d30f3b
+	}
d30f3b
+
d30f3b
+	for (i = 0; i < imax; i++) {
d30f3b
+		UINTN SizeOfInfo;
d30f3b
+		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
d30f3b
+					&info;;
d30f3b
+		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
d30f3b
+			Print(L"gop->QueryMode() returned %r\n", rc);
d30f3b
+			Print(L"Trying to start GOP with SetMode().\n");
d30f3b
+			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
d30f3b
+				gop->Mode ? gop->Mode->Mode : 0);
d30f3b
+			rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i,
d30f3b
+				&SizeOfInfo, &info;;
d30f3b
+		}
d30f3b
+
d30f3b
+		if (EFI_ERROR(rc)) {
d30f3b
+			Print(L"%d: Bad response from QueryMode: %r (%d)\n",
d30f3b
+			      i, rc, rc);
d30f3b
+			continue;
d30f3b
+		}
d30f3b
+
d30f3b
+		if (CompareMem(info, gop->Mode->Info, sizeof (*info)))
d30f3b
+			continue;
d30f3b
+
d30f3b
+		NumPixels = info->VerticalResolution * info->HorizontalResolution;
d30f3b
+		BufferSize = NumPixels * sizeof(UINT32);
d30f3b
+
d30f3b
+		PixelBuffer = AllocatePool(BufferSize);
d30f3b
+		if (!PixelBuffer) {
d30f3b
+			Print(L"Allocation of 0x%08lx bytes failed.\n",
d30f3b
+			      sizeof(UINT32) * NumPixels);
d30f3b
+			return;
d30f3b
+		}
d30f3b
+
d30f3b
+		fill_boxes(PixelBuffer,
d30f3b
+			   info->HorizontalResolution, info->VerticalResolution);
d30f3b
+
d30f3b
+		uefi_call_wrapper(gop->Blt, 10, gop,
d30f3b
+				  (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)PixelBuffer,
d30f3b
+				  EfiBltBufferToVideo,
d30f3b
+				  0, 0, 0, 0,
d30f3b
+				  info->HorizontalResolution,
d30f3b
+				  info->VerticalResolution,
d30f3b
+				  0);
d30f3b
+		return;
d30f3b
+	}
d30f3b
+	Print(L"Never found the active video mode?\n");
d30f3b
+}
d30f3b
+
d30f3b
+static EFI_STATUS
d30f3b
+SetWatchdog(UINTN seconds)
d30f3b
+{
d30f3b
+	EFI_STATUS rc;
d30f3b
+	rc = uefi_call_wrapper(BS->SetWatchdogTimer, 4, seconds, 0x1ffff,
d30f3b
+				0, NULL);
d30f3b
+	if (EFI_ERROR(rc)) {
d30f3b
+		CHAR16 Buffer[64];
d30f3b
+		StatusToString(Buffer, rc);
d30f3b
+		Print(L"Bad response from QueryMode: %s (%d)\n", Buffer, rc);
d30f3b
+	}
d30f3b
+	return rc;
d30f3b
+}
d30f3b
+
d30f3b
+EFI_STATUS
d30f3b
+efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab)
d30f3b
+{
d30f3b
+	EFI_STATUS rc;
d30f3b
+	EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
d30f3b
+
d30f3b
+	InitializeLib(image_handle, systab);
d30f3b
+
d30f3b
+	SetWatchdog(10);
d30f3b
+
d30f3b
+	rc = LibLocateProtocol(&GraphicsOutputProtocol, (void **)&gop);
d30f3b
+	if (EFI_ERROR(rc)) {
d30f3b
+		Print(L"Could not locate GOP: %r\n", rc);
d30f3b
+		return rc;
d30f3b
+	}
d30f3b
+
d30f3b
+	if (!gop) {
d30f3b
+		Print(L"LocateProtocol(GOP, &gop) returned %r but GOP is NULL\n", rc);
d30f3b
+		return EFI_UNSUPPORTED;
d30f3b
+	}
d30f3b
+
d30f3b
+	draw_boxes(gop);
d30f3b
+
d30f3b
+	SetWatchdog(0);
d30f3b
+	return EFI_SUCCESS;
d30f3b
+}
d30f3b
diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c
d30f3b
new file mode 100644
d30f3b
index 00000000000..53a255afbb9
d30f3b
--- /dev/null
d30f3b
+++ b/apps/lfbgrid.c
d30f3b
@@ -0,0 +1,170 @@
d30f3b
+#include <efi.h>
d30f3b
+#include <efilib.h>
d30f3b
+
d30f3b
+extern EFI_GUID GraphicsOutputProtocol;
d30f3b
+
d30f3b
+#define be32_to_cpu(x) __builtin_bswap32(x)
d30f3b
+
d30f3b
+static void
d30f3b
+fill_boxes(UINT32 *PixelBuffer, UINT32 Width, UINT32 Height, UINT32 Pitch,
d30f3b
+	   EFI_GRAPHICS_PIXEL_FORMAT Format, EFI_PIXEL_BITMASK Info )
d30f3b
+{
d30f3b
+	UINT32 Red, Green;
d30f3b
+	UINT32 y, x, color;
d30f3b
+
d30f3b
+	switch(Format) {
d30f3b
+	case PixelRedGreenBlueReserved8BitPerColor:
d30f3b
+		Red = be32_to_cpu(0xff000000);
d30f3b
+		Green = be32_to_cpu(0x00ff0000);
d30f3b
+		break;
d30f3b
+	case PixelBlueGreenRedReserved8BitPerColor:
d30f3b
+		Red = be32_to_cpu(0x0000ff00);
d30f3b
+		Green = be32_to_cpu(0x00ff0000);
d30f3b
+		break;
d30f3b
+	case PixelBitMask:
d30f3b
+		Red = Info.RedMask;
d30f3b
+		Green = Info.GreenMask;
d30f3b
+		break;
d30f3b
+	case PixelBltOnly:
d30f3b
+		return;
d30f3b
+	default:
d30f3b
+		Print(L"Invalid pixel format\n");
d30f3b
+		return;
d30f3b
+	}
d30f3b
+
d30f3b
+	for (y = 0; y < Height; y++) {
d30f3b
+		color = ((y / 32) % 2 == 0) ? Red : Green;
d30f3b
+		for (x = 0; x < Width; x++) {
d30f3b
+			if (x % 32 == 0 && x != 0)
d30f3b
+				color = (color == Red) ? Green : Red;
d30f3b
+			PixelBuffer[y * Pitch + x] = color;
d30f3b
+		}
d30f3b
+	}
d30f3b
+}
d30f3b
+
d30f3b
+static void
d30f3b
+draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
d30f3b
+{
d30f3b
+	int i, imax;
d30f3b
+	EFI_STATUS rc;
d30f3b
+	EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
d30f3b
+	UINTN NumPixels;
d30f3b
+	UINT32 *PixelBuffer;
d30f3b
+	UINT32 CopySize, BufferSize;
d30f3b
+#if defined(__x86_64__) || defined(__aarch64__)
d30f3b
+	UINT64 FrameBufferAddr;
d30f3b
+#elif defined(__i386__) || defined(__arm__)
d30f3b
+	UINT32 FrameBufferAddr;
d30f3b
+#else
d30f3b
+#error YOUR ARCH HERE
d30f3b
+#endif
d30f3b
+
d30f3b
+	if (gop->Mode) {
d30f3b
+		imax = gop->Mode->MaxMode;
d30f3b
+	} else {
d30f3b
+		Print(L"gop->Mode is NULL\n");
d30f3b
+		return;
d30f3b
+	}
d30f3b
+
d30f3b
+	for (i = 0; i < imax; i++) {
d30f3b
+		UINTN SizeOfInfo;
d30f3b
+		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
d30f3b
+					&info;;
d30f3b
+		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
d30f3b
+			Print(L"gop->QueryMode() returned %r\n", rc);
d30f3b
+			Print(L"Trying to start GOP with SetMode().\n");
d30f3b
+			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
d30f3b
+				gop->Mode ? gop->Mode->Mode : 0);
d30f3b
+			rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i,
d30f3b
+				&SizeOfInfo, &info;;
d30f3b
+		}
d30f3b
+
d30f3b
+		if (EFI_ERROR(rc)) {
d30f3b
+			Print(L"%d: Bad response from QueryMode: %r (%d)\n",
d30f3b
+			      i, rc, rc);
d30f3b
+			continue;
d30f3b
+		}
d30f3b
+
d30f3b
+		if (CompareMem(info, gop->Mode->Info, sizeof (*info)))
d30f3b
+			continue;
d30f3b
+
d30f3b
+		NumPixels = info->VerticalResolution * info->PixelsPerScanLine;
d30f3b
+		BufferSize = NumPixels * sizeof(UINT32);
d30f3b
+		if (BufferSize == gop->Mode->FrameBufferSize) {
d30f3b
+			CopySize = BufferSize;
d30f3b
+		} else {
d30f3b
+			CopySize = BufferSize < gop->Mode->FrameBufferSize ?
d30f3b
+				BufferSize : gop->Mode->FrameBufferSize;
d30f3b
+			Print(L"height * pitch * pixelsize = %lu buf fb size is %lu; using %lu\n",
d30f3b
+			      BufferSize, gop->Mode->FrameBufferSize, CopySize);
d30f3b
+		}
d30f3b
+
d30f3b
+		PixelBuffer = AllocatePool(BufferSize);
d30f3b
+		if (!PixelBuffer) {
d30f3b
+			Print(L"Allocation of 0x%08lx bytes failed.\n",
d30f3b
+			      sizeof(UINT32) * NumPixels);
d30f3b
+			return;
d30f3b
+		}
d30f3b
+
d30f3b
+		fill_boxes(PixelBuffer, info->HorizontalResolution,
d30f3b
+			   info->VerticalResolution, info->PixelsPerScanLine,
d30f3b
+			   info->PixelFormat, info->PixelInformation);
d30f3b
+
d30f3b
+		if (info->PixelFormat == PixelBltOnly) {
d30f3b
+			Print(L"No linear framebuffer on this device.\n");
d30f3b
+			return;
d30f3b
+		}
d30f3b
+#if defined(__x86_64__) || defined(__aarch64__)
d30f3b
+		FrameBufferAddr = (UINT64)gop->Mode->FrameBufferBase;
d30f3b
+#elif defined(__i386__) || defined(__arm__)
d30f3b
+		FrameBufferAddr = (UINT32)(UINT64)gop->Mode->FrameBufferBase;
d30f3b
+#else
d30f3b
+#error YOUR ARCH HERE
d30f3b
+#endif
d30f3b
+
d30f3b
+		CopyMem((VOID *)FrameBufferAddr, PixelBuffer, CopySize);
d30f3b
+		return;
d30f3b
+	}
d30f3b
+	Print(L"Never found the active video mode?\n");
d30f3b
+}
d30f3b
+
d30f3b
+static EFI_STATUS
d30f3b
+SetWatchdog(UINTN seconds)
d30f3b
+{
d30f3b
+	EFI_STATUS rc;
d30f3b
+	rc = uefi_call_wrapper(BS->SetWatchdogTimer, 4, seconds, 0x1ffff,
d30f3b
+				0, NULL);
d30f3b
+	if (EFI_ERROR(rc)) {
d30f3b
+		CHAR16 Buffer[64];
d30f3b
+		StatusToString(Buffer, rc);
d30f3b
+		Print(L"Bad response from QueryMode: %s (%d)\n", Buffer, rc);
d30f3b
+	}
d30f3b
+	return rc;
d30f3b
+}
d30f3b
+
d30f3b
+EFI_STATUS
d30f3b
+efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab)
d30f3b
+{
d30f3b
+	EFI_STATUS rc;
d30f3b
+	EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
d30f3b
+
d30f3b
+	InitializeLib(image_handle, systab);
d30f3b
+
d30f3b
+	SetWatchdog(10);
d30f3b
+
d30f3b
+	rc = LibLocateProtocol(&GraphicsOutputProtocol, (void **)&gop);
d30f3b
+	if (EFI_ERROR(rc)) {
d30f3b
+		Print(L"Could not locate GOP: %r\n", rc);
d30f3b
+		return rc;
d30f3b
+	}
d30f3b
+
d30f3b
+	if (!gop) {
d30f3b
+		Print(L"LocateProtocol(GOP, &gop) returned %r but GOP is NULL\n", rc);
d30f3b
+		return EFI_UNSUPPORTED;
d30f3b
+	}
d30f3b
+
d30f3b
+	draw_boxes(gop);
d30f3b
+
d30f3b
+	SetWatchdog(0);
d30f3b
+	return EFI_SUCCESS;
d30f3b
+}
d30f3b
diff --git a/apps/modelist.c b/apps/modelist.c
d30f3b
index 8d816d1d9da..26892e1d5f5 100644
d30f3b
--- a/apps/modelist.c
d30f3b
+++ b/apps/modelist.c
d30f3b
@@ -3,57 +3,44 @@
d30f3b
 
d30f3b
 extern EFI_GUID GraphicsOutputProtocol;
d30f3b
 
d30f3b
-static int memcmp(const void *s1, const void *s2, UINTN n)
d30f3b
-{
d30f3b
-	const unsigned char *c1 = s1, *c2 = s2;
d30f3b
-	int d = 0;
d30f3b
-
d30f3b
-	if (!s1 && !s2)
d30f3b
-		return 0;
d30f3b
-	if (s1 && !s2)
d30f3b
-		return 1;
d30f3b
-	if (!s1 && s2)
d30f3b
-		return -1;
d30f3b
-
d30f3b
-	while (n--) {
d30f3b
-		d = (int)*c1++ - (int)*c2++;
d30f3b
-		if (d)
d30f3b
-			break;
d30f3b
-	}
d30f3b
-	return d;
d30f3b
-}
d30f3b
-
d30f3b
 static void
d30f3b
 print_modes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
d30f3b
 {
d30f3b
 	int i, imax;
d30f3b
 	EFI_STATUS rc;
d30f3b
 
d30f3b
-	imax = gop->Mode->MaxMode;
d30f3b
+	if (gop->Mode) {
d30f3b
+		imax = gop->Mode->MaxMode;
d30f3b
+		Print(L"GOP reports MaxMode %d\n", imax);
d30f3b
+	} else {
d30f3b
+		Print(L"gop->Mode is NULL\n");
d30f3b
+		imax = 1;
d30f3b
+	}
d30f3b
 
d30f3b
-	Print(L"GOP reports MaxMode %d\n", imax);
d30f3b
 	for (i = 0; i < imax; i++) {
d30f3b
 		EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
d30f3b
 		UINTN SizeOfInfo;
d30f3b
 		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
d30f3b
 					&info;;
d30f3b
 		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
d30f3b
+			Print(L"gop->QueryMode() returned %r\n", rc);
d30f3b
+			Print(L"Trying to start GOP with SetMode().\n");
d30f3b
 			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
d30f3b
-				gop->Mode->Mode);
d30f3b
+				gop->Mode ? gop->Mode->Mode : 0);
d30f3b
 			rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i,
d30f3b
 				&SizeOfInfo, &info;;
d30f3b
 		}
d30f3b
 
d30f3b
 		if (EFI_ERROR(rc)) {
d30f3b
-			CHAR16 Buffer[64];
d30f3b
-			StatusToString(Buffer, rc);
d30f3b
-			Print(L"%d: Bad response from QueryMode: %s (%d)\n",
d30f3b
-				i, Buffer, rc);
d30f3b
+			Print(L"%d: Bad response from QueryMode: %r (%d)\n",
d30f3b
+			      i, rc, rc);
d30f3b
 			continue;
d30f3b
 		}
d30f3b
-		Print(L"%c%d: %dx%d ", memcmp(info,gop->Mode->Info,sizeof(*info)) == 0 ? '*' : ' ', i,
d30f3b
-			info->HorizontalResolution,
d30f3b
-			info->VerticalResolution);
d30f3b
+		Print(L"%c%d: %dx%d ",
d30f3b
+		      (gop->Mode &&
d30f3b
+		       CompareMem(info,gop->Mode->Info,sizeof(*info)) == 0
d30f3b
+		       ) ? '*' : ' ',
d30f3b
+		      i, info->HorizontalResolution, info->VerticalResolution);
d30f3b
 		switch(info->PixelFormat) {
d30f3b
 			case PixelRedGreenBlueReserved8BitPerColor:
d30f3b
 				Print(L"RGBR");
d30f3b
@@ -104,8 +91,15 @@ efi_main (EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *systab)
d30f3b
 	SetWatchdog(10);
d30f3b
 
d30f3b
 	rc = LibLocateProtocol(&GraphicsOutputProtocol, (void **)&gop);
d30f3b
-	if (EFI_ERROR(rc))
d30f3b
+	if (EFI_ERROR(rc)) {
d30f3b
+		Print(L"Could not locate GOP: %r\n", rc);
d30f3b
 		return rc;
d30f3b
+	}
d30f3b
+
d30f3b
+	if (!gop) {
d30f3b
+		Print(L"LocateProtocol(GOP, &gop) returned %r but GOP is NULL\n", rc);
d30f3b
+		return EFI_UNSUPPORTED;
d30f3b
+	}
d30f3b
 
d30f3b
 	print_modes(gop);
d30f3b
 
d30f3b
diff --git a/apps/Makefile b/apps/Makefile
d30f3b
index 5fffd4254c8..4e26444c469 100644
d30f3b
--- a/apps/Makefile
d30f3b
+++ b/apps/Makefile
d30f3b
@@ -61,7 +61,8 @@ LOADLIBES	+= -T $(LDSCRIPT)
d30f3b
 TARGET_APPS = t.efi t2.efi t3.efi t4.efi t5.efi t6.efi \
d30f3b
 	      printenv.efi t7.efi t8.efi tcc.efi modelist.efi \
d30f3b
 	      route80h.efi drv0_use.efi AllocPages.efi exit.efi \
d30f3b
-	      FreePages.efi setjmp.efi debughook.efi debughook.efi.debug
d30f3b
+	      FreePages.efi setjmp.efi debughook.efi debughook.efi.debug \
d30f3b
+	      bltgrid.efi lfbgrid.efi
d30f3b
 TARGET_BSDRIVERS = drv0.efi
d30f3b
 TARGET_RTDRIVERS =
d30f3b
 
d30f3b
-- 
d30f3b
2.15.0
d30f3b