From owner-svn-src-projects@FreeBSD.ORG Thu Mar 27 19:59:34 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E897FCC; Thu, 27 Mar 2014 19:59:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B437D80; Thu, 27 Mar 2014 19:59:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2RJxY5a051660; Thu, 27 Mar 2014 19:59:34 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2RJxXgn051655; Thu, 27 Mar 2014 19:59:33 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201403271959.s2RJxXgn051655@svn.freebsd.org> From: Ed Maste Date: Thu, 27 Mar 2014 19:59:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263828 - in projects/uefi/sys: amd64/amd64 amd64/include boot/amd64/efi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Mar 2014 19:59:34 -0000 Author: emaste Date: Thu Mar 27 19:59:33 2014 New Revision: 263828 URL: http://svnweb.freebsd.org/changeset/base/263828 Log: Update for r263815 and r263826 Sponsored by: The FreeBSD Foundation Deleted: projects/uefi/sys/amd64/include/efi.h Modified: projects/uefi/sys/amd64/amd64/machdep.c projects/uefi/sys/boot/amd64/efi/bootinfo.c projects/uefi/sys/boot/amd64/efi/framebuffer.c projects/uefi/sys/boot/amd64/efi/framebuffer.h Modified: projects/uefi/sys/amd64/amd64/machdep.c ============================================================================== --- projects/uefi/sys/amd64/amd64/machdep.c Thu Mar 27 19:53:37 2014 (r263827) +++ projects/uefi/sys/amd64/amd64/machdep.c Thu Mar 27 19:59:33 2014 (r263828) @@ -114,7 +114,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -147,39 +146,6 @@ __FBSDID("$FreeBSD$"); #include #include -enum EFI_MEMORY_TYPE { - EfiReservedMemoryType, - EfiLoaderCode, - EfiLoaderData, - EfiBootServicesCode, - EfiBootServicesData, - EfiRuntimeServicesCode, - EfiRuntimeServicesData, - EfiConventionalMemory, - EfiUnusableMemory, - EfiACPIReclaimMemory, - EfiACPIMemoryNVS, - EfiMemoryMappedIO, - EfiMemoryMappedIOPortSpace, - EfiPalCode, - EfiMaxMemoryType -}; - -// possible caching types for the memory range -#define EFI_MEMORY_UC 0x0000000000000001 -#define EFI_MEMORY_WC 0x0000000000000002 -#define EFI_MEMORY_WT 0x0000000000000004 -#define EFI_MEMORY_WB 0x0000000000000008 -#define EFI_MEMORY_UCE 0x0000000000000010 - -// physical memory protection on range -#define EFI_MEMORY_WP 0x0000000000001000 -#define EFI_MEMORY_RP 0x0000000000002000 -#define EFI_MEMORY_XP 0x0000000000004000 - -// range requires a runtime mapping -#define EFI_MEMORY_RUNTIME 0x8000000000000000 - /* Sanity check for __curthread() */ CTASSERT(offsetof(struct pcpu, pc_curthread) == 0); @@ -1605,7 +1571,6 @@ parsememmap(caddr_t kmdp, u_int64_t firs { int i, physmap_idx; u_long physmem_tunable; - struct efi_header *efihdr; bzero(physmap, sizeof(physmap)); basemem = 0; Modified: projects/uefi/sys/boot/amd64/efi/bootinfo.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 19:53:37 2014 (r263827) +++ projects/uefi/sys/boot/amd64/efi/bootinfo.c Thu Mar 27 19:59:33 2014 (r263828) @@ -225,8 +225,8 @@ bi_load_efi_data(struct preloaded_file * struct efi_header *efihdr; struct efi_fb efifb; - efi_find_framebuffer(&efifb); - file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); + if (efi_find_framebuffer(&efifb) == 0) + file_addmetadata(kfp, MODINFOMD_EFI_FB, sizeof(efifb), &efifb); efisz = (sizeof(struct efi_header) + 0xf) & ~0xf; Modified: projects/uefi/sys/boot/amd64/efi/framebuffer.c ============================================================================== --- projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 19:53:37 2014 (r263827) +++ projects/uefi/sys/boot/amd64/efi/framebuffer.c Thu Mar 27 19:59:33 2014 (r263828) @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); static EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; -void +int efi_find_framebuffer(struct efi_fb *efifb) { EFI_GRAPHICS_OUTPUT *gop; @@ -47,15 +47,12 @@ efi_find_framebuffer(struct efi_fb *efif EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info; status = BS->LocateProtocol(&gop_guid, NULL, (VOID **)&gop); - if (EFI_ERROR(status)) { - efifb->fb_present = 0; - return; - } + if (EFI_ERROR(status)) + return (1); mode = gop->Mode; info = gop->Mode->Info; - efifb->fb_present = 1; efifb->fb_addr = mode->FrameBufferBase; efifb->fb_size = mode->FrameBufferSize; efifb->fb_height = info->VerticalResolution; @@ -83,6 +80,7 @@ efi_find_framebuffer(struct efi_fb *efif info->PixelInformation.ReservedMask; break; default: - efifb->fb_present = 0; + return (1); } + return (0); } Modified: projects/uefi/sys/boot/amd64/efi/framebuffer.h ============================================================================== --- projects/uefi/sys/boot/amd64/efi/framebuffer.h Thu Mar 27 19:53:37 2014 (r263827) +++ projects/uefi/sys/boot/amd64/efi/framebuffer.h Thu Mar 27 19:59:33 2014 (r263828) @@ -1,6 +1,6 @@ #ifndef _EFIFB_H_ #define _EFIFB_H_ -void efi_find_framebuffer(struct efi_fb *efifb); +int efi_find_framebuffer(struct efi_fb *efifb); #endif /* _EFIFB_H_ */