jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-30 04:22:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

loader: Fix 32-bit compatibility

Browse Source 
main.c - Fix rsdp cast.
framebuffer.c -
 	- Use temp variable instead of directly passing pointer when
          EFI_PHYSICAL_ADDRESS is expected.
	  Also fix FreePages cast.
	- Mask framebuffer address given to us by UEFI.

Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/1098
This commit is contained in:
Ahmad Khalifa 2024-05-14 22:29:08 +03:00 committed by Warner Losh
parent 95f75b0e6e
commit 6818ff7797
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
stand/efi/loader/framebuffer.c
View File

@ -149,7 +149,16 @@ efifb_from_gop(struct efi_fb *efifb, EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *mode,
{
int result;
efifb->fb_addr = mode->FrameBufferBase;
/*
* The Asus EEEPC 1025C, and possibly others,
* require the address to be masked.
*/
efifb->fb_addr =
#ifdef __i386__
mode->FrameBufferBase & 0xffffffff;
#else
mode->FrameBufferBase;
#endif
efifb->fb_size = mode->FrameBufferSize;
efifb->fb_height = info->VerticalResolution;
efifb->fb_width = info->HorizontalResolution;
@ -555,6 +564,7 @@ efi_has_gop(void)
int
efi_find_framebuffer(teken_gfx_t *gfx_state)
{
EFI_PHYSICAL_ADDRESS ptr;
EFI_HANDLE *hlist;
UINTN nhandles, i, hsize;
struct efi_fb efifb;
@ -651,16 +661,15 @@ efi_find_framebuffer(teken_gfx_t *gfx_state)
efifb.fb_mask_blue | efifb.fb_mask_reserved);
if (gfx_state->tg_shadow_fb != NULL)
BS->FreePages((EFI_PHYSICAL_ADDRESS)gfx_state->tg_shadow_fb,
BS->FreePages((uintptr_t)gfx_state->tg_shadow_fb,
gfx_state->tg_shadow_sz);
gfx_state->tg_shadow_sz =
EFI_SIZE_TO_PAGES(efifb.fb_height * efifb.fb_width *
sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL));
status = BS->AllocatePages(AllocateAnyPages, EfiLoaderData,
gfx_state->tg_shadow_sz,
(EFI_PHYSICAL_ADDRESS *)&gfx_state->tg_shadow_fb);
if (status != EFI_SUCCESS)
gfx_state->tg_shadow_fb = NULL;
gfx_state->tg_shadow_sz, &ptr);
gfx_state->tg_shadow_fb = status == EFI_SUCCESS ?
(uint32_t *)(uintptr_t)ptr : NULL;
return (0);
}

3
stand/efi/loader/main.c
View File

@ -45,6 +45,7 @@
#include <disk.h>
#include <dev_net.h>
#include <net.h>
#include <inttypes.h>
#include <efi.h>
#include <efilib.h>
@ -920,7 +921,7 @@ acpi_detect(void)
if ((rsdp = efi_get_table(&acpi)) == NULL)
return;
sprintf(buf, "0x%016llx", (unsigned long long)rsdp);
sprintf(buf, "0x%016"PRIxPTR, (uintptr_t)rsdp);
setenv("acpi.rsdp", buf, 1);
revision = rsdp->Revision;
if (revision == 0)