d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preliminary support for EFI in boot loader. Define efi-boot forth

Browse Source 
environment variable to allow conditional compilation based on EFI
being present or not. Provide efi-setenv, efi-getenv, and
efi-unsetenv, though those need improvement. Move the efi definition
to libefi (but include a reference so they get included).
This commit is contained in:
Warner Losh 2016-10-24 20:36:54 +00:00
parent cd2b868b5d
commit b6110871b5
8 changed files with 221 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/boot/efi/libefi/Makefile
View File

@ -26,6 +26,7 @@ CFLAGS+= -msoft-float -mgeneral-regs-only
.if ${MACHINE_ARCH} == "amd64"
CFLAGS+= -fPIC -mno-red-zone
.endif
CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE}
CFLAGS+= -I${.CURDIR}/../include
CFLAGS+= -I${.CURDIR}/../include/${MACHINE}
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand

179
sys/boot/efi/libefi/env.c
View File

@ -26,8 +26,15 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <stand.h>
#include <string.h>
#include <efi.h>
#include <efilib.h>
#include <uuid.h>
#include "bootstrap.h"
#include "ficl.h"
int efi_variable_support = 1;
/*
* Simple wrappers to the underlying UEFI functions.
@ -53,3 +60,175 @@ efi_set_variable(CHAR16 *variable_name, EFI_GUID *vendor_guid, UINT32 attributes
{
return RS->SetVariable(variable_name, vendor_guid, attributes, data_size, data);
}
/*
* FreeBSD's loader interaction words and extras
*
* efi-setenv ( value n name n guid n attr -- 0 | -1)
* efi-getenv ( guid n addr n -- addr' n' | -1 )
* efi-unsetenv ( name n guid n'' -- )
*/
/*
* efi-setenv
* efi-setenv ( value n name n guid n attr -- 0 | -1)
*
* Set environment variables using the SetVariable EFI runtime service.
*
* Value and guid are passed through in binary form (so guid needs to be
* converted to binary form from its string form). Name is converted from
* ASCII to CHAR16. Since ficl doesn't have support for internationalization,
* there's no native CHAR16 interface provided.
*
* attr is an int in the bitmask of the following attributes for this variable.
*
* 1 Non volatile
* 2 Boot service access
* 4 Run time access
* (corresponding to the same bits in the UEFI spec).
*/
void
ficlEfiSetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *value = NULL, *guid = NULL;
CHAR16 *name = NULL;
int i;
#endif
char *namep, *valuep, *guidp;
int names, values, guids, attr;
int status;
uuid_t u;
uint32_t ustatus;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 6, 0);
#endif
attr = stackPopINT(pVM->pStack);
guids = stackPopINT(pVM->pStack);
guidp = (char*)stackPopPtr(pVM->pStack);
names = stackPopINT(pVM->pStack);
namep = (char*)stackPopPtr(pVM->pStack);
values = stackPopINT(pVM->pStack);
valuep = (char*)stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
guid = (char*)ficlMalloc(guids);
if (guid != NULL)
vmThrowErr(pVM, "Error: out of memory");
memcpy(guid, guidp, guids);
uuid_from_string(guid, &u, &ustatus);
if (ustatus != uuid_s_ok) {
stackPushINT(pVM->pStack, -1);
goto out;
}
name = (CHAR16 *)ficlMalloc((names + 1) * sizeof(CHAR16));
if (name == NULL)
vmThrowErr(pVM, "Error: out of memory");
for (i = 0; i < names; i++)
name[i] = namep[i];
name[names] = (CHAR16)0;
value = (char*)ficlMalloc(values + 1);
if (value != NULL)
vmThrowErr(pVM, "Error: out of memory");
memcpy(value, valuep, values);
status = efi_set_variable(name, (EFI_GUID *)&u, attr, values, value);
if (status == EFI_SUCCESS)
stackPushINT(pVM->pStack, 0);
else
stackPushINT(pVM->pStack, -1);
out:
ficlFree(name);
ficlFree(value);
ficlFree(guid);
#endif
return;
}
void
ficlEfiGetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *name, *value;
#endif
char *namep;
int names;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 2, 2);
#endif
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
strncpy(name, namep, names);
name[names] = '\0';
value = getenv(name);
ficlFree(name);
if(value != NULL) {
stackPushPtr(pVM->pStack, value);
stackPushINT(pVM->pStack, strlen(value));
} else
#endif
stackPushINT(pVM->pStack, -1);
return;
}
void
ficlEfiUnsetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *name;
#endif
char *namep;
int names;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 2, 0);
#endif
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
strncpy(name, namep, names);
name[names] = '\0';
unsetenv(name);
ficlFree(name);
#endif
return;
}
/**************************************************************************
** Add FreeBSD UEFI platform extensions into the system dictionary
**************************************************************************/
void ficlEfiCompilePlatform(FICL_SYSTEM *pSys)
{
FICL_DICT *dp = pSys->dp;
assert (dp);
dictAppendWord(dp, "efi-setenv", ficlEfiSetenv, FW_DEFAULT);
dictAppendWord(dp, "efi-getenv", ficlEfiGetenv, FW_DEFAULT);
dictAppendWord(dp, "efi-unsetenv", ficlEfiUnsetenv, FW_DEFAULT);
/* Would like to export the EFI version, but this will do for now */
ficlSetEnv(pSys, "efi-boot", 1);
return;
}
FICL_COMPILE_SET(ficlEfiCompilePlatform);

8
sys/boot/efi/loader/main.c
View File

@ -55,6 +55,10 @@ extern char bootprog_rev[];
extern char bootprog_date[];
extern char bootprog_maker[];
/* Force a reference to bring in EFI support from the library */
extern int efi_variable_support;
int *dummy1 = &efi_variable_support;
struct arch_switch archsw; /* MI/MD interface boundary */
EFI_GUID acpi = ACPI_TABLE_GUID;
@ -906,8 +910,8 @@ command_efi_show(int argc, char *argv[])
return (rv);
}
if (argc != 0) {
printf("Too many args\n");
if (argc > 0) {
printf("Too many args %d\n", argc);
pager_close();
return (CMD_ERROR);
}

207
sys/boot/ficl/efi.c
View File

@ -1,207 +0,0 @@
/*-
* Copyright (c) 2014 Netflix, Inc
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $FreeBSD$
*/
/*******************************************************************
** e f i . c
** Additional words for EFI
**
*******************************************************************/
#ifdef TESTMAIN
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#else
#include <stand.h>
#endif
#include "bootstrap.h"
#include <string.h>
#include "ficl.h"
/*
* FreeBSD's loader interaction words and extras
*
* efi-setenv ( value n name n guid n attr -- 0 | -1)
* efi-getenv ( guid n addr n -- addr' n' | -1 )
* efi-unsetenv ( name n guid n'' -- )
*/
/*
* efi-setenv
* efi-setenv ( value n name n guid n attr -- 0 | -1)
*
* Set environment variables using the SetVariable EFI runtime service.
*
* Value and guid are passed through in binary form (so guid needs to be
* converted to binary form from its string form). Name is converted from
* ASCII to CHAR16. Since ficl doesn't have support for internationalization,
* there's no native CHAR16 interface provided.
*
* attr is an int in the bitmask of the following attributes for this variable.
*
* 1 Non volatile
* 2 Boot service access
* 4 Run time access
* (corresponding to the same bits in the UEFI spec).
*/
void
ficlEfiSetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *value, *guid;
CHAR16 *name
int i;
#endif
char *namep, *valuep, *guidp;
int names, values, guids, attr;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 6, 0);
#endif
attr = stackPopINT(pVM->pStack);
guids = stackPopINT(pVM->pStack);
guidp = (char*)stackPopPtr(pVM->pStack);
names = stackPopINT(pVM->pStack);
namep = (char*)stackPopPtr(pVM->pStack);
values = stackPopINT(pVM->pStack);
valuep = (char*)stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
guid = (char*)ficlMalloc(guids);
if (guid != NULL)
vmThrowErr(pVM, "Error: out of memory");
memcpy(guid, guidp, guids);
name = (char*)ficlMalloc((names + 1) * sizeof(CHAR16));
if (name == NULL)
vmThrowErr(pVM, "Error: out of memory");
for (i = 0; i < names; i++)
name[i] = namep[i];
name[names] = (CHAR16)0;
value = (char*)ficlMalloc(values + 1);
if (value != NULL)
vmThrowErr(pVM, "Error: out of memory");
memcpy(value, valuep, values);
status = efi_set_variable(name, guid, attr, value);
if (status == EFI_SUCCESS)
stackPushINT(pVM->pStack, 0);
else
stackPushINT(pVM->pStack, -1);
ficlFree(name);
ficlFree(value);
ficlFree(guid);
#endif
return;
}
void
ficlEfiGetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *name, *value;
#endif
char *namep;
int names;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 2, 2);
#endif
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
strncpy(name, namep, names);
name[names] = '\0';
value = getenv(name);
ficlFree(name);
if(value != NULL) {
stackPushPtr(pVM->pStack, value);
stackPushINT(pVM->pStack, strlen(value));
} else
#endif
stackPushINT(pVM->pStack, -1);
return;
}
void
ficlEfiUnsetenv(FICL_VM *pVM)
{
#ifndef TESTMAIN
char *name;
#endif
char *namep;
int names;
#if FICL_ROBUST > 1
vmCheckStack(pVM, 2, 0);
#endif
names = stackPopINT(pVM->pStack);
namep = (char*) stackPopPtr(pVM->pStack);
#ifndef TESTMAIN
name = (char*) ficlMalloc(names+1);
if (!name)
vmThrowErr(pVM, "Error: out of memory");
strncpy(name, namep, names);
name[names] = '\0';
unsetenv(name);
ficlFree(name);
#endif
return;
}
/**************************************************************************
** Build FreeBSD platform extensions into the system dictionary
**************************************************************************/
void ficlEfiCompilePlatform(FICL_SYSTEM *pSys)
{
FICL_DICT *dp = pSys->dp;
assert (dp);
dictAppendWord(dp, "efi-setenv", ficlEfiSetenv, FW_DEFAULT);
dictAppendWord(dp, "efi-getenv", ficlEfiGetenv, FW_DEFAULT);
dictAppendWord(dp, "efi-unsetenv", ficlEfiUnsetenv, FW_DEFAULT);
return;
}

3
sys/boot/ficl/loader.c
View File

@ -824,9 +824,8 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys)
dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT);
dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT);
SET_FOREACH(fnpp, Xficl_compile_set) {
SET_FOREACH(fnpp, Xficl_compile_set)
(*fnpp)(pSys);
}
#if defined(PC98)
ficlSetEnv(pSys, "arch-pc98", FICL_TRUE);

1
sys/boot/forth/Makefile.inc
View File

@ -6,6 +6,7 @@ FILES+= brand-fbsd.4th
FILES+= check-password.4th
FILES+= color.4th
FILES+= delay.4th
FILES+= efi.4th
FILES+= frames.4th
FILES+= loader.4th
FILES+= loader.conf

30
sys/boot/forth/efi.4th Normal file
View File

@ -0,0 +1,30 @@
\ Copyright (c) 2016 Netflix, Inc
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
\ modification, are permitted provided that the following conditions
\ are met:
\ 1. Redistributions of source code must retain the above copyright
\ notice, this list of conditions and the following disclaimer.
\ 2. Redistributions in binary form must reproduce the above copyright
\ notice, this list of conditions and the following disclaimer in the
\ documentation and/or other materials provided with the distribution.
\
\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
\ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
\ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
\ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
\ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
\ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
\ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
\ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
\ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
\ $FreeBSD$
only forth definitions
\ Place holder for more functions
.( EFI boot environment) cr

3
sys/boot/forth/loader.4th
View File

@ -46,6 +46,9 @@ include /boot/support.4th
include /boot/color.4th
include /boot/delay.4th
include /boot/check-password.4th
s" efi-boot" environment? [if] [if]
include /boot/efi.4th
[then] [then]
only forth definitions