Compare commits
4 Commits
Author | SHA1 | Date |
---|---|---|
Stephane Eranian | 2b5c5002e1 | |
Stephane Eranian | 82f7288853 | |
Stephane Eranian | e351d8fbea | |
Stephane Eranian | 4e87874a03 |
131
ChangeLog
131
ChangeLog
|
@ -1,4 +1,82 @@
|
|||
2008-01-03 signed off by Jason Fleischli <jason.fleischli@hp.com>
|
||||
2013-03-27 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* ADD CROSSBUILD
|
||||
* intake edited version of Debian x86x crossbuild patches.
|
||||
* Fixed Makefile clean to include crossbuild envs.
|
||||
* Fixed ia32 system.c compile warning
|
||||
* Simplified efi no GOP warning so it doesnt look like an error.
|
||||
* MAJOR: Fixed Fault crash when EFI memory map changes from under elilo.
|
||||
(from an outside interrupt in this case). When the EFI Memory map
|
||||
changes after elilo has already built boot params to pass to the
|
||||
kernel the EFI call to ExitBootSvcs just prior to boot will fail
|
||||
because elilo has the old map key. This is valid EFI behavior, elilo
|
||||
retries to pick up the new memory map and valid key but had already
|
||||
freed the start params portion of boot params resulting in a NULL
|
||||
DEREF crash reset.
|
||||
* Add console reset call during initialization. thanks A. Steinmetz
|
||||
* minor bugfix, fixed -m option broken. thanks Allan-lsk.
|
||||
* tag 3_16 for release
|
||||
|
||||
2011-1-10 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* Uptake of SUSE patches
|
||||
- add sysfs support for efi vars (formerly /proc/efi/vars)
|
||||
- fix strncpy overflow
|
||||
- fix bzimage alloc
|
||||
- cleanups
|
||||
- support longer command line
|
||||
- yet some more mac fixes
|
||||
- align elilo with latest kernel boot protocol format.
|
||||
- new memory management strategy for initrd and kernel image loading.
|
||||
* add force text mode command line option.
|
||||
* replace error output on GOP handle failed, downgraded to normal
|
||||
print status with more informative output.
|
||||
|
||||
2009-10-22 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* elilo 3.12 release commit
|
||||
* Added additional #defines for debug levels to reduce the output
|
||||
* Added Mac console patch rework from Julien Blache @ debian
|
||||
this fixes the invisible console output from elilo on Macs
|
||||
* Moved static ELILO_VERSION variable from elilo.c to elilo.h
|
||||
so that elilo will print its version string and arch on startup.
|
||||
* Fixed bug 2825044 ExitBootServices error handling, correctly deal
|
||||
with changed memory map key if memory map changes from under elilo.
|
||||
* Added memory map key to map debug output.
|
||||
* Fixed bug 2874380 netbooting just flat broken. fixed ia64, x86_64
|
||||
ia32, fixed handling of server side support of tfpt options (get file size)
|
||||
elilo now attempts to get file size before attempting read of file
|
||||
to set the buffers up correctly and deal with tftp servers that dont
|
||||
support options extensions a little better.
|
||||
* netboot, fixed bad blocksize handling
|
||||
* netboot, fixed filename length for elilo-x86_64.conf type on tftp
|
||||
server.
|
||||
* increased bzimage kernel max length sizes to 4mb on i386 and 8mb on
|
||||
x86_64... this is a legacy design hold over from original design and
|
||||
needs to be re-written to do dynamic size memory management based on
|
||||
the size of the actual vmlinuz image, as ia64/gzip does.
|
||||
|
||||
2008-04-02 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* elilo 3.10 release commit
|
||||
* Bumped version string to 3.10
|
||||
* added PTR_FMT 32bit & 64bit pointer translation for correct output
|
||||
* elilo hang bugfix x86_64 non-standard kernels with non-traditional start address
|
||||
elilo will pull the start address from the kernel elf header for 2.6
|
||||
or newer kernels, map memory and use that start address, else use standard
|
||||
1MB default start address. And handle case of overlapping kernels
|
||||
and initrds in memory. Patch contributor Stuart Hayes @ Dell,
|
||||
thanks Stuart!
|
||||
* ported kernel start adress fix to ia32
|
||||
* eliminated all possible compiler warnings except those actually
|
||||
caused by gnu-efi that cant be fixed here.
|
||||
* Debug output improvement, added pauses with visual feedback when
|
||||
user sets debug & verbose options.
|
||||
* bugfix added missing find_bits function definition back into ia32
|
||||
subtree
|
||||
* bugfix loader_probe now correctly errors out if no loaders
|
||||
registered.
|
||||
|
||||
2008-01-11 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* Various compile warning cleanups.
|
||||
|
||||
2008-01-03 signed off by Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* Patch contribution from Scott Davilla <davilla@4pi.com>
|
||||
when x is zero for the first call to add_memory_region, e820_map[-1]
|
||||
will access memory outside the bounds of e820_map. While this does
|
||||
|
@ -6,7 +84,8 @@
|
|||
above the e820_map[0] location that should have been zeroed by the
|
||||
bootloader, the code should not access outside the bounds of
|
||||
structures.
|
||||
2008-01-03 Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
2008-01-03 Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* initrd.c -- Let the allocator decide where to grab the memory from
|
||||
the efi memory map. Current start_addr=image->start_addr forces the
|
||||
same efi region everytime, and has a 7mb limit. ramdisk (initrd.img)
|
||||
|
@ -14,9 +93,11 @@
|
|||
the image->start_addr resulting in an elilo hang. Leaving start_addr
|
||||
NULL at initialization forces alloc_pages to get a memory region
|
||||
sufficient for the size of the initrd image.
|
||||
2007-12-19 Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
2007-12-19 Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* bumping version string to 3.8
|
||||
2007-12-19 Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
2007-12-19 Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* MORE PATCHES FROM INTEL FOR IA32 X86_64.
|
||||
* Fix compile warning for cmdline_addr assignment.
|
||||
* Fix an issue caused by uninitialized e820_nr_map in fill_e820map.
|
||||
|
@ -40,12 +121,14 @@
|
|||
EFI framebuffer type ID setting code in ELILO is changed accordingly.
|
||||
* E820 memory map is added to IA32 to make it possible for
|
||||
Linux kernel not to depend on EFI memory map on EFI 32.
|
||||
2007-09-27 Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
2007-09-27 Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* updating changelog for last commit that was omitted
|
||||
* incorporating AGriffis patches to enhance parsing
|
||||
passes root= option to kernel options and accounts for -- option
|
||||
designation.
|
||||
2007-07-19 Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
2007-07-19 Jason Fleischli <fleischli@users.sourceforge.net>
|
||||
* Integrated x86_64 support patches from Chandramouli Narayanan
|
||||
<mouli@linux.intel.com> changes summarized in following bullets.
|
||||
* alloc.c -- adds patch contributors credit to copyright
|
||||
|
@ -116,13 +199,17 @@
|
|||
* x86_64/sysdeps.c -- new file, system stuff for x86_64
|
||||
* elilo.txt -- documentation update, add Intel to copyright
|
||||
* README.gnu-efi -- documentation update for x86_64
|
||||
|
||||
2006-01-27 Alex Williamson <alex.williamson@hp.com>
|
||||
* Found a couple more places where vmcode isn't zeroed, causing the
|
||||
option to get carried over to labels it shouldn't.
|
||||
|
||||
2006-01-09 Brett Johnson <brett@hp.com>
|
||||
* Released 3.6
|
||||
|
||||
2005-12-22 Alex Williamson <alex.williamson@hp.com>
|
||||
* Fixed vmcode_name initialization in textmenu chooser
|
||||
|
||||
2005-12-01 Alex Williamson <alex.williamson@hp.com>
|
||||
* Applied patch from Fred Yang <fred.yang@intel.com> to support the
|
||||
vmm= boot option. This option specifies the kernel image for a
|
||||
|
@ -136,29 +223,37 @@
|
|||
image will be uncompressed into memory before it is provided to the
|
||||
hypervisor. Any combination of compressed and uncompressed images
|
||||
can be used for the image and vmm options.
|
||||
|
||||
2005-09-15 Brett Johnson <brett@hp.com>
|
||||
* Applied patch from Tristan Gingold to add dcache flush and sync with
|
||||
icache to gzip and plain loaders. This ommision was just noticed now
|
||||
due to the much larger caches in Montecito, and the smaller size of
|
||||
Xen (as compared to the linux kernel).
|
||||
|
||||
2004-09-27 Brett Johnson <brett@hp.com>
|
||||
* Increase the hardcoded size of the texmenu chooser menu from 16 to 64
|
||||
|
||||
2004-09-23 Brett Johnson <brett@hp.com>
|
||||
* Fix for 924147. Thanks to Stephanie Schaaf <sas@sgi.com> for a patch
|
||||
that the fix is based on.
|
||||
|
||||
2004-02-19 Brett Johnson <brett@hp.com>
|
||||
* Fixed bug where default image initrd would carry over to another
|
||||
image that was selected interactively (iff the newly selected image
|
||||
did not have an initrd).
|
||||
* Added support for subnet-specific config files in netfs.
|
||||
|
||||
2004-02-17 Brett Johnson <brett@hp.com>
|
||||
* integrated ia32 compressed kernel support from Matt Tolentino
|
||||
<matthew.e.tolentino@intel.com>
|
||||
|
||||
2003-08-20 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* released 3.4
|
||||
|
||||
2003-08-19 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* integrated ia32 updates from Matt
|
||||
Tolentino <matthew.e.tolentino@intel.com>
|
||||
|
||||
2003-08-13 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* updated elilo.txt and netbooting.txt
|
||||
* fix a bug in choosers/simple.c:print_infos().
|
||||
|
@ -171,37 +266,47 @@
|
|||
* updated simple chooser set of builtin command keys
|
||||
* command keys are only valid if first on the line
|
||||
* increase default buffer size and increment when netbooting
|
||||
|
||||
2003-06-04 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fix fs/netfs.c to work with recent version
|
||||
of EFI (14.61 or higher) which do not have the
|
||||
TFTP problem anymore. fix submitted by Guy Laborde
|
||||
|
||||
2003-04-21 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* ext2fs support is turned off by default to avoid
|
||||
problems with ext3-formatted partitions.
|
||||
* added gcc version check. MUST use 3.0 or higher
|
||||
|
||||
2003-03-03 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added check on dev_tab in fs/*fs.c:*_uninstall()
|
||||
|
||||
2003-02-07 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* clean up in glue_localfs.c w.r.t. CHAR16 in set_default_path()
|
||||
* added support for extracting basename of bootloader path
|
||||
when using BOOTP (DHCP) only. The prefix is then used for all files
|
||||
open via netfs. Suggestion and initial patch by Guy Laborde from HP.
|
||||
|
||||
2003-01-28 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fix the set_default_path() routine in glue_localfs.c. It would not
|
||||
correctly get the basename of the devpath. This caused the
|
||||
elilo.conf not to be found sometimes.
|
||||
|
||||
2003-01-21 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fix bug in glue_netfs.c convert_ip2decstr() which caused some IP
|
||||
addresses to be incorrectly converted to strings.
|
||||
|
||||
2002-11-01 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fix bug in -r option for IA64. There is no argument to this option.
|
||||
|
||||
2002-10-15 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fixed a double free bug for the kernel memory in case of abort.
|
||||
(bug spotted by Levent Akyl from Intel)
|
||||
* released 3.3a
|
||||
|
||||
2002-09-14 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* applied patch from Andreas Schwab <schwab@suse.de> to eliloalt.c.
|
||||
eliloalt dynamically selects a variable in /proc/efi/vars.
|
||||
|
||||
2002-09-12 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* removed extra free() from fs/ext2fs.c:ext2fs_init_state().
|
||||
Bug report and fix by NOMURA Jun'ichi <j-nomura@ce.jp.nec.com>
|
||||
|
@ -209,25 +314,31 @@
|
|||
was bigger than the 128KB limit of EFI causing some weird fimrware
|
||||
errors. bug reported by OMURA Jun'ichi <j-nomura@ce.jp.nec.com>
|
||||
* on IA-64 forbid the use of f32-f127 by the compiler (EFI spec)
|
||||
|
||||
2002-09-10 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fix a bug in argify() that was causing an EFI assertion
|
||||
when aborting at the elilo prompt when netbooted.
|
||||
|
||||
2002-08-26 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fixed devschemes/simple.c to use SPrint() instead of its own buggy
|
||||
conversion code (spotted by Richard Hirst).
|
||||
* fix bug in argify() when there was no NULL character in the string.
|
||||
* released 3.3
|
||||
|
||||
2002-08-19 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added fpswa.txt in the docs directory
|
||||
* updated elilo.txt
|
||||
|
||||
2002-08-15 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added -F file option for IA-64 to allow a specific fpswa driver to be loaded
|
||||
* fixed fpswa.c to try and load the driver from all accessible partitions
|
||||
* added support to load (plain or gzipped) big-endian ELF/ia64 binaries using p_paddr.
|
||||
* fixed problem in fs/netfs.c causing large (>4MB) binaries to fail the Mftp() call
|
||||
|
||||
2002-06-13 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* Changed the despecialization character for the variables from \\ to &
|
||||
to avoid conflicts with \\ as a path separator
|
||||
|
||||
2002-06-11 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fixed the return value in efi_main(). elilo was always returning
|
||||
success even in case of failure. Bug reported by Egan Ford <egan@sense.net>
|
||||
|
@ -237,11 +348,13 @@
|
|||
compliant with EFI spec with regards to where it looks for files.
|
||||
With this patch, elilo will look in the directory it was loaded
|
||||
from, not on the root of the partition anymore.
|
||||
|
||||
2002-03-04 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* released version 3.2
|
||||
* cleanup some GNU extension in fs/ext2fs.c (variable size array)
|
||||
* updated all documentation. Added netbooting.txt, simple_chooser.txt,
|
||||
eliloalt.txt, elilovar.txt
|
||||
|
||||
2002-02-21 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added a Linux utility program (elilovar in tools) to set/read/delete
|
||||
the EliloAlt EFI variable used to specify an alternate kernel to boot.
|
||||
|
@ -249,19 +362,24 @@
|
|||
* added support for hostname,domain name extraction in fs/netfs.c
|
||||
* fixed all known bugs in alternate.c
|
||||
* integrated patch from SGI to fix load offset for relocatable kernels (Jack Steiner, Brent Casavant)
|
||||
|
||||
2002-02-21 Michael Johnston <michael.johnston@intel.com> and Chris Ahna <christopher.j.ahna@intel.com>
|
||||
* major update to ia32 support: can now boot 2.4.x, and 2.2.x kernels
|
||||
|
||||
2002-02-20 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* fixed missing netfs_fd_free() in case of file not found in netfs.c
|
||||
|
||||
2002-02-19 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added support for substitution variables (vars.c)
|
||||
* changed the bootparam structure size back to 4kB
|
||||
* added support to simple to print final command line option with tab key
|
||||
* got rid of all the \r characters in strings use only \n (adjust emulator)
|
||||
* added EFICRT0 variable in Makefile to indicate location of loader script+crt0
|
||||
|
||||
2002-02-14 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* added support for message= option to simple chooser
|
||||
* added support for description= option to simple chooser
|
||||
|
||||
2002-02-13 Stephane Eranian <eranian@hpl.hp.com>
|
||||
* choosers/textmenu.c: new textmenu chooser (by rhirst@linuxcare.com) used by Debian
|
||||
* config.c: added support for dynamic global/per-image option management
|
||||
|
@ -290,6 +408,7 @@
|
|||
mode was specified in config file. In this case, we now autoboot
|
||||
and ignore the prompt directive.
|
||||
* updated elilo.txt
|
||||
|
||||
2001-08-15 Brent Casavant <bcasavan@sgi.com>
|
||||
* fix a bug in config.c:find_option() where it would do
|
||||
a strXcmp() on a NULL string.
|
||||
|
|
|
@ -61,14 +61,17 @@ EFICRT0 = /usr/lib
|
|||
|
||||
CDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
|
||||
TOPDIR =
|
||||
ALLSUBDIRS = ia32 ia64 x86_64 fs choosers devschemes tools
|
||||
|
||||
ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
|
||||
INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol
|
||||
HOSTARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
|
||||
ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH | sed s,i[3456789]86,ia32, | sed s,amd64,x86_64, )
|
||||
INCDIR = -I. -I$(TOPDIR) -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol -I$(TOPDIR)/efi110
|
||||
CPPFLAGS = -DCONFIG_$(ARCH)
|
||||
|
||||
OPTIMFLAGS = -O2
|
||||
DEBUGFLAGS = -Wall
|
||||
CFLAGS = $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS)
|
||||
CFLAGS = $(ARCH3264) $(OPTIMFLAGS) -fno-stack-protector -fno-strict-aliasing -fpic -fshort-wchar $(DEBUGFLAGS)
|
||||
ASFLAGS = $(ARCH3264)
|
||||
LDFLAGS = -nostdlib -znocombreloc
|
||||
INSTALL = install
|
||||
|
||||
|
@ -108,10 +111,30 @@ OBJCOPY = $(prefix)objcopy
|
|||
|
||||
# Use Modified binutils that supports x86_64 using UEFI ABI
|
||||
ifeq ($(ARCH), x86_64)
|
||||
ifeq ($(HOSTARCH), ia32)
|
||||
ARCH3264 = -m64
|
||||
LD3264 = -melf_x86_64
|
||||
|
||||
GNUEFILIB := $(GNUEFILIB)64
|
||||
EFILIB := $(EFILIB)64
|
||||
EFICRT0 := $(EFICRT0)64
|
||||
endif
|
||||
|
||||
CFLAGS += -DEFI_FUNCTION_WRAPPER
|
||||
OBJCOPY = /usr/bin/objcopy
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH), ia32)
|
||||
ifeq ($(HOSTARCH), x86_64)
|
||||
ARCH3264 = -m32
|
||||
LD3264 = -melf_i386
|
||||
|
||||
GNUEFILIB := /usr/lib32
|
||||
EFILIB := /usr/lib32
|
||||
EFICRT0 := /usr/lib32
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),ia64)
|
||||
GCC_VERSION=$(shell $(CROSS_COMPILE)$(CC) -v 2>&1 | fgrep 'gcc version' | cut -f3 -d' ' | cut -f1 -d'.')
|
||||
|
||||
|
|
21
Makefile
21
Makefile
|
@ -25,15 +25,19 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include Make.defaults
|
||||
TOPDIR=.
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/Make.defaults
|
||||
TOPDIR = $(SRCDIR)
|
||||
|
||||
|
||||
CRTOBJS = $(EFICRT0)/crt0-efi-$(ARCH).o
|
||||
LDSCRIPT = $(EFICRT0)/elf_$(ARCH)_efi.lds
|
||||
|
||||
LDFLAGS += -T $(LDSCRIPT) -shared -Bsymbolic -L$(EFILIB) -L$(GNUEFILIB) $(CRTOBJS)
|
||||
LOADLIBES = -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name)
|
||||
LOADLIBES = -lefi -lgnuefi $(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
|
||||
FORMAT = efi-app-$(ARCH)
|
||||
|
||||
FILESYSTEM =
|
||||
|
@ -67,7 +71,7 @@ endif
|
|||
FILES = elilo.o getopt.o strops.o loader.o \
|
||||
fileops.o util.o vars.o alloc.o chooser.o \
|
||||
config.o initrd.o alternate.o bootparams.o \
|
||||
gunzip.o fs/fs.o \
|
||||
gunzip.o console.o fs/fs.o \
|
||||
choosers/choosers.o \
|
||||
devschemes/devschemes.o \
|
||||
$(ARCH)/sysdeps.o \
|
||||
|
@ -81,18 +85,19 @@ elilo.efi: elilo.so
|
|||
|
||||
elilo.so: $(FILES)
|
||||
|
||||
elilo.o : elilo.c
|
||||
elilo.o : elilo.c $(ARCH)/sysdeps.h
|
||||
|
||||
fileops.o : Make.defaults
|
||||
chooser.o : Make.defaults
|
||||
|
||||
$(SUBDIRS): dummy
|
||||
$(MAKE) -C $@
|
||||
mkdir -p $@
|
||||
$(MAKE) -C $@ -f $(SRCDIR)/../$@/Makefile SRCDIR=$(SRCDIR)/../$@ ARCH=$(ARCH)
|
||||
|
||||
dummy:
|
||||
|
||||
clean:
|
||||
@set -e ; for d in $(SUBDIRS) ; do $(MAKE) -C $$d $@ ; done
|
||||
@set -e ; for d in $(ALLSUBDIRS) ; do $(MAKE) -C $$d $@ ; done
|
||||
rm -f $(TARGETS) *~ *.so $(FILES)
|
||||
|
||||
.PRECIOUS: elilo.so
|
||||
|
@ -106,4 +111,4 @@ ifeq ($(GCC_VERSION),2)
|
|||
@exit 1
|
||||
endif
|
||||
|
||||
include Make.rules
|
||||
include $(SRCDIR)/Make.rules
|
||||
|
|
52
alloc.c
52
alloc.c
|
@ -105,13 +105,13 @@ alloc(UINTN size, EFI_MEMORY_TYPE type)
|
|||
|
||||
status = uefi_call_wrapper(BS->AllocatePool, 3, type, size, &tmp);
|
||||
if (EFI_ERROR(status)) {
|
||||
ERR_PRT((L"allocator: AllocatePool(%d, %d, 0x%x) failed (%r)\n", type, size, status));
|
||||
ERR_PRT((L"allocator: AllocatePool(%d, %d) failed (%r)\n", type, size, status));
|
||||
return NULL;
|
||||
}
|
||||
alloc_add(tmp, size, ALLOC_POOL);
|
||||
|
||||
DBG_PRT((L"alloc: allocated %d bytes @[0x%lx-0x%lx]\n", size, tmp, tmp+size));
|
||||
|
||||
#ifdef DEBUG_MEM
|
||||
DBG_PRT((L"alloc: allocated %d bytes @[" PTR_FMT "-" PTR_FMT "]", size, tmp, tmp+size));
|
||||
#endif
|
||||
return tmp;
|
||||
}
|
||||
|
||||
|
@ -140,7 +140,7 @@ alloc_pages(UINTN pgcnt, EFI_MEMORY_TYPE type, EFI_ALLOCATE_TYPE where, VOID *ad
|
|||
|
||||
alloc_add(addr, pgcnt, ALLOC_PAGES);
|
||||
|
||||
DBG_PRT((L"allocator: allocated %d pages @0x%lx\n", pgcnt, tmp));
|
||||
DBG_PRT((L"allocator: allocated %d pages @" PTR_FMT, pgcnt, tmp));
|
||||
|
||||
return addr;
|
||||
}
|
||||
|
@ -158,13 +158,14 @@ free(VOID *addr)
|
|||
if (p->addr == addr) goto found;
|
||||
}
|
||||
/* not found */
|
||||
VERB_PRT(1, Print(L"allocator: invalid free @ 0x%lx\n", addr));
|
||||
VERB_PRT(1, Print(L"allocator: invalid free @ " PTR_FMT "\n", addr));
|
||||
return;
|
||||
found:
|
||||
DBG_PRT((L"free: %s @0x%lx size=%ld\n",
|
||||
#ifdef DEBUG_MEM
|
||||
DBG_PRT((L"free: %s @" PTR_FMT " size=%d",
|
||||
p->type == ALLOC_POOL ? L"Pool": L"Page",
|
||||
addr, p->size));
|
||||
|
||||
#endif
|
||||
if (p->type == ALLOC_POOL)
|
||||
uefi_call_wrapper(BS->FreePool, 1, addr);
|
||||
else
|
||||
|
@ -194,9 +195,9 @@ free_all(VOID)
|
|||
alloc_entry_t *tmp;
|
||||
|
||||
while(used_allocs) {
|
||||
|
||||
DBG_PRT((L"free_all %a @ 0x%lx\n", used_allocs->type == ALLOC_POOL ? "pool" : "pages", used_allocs->addr));
|
||||
|
||||
#ifdef DEBUG_MEM
|
||||
DBG_PRT((L"free_all %a @ " PTR_FMT, used_allocs->type == ALLOC_POOL ? "pool" : "pages", used_allocs->addr));
|
||||
#endif
|
||||
if (used_allocs->type == ALLOC_POOL)
|
||||
uefi_call_wrapper(BS->FreePool, 1, used_allocs->addr);
|
||||
else
|
||||
|
@ -212,6 +213,27 @@ free_all(VOID)
|
|||
}
|
||||
}
|
||||
|
||||
INTN
|
||||
alloc_kmem_anywhere(VOID **start_addr, UINTN pgcnt)
|
||||
{
|
||||
void * tmp;
|
||||
/*
|
||||
* During "AllocateAnyPages" *start_addr will be ignored.
|
||||
* Therefore we can safely subvert it to reuse this function with
|
||||
* an alloc_kmem_anyhwere_below() semantic...
|
||||
*/
|
||||
tmp = alloc_pages(pgcnt, EfiLoaderData,
|
||||
(*start_addr) ? AllocateMaxAddress : AllocateAnyPages,
|
||||
*start_addr);
|
||||
if (tmp == NULL) return -1;
|
||||
|
||||
kmem_addr = tmp;
|
||||
kmem_pgcnt = pgcnt;
|
||||
*start_addr = tmp;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
INTN
|
||||
alloc_kmem(VOID *start_addr, UINTN pgcnt)
|
||||
{
|
||||
|
@ -226,13 +248,17 @@ alloc_kmem(VOID *start_addr, UINTN pgcnt)
|
|||
VOID
|
||||
free_kmem(VOID)
|
||||
{
|
||||
DBG_PRT((L"free_kmem before (%lx, %ld)\n", kmem_addr, kmem_pgcnt));
|
||||
#ifdef DEBUG_MEM
|
||||
DBG_PRT((L"free_kmem before (" PTR_FMT ", %d)", kmem_addr, kmem_pgcnt));
|
||||
#endif
|
||||
if (kmem_addr && kmem_pgcnt != 0) {
|
||||
free(kmem_addr);
|
||||
kmem_addr = NULL;
|
||||
kmem_pgcnt = 0;
|
||||
}
|
||||
DBG_PRT((L"free_kmem after (%lx, %ld)\n", kmem_addr, kmem_pgcnt));
|
||||
#ifdef DEBUG_MEM
|
||||
DBG_PRT((L"free_kmem after (" PTR_FMT ", %d)", kmem_addr, kmem_pgcnt));
|
||||
#endif
|
||||
}
|
||||
|
||||
VOID
|
||||
|
|
|
@ -56,7 +56,7 @@ static EFI_GUID altk_guid={0,};
|
|||
* Please note that no fatal error is reported by this function
|
||||
*/
|
||||
INTN
|
||||
alternate_kernel(CHAR16 *buffer, INTN size)
|
||||
alternate_kernel(CHAR16 *buffer, UINTN size)
|
||||
{
|
||||
EFI_STATUS status;
|
||||
INTN ret = -1;
|
||||
|
|
|
@ -67,9 +67,6 @@ create_boot_params(CHAR16 *args, memdesc_t *initrd, memdesc_t *vmcode, UINTN *co
|
|||
|
||||
/*
|
||||
* Allocate memory for boot parameters.
|
||||
* This CANNOT be EfiLoaderData or EfiLoaderCode as the kernel
|
||||
* frees this region when initializing.
|
||||
* FIXME: Is this a bug? (since the memory type *is* EfiLoaderData)
|
||||
*/
|
||||
|
||||
bp = (boot_params_t *)alloc(BOOT_PARAM_MEMSIZE, EfiLoaderData);
|
||||
|
@ -78,7 +75,7 @@ create_boot_params(CHAR16 *args, memdesc_t *initrd, memdesc_t *vmcode, UINTN *co
|
|||
return 0;
|
||||
}
|
||||
|
||||
VERB_PRT(3, Print(L"boot params @ 0x%lx\n", bp));
|
||||
VERB_PRT(3, Print(L"boot params @ " PTR_FMT "\n", bp));
|
||||
|
||||
/* XXX: need to fix this for 3.5 */
|
||||
#ifdef CONFIG_ia64
|
||||
|
@ -96,6 +93,8 @@ create_boot_params(CHAR16 *args, memdesc_t *initrd, memdesc_t *vmcode, UINTN *co
|
|||
*/
|
||||
Memset(bp, 0, BOOT_PARAM_MEMSIZE);
|
||||
|
||||
U2ascii(args, cp, cmdline_size);
|
||||
|
||||
if (sysdeps_create_boot_params(bp, cp, initrd, vmcode, cookie) == -1) return 0;
|
||||
|
||||
/*
|
||||
|
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=
|
||||
|
||||
|
@ -42,17 +47,14 @@ TARGET=choosers.o
|
|||
|
||||
all: $(TARGET)
|
||||
|
||||
$(TARGET): check-choosers $(TOPDIR)/Make.defaults $(FILES)
|
||||
$(LD) -o $@ -r $(FILES)
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
||||
check-choosers:
|
||||
@if [ -n "$(FILES)" ]; then \
|
||||
exit 0; \
|
||||
else \
|
||||
$(TARGET): $(TOPDIR)/Make.defaults $(FILES)
|
||||
@if [ -z "$(FILES)" ]; then \
|
||||
echo "You need to define at least one chooser in Make.defaults"; \
|
||||
exit 1; \
|
||||
fi
|
||||
$(LD) $(LD3264) -o $@ -r $(FILES)
|
||||
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include "elilo.h"
|
||||
#include "vars.h"
|
||||
#include "console.h"
|
||||
|
||||
/* static is ugly but does the job here! */
|
||||
static CHAR16 **alt_argv;
|
||||
|
@ -40,8 +41,8 @@ static VOID
|
|||
display_label_info(CHAR16 *name)
|
||||
{
|
||||
CHAR16 *desc;
|
||||
CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||
CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||
CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||
CHAR16 options_tmp[CMDLINE_MAXLEN];
|
||||
CHAR16 options[CMDLINE_MAXLEN];
|
||||
CHAR16 kname[FILENAME_MAXLEN];
|
||||
|
@ -220,7 +221,7 @@ display_message(VOID)
|
|||
{
|
||||
fops_fd_t fd;
|
||||
EFI_STATUS status;
|
||||
INTN len, i;
|
||||
UINTN len, i;
|
||||
CHAR16 *filename;
|
||||
CHAR8 buf[256];
|
||||
|
||||
|
@ -253,10 +254,10 @@ simple_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmdli
|
|||
# define BOOT_IMG_STR L"BOOT_IMAGE="
|
||||
CHAR16 buffer[CMDLINE_MAXLEN];
|
||||
CHAR16 alt_buffer[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||
CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||
CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||
CHAR16 args[CMDLINE_MAXLEN];
|
||||
CHAR16 devname[CMDLINE_MAXLEN];
|
||||
CHAR16 devname[PATHNAME_MAXLEN];
|
||||
CHAR16 dpath[FILENAME_MAXLEN];
|
||||
CHAR16 *slash_pos, *colon_pos, *backslash_pos;
|
||||
UINTN len;
|
||||
|
@ -288,8 +289,10 @@ restart:
|
|||
}
|
||||
|
||||
if (elilo_opt.prompt) {
|
||||
ret = select_kernel(buffer, sizeof(buffer));
|
||||
console_textmode();
|
||||
ret = select_kernel(buffer, CMDLINE_MAXLEN);
|
||||
if (ret == -1) return -1;
|
||||
/* this function takes really the number of bytes ... */
|
||||
argc = argify(buffer,sizeof(buffer), argv);
|
||||
index = 0;
|
||||
}
|
||||
|
@ -355,7 +358,7 @@ restart:
|
|||
|
||||
if (elilo_opt.prompt == 0) {
|
||||
/* minimal printing */
|
||||
Print(L"ELILO\n");
|
||||
Print(L"ELILO v%s for EFI/%a\n", ELILO_VERSION, ELILO_ARCH);
|
||||
ret = wait_timeout(elilo_opt.delay);
|
||||
if (ret != 0) {
|
||||
elilo_opt.prompt = 1;
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <efilib.h>
|
||||
|
||||
#include "elilo.h"
|
||||
#include "console.h"
|
||||
|
||||
#define MAX_LABELS 64
|
||||
#define MSGBUFLEN 4096
|
||||
|
@ -186,12 +187,12 @@ paint_menu(VOID)
|
|||
}
|
||||
|
||||
static INTN
|
||||
read_message_file(INTN msg, INT8 *buf, INTN max)
|
||||
read_message_file(INTN msg, UINT8 *buf, UINTN max)
|
||||
{
|
||||
CHAR16 *filename;
|
||||
fops_fd_t message_fd;
|
||||
EFI_STATUS status;
|
||||
INTN len = max;
|
||||
UINTN len = max;
|
||||
|
||||
if (msg > 10) return 0;
|
||||
|
||||
|
@ -362,10 +363,10 @@ textmenu_choose(CHAR16 **argv, INTN argc, INTN index, CHAR16 *kname, CHAR16 *cmd
|
|||
{
|
||||
# define BOOT_IMG_STR L"BOOT_IMAGE="
|
||||
CHAR16 label[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd_name[CMDLINE_MAXLEN];
|
||||
CHAR16 vmcode_name[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd_name[PATHNAME_MAXLEN];
|
||||
CHAR16 vmcode_name[PATHNAME_MAXLEN];
|
||||
CHAR16 args[CMDLINE_MAXLEN];
|
||||
CHAR16 devname[CMDLINE_MAXLEN];
|
||||
CHAR16 devname[PATHNAME_MAXLEN];
|
||||
CHAR16 dpath[FILENAME_MAXLEN];
|
||||
CHAR16 *slash_pos, *colon_pos, *backslash_pos;
|
||||
UINTN len;
|
||||
|
@ -394,6 +395,7 @@ restart:
|
|||
Memset(&elilo_opt.img_opt, 0, sizeof(elilo_opt.img_opt));
|
||||
|
||||
if (elilo_opt.prompt) {
|
||||
console_textmode();
|
||||
ret = select_kernel(label, sizeof(label));
|
||||
if (ret == -1) return -1;
|
||||
argc = argify(PromptBuf,sizeof(PromptBuf), argv);
|
||||
|
@ -466,7 +468,7 @@ restart:
|
|||
|
||||
if (elilo_opt.prompt == 0) {
|
||||
/* minimal printing */
|
||||
Print(L"ELILO\n");
|
||||
Print(L"ELILO v%s for EFI/%a\n", ELILO_VERSION, ELILO_ARCH);
|
||||
ret = wait_timeout(elilo_opt.delay);
|
||||
if (ret != 0) {
|
||||
elilo_opt.prompt = 1;
|
||||
|
|
30
config.c
30
config.c
|
@ -56,7 +56,7 @@
|
|||
*/
|
||||
#define ELILO_DEFAULT_CONFIG L"elilo.conf"
|
||||
|
||||
#define MAX_STRING CMDLINE_MAXLEN
|
||||
#define MAX_STRING 512
|
||||
#define CONFIG_BUFSIZE 512 /* input buffer size */
|
||||
|
||||
/*
|
||||
|
@ -71,7 +71,7 @@ typedef struct boot_image {
|
|||
struct boot_image *next;
|
||||
CHAR16 label[MAX_STRING];
|
||||
CHAR16 kname[FILENAME_MAXLEN];
|
||||
CHAR16 options[MAX_STRING];
|
||||
CHAR16 options[CMDLINE_MAXLEN];
|
||||
CHAR16 initrd[FILENAME_MAXLEN];
|
||||
CHAR16 vmcode[FILENAME_MAXLEN];
|
||||
CHAR16 root[FILENAME_MAXLEN];
|
||||
|
@ -100,7 +100,7 @@ typedef struct {
|
|||
CHAR16 root[FILENAME_MAXLEN]; /* globally defined root fs */
|
||||
CHAR16 initrd[FILENAME_MAXLEN];/* globally defined initrd */
|
||||
CHAR16 vmcode[FILENAME_MAXLEN];/* globally defined boot-time module */
|
||||
CHAR16 options[MAX_STRING];
|
||||
CHAR16 options[CMDLINE_MAXLEN];
|
||||
CHAR16 default_image_name[MAX_STRING];
|
||||
CHAR16 message_file[MAX_MESSAGES][FILENAME_MAXLEN];
|
||||
CHAR16 chooser[FILENAME_MAXLEN];/* which image chooser to use */
|
||||
|
@ -255,7 +255,16 @@ next(VOID)
|
|||
back = 0;
|
||||
return ch;
|
||||
}
|
||||
return getc();
|
||||
/*
|
||||
* config files served from pxe/tftpboot windows servers can contain
|
||||
* extraneous '\r' characters, often the first char in the file, and
|
||||
* we need to simply skip over those and continue on
|
||||
*/
|
||||
ch = getc();
|
||||
if(ch == '\r')
|
||||
ch = getc();
|
||||
|
||||
return ch;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -310,13 +319,13 @@ get_token_core(CHAR16 *str, UINTN maxlen, BOOLEAN rhs)
|
|||
CHAR16 *here;
|
||||
|
||||
for (;;) {
|
||||
while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n') line_num++;
|
||||
while ((ch = next()), ch == ' ' || ch == '\t' || ch == '\n') if (ch == '\n' ) line_num++;
|
||||
|
||||
if (ch == CHAR_EOF) return TOK_EOF;
|
||||
|
||||
/* skip comment line */
|
||||
if (ch != '#') break;
|
||||
|
||||
/* skip comment line */
|
||||
while ((ch = next()), ch != '\n') if (ch == CHAR_EOF) return TOK_EOF;
|
||||
line_num++;
|
||||
}
|
||||
|
@ -762,7 +771,10 @@ config_parse(VOID)
|
|||
|
||||
if (tok == TOK_EOF) break;
|
||||
|
||||
if (tok == TOK_ERR) return -1;
|
||||
if (tok == TOK_ERR) {
|
||||
Print(L"Bad Token from elilo config file, parser read: %s\n elilo exiting\n", str);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if ( (p = find_option(current_options, str)) == NULL) {
|
||||
config_error(L"Unkown option %s", str);
|
||||
|
@ -897,10 +909,10 @@ print_label_list(VOID)
|
|||
{
|
||||
boot_image_t *img, *dfl = global_config.default_image;
|
||||
|
||||
if (dfl) Print(L"\t%s\n", dfl->label);
|
||||
if (dfl) Print(L" %s\n", dfl->label);
|
||||
|
||||
for (img = image_list; img; img = img->next) {
|
||||
if (img != dfl) Print(L"\t%s\n", img->label);
|
||||
if (img != dfl) Print(L" %s\n", img->label);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,71 @@
|
|||
/*
|
||||
* console.c - Console screen handling functions
|
||||
*
|
||||
* Copyright (C) 2006 Christoph Pfisterer
|
||||
*
|
||||
* This file is part of the ELILO, the EFI Linux boot loader.
|
||||
*
|
||||
* ELILO is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* ELILO is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with ELILO; see the file COPYING. If not, write to the Free
|
||||
* Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*
|
||||
* Please check out the elilo.txt for complete documentation on how
|
||||
* to use this program.
|
||||
*/
|
||||
|
||||
#include <efi.h>
|
||||
#include <efilib.h>
|
||||
|
||||
#include "elilo.h"
|
||||
|
||||
#include <efiConsoleControl.h>
|
||||
|
||||
static EFI_GUID console_guid = EFI_CONSOLE_CONTROL_PROTOCOL_GUID;
|
||||
|
||||
static BOOLEAN console_inited = FALSE;
|
||||
|
||||
static EFI_CONSOLE_CONTROL_PROTOCOL *console_control;
|
||||
|
||||
/*
|
||||
* Initialize console functions
|
||||
*/
|
||||
static VOID console_init(VOID)
|
||||
{
|
||||
EFI_STATUS status;
|
||||
|
||||
if (!console_inited) {
|
||||
console_inited = TRUE;
|
||||
|
||||
status = LibLocateProtocol(&console_guid, (VOID **) &console_control);
|
||||
if (EFI_ERROR(status))
|
||||
console_control = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Switch the console to text mode
|
||||
*/
|
||||
|
||||
VOID console_textmode(VOID)
|
||||
{
|
||||
EFI_CONSOLE_CONTROL_SCREEN_MODE console_mode;
|
||||
|
||||
console_init();
|
||||
|
||||
if (console_control != NULL) {
|
||||
uefi_call_wrapper(console_control->GetMode, 4, console_control, &console_mode, NULL, NULL);
|
||||
if (console_mode == EfiConsoleControlScreenGraphics)
|
||||
uefi_call_wrapper(console_control->SetMode, 2, console_control, EfiConsoleControlScreenText);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,32 @@
|
|||
/*
|
||||
* console.h - Console screen handling functions
|
||||
*
|
||||
* Copyright (C) 2006 Christoph Pfisterer
|
||||
*
|
||||
* This file is part of the ELILO, the EFI Linux boot loader.
|
||||
*
|
||||
* ELILO is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* ELILO is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with ELILO; see the file COPYING. If not, write to the Free
|
||||
* Software Foundation, 59 Temple Place - Suite 330, Boston, MA
|
||||
* 02111-1307, USA.
|
||||
*
|
||||
* Please check out the elilo.txt for complete documentation on how
|
||||
* to use this program.
|
||||
*/
|
||||
|
||||
#ifndef __ELILO_CONSOLE_H__
|
||||
#define __ELILO_CONSOLE_H__
|
||||
|
||||
extern VOID console_textmode(VOID);
|
||||
|
||||
#endif /* __ELILO_CONSOLE_H__ */
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=simple.o
|
||||
|
||||
|
@ -40,7 +45,7 @@ all: $(TARGET)
|
|||
# without doing make clean.
|
||||
#
|
||||
$(TARGET): $(FILES)
|
||||
$(LD) -r -o $@ $(FILES)
|
||||
$(LD) $(LD3264) -r -o $@ $(FILES)
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
|
|
@ -0,0 +1,522 @@
|
|||
--------------------------------------------------------------------
|
||||
ELILO.EFI: Linux boot loader for
|
||||
EFI/IA-64,EFI/IA-32 and EFI/x86_64 based systems
|
||||
--------------------------------------------------------------------
|
||||
Stephane Eranian <eranian@hpl.hp.com>
|
||||
|
||||
August 2003
|
||||
|
||||
Copyright (C) 2000-2012 Hewlett-Packard Co.
|
||||
Copyright (C) 2006-2010 Intel Co.
|
||||
|
||||
|
||||
I/ Introduction
|
||||
------------
|
||||
|
||||
This document describes how to use ELILO on for IA-64, IA-32 and x86_64 EFI-based platforms.
|
||||
This document describes ELILO version 3.7 - 3.14.
|
||||
|
||||
II/ Command line options
|
||||
--------------------
|
||||
|
||||
elilo [-hDpPVvaE] [-d nsec] [-C config] [-i initrd] [-c chooser] [kernel [kernel options...]]
|
||||
|
||||
-h Display a list of all possible command line options.
|
||||
|
||||
-V Print the version number and exit.
|
||||
|
||||
-d nsec Specify the number of 10th of seconds before loading the
|
||||
kernel.
|
||||
|
||||
-C file Specify the config file to use. The default is elilo.conf in the directory
|
||||
that elilo.efi was loaded from.
|
||||
|
||||
-P Verify config file syntax only. this option causes ELILO to
|
||||
parse the config file and generate a report on the console.
|
||||
No kernel is loaded.
|
||||
|
||||
-v Turn on verbose mode. ELILO prints more message about what it
|
||||
is doing. For each occurrence of this option the verbosity level
|
||||
is increased by one. The maximum level is 5.
|
||||
|
||||
-a Always check for alternate kernel image. The default behavior
|
||||
of ELILO is to NOT look for an alternate image. This
|
||||
option overrides this behavior and ELILO is checking for
|
||||
alternate images no matter what. Alternate images are
|
||||
specified using the EliloAlt EFI variable.
|
||||
|
||||
-p force interactive prompt mode. Valid when no kernel image is
|
||||
specified on the command line.
|
||||
|
||||
-D print debug output.
|
||||
|
||||
-E don't force EDD30 variable to TRUE when FALSE.
|
||||
|
||||
-i file Use file as the initial ramdisk (initrd).
|
||||
|
||||
-c name Specify which kernel chooser to use. Default is 'simple', and
|
||||
the only other choice at present is 'textmenu'.
|
||||
|
||||
In addition, elilo supports platform specific options:
|
||||
|
||||
For IA-64:
|
||||
----------
|
||||
-r the kernel image can be relocated if initial load address is not
|
||||
available. This options requires a special version of the kernel.
|
||||
|
||||
-F file will try to load the FPSWA driver indicated by 'file'. Only this file
|
||||
will be attempted. When no specific file is given, elilo will try
|
||||
loading \efi\intel firmware\fpswa.efi from all accessible EFI system
|
||||
partitions.
|
||||
For IA-32:
|
||||
----------
|
||||
no option defined.
|
||||
|
||||
All file names (including the kernel file) can include a device name using the
|
||||
following syntax:
|
||||
|
||||
dev_name:/path/to/my/kernel
|
||||
|
||||
The 'dev_name' component depends on the naming scheme selected and the detected
|
||||
devices for your system. Some choosers may print the information automatically
|
||||
or on demand, see chooser specific documentation for more on this. See README.devschemes
|
||||
for more information on device naming schemes. The slash character '/' can be used as
|
||||
a directory separator on any file systems including the EFI file system (FAT32).
|
||||
|
||||
For x86_64:
|
||||
----------
|
||||
none
|
||||
|
||||
III/ Configuration File
|
||||
------------------
|
||||
|
||||
ELILO supports a config file with options similar to the LILO/x86 boot loader.
|
||||
|
||||
Elilo will use the following sequence (shown in order) when looking for its config
|
||||
file when none is specified on the command line:
|
||||
|
||||
1/ AABBCCDD.conf (netbooting with regular DHCP)
|
||||
where AABBCCDD is the hexadecimal representation
|
||||
of the IP address assigned during the DHCP phase.
|
||||
|
||||
2/ elilo-ia64.conf or elilo-ia32.conf or elilo-x86_64.conf
|
||||
The choice depends on the client platform. This step allows
|
||||
the same DHCP/PXE server to provide files for both types of clients.
|
||||
|
||||
3/ elilo.conf
|
||||
|
||||
Unless explicitly specified on the command line, elilo looks for its config file
|
||||
in the filesystem and directory it was loaded from. For instance, if elilo.efi
|
||||
is invoked as:
|
||||
|
||||
fs0:\> \efi\debian\elilo.efi
|
||||
|
||||
Then elilo will look for its configuration file in fs0:\efi\debian and not
|
||||
in the root directory of fs0:. The prefix fs0:\efi\debian will be used for
|
||||
all other files that elilo needs to download when their paths are specified
|
||||
as being relative.
|
||||
|
||||
IMPORTANT:
|
||||
This rule also applies when a specific config file is passed via the -C
|
||||
option. For example:
|
||||
|
||||
fs0:\> \efi\debian\elilo.efi -C elilo.conf
|
||||
|
||||
This will look for elilo.conf in fs0:\efi\debian and not in fs0:\.
|
||||
To get to the elilo.conf in fs0:\, you need to specify the absolute
|
||||
path:
|
||||
|
||||
fs0:\> \efi\debian\elilo.efi -C \elilo.conf
|
||||
|
||||
|
||||
The configuration file is an ASCII file and not a UNICODE file.
|
||||
|
||||
The config file contains additional options to change the behavior of the loader.
|
||||
If the same option is specified in the config file AND on the command line, the
|
||||
latter takes precedence. Not all options available in the config file have an
|
||||
equivalent on command line.
|
||||
|
||||
When elilo is invoked with the -h option, it prints the list of support command line
|
||||
options but also the list of config file options. For each option it also prints
|
||||
the type of data expected.
|
||||
|
||||
The config file options are divided in 2 groups:
|
||||
|
||||
|
||||
- image options which are specific to a particular kernel image. Each kernel image
|
||||
must be identified with a logical name called a label.
|
||||
|
||||
- global options which affect the behavior of ELILO and apply to all images.
|
||||
|
||||
The ELILO config file follows the LILO/x86 syntax. First come the global
|
||||
options, then the list of images and options for each of them, if
|
||||
necessary. At least one image MUST be defined and it is possible to have
|
||||
an empty list of global options.
|
||||
|
||||
Options have types. Three types are defined:
|
||||
- boolean: set or not set
|
||||
- string : a string of characters which can be quoted if necessary
|
||||
- number (in decimal)
|
||||
- filename: a string interpreted as a file name
|
||||
|
||||
|
||||
The config file supports the following options:
|
||||
|
||||
Global Options:
|
||||
---------------
|
||||
default=value Name the default image to boot. If not defined ELILO
|
||||
will boot the first defined image.
|
||||
|
||||
timeout=number The number of 10th of seconds to wait while in
|
||||
interactive mode before auto booting default kernel.
|
||||
Default is infinity.
|
||||
|
||||
delay=number The number of 10th of seconds to wait before
|
||||
auto booting when not in interactive mode.
|
||||
Default is 0.
|
||||
|
||||
prompt Force interactive mode
|
||||
|
||||
verbose=number Set level of verbosity [0-5]. Default 0 (no verbose)
|
||||
|
||||
root=filename Set global root filesystem for Linux/ia64
|
||||
|
||||
read-only Force root filesystem to be mounted read-only
|
||||
|
||||
append=string Append a string of options to kernel command line
|
||||
|
||||
initrd=filename Name of initrd file
|
||||
|
||||
image=filename Define a new image
|
||||
|
||||
chooser=name Specify kernel chooser to use: 'simple' or 'textmenu'.
|
||||
|
||||
message=filename a message that is printed on the main screen if supported by
|
||||
the chooser.
|
||||
|
||||
fX=filename Some choosers may take advantage of this option to
|
||||
display the content of a file when a certain function
|
||||
key X is pressed. X can vary from 1-12 to cover
|
||||
function keys F1 to F12.
|
||||
|
||||
noedd30 do not force the EDD30 EFI variable to TRUE when FALSE. In other
|
||||
words, don't force the EDD30 mode if not set.
|
||||
|
||||
Image options:
|
||||
--------------
|
||||
root=filename Set root filesystem for kernel
|
||||
|
||||
read-only Force root filesystem to be mounted read-only
|
||||
|
||||
append=string Append a string of options to kernel command line
|
||||
|
||||
initrd=filename Name of initrd file
|
||||
|
||||
label=string Logical name of image (used in interactive mode)
|
||||
|
||||
description=string One line text description of the image.
|
||||
|
||||
IA-64 specific options:
|
||||
-----------------------
|
||||
|
||||
Global options:
|
||||
---------------
|
||||
fpswa=file Specify the filename for a specific FPSWA to load.
|
||||
If this option is used then no other file will be tried.
|
||||
|
||||
relocatable In case of memory allocation error at initial load point of
|
||||
kernel, allow attempt to relocate (assume kernels is relocatable)
|
||||
|
||||
Image options:
|
||||
--------------
|
||||
relocatable In case of memory allocation error at initial load point of
|
||||
kernel, allow attempt to relocate (assume this kernel is relocatable)
|
||||
|
||||
IA-32 specific options:
|
||||
-----------------------
|
||||
legacy-free Indicate that the host machine does not have a legacy BIOS at all.
|
||||
|
||||
|
||||
The user can specify a kernel and related kernel options using the image label. Alternatively,
|
||||
the user can also specify a kernel file that is not specified in the config file. In any case,
|
||||
some of the global options (such as append) are always concatenated to whatever the user type.
|
||||
|
||||
x86_64 specific options:
|
||||
-----------------------
|
||||
text-mode elilo>=3.14 boolean, image config option to force text console mode.
|
||||
|
||||
IV/ Booting from the local system
|
||||
-----------------------------
|
||||
|
||||
The elilo.efi binary must be in an EFI system partition (FAT32). The config
|
||||
file, kernel image, and optional initrd ramdisk can be on the same partition
|
||||
or even another EFI partition. In the following discussion we assume that all
|
||||
files are on the same EFI partition which is recognized by the EFI shell (nshell)
|
||||
as fs0. The kernel and initrd can be copied from the any linux filesystems to the
|
||||
EFI partition using either the mtools (mcopy) or by mounting the EFI partition as
|
||||
a vfat partition. However you do not really need this because most linux
|
||||
distributions install both files in the EFI partition and mount this partition in /boot/efi.
|
||||
|
||||
To boot a kernel, simply power cycle the machine. Once you get to the EFI
|
||||
shell prompt, change to the filesystem that maps to the partition where elilo is.
|
||||
|
||||
Shell> fs0:
|
||||
fs0:\>
|
||||
|
||||
You might need to make sure that the Shell Path is set such that it will load
|
||||
ELILO from fs0:. You can verify this by typing:
|
||||
fs0:\> set
|
||||
path : fs0:\
|
||||
|
||||
At this point you can invoke ELILO:
|
||||
|
||||
fs0:\> elilo
|
||||
|
||||
If there is no config file, then it will:
|
||||
- pick up the kernel image named vmlinux if it exists, otherwise it will abort.
|
||||
- pass no argument to the kernel.
|
||||
|
||||
You can specify the kernel image and its options on the command line.
|
||||
For instance you can do:
|
||||
|
||||
fs0:\> elilo vmlinux root=/dev/sda5
|
||||
|
||||
You can specify as many parameters as you want. The syntax follows the kernel
|
||||
rule, i.e., list of value pairs (or even single values) separated by space.
|
||||
A more complicated example would be:
|
||||
|
||||
fs0:\> elilo -i initrd-2.4.9 vmlinuz-2.4.9 root=/dev/sda2 console=tty0 console="ttyS0,115200n8"
|
||||
|
||||
In this example, notice the double quotes. They are required because the comma is a control
|
||||
character for nshell.
|
||||
|
||||
In the case a config file is found, then elilo will behave according to
|
||||
the options in that file. However if elilo is invoked with command line options, they
|
||||
will be combined or they will override (if conflicting) what is defined in the config file.
|
||||
|
||||
As of version 3.3, elilo is fully compliant with the EFI specification (1.10) with regards
|
||||
to where the bootloader (elilo.efi) must be located in the EFI system partition. In
|
||||
section 11.2.1.3 of the EFI1.10 specification, it is said that in order to avoid conflicts
|
||||
between various loaders for various OSes or distributions of the same OS, every vendor MUST
|
||||
use a dedicated directory: \EFI\vendor\. The bootloader must be placed in this directory.
|
||||
This has always been possible as this is a matter of creating the directory and copying
|
||||
the elilo.efi file in it. However up until version 3.3, elilo would look for its config file
|
||||
and kernel/initrd in the root (/) of the partition it was loaded from. As of version 3.3,
|
||||
elilo will now ONLY look for its configuration file FROM THE DIRECTORY IT WAS LOADED FROM.
|
||||
The same applies to the kernel and initrd files unless absolute paths are specified. Let us
|
||||
look at a simple example:
|
||||
|
||||
- suppose elilo.efi is in \EFI\DIST if fs0: (for the EFI Shell)
|
||||
|
||||
- if you invoke elilo as follows:
|
||||
|
||||
fs0:\> \efi\dist\elilo -v -p
|
||||
default file path: \efi\dist\
|
||||
config file : \efi\dist\elilo.conf
|
||||
ELILO boot:
|
||||
|
||||
|
||||
Note that this is the same if you invoke elilo directly from \efi or \efi\dist.
|
||||
|
||||
File references in the configuration file are treated as relative to the directory
|
||||
elilo was loaded from except if they use an absolute path.
|
||||
|
||||
As of version 3.4 a similar rule applies to the network boot sequence, see netbooting.txt
|
||||
for details.
|
||||
|
||||
V/ Interactive mode
|
||||
----------------
|
||||
|
||||
Elilo can be forced into interactive mode using the "prompt" option in the config
|
||||
file or with the -p option. In this mode, the user can select a kernel to load.
|
||||
|
||||
The interface depends on the chooser, it may be a simple command line prompt as provided
|
||||
by the simple chooser or a more sophisticated screen with scroll menus as provided by
|
||||
textmenu. Most choosers depends on the elilo config file to get the information they
|
||||
display. The simple chooser can operated without the elilo config file. However it
|
||||
is always better to have this file, to create handy logical names for each possible
|
||||
boot choices. The logical names are specified with the "label" option in the config
|
||||
file. They represent a specific kernel "image" and its specific options.
|
||||
|
||||
In elilo, the user can select a particular kernel image using the corresponding label
|
||||
name. A simple example is as follows:
|
||||
|
||||
If we suppose that the following is defined in elilo.conf:
|
||||
|
||||
image=vmlinuz-2.4.9
|
||||
label=linux-up
|
||||
initrd=initrd-2.4.9
|
||||
root=/dev/sda2
|
||||
append="console=tty0 console=ttyS0,115200n8"
|
||||
|
||||
then the user can specify linux-up at the prompt and elilo will load the
|
||||
vmlinuz-2.4.9 kernel file and the initrd-2.4.9 ramdisk and will pass
|
||||
|
||||
"root=/dev/sda2 console=tty0 console=ttyS0,115200n8"
|
||||
|
||||
as command line arguments to the kernel.
|
||||
|
||||
This behavior is identical to Lilo/x86. However, elilo further allows the user
|
||||
to specify actual kernel files names as well, i.e., kernels that are not defined
|
||||
in the configuration file. If we reuse the above example and the simple chooser,
|
||||
the user can type:
|
||||
|
||||
ELILO boot: vmlinux-2.4.18 root=/dev/sda2
|
||||
|
||||
and elilo will boot the vmlinuz-2.4.18 kernel if it exists.
|
||||
|
||||
VI/ The alternate kernel image
|
||||
--------------------------
|
||||
|
||||
Oftentimes when debugging kernels you want to reboot the machine once with
|
||||
your test kernel and, if something goes wrong, you want to fall back to a more
|
||||
stable kernel. In addition you want to be able to do this from a remote machine.
|
||||
Many things can go wrong when doing kernel debugging. It could be that you don't
|
||||
even reach user-mode. In this case however, you still want to fall back to
|
||||
a stable kernel. The feature you'd like from a boot loader is 'boot once and
|
||||
then fall back to safe kernel'.
|
||||
|
||||
Elilo offers this feature and it's called 'alternate kernel image'.
|
||||
You can configure elilo to load a kernel only once and then whatever
|
||||
happens the next reboot falls back to a different kernel hopefully more stable.
|
||||
|
||||
To do this, elilo relies on an EFI variable called 'EliloAlt' with a NULL GUID.
|
||||
The content of this variable is a UNICODE string containing the kernel file name
|
||||
and its command line options.
|
||||
|
||||
When the -a option is specified on the command line or if the "checkalt" option
|
||||
is present in the config file, elilo will check for the presence of this variable.
|
||||
If found and the content is a valid UNICODE string, elilo will use it as the kernel
|
||||
to boot. There is no verification made on the validity of the kernel name or options.
|
||||
Then the variable is deleted. If the variable is rejected because it does not look
|
||||
sane, it is also deleted.
|
||||
|
||||
The variable can be set from a running Linux system using the /proc/efi/vars
|
||||
interface. In the tools directory of this package, there is a Linux tool called
|
||||
elilovar which can be used to create, modify, print, and delete the EliloAlt
|
||||
variable. Refer to eliloalt.txt for more information on this tool.
|
||||
|
||||
VII/ Auto booting the machine
|
||||
-----------------------
|
||||
|
||||
Once you're satisfied with your machine setup, it is good to install an
|
||||
auto boot procedure. You have two options to do this:
|
||||
- from the EFI boot manager menu
|
||||
- from the EFI shell
|
||||
|
||||
The first option is preferred and is used by most Linux distributions.
|
||||
Elilo can be invoked directly from the boot manager. You need to get into
|
||||
the 'boot maintenance' menu and use load file a file. This can be tedious
|
||||
so instead it is recommended that you use a Linux tool called efibootmgr
|
||||
which is also shipped in most distributions. With this tool, you can
|
||||
create your own boot option and change the boot order.
|
||||
|
||||
|
||||
|
||||
The second approach use the EFI shell and a shell script with a special name: 'startup.nsh'.
|
||||
|
||||
When the system boots, it looks for EFI partitions and if it finds
|
||||
a 'startup.nsh' file in ANY of these it will jumpstart execution from it.
|
||||
|
||||
So the typical way of auto booting your Linux/ia64 system is to simply create
|
||||
such a file with the following content:
|
||||
|
||||
# cat /boot/startup.nsh
|
||||
elilo vmlinuz root=/dev/sda2
|
||||
|
||||
Of course, this can be simplified if there is a configuration file.
|
||||
|
||||
|
||||
VII/ Netbooting
|
||||
----------
|
||||
|
||||
Please refer to netbooting.txt for a complete description of how to boot
|
||||
from the network.
|
||||
|
||||
|
||||
XII/ Booting on EFI/ia32 platforms
|
||||
-----------------------------
|
||||
|
||||
Until PC comes with the EFI firmware built in, you need to boot from a
|
||||
floppy that has the EFI firmware on it. Such floppy can be
|
||||
constructed from the EFI sample implementation and toolkit that is
|
||||
available from the Intel Developer Web site at:
|
||||
|
||||
http://developer.intel.com/technology/efi/
|
||||
|
||||
To use elilo on IA-32, you can put it on a floppy and
|
||||
on a FAT32 partition (msdos partition). You can also
|
||||
netbooting if you network adapter has support for UNDI/PXE.
|
||||
|
||||
Elilo/ia32 is capable of booting unmodified 2.2.x. and 2.4.x kernels
|
||||
as they are shipped by distributors today (such as Redhat7.2). You don't need
|
||||
to recompile the kernel with special options. Elilo ONLY takes compressed kernel
|
||||
image which are typically obtained via a 'make bzImage'. Plain elf/32 kernel can't
|
||||
be booted (plain vmlinux will not work). Similarly, existing initial ramdisks can
|
||||
be used without modifications.
|
||||
|
||||
XIII/ Booting on EFI/x86_64 platforms
|
||||
-----------------------------
|
||||
|
||||
To use elilo on x86_64, you can put it on a floppy and
|
||||
on a FAT32 partition (msdos partition). You can also
|
||||
netboot if your network adapter has support for UNDI/PXE.
|
||||
|
||||
Elilo/x86_64 requires efi64 enabled linux kernel (> 2.6.21).
|
||||
You need to compile the kernel with CONFIG_EFI option.
|
||||
x86_64 platforms with UEFI 2.0 firmware deprecate UGA protocol
|
||||
and therefore only the Graphics Output Protocol (GOP) is supported. For
|
||||
such platforms, the kernel must be configured with EFI_FB option. This
|
||||
will enable early boot messages on the console. The elilo for x86_64
|
||||
attempts to query the firmware for GOP and if it fails it defaults to
|
||||
text mode. Elilo ONLY takes compressed kernel image which are
|
||||
typically obtained via a 'make bzImage'. Plain elf/x86_64 kernel can't
|
||||
be booted (plain vmlinux will not work). Similarly, existing initial
|
||||
ramdisks can be used without modifications.
|
||||
|
||||
The x86_64 implementation converts the EFI memory map into E820 map and
|
||||
passes it in the bootparameter supplied to the OS. For details on
|
||||
bootparameter, see x86_64/sysdeps.h.
|
||||
|
||||
IX/ Credits
|
||||
-------
|
||||
|
||||
Contributors:
|
||||
Intel Corp.
|
||||
Stephane Eranian <eranian@hpl.hp.com>
|
||||
David Mosberger <davidm@hpl.hp.com>
|
||||
Johannes Erdfelt <jerdfelt@valinux.com>
|
||||
Richard Hirst <rhirst@linuxcare.com>
|
||||
Chris Ahna <christopher.j.ahna@intel.com>
|
||||
Mike Johnston <michael.johnston@intel.com>
|
||||
Fenghua Yu <fenghua.yu@intel.com>
|
||||
Bibo Mao <bibo.mao@intel.com>
|
||||
Brett Johnson <brett@hp.com>
|
||||
Jason Fleischli <Jason.Fleischli@hp.com>
|
||||
Chandramouli Narayanan <mouli@linux.intel.com>
|
||||
|
||||
Maintainers:
|
||||
Jason Fleischli <Jason.Fleischli@hp.com>
|
||||
|
||||
X/ Bug reports
|
||||
-----------
|
||||
|
||||
Use the sourceforge bug submission system on the elilo sourceforge
|
||||
project page for reporting including errors or descrepancies in this
|
||||
document.
|
||||
|
||||
XIII/ Reference
|
||||
---------
|
||||
|
||||
UEFI 2.0 specifications are available from the following web site:
|
||||
|
||||
http://www.uefi.org/home
|
||||
|
||||
EFI v1.02 specifications are available from the following web site:
|
||||
|
||||
http://developer.intel.com/technology/efi/
|
||||
|
||||
The latest sources of ELILO can be downloaded at:
|
||||
|
||||
https://sourceforge.net/projects/elilo/files/
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
August 2003
|
||||
|
||||
Copyright (C) 2000-2003 Hewlett-Packard Co.
|
||||
Copyright (C) 2000-2012 Hewlett-Packard Co.
|
||||
Copyright (C) 2006-2010 Intel Co.
|
||||
|
||||
|
||||
|
@ -14,7 +14,7 @@ I/ Introduction
|
|||
------------
|
||||
|
||||
This document describes how to use ELILO on for IA-64, IA-32 and x86_64 EFI-based platforms.
|
||||
This document describes ELILO version 3.7.
|
||||
This document describes ELILO version 3.7 - 3.14.
|
||||
|
||||
II/ Command line options
|
||||
--------------------
|
||||
|
@ -85,7 +85,7 @@ II/ Command line options
|
|||
|
||||
For x86_64:
|
||||
----------
|
||||
No new options.
|
||||
none
|
||||
|
||||
III/ Configuration File
|
||||
------------------
|
||||
|
@ -243,7 +243,7 @@ III/ Configuration File
|
|||
|
||||
x86_64 specific options:
|
||||
-----------------------
|
||||
None yet.
|
||||
text-mode elilo>=3.14 boolean, image config option to force text console mode.
|
||||
|
||||
IV/ Booting from the local system
|
||||
-----------------------------
|
||||
|
@ -481,6 +481,7 @@ XIII/ Booting on EFI/x86_64 platforms
|
|||
IX/ Credits
|
||||
-------
|
||||
|
||||
Contributors:
|
||||
Intel Corp.
|
||||
Stephane Eranian <eranian@hpl.hp.com>
|
||||
David Mosberger <davidm@hpl.hp.com>
|
||||
|
@ -490,14 +491,19 @@ IX/ Credits
|
|||
Mike Johnston <michael.johnston@intel.com>
|
||||
Fenghua Yu <fenghua.yu@intel.com>
|
||||
Bibo Mao <bibo.mao@intel.com>
|
||||
Brett Johnson <brett@hp.com>
|
||||
Jason Fleischli <Jason.Fleischli@hp.com>
|
||||
Chandramouli Narayanan <mouli@linux.intel.com>
|
||||
|
||||
Maintainers:
|
||||
Jason Fleischli <Jason.Fleischli@hp.com>
|
||||
|
||||
X/ Bug reports
|
||||
-----------
|
||||
|
||||
You can submit bugs to <eranian@hpl.hp.com> or to the Linux/ia64
|
||||
mailing list at linux-ia64@linuxia64.org. Visit http://www.linuxia64.org
|
||||
to subscribe to this list.
|
||||
Use the sourceforge bug submission system on the elilo sourceforge
|
||||
project page for reporting including errors or descrepancies in this
|
||||
document.
|
||||
|
||||
XIII/ Reference
|
||||
---------
|
||||
|
@ -512,5 +518,5 @@ XIII/ Reference
|
|||
|
||||
The latest sources of ELILO can be downloaded at:
|
||||
|
||||
ftp://ftp.hpl.hp.com/pub/linux-ia64
|
||||
https://sourceforge.net/projects/elilo/files/
|
||||
|
||||
|
|
|
@ -3,8 +3,11 @@ How to netboot using ELILO
|
|||
|
||||
Copyright (C) 2002-2003 Hewlett-Packard Co.
|
||||
Contributed by Stephane Eranian <eranian@hpl.hp.com>
|
||||
Updated by Jason Fleischli <jason.fleischli@hp.com>
|
||||
|
||||
Last updated: 03/08/11
|
||||
Last updated: 10/19/2009
|
||||
|
||||
x86_64 and uefi support was added @ elilo version 3.8 and linux kernel >= 2.6.24
|
||||
|
||||
EFI has full support for the PXE and DHCP protocol. As such
|
||||
it is relatively easy to boot a machine from the network using EFI.
|
||||
|
@ -126,7 +129,7 @@ only on two very common cases:
|
|||
|
||||
This filename is an opportunity to specify a machine specific configuration file.
|
||||
|
||||
2) AA[BB[CC]][-ia32|ia64].conf
|
||||
2) AA[BB[CC]][-ia32|ia64|x86_64].conf
|
||||
As of version 3.5, elilo will also look for IPv4 class A,B,C
|
||||
subnet-specific versions of the config file. This is useful when you
|
||||
want to have a common config file for all machines connected to a
|
||||
|
@ -140,14 +143,14 @@ only on two very common cases:
|
|||
config files first (So for example, on an Itanium system,
|
||||
"0A0000-ia64.conf" will be tried before "0A0000.conf")
|
||||
|
||||
3) elilo-ia32.config or elilo-ia64.conf
|
||||
3) elilo-ia32.conf, elilo-x86_64.conf, or elilo-ia64.conf
|
||||
|
||||
Depending on the machine (client side) architecture elilo will try the IA-32 or
|
||||
IA-64 file.
|
||||
Depending on the machine (client side) architecture elilo will try the matching
|
||||
architecture specific filename.
|
||||
|
||||
This filename is an opportunity to specify a architecture specific configuration file.
|
||||
This distinction between the architectures is useful when the same TFTP server services
|
||||
the two types of clients : IA32- and IA-64 machines.
|
||||
the three types of clients : ia32, x86_64, and ia64 machines.
|
||||
|
||||
4) elilo.conf
|
||||
|
||||
|
@ -244,7 +247,7 @@ only on two very common cases:
|
|||
|
||||
- use the name provide by the PXE server Layer 1 or
|
||||
|
||||
- elilo-ia64.conf/elilo-ia32.conf or
|
||||
- elilo-ia64.conf/elilo-ia32.conf/elilo-x86_64 or
|
||||
|
||||
- elilo.conf
|
||||
|
||||
|
@ -390,7 +393,7 @@ only on two very common cases:
|
|||
|
||||
|
||||
In the case of a DHCP boot, this type of customization makes sense only for
|
||||
the shared configuration file, elilo-ia64.conf/elilo-ia32.conf or elilo.conf.
|
||||
the shared configuration file, elilo-ia64.conf/elilo-ia32.conf/elilo-x86_64 or elilo.conf.
|
||||
The configuration file based on the IP address (such as C0A80205.conf in this
|
||||
case) would provide another way of customizing parameters for a specific
|
||||
client (IP address). The same thing holds if the name of the config file
|
||||
|
|
|
@ -0,0 +1,122 @@
|
|||
/*++
|
||||
|
||||
Copyright (c) 2004, Intel Corporation
|
||||
All rights reserved. This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
which accompanies this distribution. The full text of the license may be found at
|
||||
http://opensource.org/licenses/bsd-license.php
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
Module Name:
|
||||
|
||||
ConsoleControl.h
|
||||
|
||||
Abstract:
|
||||
|
||||
Abstraction of a Text mode or UGA screen
|
||||
|
||||
--*/
|
||||
|
||||
#ifndef __CONSOLE_CONTROL_H__
|
||||
#define __CONSOLE_CONTROL_H__
|
||||
|
||||
#define EFI_CONSOLE_CONTROL_PROTOCOL_GUID \
|
||||
{ 0xf42f7782, 0x12e, 0x4c12, { 0x99, 0x56, 0x49, 0xf9, 0x43, 0x4, 0xf7, 0x21 } }
|
||||
|
||||
/* typedef struct _EFI_CONSOLE_CONTROL_PROTOCOL EFI_CONSOLE_CONTROL_PROTOCOL; */
|
||||
struct _EFI_CONSOLE_CONTROL_PROTOCOL;
|
||||
|
||||
|
||||
typedef enum {
|
||||
EfiConsoleControlScreenText,
|
||||
EfiConsoleControlScreenGraphics,
|
||||
EfiConsoleControlScreenMaxValue
|
||||
} EFI_CONSOLE_CONTROL_SCREEN_MODE;
|
||||
|
||||
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (
|
||||
IN struct _EFI_CONSOLE_CONTROL_PROTOCOL *This,
|
||||
OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,
|
||||
OUT BOOLEAN *UgaExists, OPTIONAL
|
||||
OUT BOOLEAN *StdInLocked OPTIONAL
|
||||
)
|
||||
/*++
|
||||
|
||||
Routine Description:
|
||||
Return the current video mode information. Also returns info about existence
|
||||
of UGA Draw devices in system, and if the Std In device is locked. All the
|
||||
arguments are optional and only returned if a non NULL pointer is passed in.
|
||||
|
||||
Arguments:
|
||||
This - Protocol instance pointer.
|
||||
Mode - Are we in text of grahics mode.
|
||||
UgaExists - TRUE if UGA Spliter has found a UGA device
|
||||
StdInLocked - TRUE if StdIn device is keyboard locked
|
||||
|
||||
Returns:
|
||||
EFI_SUCCESS - Mode information returned.
|
||||
|
||||
--*/
|
||||
;
|
||||
|
||||
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE) (
|
||||
IN struct _EFI_CONSOLE_CONTROL_PROTOCOL *This,
|
||||
OUT EFI_CONSOLE_CONTROL_SCREEN_MODE Mode
|
||||
)
|
||||
/*++
|
||||
|
||||
Routine Description:
|
||||
Set the current mode to either text or graphics. Graphics is
|
||||
for Quiet Boot.
|
||||
|
||||
Arguments:
|
||||
This - Protocol instance pointer.
|
||||
Mode - Mode to set the
|
||||
|
||||
Returns:
|
||||
EFI_SUCCESS - Mode information returned.
|
||||
|
||||
--*/
|
||||
;
|
||||
|
||||
|
||||
typedef
|
||||
EFI_STATUS
|
||||
(EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN) (
|
||||
IN struct _EFI_CONSOLE_CONTROL_PROTOCOL *This,
|
||||
IN CHAR16 *Password
|
||||
)
|
||||
/*++
|
||||
|
||||
Routine Description:
|
||||
Lock Std In devices until Password is typed.
|
||||
|
||||
Arguments:
|
||||
This - Protocol instance pointer.
|
||||
Password - Password needed to unlock screen. NULL means unlock keyboard
|
||||
|
||||
Returns:
|
||||
EFI_SUCCESS - Mode information returned.
|
||||
EFI_DEVICE_ERROR - Std In not locked
|
||||
|
||||
--*/
|
||||
;
|
||||
|
||||
|
||||
|
||||
typedef struct _EFI_CONSOLE_CONTROL_PROTOCOL {
|
||||
EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE GetMode;
|
||||
EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE SetMode;
|
||||
EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN LockStdIn;
|
||||
} EFI_CONSOLE_CONTROL_PROTOCOL;
|
||||
|
||||
extern EFI_GUID gEfiConsoleControlProtocolGuid;
|
||||
|
||||
#endif
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
66
elilo.c
66
elilo.c
|
@ -46,13 +46,14 @@
|
|||
#include "loader.h"
|
||||
#include "config.h" /* for config_init() */
|
||||
|
||||
#define ELILO_VERSION L"3.8"
|
||||
#define ELILO_SHARED_CMDLINE_OPTS L"pPMC:aDhd:i:vVc:E"
|
||||
#define ELILO_SHARED_CMDLINE_OPTS L"pPMC:aDhd:i:m:vVc:E"
|
||||
|
||||
elilo_config_t elilo_opt;
|
||||
|
||||
EFI_SYSTEM_TABLE *systab; /* pointer to EFI system table */
|
||||
|
||||
extern INTN wait_timeout (UINTN);
|
||||
|
||||
/*
|
||||
* Load the Linux kernel in memory from the boot media
|
||||
* Output:
|
||||
|
@ -92,7 +93,7 @@ do_kernel_load(CHAR16 *kname, kdesc_t *kd)
|
|||
INTN
|
||||
kernel_load(EFI_HANDLE image, CHAR16 *kname, kdesc_t *kd, memdesc_t *imem, memdesc_t *mmem)
|
||||
{
|
||||
CHAR16 kernel[CMDLINE_MAXLEN];
|
||||
CHAR16 kernel[FILENAME_MAXLEN];
|
||||
|
||||
/*
|
||||
* Do the vm image switch here
|
||||
|
@ -127,11 +128,12 @@ kernel_load(EFI_HANDLE image, CHAR16 *kname, kdesc_t *kd, memdesc_t *imem, memde
|
|||
return ELILO_LOAD_RETRY;
|
||||
}
|
||||
|
||||
VERB_PRT(3, Print(L"kernel loaded in [0x%lx-0x%lx] entry=0x%lx\n",
|
||||
(unsigned long)kd->kstart, (unsigned long)kd->kend, (unsigned long)kd->kentry));
|
||||
VERB_PRT(3, Print(L"kernel loaded in [" PTR_FMT "-" PTR_FMT "] entry=" PTR_FMT "\n",
|
||||
kd->kstart, kd->kend, kd->kentry));
|
||||
|
||||
if (elilo_opt.initrd[0]) {
|
||||
|
||||
/* ramdisk image is moved to the top of available extended memory later by start_kernel() */
|
||||
if (sysdeps_initrd_get_addr(kd, imem) == -1) goto exit_error;
|
||||
|
||||
switch(load_file(elilo_opt.initrd, imem)) {
|
||||
|
@ -212,7 +214,7 @@ main_loop(EFI_HANDLE dev, CHAR16 **argv, INTN argc, INTN index, EFI_HANDLE image
|
|||
EFI_STATUS status = EFI_SUCCESS;
|
||||
kdesc_t kd;
|
||||
memdesc_t imem, mmem;
|
||||
INTN r;
|
||||
INTN r, retries=0;
|
||||
|
||||
/*
|
||||
* First place where we potentially do system dependent
|
||||
|
@ -238,19 +240,53 @@ main_loop(EFI_HANDLE dev, CHAR16 **argv, INTN argc, INTN index, EFI_HANDLE image
|
|||
}
|
||||
|
||||
do_launch:
|
||||
r =subst_vars(cmdline_tmp, cmdline, CMDLINE_MAXLEN);
|
||||
r = subst_vars(cmdline_tmp, cmdline, CMDLINE_MAXLEN);
|
||||
|
||||
VERB_PRT(3, Print(L"final cmdline(%d): %s\n", r, cmdline));
|
||||
|
||||
/* Give user time to see the output before launch */
|
||||
if (elilo_opt.debug || elilo_opt.verbose) {
|
||||
r = wait_timeout(150);
|
||||
/* have to turn off all console output(except error output) now before final get_mmemap()
|
||||
* call or it can cause the efi map key to change and the ExitBootSvc call to fail,
|
||||
* forcing debug and verbose options off is the surest way to enforce this.
|
||||
*/
|
||||
elilo_opt.debug=0;
|
||||
elilo_opt.verbose=0;
|
||||
}
|
||||
|
||||
/* free resources associated with file accesses (before ExitBootServices) */
|
||||
close_devices();
|
||||
|
||||
/* No console output permitted after create_boot_params()! */
|
||||
if ((bp=create_boot_params(cmdline, &imem, &mmem, &cookie)) == 0) goto error;
|
||||
|
||||
/* terminate bootservices */
|
||||
/* terminate bootservices
|
||||
* efi ExitBootSvcs spec: *note, get_memmap is called by create_boot_params()
|
||||
* An EFI OS loader must ensure that it has the system's current memory map at the time
|
||||
* it calls ExitBootServices(). This is done by passing in the current memory map's
|
||||
* MapKey value as returned by GetMemoryMap(). Care must be taken to ensure that the
|
||||
* memory map does not change between these two calls. It is suggested that
|
||||
* GetMemoryMap()be called immediately before calling ExitBootServices(). */
|
||||
|
||||
retry:
|
||||
status = uefi_call_wrapper(BS->ExitBootServices, 2, image, cookie);
|
||||
if (EFI_ERROR(status)) goto bad_exit;
|
||||
if (EFI_ERROR(status))
|
||||
{
|
||||
ERR_PRT((L"\nExitBootSvcs: failed, memory map has changed.\n"));
|
||||
if (retries < 2)
|
||||
{
|
||||
ERR_PRT((L"Main_Loop: Retrying,... have to rebuild boot params"));
|
||||
retries++;
|
||||
free_boot_params(bp);
|
||||
if ((bp=create_boot_params(cmdline, &imem, &mmem, &cookie)) == 0) goto error;
|
||||
goto retry;
|
||||
} else {
|
||||
ERR_PRT((L"\nMain_Loop: tried ExitBootSvcs 3 times... retries exceeded.... giving up\n"));
|
||||
goto bad_exit;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
start_kernel(kd.kentry, bp);
|
||||
/* NOT REACHED */
|
||||
|
@ -264,6 +300,7 @@ bad_exit:
|
|||
error:
|
||||
free_kmem();
|
||||
if (imem.start_addr) free(imem.start_addr);
|
||||
if (mmem.start_addr) free(mmem.start_addr);
|
||||
if (bp) free_boot_params(bp);
|
||||
exit_error:
|
||||
return ELILO_LOAD_ERROR;
|
||||
|
@ -444,7 +481,12 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *system_tab)
|
|||
* mode.
|
||||
* XXX: clean this up !
|
||||
*/
|
||||
uefi_call_wrapper(BS->SetWatchdogTimer, 4, 0, 0x0, 0, NULL);
|
||||
uefi_call_wrapper(BS->SetWatchdogTimer, 4, 0, 0x0, 0, NULL);
|
||||
|
||||
/*
|
||||
* start a clean console
|
||||
*/
|
||||
uefi_call_wrapper(systab->ConOut->Reset, 2, systab->ConOut, FALSE);
|
||||
|
||||
/* initialize memory allocator */
|
||||
if (alloc_init() == -1) return EFI_LOAD_ERROR;
|
||||
|
@ -455,7 +497,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *system_tab)
|
|||
return EFI_LOAD_ERROR;
|
||||
}
|
||||
|
||||
VERB_PRT(5,Print(L"Loaded at 0x%lx size=%d bytes code=%d data=%d\n", info->ImageBase, info->ImageSize, info->ImageCodeType, info->ImageDataType));
|
||||
VERB_PRT(5,Print(L"Loaded at " PTR_FMT " size=%ld bytes code=%d data=%d\n", info->ImageBase, info->ImageSize, info->ImageCodeType, info->ImageDataType));
|
||||
/*
|
||||
* verify EDD3.0 status. Users may have to reboot
|
||||
*/
|
||||
|
@ -599,7 +641,7 @@ efi_main (EFI_HANDLE image, EFI_SYSTEM_TABLE *system_tab)
|
|||
goto do_exit;
|
||||
}
|
||||
}
|
||||
DBG_PRT((L"Optind=%d optarg=%x argc=%d", Optind, Optarg, argc));
|
||||
DBG_PRT((L"Optind=%d optarg=" PTR_FMT " argc=%d", Optind, Optarg, argc));
|
||||
|
||||
/*
|
||||
* we can't defer this phase any longer...
|
||||
|
|
19
elilo.h
19
elilo.h
|
@ -29,8 +29,16 @@
|
|||
#ifndef __ELILO_H__
|
||||
#define __ELILO_H__
|
||||
|
||||
#define ELILO_VERSION L"3.16"
|
||||
|
||||
#include <efi.h>
|
||||
|
||||
#ifdef CONFIG_ia32
|
||||
#define PTR_FMT L"0x%x"
|
||||
#else
|
||||
#define PTR_FMT L"0x%lx"
|
||||
#endif
|
||||
|
||||
#include "elilo_debug.h"
|
||||
|
||||
#include "fileops.h"
|
||||
|
@ -46,6 +54,10 @@
|
|||
#define ROUNDUP(x,a) (((x) + (a) - 1) & ~((a) - 1))
|
||||
#define ROUNDDOWN(x,a) ((x) & ~((a) - 1))
|
||||
|
||||
#ifndef UINT32_MAX
|
||||
#define UINT32_MAX ((UINT32)-1)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Elilo Boot modes
|
||||
*/
|
||||
|
@ -57,7 +69,8 @@
|
|||
#define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY
|
||||
#define ELILO_TIMEOUT_INFINITY (~0UL)
|
||||
|
||||
#define CMDLINE_MAXLEN 512 /* needed by ia32 */
|
||||
#define CMDLINE_MAXLEN 2048
|
||||
#define PATHNAME_MAXLEN 512
|
||||
#define FILENAME_MAXLEN 256
|
||||
#define MAX_ARGS 256
|
||||
/* Just pick an arbitrary number that's high enough for now :o) */
|
||||
|
@ -150,6 +163,7 @@ extern VOID *alloc_pages(UINTN, EFI_MEMORY_TYPE, EFI_ALLOCATE_TYPE, VOID *);
|
|||
extern VOID free_pages(VOID *);
|
||||
extern VOID free_all(VOID);
|
||||
extern INTN alloc_kmem(VOID *, UINTN);
|
||||
extern INTN alloc_kmem_anywhere(VOID **, UINTN);
|
||||
extern VOID free_kmem(VOID);
|
||||
extern VOID free_all_memory(VOID);
|
||||
|
||||
|
@ -183,7 +197,7 @@ extern CHAR16 *get_config_file(VOID);
|
|||
extern INTN load_file(CHAR16 *, memdesc_t *);
|
||||
|
||||
/* from alternate.c */
|
||||
extern INTN alternate_kernel(CHAR16 *, INTN);
|
||||
extern INTN alternate_kernel(CHAR16 *, UINTN);
|
||||
|
||||
/* from bootparams.c */
|
||||
extern VOID *create_boot_params (CHAR16 *, memdesc_t *, memdesc_t *, UINTN *);
|
||||
|
@ -203,6 +217,7 @@ extern CHAR16 *sysdeps_get_cmdline_opts(VOID);
|
|||
extern INTN sysdeps_getopt(INTN, INTN, CHAR16 *);
|
||||
extern VOID sysdeps_print_cmdline_opts(VOID);
|
||||
extern INTN sysdeps_register_options(VOID);
|
||||
extern VOID *sysdeps_checkfix_initrd(VOID *, memdesc_t *);
|
||||
|
||||
#define CHAR_SLASH L'/'
|
||||
#define CHAR_BACKSLASH L'\\'
|
||||
|
|
|
@ -26,6 +26,10 @@
|
|||
#ifndef __ELILO_DEBUG__
|
||||
#define __ELILO_DEBUG__
|
||||
|
||||
//#define DEBUG_MEM
|
||||
//#define DEBUG_GZIP
|
||||
//#define DEBUG_BZ
|
||||
|
||||
#define ELILO_DEBUG 1
|
||||
|
||||
#define ERR_PRT(a) do { Print(L"%a(line %d):", __FILE__, __LINE__); Print a; Print(L"\n"); } while (0);
|
||||
|
|
|
@ -497,7 +497,7 @@ add_dev_tab(EFI_GUID *proto, EFI_HANDLE boot_handle, UINTN size, fops_fs_glue_t
|
|||
|
||||
str2 = str == NULL ? L"Unknown" : str;
|
||||
|
||||
DBG_PRT((L"%s : %-8s : %s\n", dev_tab[idx].name,
|
||||
DBG_PRT((L"%s : %-8s : %s", dev_tab[idx].name,
|
||||
(dev_tab[idx].fops ? dev_tab[idx].fops->name: L"N/A"), str2));
|
||||
|
||||
if (str) FreePool(str);
|
||||
|
|
27
fs/Makefile
27
fs/Makefile
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=
|
||||
ifeq ($(CONFIG_localfs),y)
|
||||
|
@ -54,17 +59,13 @@ all: $(TARGET)
|
|||
# XXX: does not trigger recompile when changing filesystem selection
|
||||
# without doing make clean.
|
||||
#
|
||||
$(TARGET): check-filesystems $(TOPDIR)/Make.defaults $(FILES)
|
||||
$(LD) -r -o $@ $(FILES)
|
||||
$(TARGET): $(TOPDIR)/Make.defaults $(FILES)
|
||||
@if [ -z "$(FILES)" ]; then \
|
||||
echo "You need to define at least one filesystem in Make.defaults"; \
|
||||
exit 1; \
|
||||
fi
|
||||
$(LD) $(LD3264) -r -o $@ $(FILES)
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
||||
check-filesystems:
|
||||
@if [ -n "$(FILES)" ]; then \
|
||||
exit 0; \
|
||||
else \
|
||||
echo "You need to define at least one filesystem in Make.defaults"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
|
|
|
@ -142,7 +142,7 @@ read_bytes(EFI_BLOCK_IO *blkio, UINT32 mediaid, UINTN offset, VOID *addr, UINTN
|
|||
return ret;
|
||||
}
|
||||
|
||||
DBG_PRT((L"readblock(%x, %d, %d, %d, %x)", blkio, mediaid, base, buffer_size, buffer));
|
||||
DBG_PRT((L"readblock(PTR_FMT ", %d, %ld, %d, " PTR_FMT ")", blkio, mediaid, base, buffer_size, buffer));
|
||||
|
||||
status = uefi_call_wrapper(blkio->ReadBlocks, 5, blkio, mediaid, base, buffer_size, buffer);
|
||||
if (EFI_ERROR(status)) {
|
||||
|
@ -903,7 +903,7 @@ ext2fs_install_one(EFI_HANDLE dev, VOID **intf)
|
|||
}
|
||||
|
||||
if (sb.s_magic != EXT2_SUPER_MAGIC) {
|
||||
DBG_PRT((L"bad magic 0x%x\n", sb.s_magic));
|
||||
DBG_PRT((L"bad magic "PTR_FMT"\n", sb.s_magic));
|
||||
return EFI_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ localfs_open(localfs_interface_t *this, CHAR16 *name, UINTN *fd)
|
|||
|
||||
DBG_PRT((L"localfs_open on %s\n", name));
|
||||
|
||||
status = uefi_call_wrapper(lfs->volume->Open, 5, lfs->volume, &fh, name, EFI_FILE_MODE_READ, 0);
|
||||
status = uefi_call_wrapper(lfs->volume->Open, 5, lfs->volume, &fh, name, EFI_FILE_MODE_READ, (UINT64)0);
|
||||
if (status == EFI_SUCCESS) {
|
||||
*fd = LOCALFS_F2FD(fh);
|
||||
}
|
||||
|
|
153
fs/netfs.c
153
fs/netfs.c
|
@ -1,6 +1,7 @@
|
|||
/*
|
||||
* Copyright (C) 2001-2003 Hewlett-Packard Co.
|
||||
* Copyright (C) 2001-2009 Hewlett-Packard Co.
|
||||
* Contributed by Stephane Eranian <eranian@hpl.hp.com>
|
||||
* Contributed by Jason Fleischli <jason.fleischli@hp.com>
|
||||
* Copyright (C) 2006-2009 Intel Corporation
|
||||
* Contributed by Fenghua Yu <fenghua.yu@intel.com>
|
||||
* Contributed by Bibo Mao <bibo.mao@intel.com>
|
||||
|
@ -38,6 +39,13 @@
|
|||
|
||||
#define NETFS_DEFAULT_BUFSIZE 16*MB
|
||||
#define NETFS_DEFAULT_BUFSIZE_INC 8*MB
|
||||
#define NETFS_DEFAULT_BLOCKSIZE 1024 /* setting to zero is supposed to default the underlying */
|
||||
/* pxe implementation to largest blocksize supported,... */
|
||||
/* in reality on original older efi implementations its */
|
||||
/* never set causing the pxe transfer to timeout. */
|
||||
/* the spec defines the minimum supported blocksize default */
|
||||
/* to be 512 bytes... a bit extreme, 1024 should work for */
|
||||
/* everything */
|
||||
|
||||
#define NETFS_DEFAULT_SERVER_TYPE EFI_PXE_BASE_CODE_BOOT_TYPE_BOOTSTRAP
|
||||
#define NETFS_FD_MAX 2
|
||||
|
@ -221,7 +229,7 @@ netfs_extract_ip(netfs_priv_state_t *nfs)
|
|||
if (pxe->Mode->RouteTableEntries>0)
|
||||
Memcpy(&nfs->gw_ip, &pxe->Mode->RouteTable[0].GwAddr, sizeof(EFI_IP_ADDRESS));
|
||||
|
||||
VERB_PRT(1, Print(L"PXE PxeDiscoverValid: %s\n", pxe->Mode->PxeDiscoverValid? L"Yes (PXE-aware DHCPD)" : L"No (Regular DHCPD)"));
|
||||
VERB_PRT(1, Print(L"PXE PxeDiscoverValid: %s\n", pxe->Mode->PxeDiscoverValid? L"Yes (PXE-aware DHCPD)\n" : L"No (Regular DHCPD)\n"));
|
||||
#if 0
|
||||
status = BS->HandleProtocol(dev, &PxeCallbackProtocol, (VOID **)&netfs_callback);
|
||||
status = LibInstallProtocolInterfaces(&dev, &PxeCallbackProtocol, &netfs_callback, NULL);
|
||||
|
@ -279,7 +287,9 @@ netfs_open(netfs_interface_t *this, CHAR16 *name, UINTN *fd)
|
|||
netfs_fd_t *f;
|
||||
EFI_STATUS status;
|
||||
CHAR8 ascii_name[FILENAME_MAXLEN];
|
||||
UINTN blocksize = 0, prev_netbufsize;
|
||||
UINTN blocksize = NETFS_DEFAULT_BLOCKSIZE;
|
||||
UINTN prev_netbufsize, retries = 0;
|
||||
BOOLEAN server_provided_filesize = FALSE;
|
||||
|
||||
if (this == NULL || name == NULL || fd == NULL) return EFI_INVALID_PARAMETER;
|
||||
|
||||
|
@ -305,6 +315,7 @@ netfs_open(netfs_interface_t *this, CHAR16 *name, UINTN *fd)
|
|||
return EFI_SUCCESS;
|
||||
}
|
||||
f->netbuf_maxsize = NETFS_DEFAULT_BUFSIZE;
|
||||
f->netbuf_size = 0;
|
||||
|
||||
if (f->netbuf == NULL && netbuf_alloc(f) == -1) {
|
||||
netfs_fd_free(nfs, f);
|
||||
|
@ -315,58 +326,108 @@ netfs_open(netfs_interface_t *this, CHAR16 *name, UINTN *fd)
|
|||
|
||||
U2ascii(name, ascii_name, FILENAME_MAXLEN);
|
||||
|
||||
VERB_PRT(2, Print(L"downloading %a from %d.%d.%d.%d...", ascii_name,
|
||||
VERB_PRT(2, Print(L"downloading %a from %d.%d.%d.%d...\n", ascii_name,
|
||||
nfs->srv_ip.v4.Addr[0],
|
||||
nfs->srv_ip.v4.Addr[1],
|
||||
nfs->srv_ip.v4.Addr[2],
|
||||
nfs->srv_ip.v4.Addr[3]));
|
||||
retry:
|
||||
f->netbuf_size = f->netbuf_maxsize;
|
||||
if (retries == 2) {
|
||||
netfs_fd_free(nfs, f);
|
||||
VERB_PRT(2, Print(L"Failed: %r\n", status));
|
||||
return status;
|
||||
}
|
||||
|
||||
DBG_PRT((L"\nbefore netbuf:0x%lx netbuf_size=%ld\n", f->netbuf, f->netbuf_size));
|
||||
|
||||
/*
|
||||
* For EFI versions older than 14.61:
|
||||
* it seems like there is an EFI bug (or undocumented behavior) when the buffer size
|
||||
* is too small AND the blocksize parameter is NULL, i.e., used the largest possible.
|
||||
* In this case, Mtftp() never returns EFI_BUFFER_TOO_SMALL but EFI_TIMEOUT instead.
|
||||
* This is true for 1.02 and also 1.10 it seems. Here we set it to the minimal value (512).
|
||||
*
|
||||
* Also it seems like on a READ_FILE which returns EFI_BUFFER_TOO_SMALL, the buffersize
|
||||
* is NOT updated to reflect the required size for the next attempt.
|
||||
*
|
||||
* For EFI versions 14.61 and higher:
|
||||
* In case the buffer is too small AND the TFTP server reports the file size (see RFC 2349),
|
||||
* the f->netbuf_size will report the exact size for the buffer.
|
||||
/*
|
||||
* netboot bugfix SF tracker 2874380
|
||||
* EFI 1.10 spec
|
||||
* For read operations, the return data will be placed in the buffer specified by BufferPtr. If
|
||||
* BufferSize is too small to contain the entire downloaded file, then
|
||||
* EFI_BUFFER_TOO_SMALL will be returned and BufferSize will be set to zero or the size of
|
||||
* the requested file (the size of the requested file is only returned if the TFTP server supports TFTP
|
||||
* options). If BufferSize is large enough for the read operation, then BufferSize will be set to
|
||||
* the size of the downloaded file, and EFI_SUCCESS will be returned. Applications using the
|
||||
* PxeBc.Mtftp() services should use the get-file-size operations to determine the size of the
|
||||
* downloaded file prior to using the read-file operations—especially when downloading large
|
||||
* (greater than 64 MB) files—instead of making two calls to the read-file operation. Following this
|
||||
* recommendation will save time if the file is larger than expected and the TFTP server does not
|
||||
* support TFTP option extensions. Without TFTP option extension support, the client has to
|
||||
* download the entire file, counting and discarding the received packets, to determine the file size.
|
||||
* ...
|
||||
* For TFTP “get file size” operations, the size of the requested file or directory is returned in
|
||||
* BufferSize, and EFI_SUCCESS will be returned. If the TFTP server does not support options,
|
||||
* the file will be downloaded into a bit bucket and the length of the downloaded file will be returned.
|
||||
*/
|
||||
status = uefi_call_wrapper(nfs->pxe->Mtftp, 10,
|
||||
nfs->pxe,
|
||||
EFI_PXE_BASE_CODE_TFTP_GET_FILE_SIZE,
|
||||
f->netbuf,
|
||||
FALSE,
|
||||
&(f->netbuf_size), // PXE writes size of file from server here
|
||||
&blocksize,
|
||||
&nfs->srv_ip,
|
||||
ascii_name,
|
||||
NULL,
|
||||
FALSE);
|
||||
/*
|
||||
* If options are not supported by this tftp server, according to the spec the file will be
|
||||
* downloaded into a bit bucket, the size calculated by efi fw and returned in the status
|
||||
* field of this call. YUK!!... in this case we will default to currently allocated max
|
||||
* if thats still not big enough it will be caught and increased following the read file attempt
|
||||
* then retried.
|
||||
* XXX need to research how this is handled or changed in the latest UEFI spec.
|
||||
*/
|
||||
if (status != EFI_SUCCESS) {
|
||||
f->netbuf_size = f->netbuf_maxsize;
|
||||
VERB_PRT(2, Print(L"setting default buffer size of %d for %a, no filesize recd from tftp server\n",
|
||||
f->netbuf_size, ascii_name));
|
||||
}
|
||||
|
||||
if (status == EFI_SUCCESS) {
|
||||
server_provided_filesize = TRUE;
|
||||
VERB_PRT(2, Print(L"received file size of %d for %a from tftp server.\n",
|
||||
f->netbuf_size, ascii_name));
|
||||
}
|
||||
|
||||
if (f->netbuf_size > f->netbuf_maxsize) { // we need a bigger buffer
|
||||
VERB_PRT(2, Print(L"allocated buffer too small, attempting to increase\n"));
|
||||
f->netbuf_maxsize += f->netbuf_size;
|
||||
free(f->netbuf);
|
||||
f->netbuf = NULL;
|
||||
if (netbuf_alloc(f) == -1) return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
/* paranoid catch any corner case missed */
|
||||
if (f->netbuf_size == 0) f->netbuf_size = f->netbuf_maxsize;
|
||||
|
||||
DBG_PRT((L"\nbefore read: netbuf:" PTR_FMT " netbuf_size=%d blocksize=%d\n",
|
||||
f->netbuf,
|
||||
f->netbuf_size,
|
||||
blocksize));
|
||||
|
||||
prev_netbufsize = f->netbuf_size;
|
||||
|
||||
status = uefi_call_wrapper(nfs->pxe->Mtftp, 10, nfs->pxe, EFI_PXE_BASE_CODE_TFTP_READ_FILE, f->netbuf, FALSE,
|
||||
&(f->netbuf_size),
|
||||
blocksize > 0 ? &blocksize : NULL,
|
||||
&nfs->srv_ip,
|
||||
ascii_name,
|
||||
NULL,
|
||||
FALSE);
|
||||
/* now try and download this file from the tftp server */
|
||||
status = uefi_call_wrapper(nfs->pxe->Mtftp, 10,
|
||||
nfs->pxe,
|
||||
EFI_PXE_BASE_CODE_TFTP_READ_FILE,
|
||||
f->netbuf,
|
||||
FALSE,
|
||||
&(f->netbuf_size),
|
||||
&blocksize,
|
||||
&nfs->srv_ip,
|
||||
ascii_name,
|
||||
NULL,
|
||||
FALSE);
|
||||
|
||||
DBG_PRT((L"after Mftp=%r netbuf:0x%lx netbuf_size=%ld blocksize=%ld\n",
|
||||
DBG_PRT((L"after: status=%r netbuf:" PTR_FMT " netbuf_size=%d blocksize=%d\n",
|
||||
status,
|
||||
f->netbuf,
|
||||
f->netbuf_size,
|
||||
blocksize));
|
||||
|
||||
if (status == EFI_TIMEOUT && blocksize == 0) {
|
||||
/*
|
||||
* XXX: if blocksize is not adjusted we could loop forever here
|
||||
*/
|
||||
//blocksize = 512;
|
||||
status = EFI_BUFFER_TOO_SMALL;
|
||||
}
|
||||
/*
|
||||
* check if we need to increase our buffer size
|
||||
*/
|
||||
if (status == EFI_BUFFER_TOO_SMALL) {
|
||||
DBG_PRT((L"buffer too small, need netbuf_size=%d", f->netbuf_size));
|
||||
if ((status == EFI_TIMEOUT || status == EFI_BUFFER_TOO_SMALL) && !server_provided_filesize) {
|
||||
Print(L"buffer too small, need netbuf_size=%d\n", f->netbuf_size);
|
||||
/*
|
||||
* if the TFTP server supports TFTP options, then we should
|
||||
* get the required size. So we test to see if the size
|
||||
|
@ -378,16 +439,22 @@ retry:
|
|||
} else {
|
||||
/* we got an answer from the TFTP server, let's try it */
|
||||
f->netbuf_maxsize = f->netbuf_size;
|
||||
server_provided_filesize = TRUE;
|
||||
}
|
||||
free(f->netbuf);
|
||||
|
||||
f->netbuf = NULL; /* will force reallocation */
|
||||
|
||||
if (netbuf_alloc(f) == 0) goto retry;
|
||||
if (netbuf_alloc(f) == 0) {
|
||||
retries++;
|
||||
goto retry;
|
||||
}
|
||||
|
||||
/* fall through in case of error */
|
||||
} else if (status == EFI_TIMEOUT) { //if just a simple timeout, buffers are good just retry
|
||||
VERB_PRT(2, Print(L"TFTP returned EFI_TIMEOUT ERROR... %d retries left.\n", (2 - retries)));
|
||||
retries++;
|
||||
goto retry;
|
||||
}
|
||||
|
||||
if (status == EFI_SUCCESS) {
|
||||
/* start at the beginning of the file */
|
||||
f->netbuf_pos = 0;
|
||||
|
|
34
glue_netfs.c
34
glue_netfs.c
|
@ -64,6 +64,19 @@ static CHAR16 netfs_default_path[FILENAME_MAXLEN];
|
|||
|
||||
static CHAR16 *hexa=L"0123456789ABCDEF";
|
||||
|
||||
static VOID
|
||||
convert_mac2hex(UINT8 *hw_addr,INTN l, CHAR16 *str)
|
||||
{
|
||||
UINTN i;
|
||||
|
||||
for (i=0 ; i < l; i++) {
|
||||
str[3*i] = hexa[(hw_addr[i] & 0xf0)>>4];
|
||||
str[3*i+1] = hexa[hw_addr[i] & 0x0f];
|
||||
str[3*i+2] = ':';
|
||||
}
|
||||
str[3*l-1]='\0';
|
||||
}
|
||||
|
||||
static VOID
|
||||
convert_ip2hex(UINT8 *ip, INTN l, CHAR16 *str)
|
||||
{
|
||||
|
@ -153,6 +166,8 @@ netfs_setdefaults(VOID *intf, config_file_t *config, CHAR16 *kname, UINTN maxlen
|
|||
set_var(VAR_NETFS_DOMAINAME, info.domainame);
|
||||
|
||||
if (info.using_pxe) {
|
||||
DBG_PRT((L"netfs_setdefaults: using_pxe"));
|
||||
|
||||
status = netfs->netfs_query_layer(netfs, 0, NETFS_CONFIG_LAYER, maxlen, config[0].fname);
|
||||
if (EFI_ERROR(status)) {
|
||||
StrnCpy(config[0].fname, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
|
@ -169,15 +184,20 @@ netfs_setdefaults(VOID *intf, config_file_t *config, CHAR16 *kname, UINTN maxlen
|
|||
|
||||
# if defined(CONFIG_ia64)
|
||||
# define CONFIG_ARCH_EXTENSION L"-ia64.conf\0"
|
||||
# define EXTENSION_LENGTH 11
|
||||
# elif defined (CONFIG_ia32)
|
||||
# define CONFIG_ARCH_EXTENSION L"-ia64.conf\0"
|
||||
# define CONFIG_ARCH_EXTENSION L"-ia32.conf\0"
|
||||
# define EXTENSION_LENGTH 11
|
||||
# elif defined (CONFIG_x86_64)
|
||||
# define CONFIG_ARCH_EXTENSION L"-x86_64.conf\0"
|
||||
# define EXTENSION_LENGTH 13
|
||||
# else
|
||||
# error "You need to specfy your default arch config file"
|
||||
# endif
|
||||
|
||||
# define CONFIG_EXTENSION L".conf\0"
|
||||
|
||||
DBG_PRT((L"netfs_setdefaults: machine specific (!using_pxe)"));
|
||||
/*
|
||||
* will try machine/subnet specific files first.
|
||||
* the filenames are constructed based on the IP(v4) address
|
||||
|
@ -187,22 +207,28 @@ netfs_setdefaults(VOID *intf, config_file_t *config, CHAR16 *kname, UINTN maxlen
|
|||
StrnCpy(config[0].fname+8, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[1].fname, str, maxlen-1);
|
||||
StrnCpy(config[1].fname+6, CONFIG_ARCH_EXTENSION, 11);
|
||||
StrnCpy(config[1].fname+6, CONFIG_ARCH_EXTENSION, EXTENSION_LENGTH);
|
||||
|
||||
StrnCpy(config[2].fname, str, maxlen-1);
|
||||
StrnCpy(config[2].fname+6, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[3].fname, str, maxlen-1);
|
||||
StrnCpy(config[3].fname+4, CONFIG_ARCH_EXTENSION, 11);
|
||||
StrnCpy(config[3].fname+4, CONFIG_ARCH_EXTENSION, EXTENSION_LENGTH);
|
||||
|
||||
StrnCpy(config[4].fname, str, maxlen-1);
|
||||
StrnCpy(config[4].fname+4, CONFIG_EXTENSION, 6);
|
||||
|
||||
StrnCpy(config[5].fname, str, maxlen-1);
|
||||
StrnCpy(config[5].fname+2, CONFIG_ARCH_EXTENSION, 11);
|
||||
StrnCpy(config[5].fname+2, CONFIG_ARCH_EXTENSION, EXTENSION_LENGTH);
|
||||
|
||||
StrnCpy(config[6].fname, str, maxlen-1);
|
||||
StrnCpy(config[6].fname+2, CONFIG_EXTENSION, 6);
|
||||
|
||||
/* use the MAC address as a possible file name as well */
|
||||
convert_mac2hex(info.hw_addr,6,str);
|
||||
StrnCpy(config[7].fname, str, maxlen-1);
|
||||
StrnCpy(config[7].fname+17, CONFIG_EXTENSION, 6);
|
||||
|
||||
#else
|
||||
StrnCpy(config[0].fname, NETFS_DEFAULT_CONFIG, maxlen-1);
|
||||
config[0].fname[maxlen-1] = CHAR_NULL;
|
||||
|
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o
|
||||
|
||||
|
@ -37,13 +42,13 @@ all: $(TARGET)
|
|||
system.o: rmswitch.h
|
||||
|
||||
rmswitch.h: bin_to_h.c rmswitch.S
|
||||
$(CC) -o bin_to_h bin_to_h.c
|
||||
$(AS) -o rmswitch.o rmswitch.S
|
||||
$(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c
|
||||
$(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S
|
||||
$(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o
|
||||
./bin_to_h <rmswitch >rmswitch.h
|
||||
|
||||
$(TARGET): $(FILES)
|
||||
$(LD) -r -o $@ $(FILES)
|
||||
$(LD) $(LD3264) -r -o $@ $(FILES)
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
boot_params_t *param_start = NULL;
|
||||
UINTN param_size = 0;
|
||||
|
||||
UINTN kernel_size = 0x200000; /* 2M (largest x86 bzImage kernel image) */
|
||||
UINTN kernel_size = 0x400000; /* 4M (default x86 bzImage size limit) */
|
||||
|
||||
static INTN
|
||||
bzImage_probe(CHAR16 *kname)
|
||||
|
@ -47,7 +47,7 @@ bzImage_probe(CHAR16 *kname)
|
|||
DBG_PRT((L"probe_bzImage_boot()\n"));
|
||||
|
||||
if (!kname) {
|
||||
ERR_PRT((L"kname == %xh", kname));
|
||||
ERR_PRT((L"kname == " PTR_FMT, kname));
|
||||
free_kmem();
|
||||
return -1;
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ bzImage_probe(CHAR16 *kname)
|
|||
param_size = (bootsect[0x1F1] + 1) * 512;
|
||||
param_start = alloc(param_size, EfiLoaderData);
|
||||
|
||||
DBG_PRT((L"param_size=%d param_start=%x", param_size, param_start));
|
||||
DBG_PRT((L"param_size=%d param_start=" PTR_FMT, param_size, param_start));
|
||||
|
||||
if (!param_start) {
|
||||
ERR_PRT((L"Could not allocate %d bytes of setup data.",
|
||||
|
@ -141,7 +141,7 @@ bzImage_probe(CHAR16 *kname)
|
|||
|
||||
{
|
||||
UINT8 *c = ((UINT8 *)param_start)+514;
|
||||
DBG_PRT((L"param_start(c=%x): %c-%c-%c-%c",
|
||||
DBG_PRT((L"param_start(c=" PTR_FMT "): %c-%c-%c-%c",
|
||||
c, (CHAR16)c[0],(CHAR16) c[1], (CHAR16)c[2], (CHAR16)c[3]));
|
||||
}
|
||||
if (CompareMem(((UINT8 *)param_start) + 514, "HdrS", 4)) {
|
||||
|
@ -158,13 +158,38 @@ bzImage_probe(CHAR16 *kname)
|
|||
* Allocate memory for kernel.
|
||||
*/
|
||||
|
||||
if (alloc_kmem(kernel_start, EFI_SIZE_TO_PAGES(kernel_size))) {
|
||||
ERR_PRT((L"Could not allocate kernel memory."));
|
||||
return -1;
|
||||
} else {
|
||||
VERB_PRT(3, Print(L"kernel_start: 0x%x kernel_size: %d\n",
|
||||
kernel_start, kernel_size));
|
||||
}
|
||||
/*
|
||||
* Get correct address for kernel from header, if applicable & available.
|
||||
*/
|
||||
if ((param_start->s.hdr_major == 2) &&
|
||||
(param_start->s.hdr_minor >= 6) &&
|
||||
(param_start->s.kernel_start >= DEFAULT_KERNEL_START)) {
|
||||
kernel_start = (void *)param_start->s.kernel_start;
|
||||
VERB_PRT(3, Print(L"kernel header suggests kernel start at address "PTR_FMT"\n",
|
||||
kernel_start));
|
||||
}
|
||||
|
||||
kernel_load_address = NULL; /* allocate anywhere! */
|
||||
|
||||
if (alloc_kmem(kernel_start, EFI_SIZE_TO_PAGES(kernel_size)) != 0) {
|
||||
/*
|
||||
* Couldn't get desired address--just load it anywhere and move it later.
|
||||
* (Easier than relocating kernel, and also works with non-relocatable kernels.)
|
||||
*/
|
||||
if (alloc_kmem_anywhere(&kernel_load_address, EFI_SIZE_TO_PAGES(kernel_size)) != 0) {
|
||||
ERR_PRT((L"Could not allocate memory for kernel."));
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
fops_close(fd);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
VERB_PRT(3, Print(L"kernel_start: "PTR_FMT" kernel_size: %d loading at: "PTR_FMT"\n",
|
||||
kernel_start, kernel_size, kernel_load_address));
|
||||
|
||||
|
||||
/*
|
||||
* Now read the rest of the kernel image into memory.
|
||||
*/
|
||||
|
@ -172,7 +197,7 @@ bzImage_probe(CHAR16 *kname)
|
|||
DBG_PRT((L"reading kernel image...\n"));
|
||||
|
||||
size = kernel_size;
|
||||
efi_status = fops_read(fd, kernel_start, &size);
|
||||
efi_status = fops_read(fd, kernel_load_address, &size);
|
||||
if (EFI_ERROR(efi_status) || size < 0x10000) {
|
||||
ERR_PRT((L"Error reading kernel image %s.", kname));
|
||||
free(param_start);
|
||||
|
@ -200,7 +225,7 @@ bzImage_load(CHAR16 *kname, kdesc_t *kd)
|
|||
DBG_PRT((L"load_bzImage_boot()\n"));
|
||||
|
||||
if (!kname || !kd) {
|
||||
ERR_PRT((L"kname=0x%x kd=0x%x", kname, kd));
|
||||
ERR_PRT((L"kname=" PTR_FMT " kd=" PTR_FMT, kname, kd));
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
|
@ -210,7 +235,7 @@ bzImage_load(CHAR16 *kname, kdesc_t *kd)
|
|||
kd->kstart = kd->kentry = kernel_start;
|
||||
kd->kend = ((UINT8 *)kd->kstart) + kernel_size;
|
||||
|
||||
DBG_PRT((L"kstart=0x%x kentry=0x%x kend=0x%x\n", kd->kstart, kd->kentry, kd->kend));
|
||||
DBG_PRT((L"kstart=" PTR_FMT " kentry=" PTR_FMT " kend=" PTR_FMT "\n", kd->kstart, kd->kentry, kd->kend));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
35
ia32/gzip.c
35
ia32/gzip.c
|
@ -153,7 +153,7 @@ gzip_free(void *where)
|
|||
int
|
||||
fill_inbuf(void)
|
||||
{
|
||||
INTN expected, nread;
|
||||
UINTN expected, nread;
|
||||
EFI_STATUS status;
|
||||
|
||||
expected = nread = INBUFSIZE;
|
||||
|
@ -162,7 +162,9 @@ fill_inbuf(void)
|
|||
if (EFI_ERROR(status)) {
|
||||
error("elilo: Read failed");
|
||||
}
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : read %d bytes of %d bytes\n", LD_NAME, nread, expected));
|
||||
#endif
|
||||
|
||||
insize = nread;
|
||||
inptr = 1;
|
||||
|
@ -277,7 +279,7 @@ analyze_chunks(void)
|
|||
* the relevant header information.
|
||||
*/
|
||||
int
|
||||
first_block (const char *buf, long blocksize)
|
||||
first_block (const unsigned char *buf, long blocksize)
|
||||
{
|
||||
Elf32_Ehdr *elf;
|
||||
Elf32_Phdr *phdrs;
|
||||
|
@ -297,13 +299,13 @@ first_block (const char *buf, long blocksize)
|
|||
phnum = elf->e_phnum;
|
||||
|
||||
VERB_PRT(3, {
|
||||
Print(L"Entry point 0x%lx\n", elf->e_entry);
|
||||
Print(L"Entry point "PTR_FMT"\n", elf->e_entry);
|
||||
Print(L"%d program headers\n", phnum);
|
||||
Print(L"%d segment headers\n", elf->e_shnum);
|
||||
});
|
||||
|
||||
if (offs + phnum * sizeof(*phdrs) > (unsigned) blocksize) {
|
||||
ERR_PRT((L"%s : ELF program headers not in first block (%ld)\n", LD_NAME, offs));
|
||||
ERR_PRT((L"%s : ELF program headers not in first block (%d)\n", LD_NAME, offs));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -345,15 +347,15 @@ first_block (const char *buf, long blocksize)
|
|||
|
||||
if (phdrs[i].p_type != PT_LOAD) {
|
||||
CHUNK_NO_LOAD(i); /* mark no load chunk */
|
||||
DBG_PRT((L"%s : skipping segment %ld\n", LD_NAME, i));
|
||||
DBG_PRT((L"%s : skipping segment %d\n", LD_NAME, i));
|
||||
continue;
|
||||
}
|
||||
|
||||
CHUNK_CAN_LOAD(i); /* mark no load chunk */
|
||||
|
||||
VERB_PRT(3,
|
||||
Print(L"\n%s : segment %ld vaddr [0x%lx-0x%lx] offset %ld filesz %ld "
|
||||
"memsz=%ld bss_sz=%ld\n",
|
||||
Print(L"\n%s : segment %d vaddr ["PTR_FMT"-"PTR_FMT"] offset %d filesz %d "
|
||||
"memsz=%d bss_sz=%d\n",
|
||||
LD_NAME, 1+i, chunks[i].addr, chunks[i].addr+phdrs[i].p_filesz,
|
||||
chunks[i].offset, chunks[i].size, memsz, chunks[i].bss_sz));
|
||||
|
||||
|
@ -364,12 +366,12 @@ first_block (const char *buf, long blocksize)
|
|||
}
|
||||
|
||||
if (low_addr & (EFI_PAGE_SIZE - 1)) {
|
||||
ERR_PRT((L"%s : low_addr not page aligned 0x%lx\n", LD_NAME, low_addr));
|
||||
ERR_PRT((L"%s : low_addr not page aligned "PTR_FMT"\n", LD_NAME, low_addr));
|
||||
goto error;
|
||||
}
|
||||
analyze_chunks();
|
||||
|
||||
DBG_PRT((L"%s : %d program headers entry=0x%lx\nlowest_addr=0x%lx highest_addr=0x%lx\n",
|
||||
DBG_PRT((L"%s : %d program headers entry=" PTR_FMT "\nlowest_addr="PTR_FMT" highest_addr="PTR_FMT"\n",
|
||||
LD_NAME,
|
||||
phnum, kernel_entry, low_addr, max_addr));
|
||||
|
||||
|
@ -384,9 +386,9 @@ first_block (const char *buf, long blocksize)
|
|||
|
||||
/* allocate memory for the kernel */
|
||||
if (alloc_kmem((void *)low_addr, pages) == -1) {
|
||||
ERR_PRT((L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n",
|
||||
ERR_PRT((L"%s : AllocatePages(%d, "PTR_FMT") for kernel failed\n",
|
||||
LD_NAME, pages, low_addr));
|
||||
ERR_PRT((L"%s : Could not load kernel at 0x%lx\n", LD_NAME, low_addr));
|
||||
ERR_PRT((L"%s : Could not load kernel at "PTR_FMT"\n", LD_NAME, low_addr));
|
||||
ERR_PRT((L"%s : Bailing\n", LD_NAME));
|
||||
goto error;
|
||||
}
|
||||
|
@ -430,12 +432,13 @@ flush_window(void)
|
|||
static const CHAR8 helicopter[4] = { '|' , '/' , '-' , '\\' };
|
||||
static UINTN heli_count;
|
||||
struct segment *cp;
|
||||
char *src, *dst;
|
||||
unsigned char *src, *dst;
|
||||
long cnt;
|
||||
|
||||
if (!outcnt) return;
|
||||
|
||||
DBG_PRT((L"%s : flush_window outnct=%d file_offset=%ld\n", LD_NAME, outcnt, file_offset));
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : flush_window outnct=%d file_offset=%d\n", LD_NAME, outcnt, file_offset));
|
||||
#endif
|
||||
|
||||
Print(L"%c\b",helicopter[heli_count++%4]);
|
||||
|
||||
|
@ -468,7 +471,7 @@ tail:
|
|||
file_offset += skip;
|
||||
outcnt -= skip;
|
||||
}
|
||||
dst = (char *)cp->addr + (file_offset - cp->offset);
|
||||
dst = (unsigned char *)cp->addr + (file_offset - cp->offset);
|
||||
cnt = cp->offset + cp->size - file_offset;
|
||||
if (cnt > outcnt)
|
||||
cnt = outcnt;
|
||||
|
@ -482,7 +485,7 @@ tail:
|
|||
/* See if we are at the end of this chunk */
|
||||
if (file_offset == cp->offset + cp->size) {
|
||||
if (cp->bss_sz) {
|
||||
dst = (char *)cp->addr + cp->size;
|
||||
dst = (unsigned char *)cp->addr + cp->size;
|
||||
Memset(dst, 0, cp->bss_sz);
|
||||
}
|
||||
nextchunk();
|
||||
|
|
|
@ -111,7 +111,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
}
|
||||
VERB_PRT(3, {
|
||||
Print(L"ELF Header information: \n");
|
||||
Print(L"\tEntry point 0x%x\n", (ehdr.e_entry & PADDR_MASK));
|
||||
Print(L"\tEntry point "PTR_FMT"\n", (ehdr.e_entry & PADDR_MASK));
|
||||
Print(L"\t%d program headers\n", ehdr.e_phnum);
|
||||
Print(L"\t%d segment headers\n", ehdr.e_shnum);
|
||||
});
|
||||
|
@ -145,8 +145,8 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
paddr = (phdrs[i].p_paddr & PADDR_MASK);
|
||||
memsz = phdrs[i].p_memsz;
|
||||
|
||||
DBG_PRT((L"Phdr %d paddr [0x%x-0x%x] offset 0x%x"
|
||||
" filesz 0x%x memsz=0x%x bss_sz=0x%x p_type=0x%x\n",
|
||||
DBG_PRT((L"Phdr %d paddr ["PTR_FMT"-"PTR_FMT"] offset "PTR_FMT""
|
||||
" filesz "PTR_FMT" memsz="PTR_FMT" bss_sz="PTR_FMT" p_type="PTR_FMT"\n",
|
||||
1+i, paddr, paddr+phdrs[i].p_filesz, phdrs[i].p_offset,
|
||||
phdrs[i].p_filesz, memsz,
|
||||
(memsz - phdrs[i].p_filesz), phdrs[i].p_type));
|
||||
|
@ -160,7 +160,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
}
|
||||
|
||||
if ((UINTN)low_addr & (EFI_PAGE_SIZE - 1)) {
|
||||
ERR_PRT((L"%s : kernel low address 0x%x not page aligned\n",
|
||||
ERR_PRT((L"%s : kernel low address "PTR_FMT" not page aligned\n",
|
||||
LD_NAME, low_addr));
|
||||
goto out;
|
||||
}
|
||||
|
@ -176,16 +176,16 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
kd->kentry = (VOID *)(ehdr.e_entry & PADDR_MASK);
|
||||
|
||||
VERB_PRT(3, {
|
||||
Print(L"Lowest PhysAddr: 0x%x\nTotalMemSize:%d bytes (%d pages)\n",
|
||||
Print(L"Lowest PhysAddr: "PTR_FMT"\nTotalMemSize:%d bytes (%d pages)\n",
|
||||
low_addr, total_size, pages);
|
||||
Print(L"Kernel entry @ 0x%x\n", kd->kentry);
|
||||
Print(L"Kernel entry @ "PTR_FMT"\n", kd->kentry);
|
||||
});
|
||||
|
||||
/* now allocate memory for the kernel at the exact requested spot */
|
||||
if (alloc_kmem(low_addr, pages) == -1) {
|
||||
ERR_PRT((L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n",
|
||||
ERR_PRT((L"%s : AllocatePages(%d, "PTR_FMT") for kernel failed\n",
|
||||
LD_NAME, pages, low_addr));
|
||||
ERR_PRT((L"%s : Could not alloc %d pages for the kernel at 0x%lx "
|
||||
ERR_PRT((L"%s : Could not alloc %d pages for the kernel at "PTR_FMT""
|
||||
" and relocation is not not been implemented!\n",
|
||||
LD_NAME, pages, low_addr));
|
||||
goto load_abort;
|
||||
|
@ -206,7 +206,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
if (phdrs[i].p_type != PT_LOAD)
|
||||
continue;
|
||||
|
||||
VERB_PRT(3, Print(L"poffs: 0x%x (phdrs[%d].p_offset)\n",
|
||||
VERB_PRT(3, Print(L"poffs: "PTR_FMT" (phdrs[%d].p_offset)\n",
|
||||
phdrs[i].p_offset, i));
|
||||
|
||||
filesz = phdrs[i].p_filesz;
|
||||
|
@ -221,9 +221,9 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
|
||||
VERB_PRT(4, {
|
||||
Print(L"\nHeader #%d\n", i);
|
||||
Print(L"Offset in file 0x%x\n", phdrs[i].p_offset);
|
||||
Print(L"Physical addr 0x%x\n", low_addr);
|
||||
Print(L"BSS size 0x%x bytes\n", bss_sz);
|
||||
Print(L"Offset in file "PTR_FMT"\n", phdrs[i].p_offset);
|
||||
Print(L"Physical addr "PTR_FMT"\n", low_addr);
|
||||
Print(L"BSS size %d bytes\n", bss_sz);
|
||||
});
|
||||
|
||||
/*
|
||||
|
|
|
@ -35,6 +35,9 @@
|
|||
#define ELILO_ARCH "IA-32" /* ASCII string */
|
||||
#define PADDR_MASK 0xfffffff
|
||||
|
||||
#define INITRD_START (15*1024*1024)
|
||||
#define DEFAULT_KERNEL_START 0x100000
|
||||
|
||||
/* for now use library versions */
|
||||
#define Memset(a,v,n) SetMem((a),(n),(v))
|
||||
#define Memcpy(a,b,n) CopyMem((a),(b),(n))
|
||||
|
@ -299,11 +302,17 @@ typedef union ia32_boot_params {
|
|||
UINT8 *t = (UINT8 *)(to); \
|
||||
UINT8 *f = (UINT8 *)(from); \
|
||||
UINTN n = cnt; \
|
||||
if (t && f && n) { \
|
||||
while (n--) { \
|
||||
*t++ = *f++; \
|
||||
} \
|
||||
} \
|
||||
if (t && f && n && (t<f)) { \
|
||||
while (n--) { \
|
||||
*t++ = *f++; \
|
||||
} \
|
||||
} else if (t && f && n && (t>f)) { \
|
||||
t += n; \
|
||||
f += n; \
|
||||
while (n--) { \
|
||||
*t-- = *f--; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
#define MEMSET(ptr, size, val) { \
|
||||
|
@ -338,6 +347,7 @@ extern UINTN kernel_size;
|
|||
|
||||
extern VOID *initrd_start;
|
||||
extern UINTN initrd_size;
|
||||
extern VOID *kernel_load_address;
|
||||
|
||||
extern dt_addr_t gdt_addr;
|
||||
extern dt_addr_t idt_addr;
|
||||
|
@ -357,19 +367,31 @@ extern INTN ia32_use_legacy_free_boot();
|
|||
static inline void
|
||||
start_kernel(VOID *kentry, boot_params_t *bp)
|
||||
{
|
||||
UINT32 temp;
|
||||
|
||||
/*
|
||||
* Disable interrupts.
|
||||
*/
|
||||
asm volatile ( "cli" : : );
|
||||
|
||||
/*
|
||||
* Relocate initrd, if present.
|
||||
*/
|
||||
/*
|
||||
* Relocate kernel (if needed), and initrd (if present).
|
||||
* Copy kernel first, in case kernel was loaded overlapping where we're
|
||||
* planning to copy the initrd. This assumes that the initrd didn't
|
||||
* get loaded overlapping where we're planning to copy the kernel, but
|
||||
* that's pretty unlikely since we couldn't alloc that space for the
|
||||
* kernel (or the kernel would already be there).
|
||||
*/
|
||||
if (kernel_start != kernel_load_address) {
|
||||
MEMCPY(kernel_start, kernel_load_address, kernel_size);
|
||||
}
|
||||
|
||||
if (bp->s.initrd_start) {
|
||||
temp = bp->s.initrd_start;
|
||||
MEMCPY(INITRD_START, temp , bp->s.initrd_size);
|
||||
bp->s.initrd_start = INITRD_START;
|
||||
}
|
||||
|
||||
if (bp->s.initrd_start) {
|
||||
MEMCPY(15 * 1024 * 1024, bp->s.initrd_start, bp->s.initrd_size);
|
||||
bp->s.initrd_start = 15 * 1024 * 1024;
|
||||
}
|
||||
/*
|
||||
* Copy boot sector, setup data and command line
|
||||
* to final resting place. We need to copy
|
||||
|
|
|
@ -97,7 +97,10 @@ UINTN high_base_mem = 0x90000;
|
|||
UINTN high_ext_mem = 32 * 1024 * 1024;
|
||||
|
||||
/* This starting address will hold true for all of the loader types for now */
|
||||
VOID *kernel_start = (VOID *)0x100000; /* 1M */
|
||||
VOID *kernel_start = (VOID *)DEFAULT_KERNEL_START;
|
||||
|
||||
/* The kernel may load elsewhere if EFI firmware reserves kernel_start */
|
||||
VOID *kernel_load_address = (VOID *)DEFAULT_KERNEL_START;
|
||||
|
||||
VOID *initrd_start = NULL;
|
||||
UINTN initrd_size = 0;
|
||||
|
@ -131,21 +134,27 @@ sysdeps_initrd_get_addr(kdesc_t *kd, memdesc_t *imem)
|
|||
DBG_PRT((L"initrd_get_addr()\n"));
|
||||
|
||||
if (!kd || !imem) {
|
||||
ERR_PRT((L"kd=0x%x imem=0x%x", kd, imem));
|
||||
ERR_PRT((L"kd=" PTR_FMT " imem=" PTR_FMT, kd, imem));
|
||||
return -1;
|
||||
}
|
||||
|
||||
VERB_PRT(3, Print(L"kstart=0x%x kentry=0x%x kend=0x%x\n",
|
||||
VERB_PRT(3, Print(L"kstart=" PTR_FMT " kentry=" PTR_FMT " kend=" PTR_FMT "\n",
|
||||
kd->kstart, kd->kentry, kd->kend));
|
||||
|
||||
imem->start_addr = kd->kend;
|
||||
|
||||
VERB_PRT(3, Print(L"initrd start_addr=0x%x pgcnt=%d\n",
|
||||
VERB_PRT(3, Print(L"initrd start_addr=" PTR_FMT " pgcnt=%d\n",
|
||||
imem->start_addr, imem->pgcnt));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
VOID *
|
||||
sysdeps_checkfix_initrd(VOID *start_addr, memdesc_t *imem)
|
||||
{
|
||||
return start_addr;
|
||||
}
|
||||
|
||||
VOID
|
||||
sysdeps_free_boot_params(boot_params_t *bp)
|
||||
{
|
||||
|
@ -156,6 +165,24 @@ sysdeps_free_boot_params(boot_params_t *bp)
|
|||
free_memmap(&md);
|
||||
}
|
||||
|
||||
static VOID find_bits(unsigned long mask, UINT8 *first, UINT8* len) {
|
||||
unsigned char bit_pos = 0, bit_len = 0;
|
||||
*first =0;
|
||||
*len = 0;
|
||||
if (mask == 0)
|
||||
return;
|
||||
while (!(mask & 0x1)) {
|
||||
mask = mask >> 1;
|
||||
bit_pos++;
|
||||
}
|
||||
while (mask & 0x1) {
|
||||
mask = mask >> 1;
|
||||
bit_len++;
|
||||
}
|
||||
*first = bit_pos;
|
||||
*len = bit_len;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get video information.
|
||||
*/
|
||||
|
@ -163,10 +190,11 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
EFI_GUID GopProtocol = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop_interface;
|
||||
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Gop_info;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Gop_mode;
|
||||
EFI_HANDLE *Gop_handle;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Gop_mode = NULL;
|
||||
EFI_HANDLE *Gop_handle = NULL;
|
||||
EFI_STATUS efi_status;
|
||||
UINTN size, size1;
|
||||
UINTN size = 0;
|
||||
UINTN size1;
|
||||
UINT8 i;
|
||||
|
||||
efi_status = uefi_call_wrapper(
|
||||
|
@ -179,7 +207,8 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
(VOID **)Gop_handle);
|
||||
|
||||
if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
|
||||
ERR_PRT((L"LocateHandle GopProtocol failed."));
|
||||
Print(L"EFI returned no GoP handle, No Graphics Output Device?\n");
|
||||
Print(L"--Elilo will try to default to console text mode.\n");
|
||||
return -1;
|
||||
}
|
||||
Gop_handle = alloc(size, 0);
|
||||
|
@ -204,7 +233,7 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
3,
|
||||
*Gop_handle,
|
||||
&GopProtocol,
|
||||
&Gop_interface);
|
||||
(VOID **) &Gop_interface);
|
||||
|
||||
if (EFI_ERROR(efi_status)) {
|
||||
continue;
|
||||
|
@ -428,7 +457,7 @@ sysdeps_create_boot_params(
|
|||
DBG_PRT((L"fill_boot_params()\n"));
|
||||
|
||||
if (!bp || !cmdline || !initrd || !cookie) {
|
||||
ERR_PRT((L"bp=0x%x cmdline=0x%x initrd=0x%x cookie=0x%x",
|
||||
ERR_PRT((L"bp=" PTR_FMT " cmdline=" PTR_FMT " initrd=" PTR_FMT " cookie=" PTR_FMT,
|
||||
bp, cmdline, initrd, cookie));
|
||||
|
||||
if (param_start != NULL) {
|
||||
|
@ -448,9 +477,6 @@ sysdeps_create_boot_params(
|
|||
*/
|
||||
if (param_start != NULL) {
|
||||
CopyMem(bp, param_start, 0x2000);
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
}
|
||||
/*
|
||||
* Save off our header revision information.
|
||||
|
@ -515,7 +541,7 @@ sysdeps_create_boot_params(
|
|||
* Initial RAMdisk and root device stuff.
|
||||
*/
|
||||
|
||||
DBG_PRT((L"initrd->start_addr=0x%x initrd->pgcnt=%d\n",
|
||||
DBG_PRT((L"initrd->start_addr=" PTR_FMT " initrd->pgcnt=%d\n",
|
||||
initrd->start_addr, initrd->pgcnt));
|
||||
|
||||
/* These RAMdisk flags are not needed, just zero them. */
|
||||
|
@ -597,7 +623,7 @@ sysdeps_create_boot_params(
|
|||
#define WAIT_FOR_KEY() \
|
||||
{ \
|
||||
EFI_INPUT_KEY key; \
|
||||
while (ST->ConIn->ReadKeyStroke(ST->ConIn, &key) != EFI_SUCCESS) { \
|
||||
while (uefi_call_wrapper(ST->ConIn->ReadKeyStroke, 2, ST->ConIn, &key) != EFI_SUCCESS) { \
|
||||
; \
|
||||
} \
|
||||
}
|
||||
|
@ -697,7 +723,9 @@ sysdeps_create_boot_params(
|
|||
|
||||
if (!get_video_info(bp)) goto do_memmap;
|
||||
|
||||
efi_status = ST->ConOut->QueryMode(
|
||||
efi_status = uefi_call_wrapper(
|
||||
ST->ConOut->QueryMode,
|
||||
4,
|
||||
ST->ConOut,
|
||||
ST->ConOut->Mode->Mode,
|
||||
&cols,
|
||||
|
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=system.o config.o fpswa.o plain_loader.o gzip_loader.o \
|
||||
gzip.o memset.o memcpy.o setjmp.o longjmp.o
|
||||
|
|
|
@ -132,7 +132,7 @@ check_fpswa(EFI_HANDLE image, EFI_HANDLE dev, CHAR16 *fpswa_file)
|
|||
#endif
|
||||
};
|
||||
UINTN j, count = sizeof(fpswa_filenames)/sizeof(CHAR16 *);
|
||||
INTN cookie;
|
||||
UINTN cookie;
|
||||
CHAR16 devname[FILENAME_MAXLEN];
|
||||
|
||||
if (fpswa_file) {
|
||||
|
|
19
ia64/gzip.c
19
ia64/gzip.c
|
@ -161,7 +161,7 @@ gzip_free(void *where)
|
|||
int
|
||||
fill_inbuf(void)
|
||||
{
|
||||
INTN expected, nread;
|
||||
UINTN expected, nread;
|
||||
EFI_STATUS status;
|
||||
|
||||
expected = nread = INBUFSIZE;
|
||||
|
@ -170,7 +170,9 @@ fill_inbuf(void)
|
|||
if (EFI_ERROR(status)) {
|
||||
error("elilo: Read failed");
|
||||
}
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : read %d bytes of %d bytes\n", LD_NAME, nread, expected));
|
||||
#endif
|
||||
|
||||
insize = nread;
|
||||
inptr = 1;
|
||||
|
@ -309,7 +311,7 @@ analyze_chunks(void)
|
|||
* the relevant header information.
|
||||
*/
|
||||
int
|
||||
first_block (const char *buf, long blocksize)
|
||||
first_block (const unsigned char *buf, long blocksize)
|
||||
{
|
||||
Elf64_Ehdr *elf;
|
||||
Elf64_Phdr *phdrs;
|
||||
|
@ -439,7 +441,7 @@ first_block (const char *buf, long blocksize)
|
|||
if (alloc_kmem((void *)low_addr, pages) == -1) {
|
||||
VOID *new_addr;
|
||||
|
||||
VERB_PRT(1, (L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr));
|
||||
VERB_PRT(1, Print(L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr));
|
||||
|
||||
if (ia64_can_relocate() == 0) {
|
||||
ERR_PRT((L"relocation is disabled, cannot load kernel"));
|
||||
|
@ -464,7 +466,7 @@ first_block (const char *buf, long blocksize)
|
|||
/* unsigned arithmetic */
|
||||
load_offset = (UINTN) (new_addr - ROUNDDOWN((UINTN) low_addr,256*MB));
|
||||
|
||||
VERB_PRT(1, (L"low_addr=0x%lx new_addr=0x%lx offset=0x%lx", low_addr, new_addr, load_offset));
|
||||
VERB_PRT(1, Print(L"low_addr=0x%lx new_addr=0x%lx offset=0x%lx", low_addr, new_addr, load_offset));
|
||||
|
||||
/*
|
||||
* correct various addresses for non-zero load_offset
|
||||
|
@ -526,12 +528,13 @@ flush_window(void)
|
|||
static const CHAR8 helicopter[4] = { '|' , '/' , '-' , '\\' };
|
||||
static UINTN heli_count;
|
||||
struct segment *cp;
|
||||
char *src, *dst;
|
||||
unsigned char *src, *dst;
|
||||
long cnt;
|
||||
|
||||
if (!outcnt) return;
|
||||
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : flush_window outnct=%d file_offset=%ld\n", LD_NAME, outcnt, file_offset));
|
||||
#endif
|
||||
|
||||
Print(L"%c\b",helicopter[heli_count++%4]);
|
||||
|
||||
|
@ -565,7 +568,7 @@ tail:
|
|||
file_offset += skip;
|
||||
outcnt -= skip;
|
||||
}
|
||||
dst = (char *)cp->addr + (file_offset - cp->offset);
|
||||
dst = (unsigned char *)cp->addr + (file_offset - cp->offset);
|
||||
|
||||
cnt = cp->offset + cp->size - file_offset;
|
||||
|
||||
|
@ -582,7 +585,7 @@ tail:
|
|||
/* See if we are at the end of this chunk */
|
||||
if (file_offset == cp->offset + cp->size) {
|
||||
if (cp->bss_sz) {
|
||||
dst = (char *)cp->addr + cp->size;
|
||||
dst = (unsigned char *)cp->addr + cp->size;
|
||||
Memset(dst, 0, cp->bss_sz);
|
||||
}
|
||||
nextchunk();
|
||||
|
|
|
@ -159,4 +159,4 @@ longjmp:
|
|||
invala // virt. -> phys. regnum mapping may change
|
||||
mov pr=r24,-1
|
||||
br.ret.dptk.few rp
|
||||
.endp __longjmp
|
||||
.endp longjmp
|
||||
|
|
|
@ -288,7 +288,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
if (alloc_kmem(low_addr, pages) == -1) {
|
||||
VOID *new_addr;
|
||||
|
||||
VERB_PRT(1, (L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr));
|
||||
VERB_PRT(1, Print(L"%s : AllocatePages(%d, 0x%lx) for kernel failed\n", LD_NAME, pages, low_addr));
|
||||
|
||||
if (ia64_can_relocate() == 0) {
|
||||
ERR_PRT((L"relocation is disabled, cannot load kernel"));
|
||||
|
|
|
@ -81,6 +81,7 @@ setjmp:
|
|||
.proc __sigsetjmp
|
||||
__sigsetjmp:
|
||||
//.prologue ASM_UNW_PRLG_RP|ASM_UNW_PRLG_PFS, ASM_UNW_PRLG_GRSAVE(2)
|
||||
.body
|
||||
alloc loc1=ar.pfs,2,2,2,0
|
||||
mov r16=ar.unat
|
||||
;;
|
||||
|
@ -89,6 +90,7 @@ __sigsetjmp:
|
|||
add r3=8,in0
|
||||
;;
|
||||
st8.spill.nta [r2]=sp,16 // r12 (sp)
|
||||
;;
|
||||
st8.spill.nta [r3]=gp,16 // r1 (gp)
|
||||
;;
|
||||
st8.nta [r2]=r16,16 // save caller's unat
|
||||
|
@ -96,13 +98,13 @@ __sigsetjmp:
|
|||
add r8=0xa0,in0
|
||||
;;
|
||||
st8.spill.nta [r2]=r4,16 // r4
|
||||
;;
|
||||
st8.spill.nta [r3]=r5,16 // r5
|
||||
add r9=0xb0,in0
|
||||
;;
|
||||
stf.spill.nta [r8]=f2,32
|
||||
stf.spill.nta [r9]=f3,32
|
||||
mov loc0=rp
|
||||
.body
|
||||
;;
|
||||
stf.spill.nta [r8]=f4,32
|
||||
stf.spill.nta [r9]=f5,32
|
||||
|
@ -139,6 +141,7 @@ __sigsetjmp:
|
|||
stf.spill.nta [r9]=f31
|
||||
|
||||
st8.spill.nta [r2]=r6,16 // r6
|
||||
;;
|
||||
st8.spill.nta [r3]=r7,16 // r7
|
||||
;;
|
||||
mov r23=ar.bsp
|
||||
|
|
|
@ -86,7 +86,7 @@ start_kernel(VOID *kentry, VOID *bp)
|
|||
asm volatile ("mov r28=%1; br.sptk.few %0" :: "b"(kentry),"r"(bp));
|
||||
}
|
||||
|
||||
static inline const UINT64
|
||||
static inline UINT64
|
||||
__ia64_swab64 (UINT64 x)
|
||||
{
|
||||
UINT64 result;
|
||||
|
@ -95,13 +95,13 @@ __ia64_swab64 (UINT64 x)
|
|||
return result;
|
||||
}
|
||||
|
||||
static inline const UINT32
|
||||
static inline UINT32
|
||||
__ia64_swab32 (UINT32 x)
|
||||
{
|
||||
return __ia64_swab64(x) >> 32;
|
||||
}
|
||||
|
||||
static inline const UINT16
|
||||
static inline UINT16
|
||||
__ia64_swab16(UINT16 x)
|
||||
{
|
||||
return __ia64_swab64(x) >> 48;
|
||||
|
|
|
@ -55,7 +55,7 @@ sysdeps_create_boot_params(boot_params_t *bp, CHAR8 *cmdline, memdesc_t *initrd,
|
|||
|
||||
if (get_memmap(&mdesc) == -1) return -1;
|
||||
|
||||
DBG_PRT((L"Got memory map @ 0x%lx (%d bytes)", mdesc.md, mdesc.map_size));
|
||||
DBG_PRT((L"Got memory map @ 0x%lx (%d bytes) with key %d", mdesc.md, mdesc.map_size, mdesc.cookie));
|
||||
|
||||
bp->efi_systab = (UINTN)systab;
|
||||
bp->efi_memmap = (UINTN)mdesc.md;
|
||||
|
@ -140,6 +140,12 @@ sysdeps_initrd_get_addr(kdesc_t *kd, memdesc_t *imem)
|
|||
return 0;
|
||||
}
|
||||
|
||||
VOID *
|
||||
sysdeps_checkfix_initrd(VOID *start_addr, memdesc_t *imem)
|
||||
{
|
||||
return start_addr;
|
||||
}
|
||||
|
||||
/* Flush data cache [addr; addr + len], and sync with icache. */
|
||||
void
|
||||
flush_dcache (CHAR8 *addr, UINT64 len)
|
||||
|
@ -147,7 +153,7 @@ flush_dcache (CHAR8 *addr, UINT64 len)
|
|||
/* Cache line length is at least 32. */
|
||||
UINT64 a = (UINT64)addr & ~0x1f;
|
||||
|
||||
VERB_PRT(3, Print(L"Flush 0x%lx-", a));
|
||||
DBG_PRT((L"Flush 0x%lx-", a));
|
||||
|
||||
/* Flush data. */
|
||||
for (len = (len + 31) & ~0x1f; len > 0; len -= 0x20, a += 0x20)
|
||||
|
@ -155,5 +161,5 @@ flush_dcache (CHAR8 *addr, UINT64 len)
|
|||
/* Sync and serialize. Maybe extra. */
|
||||
asm volatile (";; sync.i;; srlz.i;;");
|
||||
|
||||
VERB_PRT(3, Print(L"0x%lx\n", a));
|
||||
DBG_PRT((L"0x%lx\n", a));
|
||||
}
|
||||
|
|
|
@ -1094,10 +1094,10 @@ static int gunzip(void)
|
|||
error("Input has invalid flags\n");
|
||||
return -1;
|
||||
}
|
||||
(ulg)get_byte(); /* Get timestamp */
|
||||
((ulg)get_byte()) << 8;
|
||||
((ulg)get_byte()) << 16;
|
||||
((ulg)get_byte()) << 24;
|
||||
(void)get_byte(); /* Get timestamp - 4 bytes */
|
||||
(void)get_byte();
|
||||
(void)get_byte();
|
||||
(void)get_byte();
|
||||
|
||||
(void)get_byte(); /* Ignore extra flags for the moment */
|
||||
(void)get_byte(); /* Ignore OS type for the moment */
|
||||
|
|
16
initrd.c
16
initrd.c
|
@ -41,7 +41,11 @@ INTN
|
|||
load_file(CHAR16 *filename, memdesc_t *image)
|
||||
{
|
||||
EFI_STATUS status;
|
||||
VOID *start_addr = NULL;
|
||||
/*
|
||||
* Actually using the value from sysdeps_initrd_get_addr()
|
||||
* instead of NULL is no change for ia64!
|
||||
*/
|
||||
VOID *start_addr = image->start_addr;
|
||||
UINTN pgcnt;
|
||||
UINT64 size = 0;
|
||||
fops_fd_t fd;
|
||||
|
@ -71,15 +75,19 @@ load_file(CHAR16 *filename, memdesc_t *image)
|
|||
/* round up to get required number of pages (4KB) */
|
||||
image->pgcnt = pgcnt = EFI_SIZE_TO_PAGES(image->size);
|
||||
|
||||
start_addr = alloc_pages(pgcnt, EfiLoaderData, start_addr ? AllocateAddress : AllocateAnyPages, 0 );
|
||||
start_addr = alloc_pages(pgcnt, EfiLoaderData,
|
||||
start_addr ? AllocateAddress : AllocateAnyPages, start_addr);
|
||||
|
||||
start_addr = sysdeps_checkfix_initrd(start_addr, image);
|
||||
|
||||
if (start_addr == NULL) {
|
||||
ERR_PRT((L"Failed to allocate %d pages for %s image", pgcnt,
|
||||
filename));
|
||||
goto error;
|
||||
}
|
||||
VERB_PRT(2, Print(L"%s image: total_size: %ld bytes base: 0x%lx "
|
||||
VERB_PRT(2, Print(L"%s image: total_size: %d bytes base: " PTR_FMT " "
|
||||
"pages %d\n", filename, image->size,
|
||||
(UINTN)start_addr, pgcnt));
|
||||
start_addr, pgcnt));
|
||||
|
||||
Print(L"Loading file %s...", filename);
|
||||
|
||||
|
|
6
loader.c
6
loader.c
|
@ -38,12 +38,18 @@ loader_ops_t *
|
|||
loader_probe(CHAR16 *kname)
|
||||
{
|
||||
loader_ops_t *ops;
|
||||
UINTN n = 0;
|
||||
|
||||
for (ops= ldops_list; ops; ops = ops->next) {
|
||||
n++;
|
||||
VERB_PRT(3, Print(L"Probing loader: %s\n", ops->ld_name));
|
||||
if (ops->ld_probe(kname) == 0) {
|
||||
return ops;
|
||||
}
|
||||
}
|
||||
if (!n) {
|
||||
ERR_PRT((L"No loaders registered"));
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
193
release.notes
193
release.notes
|
@ -1,94 +1,119 @@
|
|||
3 . 1 6 R E L E A S E N O T E S
|
||||
===================================
|
||||
|
||||
SUBMIT BUG REPORTS HERE --> http://sourceforge.net/tracker/?group_id=91879&atid=598709
|
||||
QUICK CHANGE SUMMARY
|
||||
====================
|
||||
* Adds native x86x crossbuild functionality
|
||||
build 32bit or 64bit versions from either environment via
|
||||
make ARCH=ia32|x86_64 (the ARCH IS case sensitive).
|
||||
make by itself will default to the native host arch.
|
||||
* Add console reset call during initialization. thanks A. Steinmetz
|
||||
* simplify output of no GOP warning text so it no longer looks like an error.
|
||||
* MAJOR: Fixed Fault crash when EFI memory map changes from under elilo.
|
||||
(from an outside interrupt in this case). When the EFI Memory map
|
||||
changes after elilo has already built boot params to pass to the
|
||||
kernel the EFI call to ExitBootSvcs just prior to boot will fail
|
||||
because elilo has the old map key. This is valid EFI behavior, elilo
|
||||
retries to pick up the new memory map and key but had already freed
|
||||
the start params portion of boot params resulting in a NULL DEREF
|
||||
crash reset once it hands the now bogus boot params to the kernel on
|
||||
the 2nd successful call to exit efi and boot.
|
||||
Thanks to Jerry Hoemann @ HP for reporting this bug.
|
||||
* minor bugfix, fixed -m option broken. thanks Allan-lsk.
|
||||
|
||||
BUILD NOTES
|
||||
====================
|
||||
You will need the following toolchain to build elilo-3.14 from source
|
||||
the elilo build environment is optimized for Debian and Debian based distros.
|
||||
elilo-3.16 was built in the squeeze+(ubuntu 11.x) build environments except
|
||||
for itanium which is unchanged to best support legacy enterprise configs.
|
||||
Toolchain versions for this release were:
|
||||
x86x(32 & 64bit versions)
|
||||
* gnu-efi --> 3.0i-3
|
||||
* gcc ------> 4:4.4.4-1ubuntu2
|
||||
* binutils -> 2.20.51.20100908-0ubuntu2
|
||||
ia64
|
||||
* gnu-efi --> 3.0e-2
|
||||
* gcc ------> 4.3.2-2
|
||||
* binutils -> 2.18.1~cvs20080103-7
|
||||
|
||||
IMPORTANT NOTE FOR BUILDS ON ALL ARCHS:
|
||||
-------------------------
|
||||
|
||||
You will need the following toolchain to build elilo with the 3.7 source tarball
|
||||
(for all archs due to the new uefi call wrappers).
|
||||
|
||||
1. gnu-efi-3.0d or > .... http://sourceforge.net/project/showfiles.php?group_id=163609&package_id=185019&release_id=508306
|
||||
|
||||
2. gcc-4.1.1 or >
|
||||
3. binutils-2.17.50.0.14 or > with Intel64 EFI support
|
||||
|
||||
*BuildNote: efi libraries are installed to /usr/local/lib
|
||||
by the default gnu-efi source package. elilo expects them to
|
||||
be in standard linux system location /usr/lib. efi includes
|
||||
may be located in /usr/local/include/efi. elilo expects
|
||||
them to be in standard linux system location /usr/include/efi.
|
||||
likewise objcopy may be installed to /usr/local/bin by binutils,
|
||||
elilo source expects it to be in /usr/bin. On distributions
|
||||
using standard linux system conventions such
|
||||
as Debian and Ubuntu this is corrected in the binutils and gnu-efi packages.
|
||||
* if you use a debian based build environment you will have no problems
|
||||
and setting it up is simple. you will be able to build elilo in 3 steps:
|
||||
1. apt-get install gnu-efi, gcc, binutils
|
||||
2. apt-get source elilo (or download elilo-3.16 source from SourceForge.)
|
||||
3. extract source tarball and cd to ./$your-elilo-source and type $> make
|
||||
|
||||
|
||||
Implementation:
|
||||
--------------
|
||||
Calls to EFI services in x86_64 require a wrapper to pass the arguments
|
||||
in the appropriate manner. This is implemented with efi wrapper.
|
||||
For IA32 and IA64, the wrapper is a macro that merely calls the
|
||||
EFI services directly. The elilo source has been modified to use the
|
||||
efi wrapper implemented in the gnu-efi-3.0d library.
|
||||
elilo for x86_64 and its dependent libraries are built and the final
|
||||
ELF image is converted into PE-COFF image using the objcopy supported
|
||||
by binutils-2.17.50.0.14 or above with Intel64 EFI support.
|
||||
** If you use the upstream toolchain tarballs(i.e. pre distro) you will need
|
||||
to move some files around for elilo build to work.
|
||||
GNU-EFI (provides the efi 1.10 and uefi 2.x libraries & api)
|
||||
-------
|
||||
gnu-efi libraries are installed to /usr/local/lib by the
|
||||
upstream gnu-efi source package. elilo expects them to be in system location
|
||||
/usr/lib. efi includes may be located in /usr/local/include/efi. elilo
|
||||
expects them to be in system location /usr/include/efi.
|
||||
[ The reason is LSB compliance ].
|
||||
|
||||
On UEFI 2.0 firmware, only Graphics Output Protocol (GOP) is supported.
|
||||
The x86_64 elilo first queries video information from GOP failing which
|
||||
it queries for text mode support. The video information is passed to
|
||||
Linux kernel via boot parameter. The GOP support requires
|
||||
Linux kernel EFI framebuffer driver (kernel configuration option).
|
||||
BINUTILS (provides the elf conversion utility to produce efi bins)
|
||||
--------
|
||||
binutils provides objcopy which is installed to /usr/local/bin by binutils,
|
||||
elilo source expects it to be in /usr/bin.
|
||||
|
||||
Booting on EFI/x86_64 platforms
|
||||
-----------------------------
|
||||
again this LSB compliance is taken care of by the distro's that fix
|
||||
the toolchains to install to the correct compliant system locations
|
||||
instead of the "user optional" location.
|
||||
|
||||
To use elilo on x86_64, you can put it on a floppy and
|
||||
on a FAT32 partition (msdos partition). You can also
|
||||
netboot if your network adapter has support for UNDI/PXE.
|
||||
ELILO ON EFI X86_64
|
||||
=====================
|
||||
HARD REQUIREMENTS
|
||||
EFI + x86_64 REQUIRES an efi64 enabled linux kernel i.e. 2.6.21 or newer
|
||||
nothing earlier will work, 2.6.21 was the earliest kernel that efi64
|
||||
support went into. You need to compile the kernel with CONFIG_EFI
|
||||
kernel option ON.
|
||||
x86_64 platforms with UEFI 2.0 firmware deprecate UGA protocol
|
||||
and therefore only the Graphics Output Protocol (GOP) is supported. For
|
||||
such platforms, the kernel must be compiled with EFI_FB option ON. This
|
||||
will enable early boot messages on the console. Elilo for x86_64
|
||||
attempts to query EFI for GOP support and if it fails it defaults to
|
||||
text mode which may or may not show you early console ouput depends on
|
||||
your efi console settings and physical setup. Elilo has no way to know
|
||||
if your console settings are messed up.
|
||||
|
||||
Elilo/x86_64 requires efi64 enabled linux kernel (> 2.6.21).
|
||||
You need to compile the kernel with CONFIG_EFI option.
|
||||
x86_64 platforms with UEFI 2.0 firmware deprecate UGA protocol
|
||||
and therefore only the Graphics Output Protocol (GOP) is supported. For
|
||||
such platforms, the kernel must be configured with EFI_FB option. This
|
||||
will enable early boot messages on the console. The elilo for x86_64
|
||||
attempts to query the firmware for GOP and if it fails it defaults to
|
||||
text mode.
|
||||
WORKING ELILO.CONF FOR EFI X86_64 EXAMPLE
|
||||
Here is my elilo.conf from my UEFI2.0/x86_64 (with nvidia pcie add on
|
||||
card, i.e. your vga= kernel param may be different) workstation which uses GOP.
|
||||
Here is a partial kernel vga table I was able to find and add here.
|
||||
Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200
|
||||
-------+--------------------------------------------------------------
|
||||
4 bits | ? ? 0x302 ? ? ? ?
|
||||
8 bits | 0x300 0x301 0x303 0x305 0x161 0x307 0x31C
|
||||
15 bits | ? 0x310 0x313 0x316 0x162 0x319 0x31D
|
||||
16 bits | ? 0x311 0x314 0x317 0x163 0x31A 0x31E
|
||||
decimal | d785 d788 d791
|
||||
24 bits | ? 0x312 0x315 0x318 ? 0x31B 0x31F
|
||||
|
||||
Additionally from ...kernel-source/Documentation/Boot.txt...
|
||||
vga=<mode>
|
||||
<mode> here is either an integer (in C notation, either
|
||||
decimal, octal, or hexadecimal) or one of the strings
|
||||
"normal" (meaning 0xFFFF), "ext" (meaning 0xFFFE) or "ask"
|
||||
(meaning 0xFFFD). This value should be entered into the
|
||||
vid_mode field, as it is used by the kernel before the command
|
||||
line is parsed.
|
||||
|
||||
example below shows me console output, what elilo is doing, and kernel boot.
|
||||
vga=normal with efi console input output directed to graphics card should
|
||||
work as well.
|
||||
|
||||
default=UBUNTU
|
||||
chooser=simple
|
||||
verbose=5
|
||||
delay=30
|
||||
append="root=/dev/sda3 vga=0x31e splash showopts"
|
||||
|
||||
image=/vmlinuz-2.6.32-27-generic
|
||||
label="UBUNTU"
|
||||
description="Ubuntu 2.6.32-27-generic kernel"
|
||||
initrd=/initrd.img-2.6.32-27-generic
|
||||
|
||||
The x86_64 implementation converts the EFI memory map into E820 map and
|
||||
passes it in the bootparameter supplied to the kernel. For details on
|
||||
bootparameter, see x86_64/sysdeps.h.
|
||||
|
||||
CHANGES BETWEEN 3.6 & 3.8
|
||||
-------------------------
|
||||
- options parsing changed to append root= after append="-- options" to
|
||||
accomodate xen ia64 support. without this change the option is
|
||||
passed to the hypervisor instead of the kernel resulting in the
|
||||
standard kernel panic.
|
||||
INTEL PATCHES
|
||||
- E820 memory map is added to IA32 to make it possible for
|
||||
Linux kernel not to depend on EFI memory map on EFI 32.
|
||||
- The EFI framebuffer type ID is changed in Linux kernel to
|
||||
conform to Linux kernel framebuffer type ID grouping rules. So the
|
||||
EFI framebuffer type ID setting code in ELILO is changed accordingly.
|
||||
- The boot loader signature of IA32 and x86_64 is redefined to
|
||||
make it possible for Linux kernel to distinguish whether the
|
||||
underlying firmware is EFI 32 or EFI 64.
|
||||
- updates for EFI-2.0 boot support going into linux kernel 2.6.24-rc4
|
||||
- CL_MAGIC is not supported by 32-bit boot protocol. So, the kernel
|
||||
command line passing code is changed accordingly.
|
||||
- bugfix, on some machines efi memmap entries exceed the 128 maximum
|
||||
for e820 map entries, so consecutive memmap entries with the same
|
||||
type are merged to bring the count below 128.
|
||||
- bugfix, uninitialized e820 _nr_map in fill_e820map.
|
||||
- fixed compile warning for cmdline_addr assignment.
|
||||
ADDITIONAL CHANGES
|
||||
- version string updated to 3.8
|
||||
- fixed x86_64 hang created by initrd images larger than 7mb due
|
||||
to the code always using the same efi region which on some machines
|
||||
is only 7mb. code changed to properly have the efi allocator decide
|
||||
which regions to use based on the total pagecount required by the
|
||||
size of the initrd to be loaded.
|
||||
- bugfix, for ia32 and x86_64 code, e820_map[x-1] accesses memory
|
||||
out of bounds when x=0.
|
||||
|
|
12
strops.c
12
strops.c
|
@ -41,11 +41,11 @@ StrnCpy(OUT CHAR16 *dst, IN const CHAR16 *src, IN UINTN size)
|
|||
{
|
||||
CHAR16 *res = dst;
|
||||
|
||||
while (size-- && (*dst++ = *src++) != CHAR_NULL);
|
||||
while (size && size-- && (*dst++ = *src++) != CHAR_NULL);
|
||||
/*
|
||||
* does the null padding
|
||||
*/
|
||||
while (size-- > 0) *dst++ = CHAR_NULL;
|
||||
while (size && size-- > 0) *dst++ = CHAR_NULL;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
@ -55,11 +55,11 @@ StrnXCpy(OUT CHAR8 *dst, IN const CHAR16 *src, IN UINTN size)
|
|||
{
|
||||
CHAR8 *res = dst;
|
||||
|
||||
while (size-- && (*dst++ = (CHAR8)*src++) != '\0');
|
||||
while (size && size-- && (*dst++ = (CHAR8)*src++) != '\0');
|
||||
/*
|
||||
* does the null padding
|
||||
*/
|
||||
while (size-- > 0) *dst++ = '\0';
|
||||
while (size && size-- > 0) *dst++ = '\0';
|
||||
|
||||
return res;
|
||||
}
|
||||
|
@ -76,11 +76,11 @@ strncpya(OUT CHAR8 *dst, IN const CHAR8 *src, IN UINTN size)
|
|||
{
|
||||
CHAR8 *res = dst;
|
||||
|
||||
while (size-- && (*dst++ = *src++) != '\0');
|
||||
while (size && size-- && (*dst++ = *src++) != '\0');
|
||||
/*
|
||||
* does the null padding
|
||||
*/
|
||||
while (size-- > 0) *dst++ = '\0';
|
||||
while (size && size-- > 0) *dst++ = '\0';
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=eliloalt.o
|
||||
TARGET=eliloalt
|
||||
|
|
|
@ -47,8 +47,10 @@
|
|||
#define ELILOALT_VERSION "0.02"
|
||||
|
||||
#define ELILO_ALT_NAME "EliloAlt"
|
||||
#define EFIVAR_DIR "/proc/efi/vars"
|
||||
#define EFIVAR_DIR "/sys/firmware/efi/vars"
|
||||
#define OFIVAR_DIR "/proc/efi/vars"
|
||||
#define ELILO_ALTVAR EFIVAR_DIR"/"ELILO_ALT_NAME"-00000000-0000-0000-0000-000000000000"
|
||||
#define OLILO_ALTVAR OFIVAR_DIR"/"ELILO_ALT_NAME"-00000000-0000-0000-0000-000000000000"
|
||||
|
||||
#define EFI_VARIABLE_NON_VOLATILE 0x0000000000000001
|
||||
#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0000000000000002
|
||||
|
@ -80,7 +82,9 @@ typedef struct _efi_variable_t {
|
|||
uint32_t attributes;
|
||||
} __attribute__((packed)) efi_variable_t;
|
||||
|
||||
static char *efivar_dir = EFIVAR_DIR;
|
||||
static char *elilo_alt_name = ELILO_ALT_NAME;
|
||||
static char *elilo_altvar = ELILO_ALTVAR;
|
||||
|
||||
static struct option cmd_options[]={
|
||||
{ "version", 0, 0, 1},
|
||||
|
@ -129,9 +133,15 @@ check_proc_efi(int find_entry)
|
|||
if (getuid() != 0) {
|
||||
fatal_error("This program must be run as root\n");
|
||||
}
|
||||
efi_vars = opendir(EFIVAR_DIR);
|
||||
efi_vars = opendir(efivar_dir);
|
||||
if (efi_vars == NULL) {
|
||||
fatal_error("Cannot access %s\n", EFIVAR_DIR);
|
||||
efivar_dir = OFIVAR_DIR;
|
||||
elilo_altvar = OLILO_ALTVAR;
|
||||
efi_vars = opendir(efivar_dir);
|
||||
}
|
||||
if (efi_vars == NULL) {
|
||||
fatal_error("Can access neither %s nor %s\n",
|
||||
EFIVAR_DIR, efivar_dir);
|
||||
}
|
||||
if (!find_entry) {
|
||||
closedir(efi_vars);
|
||||
|
@ -143,9 +153,10 @@ check_proc_efi(int find_entry)
|
|||
break;
|
||||
}
|
||||
if (entry == NULL) {
|
||||
fatal_error("Cannot find entry in %s\n", EFIVAR_DIR);
|
||||
fatal_error("Cannot find entry in %s\n", efivar_dir);
|
||||
}
|
||||
sprintf(name, "%s/%s", EFIVAR_DIR, entry->d_name);
|
||||
snprintf(name, 1023, "%s/%s", efivar_dir, entry->d_name);
|
||||
name[1023] = 0;
|
||||
closedir(efi_vars);
|
||||
return name;
|
||||
}
|
||||
|
@ -158,7 +169,7 @@ delete_var(void)
|
|||
|
||||
check_proc_efi(0);
|
||||
|
||||
fd = open(ELILO_ALTVAR, O_WRONLY);
|
||||
fd = open(elilo_altvar, O_WRONLY);
|
||||
if (fd == -1) {
|
||||
fatal_error("variable not defined\n");
|
||||
}
|
||||
|
@ -176,7 +187,7 @@ delete_var(void)
|
|||
|
||||
r = write(fd, &var, sizeof(var));
|
||||
if (r != sizeof(var)) {
|
||||
fatal_error("Variable %s defined but invalid content\n", ELILO_ALTVAR);
|
||||
fatal_error("Variable %s defined but invalid content\n", elilo_altvar);
|
||||
}
|
||||
close(fd);
|
||||
}
|
||||
|
@ -191,7 +202,7 @@ print_var(void)
|
|||
|
||||
check_proc_efi(0);
|
||||
|
||||
fd = open(ELILO_ALTVAR, O_RDONLY);
|
||||
fd = open(elilo_altvar, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
fatal_error("variable not defined\n");
|
||||
}
|
||||
|
@ -200,7 +211,7 @@ print_var(void)
|
|||
|
||||
r = read(fd, &var, sizeof(var));
|
||||
if (r != sizeof(var)) {
|
||||
fatal_error("Variable %s defined but invalid content\n", ELILO_ALTVAR);
|
||||
fatal_error("Variable %s defined but invalid content\n", elilo_altvar);
|
||||
}
|
||||
printf("EliloAlt=\"");
|
||||
for(i=0; i < var.datasize; i+=1){
|
||||
|
@ -231,7 +242,7 @@ set_var(char *cmdline)
|
|||
|
||||
fd = open(name, O_WRONLY);
|
||||
if (fd == -1) {
|
||||
fatal_error("can't open %s: %s\n", ELILO_ALTVAR, strerror(errno));
|
||||
fatal_error("can't open %s: %s\n", elilo_altvar, strerror(errno));
|
||||
}
|
||||
|
||||
memset(&var, 0, sizeof(var));
|
||||
|
@ -256,7 +267,7 @@ set_var(char *cmdline)
|
|||
|
||||
r = write(fd, &var, sizeof(var));
|
||||
if (r != sizeof(var)) {
|
||||
fatal_error("Variable %s defined but invalid content %d\n", ELILO_ALTVAR, r);
|
||||
fatal_error("Variable %s defined but invalid content %d\n", elilo_altvar, r);
|
||||
}
|
||||
close(fd);
|
||||
|
||||
|
|
6
util.c
6
util.c
|
@ -134,8 +134,10 @@ wait_timeout(UINTN timeout)
|
|||
ERR_PRT((L"waitkey WaitForEvent failed %r", status));
|
||||
return -1;
|
||||
}
|
||||
if (timeout % 10 == 1) Print(L".");
|
||||
|
||||
} while (timeout-- && idx == 0);
|
||||
Print(L"\n");
|
||||
|
||||
/*
|
||||
* SetTimer(timer, TimerCancel, 0) is causing problems on IA-32 and gcc3
|
||||
|
@ -248,7 +250,7 @@ split_args(CHAR16 *buffer, CHAR16 *kname, CHAR16 *args)
|
|||
INTN
|
||||
read_file(UINTN fd, UINTN total_size, CHAR8 *buffer)
|
||||
{
|
||||
INTN size, j=0;
|
||||
UINTN size, j=0;
|
||||
EFI_STATUS status;
|
||||
CHAR16 helicopter[4] = { L'|' , L'/' , L'-' , L'\\' };
|
||||
INTN ret = ELILO_LOAD_SUCCESS;
|
||||
|
@ -315,7 +317,7 @@ get_memmap(mmap_desc_t *desc)
|
|||
}
|
||||
desc->map_size += ELILO_MEMMAP_INC;
|
||||
}
|
||||
DBG_PRT((L"final get_memmap map_size=%ld", desc->map_size));
|
||||
DBG_PRT((L"final get_memmap map_size=%d", desc->map_size));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -23,10 +23,15 @@
|
|||
# to use this program.
|
||||
#
|
||||
|
||||
include ../Make.defaults
|
||||
include ../Make.rules
|
||||
SRCDIR = .
|
||||
|
||||
VPATH = $(SRCDIR)
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
include $(SRCDIR)/../Make.rules
|
||||
|
||||
TOPDIR=$(SRCDIR)/..
|
||||
|
||||
TOPDIR=$(CDIR)/..
|
||||
|
||||
FILES=system.o config.o bzimage.o plain_loader.o gzip_loader.o gzip.o
|
||||
#FILES=system.o config.o plain_loader.o
|
||||
|
@ -38,13 +43,13 @@ all: $(TARGET)
|
|||
system.o: rmswitch.h
|
||||
|
||||
rmswitch.h: bin_to_h.c rmswitch.S
|
||||
$(CC) -o bin_to_h bin_to_h.c
|
||||
$(AS) -o rmswitch.o rmswitch.S
|
||||
$(CC) -o bin_to_h $(SRCDIR)/bin_to_h.c
|
||||
$(AS) -o rmswitch.o $(SRCDIR)/rmswitch.S
|
||||
$(LD) -Ttext 0x0 -s --oformat binary -o rmswitch rmswitch.o
|
||||
./bin_to_h <rmswitch >rmswitch.h
|
||||
|
||||
$(TARGET): $(FILES)
|
||||
$(LD) -r -o $@ $(FILES)
|
||||
$(LD) $(LD3264) -r -o $@ $(FILES)
|
||||
|
||||
clean:
|
||||
$(RM) -f $(TARGET) $(FILES)
|
||||
|
|
150
x86_64/bzimage.c
150
x86_64/bzimage.c
|
@ -34,7 +34,130 @@
|
|||
boot_params_t *param_start = NULL;
|
||||
UINTN param_size = 0;
|
||||
|
||||
UINTN kernel_size = 0x400000; /* 4M (largest x86 bzImage kernel image) */
|
||||
UINTN kernel_size = 0x800000; /* 8M (default x86_64 bzImage size limit) */
|
||||
|
||||
static VOID *
|
||||
bzImage_alloc()
|
||||
{
|
||||
UINTN pages = EFI_SIZE_TO_PAGES(kernel_size);
|
||||
int reloc_kernel = 0;
|
||||
VOID *kla, *kend = kernel_start + kernel_size;
|
||||
UINT32 kalign, kmask;
|
||||
boot_params_t *ps = param_start;
|
||||
|
||||
/*
|
||||
* Get address for kernel from header, if applicable & available.
|
||||
*/
|
||||
if ((ps->s.hdr_major < 2) ||
|
||||
(ps->s.hdr_major == 2 && ps->s.hdr_minor < 5)) {
|
||||
reloc_kernel = 0;
|
||||
} else {
|
||||
if (ps->s.kernel_start >= DEFAULT_KERNEL_START)
|
||||
kernel_start = (void *)(UINT64)ps->s.kernel_start;
|
||||
reloc_kernel = ps->s.relocatable_kernel;
|
||||
kalign = ps->s.kernel_alignment;
|
||||
kmask = kalign - 1;
|
||||
VERB_PRT(3, Print(L"kernel header (%d.%d) suggests kernel "
|
||||
"start at address "PTR_FMT" (%srelocatable!)\n",
|
||||
ps->s.hdr_major, ps->s.hdr_minor, ps->s.kernel_start,
|
||||
(reloc_kernel ? L"": L"not ")));
|
||||
}
|
||||
|
||||
/*
|
||||
* Best effort for old (< 2.6.20) and non-relocatable kernels
|
||||
*/
|
||||
if (alloc_kmem(kernel_start, pages) == 0) {
|
||||
VERB_PRT(3, Print(L"kernel_start: "PTR_FMT" kernel_size: %d\n",
|
||||
kernel_start, kernel_size));
|
||||
return kernel_start;
|
||||
} else if ( ! reloc_kernel ) {
|
||||
/*
|
||||
* Couldn't get desired address--just load it anywhere and
|
||||
* (try to) move it later. It's the only chance for non-
|
||||
* relocatable kernels, but it breaks occassionally...
|
||||
*/
|
||||
ERR_PRT((L"Kernel header (%d.%d) suggests kernel "
|
||||
"start at address "PTR_FMT" (non relocatable!)\n"
|
||||
"This address is not available, so an attempt"
|
||||
"is made to copy the kernel there later on\n"
|
||||
"BEWARE: this is unsupported and may not work. "
|
||||
"Please update your kernel.\n",
|
||||
ps->s.hdr_major, ps->s.hdr_minor, ps->s.kernel_start));
|
||||
kla = (VOID *)(UINT32_MAX - kernel_size);
|
||||
/* NULL would preserve the "anywhere" semantic, */
|
||||
/* but it would not prevent allocation above 4GB! */
|
||||
|
||||
if (alloc_kmem_anywhere(&kla, pages) != 0) {
|
||||
/* out of luck */
|
||||
return NULL;
|
||||
}
|
||||
VERB_PRT(3, Print(L"kernel_start: "PTR_FMT
|
||||
" kernel_size: %d loading at: "PTR_FMT"\n",
|
||||
kernel_start, kernel_size, kla));
|
||||
return kla;
|
||||
}
|
||||
|
||||
|
||||
/* Is 'ps->s.kernel_alignment' guaranteed to be sane? */
|
||||
if (kalign < EFI_PAGE_SIZE) {
|
||||
kalign = EFI_PAGE_SIZE;
|
||||
kmask = EFI_PAGE_MASK;
|
||||
}
|
||||
DBG_PRT((L"alignment: kernel=0x%x efi_page=0x%x : 0x%x\n",
|
||||
ps->s.kernel_alignment, EFI_PAGE_SIZE, kalign));
|
||||
|
||||
/*
|
||||
* Couldn't get the preferred address, but luckily it's
|
||||
* a relocatable kernel, so ...
|
||||
*
|
||||
* 1. use 'find_kernel_memory()' (like Itanium)
|
||||
* 2. try out the 16 lowest possible aligned addresses (> 0)
|
||||
* 3. get enough memory to align "creatively"
|
||||
* 4. forget alignment (and start praying)...
|
||||
*/
|
||||
|
||||
/* 1. */
|
||||
if ((find_kernel_memory(kernel_start, kend, kalign, &kla) != 0) ||
|
||||
(alloc_kmem(kla, pages) != 0)) {
|
||||
kla = NULL;
|
||||
}
|
||||
|
||||
/* 2. */
|
||||
if ( ! kla && (UINT64)kernel_start < kalign ) {
|
||||
int i;
|
||||
for ( i = 1; i < 16 && !kla; i++ ) {
|
||||
VOID *tmp = (VOID *)((UINT64)kalign * i);
|
||||
if (alloc_kmem(tmp, pages) == 0) {
|
||||
kla = tmp;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* 3. */
|
||||
if ( ! kla ) {
|
||||
UINTN apages = EFI_SIZE_TO_PAGES(kernel_size + kmask);
|
||||
kla = (VOID *)(UINT32_MAX - kernel_size - kmask);
|
||||
|
||||
if (alloc_kmem_anywhere(&kla, apages) == 0) {
|
||||
kla = (VOID *)(((UINT64)kla + kmask) & ~kmask);
|
||||
} else {
|
||||
kla = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/* 4. last resort */
|
||||
if ( ! kla ) {
|
||||
kla = (VOID *)(UINT32_MAX - kernel_size);
|
||||
if (alloc_kmem_anywhere(&kla, pages) != 0) {
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
kernel_start = kla;
|
||||
VERB_PRT(1, Print(L"relocating kernel_start: "PTR_FMT
|
||||
" kernel_size: %d\n", kernel_start, kernel_size));
|
||||
return kla;
|
||||
}
|
||||
|
||||
static INTN
|
||||
bzImage_probe(CHAR16 *kname)
|
||||
|
@ -158,29 +281,34 @@ bzImage_probe(CHAR16 *kname)
|
|||
* Allocate memory for kernel.
|
||||
*/
|
||||
|
||||
if (alloc_kmem(kernel_start, EFI_SIZE_TO_PAGES(kernel_size))) {
|
||||
ERR_PRT((L"Could not allocate kernel memory."));
|
||||
kernel_load_address = bzImage_alloc();
|
||||
if ( ! kernel_load_address ) {
|
||||
ERR_PRT((L"Could not allocate memory for kernel."));
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
fops_close(fd);
|
||||
return -1;
|
||||
} else {
|
||||
VERB_PRT(3, Print(L"kernel_start: 0x%x kernel_size: %d\n",
|
||||
kernel_start, kernel_size));
|
||||
}
|
||||
|
||||
/*
|
||||
* Now read the rest of the kernel image into memory.
|
||||
*/
|
||||
|
||||
DBG_PRT((L"reading kernel image...\n"));
|
||||
Print(L"Loading kernel %s... ", kname);
|
||||
|
||||
size = kernel_size;
|
||||
efi_status = fops_read(fd, kernel_start, &size);
|
||||
efi_status = fops_read(fd, kernel_load_address, &size);
|
||||
if (EFI_ERROR(efi_status) || size < 0x10000) {
|
||||
ERR_PRT((L"Error reading kernel image %s.", kname));
|
||||
ERR_PRT((L"Error reading kernel image (0x%x).", efi_status));
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
fops_close(fd);
|
||||
free_kmem();
|
||||
return -1;
|
||||
} else {
|
||||
Print(L" done\n");
|
||||
}
|
||||
|
||||
DBG_PRT((L"kernel image read: %d bytes, %d Kbytes\n", size, size / 1024));
|
||||
|
@ -200,7 +328,7 @@ bzImage_load(CHAR16 *kname, kdesc_t *kd)
|
|||
DBG_PRT((L"load_bzImage_boot()\n"));
|
||||
|
||||
if (!kname || !kd) {
|
||||
ERR_PRT((L"kname=0x%x kd=0x%x", kname, kd));
|
||||
ERR_PRT((L"kname="PTR_FMT" kd="PTR_FMT"", kname, kd));
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
|
@ -210,7 +338,7 @@ bzImage_load(CHAR16 *kname, kdesc_t *kd)
|
|||
kd->kstart = kd->kentry = kernel_start;
|
||||
kd->kend = ((UINT8 *)kd->kstart) + kernel_size;
|
||||
|
||||
DBG_PRT((L"kstart=0x%x kentry=0x%x kend=0x%x\n", kd->kstart, kd->kentry, kd->kend));
|
||||
DBG_PRT((L"kstart="PTR_FMT" kentry="PTR_FMT" kend="PTR_FMT"\n", kd->kstart, kd->kentry, kd->kend));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -33,15 +33,23 @@
|
|||
|
||||
typedef struct {
|
||||
UINTN legacy_free_boot;
|
||||
UINTN text_mode;
|
||||
} x86_64_global_config_t;
|
||||
|
||||
|
||||
#define x86_64_opt_offsetof(option) (&((sys_img_options_t *)(0x0))->option)
|
||||
|
||||
static x86_64_global_config_t x86_64_gconf;
|
||||
|
||||
static config_option_t sysdeps_global_options[]={
|
||||
{OPT_BOOL, OPT_GLOBAL, L"legacy-free", NULL, NULL, &x86_64_gconf.legacy_free_boot}
|
||||
};
|
||||
|
||||
static config_option_t sysdeps_image_options[]={
|
||||
{OPT_BOOL, OPT_IMAGE_SYS, L"text-mode", NULL, NULL, x86_64_opt_offsetof(text_mode)}
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* X86_64 operations that need to be done only once and just before
|
||||
* entering the main loop of the loader
|
||||
|
@ -81,6 +89,14 @@ x86_64_use_legacy_free_boot(VOID)
|
|||
return x86_64_gconf.legacy_free_boot ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
INTN
|
||||
x86_64_text_mode(VOID)
|
||||
{
|
||||
return (elilo_opt.sys_img_opts &&
|
||||
elilo_opt.sys_img_opts->text_mode == TRUE) ? 1 : 0;
|
||||
}
|
||||
|
||||
INTN
|
||||
sysdeps_register_options(VOID)
|
||||
{
|
||||
|
@ -89,14 +105,11 @@ sysdeps_register_options(VOID)
|
|||
ret = register_config_options(sysdeps_global_options,
|
||||
sizeof(sysdeps_global_options)/sizeof(config_option_t),
|
||||
OPTIONS_GROUP_GLOBAL);
|
||||
#if 0
|
||||
/* no per image options yet */
|
||||
if (ret == -1 ) return ret;
|
||||
|
||||
ret = register_config_options(sysdeps_image_options,
|
||||
sizeof(sysdeps_image_options)/sizeof(config_option_t),
|
||||
OPTIONS_GROUP_IMAGE);
|
||||
#endif
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -156,7 +156,7 @@ gzip_free(void *where)
|
|||
int
|
||||
fill_inbuf(void)
|
||||
{
|
||||
INTN expected, nread;
|
||||
UINTN expected, nread;
|
||||
EFI_STATUS status;
|
||||
|
||||
expected = nread = INBUFSIZE;
|
||||
|
@ -165,7 +165,9 @@ fill_inbuf(void)
|
|||
if (EFI_ERROR(status)) {
|
||||
error("elilo: Read failed");
|
||||
}
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : read %d bytes of %d bytes\n", LD_NAME, nread, expected));
|
||||
#endif
|
||||
|
||||
insize = nread;
|
||||
inptr = 1;
|
||||
|
@ -280,7 +282,7 @@ analyze_chunks(void)
|
|||
* the relevant header information.
|
||||
*/
|
||||
int
|
||||
first_block (const char *buf, long blocksize)
|
||||
first_block (const unsigned char *buf, long blocksize)
|
||||
{
|
||||
Elf64_Ehdr *elf;
|
||||
Elf64_Phdr *phdrs;
|
||||
|
@ -433,12 +435,13 @@ flush_window(void)
|
|||
static const CHAR8 helicopter[4] = { '|' , '/' , '-' , '\\' };
|
||||
static UINTN heli_count;
|
||||
struct segment *cp;
|
||||
char *src, *dst;
|
||||
unsigned char *src, *dst;
|
||||
long cnt;
|
||||
|
||||
if (!outcnt) return;
|
||||
|
||||
#ifdef DEBUG_GZIP
|
||||
DBG_PRT((L"%s : flush_window outnct=%d file_offset=%ld\n", LD_NAME, outcnt, file_offset));
|
||||
#endif
|
||||
|
||||
Print(L"%c\b",helicopter[heli_count++%4]);
|
||||
|
||||
|
@ -471,7 +474,7 @@ tail:
|
|||
file_offset += skip;
|
||||
outcnt -= skip;
|
||||
}
|
||||
dst = (char *)cp->addr + (file_offset - cp->offset);
|
||||
dst = (unsigned char *)cp->addr + (file_offset - cp->offset);
|
||||
cnt = cp->offset + cp->size - file_offset;
|
||||
if (cnt > outcnt)
|
||||
cnt = outcnt;
|
||||
|
@ -485,7 +488,7 @@ tail:
|
|||
/* See if we are at the end of this chunk */
|
||||
if (file_offset == cp->offset + cp->size) {
|
||||
if (cp->bss_sz) {
|
||||
dst = (char *)cp->addr + cp->size;
|
||||
dst = (unsigned char *)cp->addr + cp->size;
|
||||
Memset(dst, 0, cp->bss_sz);
|
||||
}
|
||||
nextchunk();
|
||||
|
|
|
@ -119,7 +119,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
}
|
||||
VERB_PRT(3, {
|
||||
Print(L"ELF Header information: \n");
|
||||
Print(L"\tEntry point 0x%x\n", (ehdr.e_entry & PADDR_MASK));
|
||||
Print(L"\tEntry point "PTR_FMT"\n", (ehdr.e_entry & PADDR_MASK));
|
||||
Print(L"\t%d program headers\n", ehdr.e_phnum);
|
||||
Print(L"\t%d segment headers\n", ehdr.e_shnum);
|
||||
});
|
||||
|
@ -153,8 +153,8 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
paddr = (phdrs[i].p_paddr & PADDR_MASK);
|
||||
memsz = phdrs[i].p_memsz;
|
||||
|
||||
DBG_PRT((L"Phdr %d paddr [0x%x-0x%x] offset 0x%x"
|
||||
" filesz 0x%x memsz=0x%x bss_sz=0x%x p_type=0x%x\n",
|
||||
DBG_PRT((L"Phdr %d paddr ["PTR_FMT"-"PTR_FMT"] offset "PTR_FMT""
|
||||
" filesz "PTR_FMT" memsz="PTR_FMT" bss_sz="PTR_FMT" p_type="PTR_FMT"\n",
|
||||
1+i, paddr, paddr+phdrs[i].p_filesz, phdrs[i].p_offset,
|
||||
phdrs[i].p_filesz, memsz,
|
||||
(memsz - phdrs[i].p_filesz), phdrs[i].p_type));
|
||||
|
@ -168,7 +168,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
}
|
||||
|
||||
if ((UINTN)low_addr & (EFI_PAGE_SIZE - 1)) {
|
||||
ERR_PRT((L"%s : kernel low address 0x%x not page aligned\n",
|
||||
ERR_PRT((L"%s : kernel low address "PTR_FMT" not page aligned\n",
|
||||
LD_NAME, low_addr));
|
||||
goto out;
|
||||
}
|
||||
|
@ -184,9 +184,9 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
kd->kentry = (VOID *)(ehdr.e_entry & PADDR_MASK);
|
||||
|
||||
VERB_PRT(3, {
|
||||
Print(L"Lowest PhysAddr: 0x%x\nTotalMemSize:%d bytes (%d pages)\n",
|
||||
Print(L"Lowest PhysAddr: "PTR_FMT"\nTotalMemSize:%d bytes (%d pages)\n",
|
||||
low_addr, total_size, pages);
|
||||
Print(L"Kernel entry @ 0x%x\n", kd->kentry);
|
||||
Print(L"Kernel entry @ "PTR_FMT"\n", kd->kentry);
|
||||
});
|
||||
|
||||
/* now allocate memory for the kernel at the exact requested spot */
|
||||
|
@ -213,7 +213,7 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
if (phdrs[i].p_type != PT_LOAD)
|
||||
continue;
|
||||
|
||||
VERB_PRT(3, Print(L"poffs: 0x%x (phdrs[%d].p_offset)\n",
|
||||
VERB_PRT(3, Print(L"poffs: "PTR_FMT" (phdrs[%d].p_offset)\n",
|
||||
phdrs[i].p_offset, i));
|
||||
|
||||
filesz = phdrs[i].p_filesz;
|
||||
|
@ -228,9 +228,9 @@ load_elf(fops_fd_t fd, kdesc_t *kd)
|
|||
|
||||
VERB_PRT(4, {
|
||||
Print(L"\nHeader #%d\n", i);
|
||||
Print(L"Offset in file 0x%x\n", phdrs[i].p_offset);
|
||||
Print(L"Physical addr 0x%x\n", low_addr);
|
||||
Print(L"BSS size 0x%x bytes\n", bss_sz);
|
||||
Print(L"Offset in file "PTR_FMT"\n", phdrs[i].p_offset);
|
||||
Print(L"Physical addr "PTR_FMT"\n", low_addr);
|
||||
Print(L"BSS size %d bytes\n", bss_sz);
|
||||
});
|
||||
|
||||
/*
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
*/
|
||||
#define INITRD_START (50*1024*1024)
|
||||
|
||||
/* Default start address for kernel. */
|
||||
#define DEFAULT_KERNEL_START 0x100000
|
||||
|
||||
|
||||
/*
|
||||
* This version must match the one in the kernel.
|
||||
*
|
||||
|
@ -103,12 +107,12 @@ typedef union x86_64_boot_params {
|
|||
/* 0x06 */ UINT8 orig_video_mode; /* LDR */
|
||||
/* 0x07 */ UINT8 orig_video_cols; /* LDR */
|
||||
|
||||
/* 0x08 */ UINT16 unused_1; /* unused */
|
||||
/* 0x08 */ UINT16 pad_1; /* unused */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x0A */ UINT16 orig_ega_bx; /* LDR */
|
||||
|
||||
/* 0x0C */ UINT16 unused_2; /* unused */
|
||||
/* 0x0C */ UINT16 pad_2; /* unused */
|
||||
|
||||
/* Screen height before passing control to kernel. */
|
||||
/* 0x0E */ UINT8 orig_video_rows; /* LDR */
|
||||
|
@ -170,7 +174,7 @@ typedef union x86_64_boot_params {
|
|||
/* 0x4E */ UINT32 bios_code_len; /* LDR */
|
||||
/* 0x52 */ UINT16 bios_data_len; /* LDR */
|
||||
|
||||
/* 0x54 */ UINT8 unused_3[0x2C]; /* unused */
|
||||
/* 0x54 */ UINT8 pad_3[0x2C]; /* unused */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x80 */ UINT8 hd0_info[0x10]; /* LDR */
|
||||
|
@ -180,7 +184,7 @@ typedef union x86_64_boot_params {
|
|||
/* 0xA0 */ UINT16 mca_info_len; /* LDR */
|
||||
/* 0xA2 */ UINT8 mca_info_buf[0x10]; /* LDR */
|
||||
|
||||
/* 0xB2 */ UINT8 unused_4[0x10E]; /* unused */
|
||||
/* 0xB2 */ UINT8 pad_4[0x10E]; /* unused */
|
||||
|
||||
/* EFI boot loader signature. */
|
||||
/* 0x1C0 */ UINT8 efi_loader_sig[4]; /* LDR */
|
||||
|
@ -205,9 +209,9 @@ typedef union x86_64_boot_params {
|
|||
/* Available contiguous extended memory in KB. */
|
||||
/* 0x1E0 */ UINT32 alt_mem_k; /* LDR */
|
||||
|
||||
/* 0x1E4 */ UINT32 unused_51; /* unused */
|
||||
/* 0x1E4 */ UINT32 pad_51; /* unused */
|
||||
/* 0x1E8 */ UINT8 e820_nrmap;
|
||||
/* 0x1E9 */ UINT32 unused_52[2]; /* unused */
|
||||
/* 0x1E9 */ UINT32 pad_52[2]; /* unused */
|
||||
|
||||
/* Size of setup code in sectors (1 sector == 512 bytes). */
|
||||
/* 0x1F1 */ UINT8 setup_sectors; /* BLD */
|
||||
|
@ -216,15 +220,10 @@ typedef union x86_64_boot_params {
|
|||
/* 0x1F2 */ UINT16 mount_root_rdonly; /* BLD */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x1F4 */ UINT16 sys_size; /* BLD */
|
||||
/* 0x1F4 */ UINT32 sys_size; /* BLD */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x1F6 */ UINT16 swap_dev; /* BLD */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x1F8 */ UINT16 ramdisk_flags; /* BLD */
|
||||
#define RAMDISK_PROMPT 0x8000
|
||||
#define RAMDISK_LOAD 0x4000
|
||||
/* 0x1F8 */ UINT16 ram_size_DNU; /* BLD */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x1FA */ UINT16 video_mode_flag; /* BLD */
|
||||
|
@ -232,12 +231,8 @@ typedef union x86_64_boot_params {
|
|||
/* %%TBD */
|
||||
/* 0x1FC */ UINT16 orig_root_dev; /* BLD */
|
||||
|
||||
/* 0x1FE */ UINT8 unused_6; /* unused */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x1FF */ UINT8 aux_dev_info; /* LDR */
|
||||
#define NO_MOUSE 0x00
|
||||
#define FOUND_MOUSE 0xAA
|
||||
/* 0x1FE */ UINT16 boot_flag; /* ? */
|
||||
|
||||
/* Jump past setup data (not used in EFI). */
|
||||
/* 0x200 */ UINT16 jump; /* BLD */
|
||||
|
@ -279,16 +274,21 @@ typedef union x86_64_boot_params {
|
|||
/* 0x21C */ UINT32 initrd_size; /* LDR */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x220 */ UINT32 bootsect_helper; /* BLD */
|
||||
/* 0x220 */ UINT32 bootsect_helper_DNU; /* BLD */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x224 */ UINT16 heap_end_ptr; /* LDR */
|
||||
|
||||
/* %%TBD */
|
||||
/* 0x226 */ UINT16 unused_7; /* LDR */
|
||||
/* 0x226 */ UINT8 ext_loader_ver; /* LDR */
|
||||
/* 0x227 */ UINT8 ext_loader_type; /* LDR */
|
||||
|
||||
/* 0x228 */ UINT32 cmdline_addr; /* LDR */
|
||||
/* 0x22C */ UINT32 unused_8[41];
|
||||
/* 0x22C */ UINT32 initrd_addr_max; /* BLD */
|
||||
/* 0x230 */ UINT32 kernel_alignment; /* BLD */
|
||||
/* 0x234 */ UINT8 relocatable_kernel; /* BLD */
|
||||
/* 0x235 */ UINT8 pad_8[3];
|
||||
/* 0x238 */ UINT32 pad_9[38];
|
||||
/* 0x2D0 */ UINT8 e820_map[2560];
|
||||
} s;
|
||||
} boot_params_t;
|
||||
|
@ -307,10 +307,16 @@ typedef union x86_64_boot_params {
|
|||
UINT8 *t = (UINT8 *)(to); \
|
||||
UINT8 *f = (UINT8 *)(from); \
|
||||
UINTN n = cnt; \
|
||||
if (t && f && n) { \
|
||||
if (t && f && n && (t<f)) { \
|
||||
while (n--) { \
|
||||
*t++ = *f++; \
|
||||
} \
|
||||
} else if (t && f && n && (t>f)) { \
|
||||
t += n; \
|
||||
f += n; \
|
||||
while (n--) { \
|
||||
*t-- = *f--; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
|
@ -343,6 +349,7 @@ extern UINTN param_size;
|
|||
|
||||
extern VOID *kernel_start;
|
||||
extern UINTN kernel_size;
|
||||
extern VOID *kernel_load_address;
|
||||
|
||||
extern VOID *initrd_start;
|
||||
extern UINTN initrd_size;
|
||||
|
@ -357,6 +364,7 @@ extern UINT8 rmswitch_image[];
|
|||
extern UINTN rmswitch_size;
|
||||
|
||||
extern INTN x86_64_use_legacy_free_boot();
|
||||
extern INTN x86_64_text_mode();
|
||||
|
||||
/*
|
||||
* How to jump to kernel code
|
||||
|
@ -370,7 +378,6 @@ start_kernel(VOID *kentry, boot_params_t *bp)
|
|||
UINT32 kernel_entry;
|
||||
UINT16 kernel_cs;
|
||||
} jumpvector;
|
||||
UINTN njump;
|
||||
VOID *jump_start;
|
||||
|
||||
/*
|
||||
|
@ -379,13 +386,16 @@ start_kernel(VOID *kentry, boot_params_t *bp)
|
|||
asm volatile ( "cli" : : );
|
||||
|
||||
/*
|
||||
* Relocate initrd, if present.
|
||||
* Relocate kernel (if needed).
|
||||
* This assumes that the initrd didn't get loaded overlapping where
|
||||
* we're planning to copy the kernel, but that's pretty unlikely
|
||||
* since we couldn't alloc that space for the kernel (or the kernel
|
||||
* would already be there).
|
||||
*/
|
||||
|
||||
if (bp->s.initrd_start) {
|
||||
MEMCPY(INITRD_START, bp->s.initrd_start, bp->s.initrd_size);
|
||||
bp->s.initrd_start = INITRD_START;
|
||||
if (kernel_start != kernel_load_address) {
|
||||
MEMCPY(kernel_start, kernel_load_address, kernel_size);
|
||||
}
|
||||
|
||||
/*
|
||||
* Copy boot sector, setup data and command line
|
||||
* to final resting place. We need to copy
|
||||
|
@ -434,20 +444,22 @@ start_kernel(VOID *kentry, boot_params_t *bp)
|
|||
|
||||
/*
|
||||
* Jump to kernel entry point.
|
||||
*
|
||||
* Cast is to tell gcc that we know we're going from
|
||||
* 64-bit ptr to 32-bit integer.
|
||||
*/
|
||||
jumpvector.kernel_entry=kentry;
|
||||
jumpvector.kernel_entry=(UINT32)((UINT64)kentry);
|
||||
jumpvector.kernel_cs=0x10;
|
||||
njump = &jumpvector;
|
||||
jump_start = (VOID *)&jumpvector;
|
||||
//asm volatile ( "mov %0, %%rcx" : : "m" (&jumpvector) );
|
||||
asm volatile ( "mov %0, %%rcx" : : "m" (jump_start) );
|
||||
//asm volatile ( "mov %0, %%rcx" : : "m" (njump) );
|
||||
asm volatile ( "ljmp *(%%rcx)" : :);
|
||||
/* Never come back to here. */
|
||||
}
|
||||
|
||||
typedef struct sys_img_options {
|
||||
UINT8 nothing_yet;
|
||||
UINT8 dummy; /* forces non-zero offset for first field */
|
||||
UINT8 text_mode; /* do not try to initialize Graphics Output Protocol */
|
||||
} sys_img_options_t;
|
||||
|
||||
#endif /* __ELILO_SYSDEPS_X86_64_H__ */
|
||||
|
|
287
x86_64/system.c
287
x86_64/system.c
|
@ -38,11 +38,19 @@
|
|||
*/
|
||||
#include <efi.h>
|
||||
#include <efilib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "elilo.h"
|
||||
#include "loader.h"
|
||||
#include "rmswitch.h"
|
||||
|
||||
#define DEBUG_CREATE_BOOT_PARAMS 0
|
||||
#if DEBUG_CREATE_BOOT_PARAMS
|
||||
#define DPR(a) do { if (elilo_opt.debug) { Print a; } } while ( 0 )
|
||||
#else
|
||||
#define DPR(a)
|
||||
#endif
|
||||
|
||||
extern loader_ops_t bzimage_loader, plain_loader, gzip_loader;
|
||||
|
||||
/*
|
||||
|
@ -105,11 +113,16 @@ UINTN high_base_mem = 0x90000;
|
|||
UINTN high_ext_mem = 32 * 1024 * 1024;
|
||||
|
||||
/* This starting address will hold true for all of the loader types for now */
|
||||
VOID *kernel_start = (VOID *)0x100000; /* 1M */
|
||||
VOID *kernel_start = (VOID *)DEFAULT_KERNEL_START;
|
||||
|
||||
/* The kernel may load elsewhere if EFI firmware reserves kernel_start */
|
||||
VOID *kernel_load_address = (VOID *)DEFAULT_KERNEL_START;
|
||||
|
||||
VOID *initrd_start = NULL;
|
||||
UINTN initrd_size = 0;
|
||||
|
||||
INTN e820_map_overflow = 0;
|
||||
|
||||
INTN
|
||||
sysdeps_init(EFI_HANDLE dev)
|
||||
{
|
||||
|
@ -128,10 +141,8 @@ sysdeps_init(EFI_HANDLE dev)
|
|||
/*
|
||||
* initrd_get_addr()
|
||||
* Compute a starting address for the initial RAMdisk image.
|
||||
* For now, this image is placed immediately after the end of
|
||||
* the kernel memory. Inside the start_kernel() code, the
|
||||
* RAMdisk image will be relocated to the top of available
|
||||
* extended memory.
|
||||
* For now we suggest 'initrd_addr_max' with room for 32MB,
|
||||
* as image->pgcnt is not initialized yet.
|
||||
*/
|
||||
INTN
|
||||
sysdeps_initrd_get_addr(kdesc_t *kd, memdesc_t *imem)
|
||||
|
@ -139,28 +150,72 @@ sysdeps_initrd_get_addr(kdesc_t *kd, memdesc_t *imem)
|
|||
DBG_PRT((L"initrd_get_addr()\n"));
|
||||
|
||||
if (!kd || !imem) {
|
||||
ERR_PRT((L"kd=0x%x imem=0x%x", kd, imem));
|
||||
ERR_PRT((L"kd="PTR_FMT" imem="PTR_FMT"", kd, imem));
|
||||
return -1;
|
||||
}
|
||||
|
||||
VERB_PRT(3, Print(L"kstart=0x%x kentry=0x%x kend=0x%x\n",
|
||||
kd->kstart, kd->kentry, kd->kend));
|
||||
VERB_PRT(3, Print(L"initrd_addr_max="PTR_FMT" reserve=%d\n",
|
||||
param_start->s.initrd_addr_max, 32*MB));
|
||||
|
||||
imem->start_addr = kd->kend;
|
||||
imem->start_addr = (VOID *)
|
||||
(((UINT64)param_start->s.initrd_addr_max - 32*MB + 1)
|
||||
& ~EFI_PAGE_MASK);
|
||||
|
||||
VERB_PRT(3, Print(L"initrd start_addr=0x%x pgcnt=%d\n",
|
||||
VERB_PRT(3, Print(L"initrd start_addr="PTR_FMT" pgcnt=%d\n",
|
||||
imem->start_addr, imem->pgcnt));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* checkfix_initrd()
|
||||
* Check and possibly fix allocation of initrd memory.
|
||||
*/
|
||||
VOID *
|
||||
sysdeps_checkfix_initrd(VOID *start_addr, memdesc_t *imem)
|
||||
{
|
||||
UINTN pgcnt = EFI_SIZE_TO_PAGES(imem->size);
|
||||
UINT64 initrd_addr_max = (UINT64)param_start->s.initrd_addr_max;
|
||||
UINT64 ki_max = initrd_addr_max - imem->size + 1;
|
||||
VOID *ki_max_addr;
|
||||
|
||||
VERB_PRT( 3, Print(L"loadfile: start_addr="PTR_FMT
|
||||
" ki_max_addr="PTR_FMT"\n", start_addr, (VOID *)ki_max));
|
||||
if (ki_max > UINT32_MAX) {
|
||||
ERR_PRT((L"Force kernel specified initrd_addr_max="PTR_FMT
|
||||
" below 4GB\n", (VOID *)initrd_addr_max));
|
||||
ki_max = UINT32_MAX - imem->size + 1;
|
||||
}
|
||||
ki_max_addr = (VOID *)ki_max;
|
||||
|
||||
if ((UINT64)start_addr > ki_max) {
|
||||
VERB_PRT(1, Print(L"initrd start_addr="PTR_FMT" above "
|
||||
"limit="PTR_FMT"\n", start_addr, ki_max_addr));
|
||||
free(start_addr);
|
||||
start_addr = NULL;
|
||||
}
|
||||
/* so either the initial allocation failed or it's been to high! */
|
||||
if (start_addr == NULL) {
|
||||
start_addr = alloc_pages(pgcnt, EfiLoaderData,
|
||||
AllocateMaxAddress, ki_max_addr);
|
||||
}
|
||||
if ((UINT64)start_addr > ki_max) {
|
||||
ERR_PRT((L"Failed to allocate %d pages below %dMB",
|
||||
pgcnt, (param_start->s.initrd_addr_max+1)>>20));
|
||||
free(start_addr);
|
||||
start_addr = NULL;
|
||||
}
|
||||
return start_addr;
|
||||
}
|
||||
|
||||
VOID
|
||||
sysdeps_free_boot_params(boot_params_t *bp)
|
||||
{
|
||||
mmap_desc_t md;
|
||||
|
||||
ZeroMem(&md, sizeof md);
|
||||
md.md = (VOID *)bp->s.efi_mem_map;
|
||||
md.md = (VOID *)(UINT64)bp->s.efi_mem_map;
|
||||
free_memmap(&md);
|
||||
}
|
||||
|
||||
|
@ -189,12 +244,17 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
EFI_GUID GopProtocol = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL *Gop_interface;
|
||||
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *Gop_info;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Gop_mode;
|
||||
EFI_HANDLE *Gop_handle;
|
||||
EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Gop_mode = NULL;
|
||||
EFI_HANDLE *Gop_handle = NULL;
|
||||
EFI_STATUS efi_status;
|
||||
UINTN size, size1;
|
||||
UINTN size = 0;
|
||||
UINTN size1;
|
||||
UINT8 i;
|
||||
|
||||
if (x86_64_text_mode() == 1) {
|
||||
Print((L"Skip GOP init, force text-mode.\n"));
|
||||
return -1;
|
||||
}
|
||||
efi_status = uefi_call_wrapper(
|
||||
BS->LocateHandle,
|
||||
5,
|
||||
|
@ -205,7 +265,19 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
(VOID **)Gop_handle);
|
||||
|
||||
if (EFI_ERROR(efi_status) && efi_status != EFI_BUFFER_TOO_SMALL) {
|
||||
ERR_PRT((L"LocateHandle GopProtocol failed."));
|
||||
Print(L"LocateHandle GopProtocol failed.\n");
|
||||
Print(L"--Either no graphics head is installed,\n" \
|
||||
"--efi console is set to serial, or,\n" \
|
||||
"--the EFI firmware version of this machine is\n" \
|
||||
"--older than UEFI 2.0. and does not support GOP");
|
||||
Print(L"you can SAFELY IGNORE this error. elilo will\n" \
|
||||
"default to text-mode.\n Alternatively you can " \
|
||||
"now force text mode by setting config variable\n" \
|
||||
"text_mode=1 for x86 in elilo.conf or via cmdline.\n\n");
|
||||
Print(L"However if this is the last text output you see\n" \
|
||||
"ensure that your kernel console command line\n " \
|
||||
"variable matches up with the actual efi boot menu\n" \
|
||||
"console output settings.\n\n");
|
||||
return -1;
|
||||
}
|
||||
Gop_handle = alloc(size, 0);
|
||||
|
@ -322,10 +394,56 @@ static INTN get_video_info(boot_params_t * bp) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
CHAR16 *
|
||||
StrStr(IN const CHAR16 *h, IN const CHAR16 *n)
|
||||
{
|
||||
const CHAR16 *t = h;
|
||||
CHAR16 *res;
|
||||
int len = 0, i;
|
||||
|
||||
len = StrLen((CHAR16 *)n);
|
||||
while(*t != CHAR_NULL) {
|
||||
res = StrChr( t, n[0]);
|
||||
if (!res) return res;
|
||||
for( i = 1; i < len && res[i] != CHAR_NULL && res[i] == n[i]; i++);
|
||||
if ( i == len ) return res;
|
||||
t = res + 1;
|
||||
if (t > h + CMDLINE_MAXLEN) return (CHAR16 *)0;
|
||||
}
|
||||
|
||||
return (CHAR16 *)0;
|
||||
}
|
||||
|
||||
CHAR8 *
|
||||
StrStr8(IN const CHAR8 *h, IN const CHAR8 *n)
|
||||
{
|
||||
const CHAR8 *t = h;
|
||||
CHAR8 *res;
|
||||
int len = 0, i;
|
||||
|
||||
len = strlena((CHAR8 *)n);
|
||||
while(*t != 0) {
|
||||
res = strchra( t, n[0]);
|
||||
if (!res) return res;
|
||||
for( i = 1; i < len && res[i] != 0 && res[i] == n[i]; i++);
|
||||
if ( i == len ) return res;
|
||||
t = res + 1;
|
||||
if (t > (h + CMDLINE_MAXLEN)) return (CHAR8 *)0;
|
||||
}
|
||||
|
||||
return (CHAR8 *)0;
|
||||
}
|
||||
|
||||
/* Convert EFI memory map to E820 map for the operating system
|
||||
* This code is based on a Linux kernel patch submitted by Edgar Hucek
|
||||
*/
|
||||
|
||||
#if DEBUG_CREATE_BOOT_PARAMS
|
||||
static int e820_max = 6;
|
||||
#else
|
||||
static int e820_max = E820_MAX;
|
||||
#endif
|
||||
|
||||
/* Add a memory region to the e820 map */
|
||||
static void add_memory_region (struct e820entry *e820_map,
|
||||
int *e820_nr_map,
|
||||
|
@ -334,21 +452,56 @@ static void add_memory_region (struct e820entry *e820_map,
|
|||
unsigned int type)
|
||||
{
|
||||
int x = *e820_nr_map;
|
||||
static unsigned long long estart = 0ULL;
|
||||
static unsigned long esize = 0L;
|
||||
static unsigned int etype = -1;
|
||||
static int merge = 0;
|
||||
|
||||
if (x == E820_MAX) {
|
||||
Print(L"Too many entries in the memory map!\n");
|
||||
if (x == 0)
|
||||
DPR((L"AMR: %3s %4s %16s/%12s/%s\n",
|
||||
L"idx", L" ", L"start", L"size", L"type"));
|
||||
|
||||
/* merge adjacent regions of same type */
|
||||
if ((x > 0) && e820_map[x-1].addr + e820_map[x-1].size == start
|
||||
&& e820_map[x-1].type == type) {
|
||||
e820_map[x-1].size += size;
|
||||
estart = e820_map[x-1].addr;
|
||||
esize = e820_map[x-1].size;
|
||||
etype = e820_map[x-1].type;
|
||||
merge++;
|
||||
return;
|
||||
}
|
||||
|
||||
if ((x > 0) && e820_map[x-1].addr + e820_map[x-1].size == start
|
||||
&& e820_map[x-1].type == type)
|
||||
e820_map[x-1].size += size;
|
||||
else {
|
||||
/* fill up to E820_MAX */
|
||||
if ( x < e820_max ) {
|
||||
e820_map[x].addr = start;
|
||||
e820_map[x].size = size;
|
||||
e820_map[x].type = type;
|
||||
(*e820_nr_map)++;
|
||||
if (merge) DPR((L"AMR: %3d ==> %016llx/%012lx/%d (%d)\n",
|
||||
x-1, estart, esize, etype, merge));
|
||||
merge=0;
|
||||
DPR((L"AMR: %3d add %016llx/%012lx/%d\n",
|
||||
x, start, size, type));
|
||||
return;
|
||||
}
|
||||
/* different type means another region didn't fit */
|
||||
/* or same type, but there's a hole */
|
||||
if (etype != type || (estart + esize) != start) {
|
||||
if (merge) DPR((L"AMR: %3d ===> %016llx/%012lx/%d (%d)\n",
|
||||
e820_map_overflow, estart, esize, etype, merge));
|
||||
merge = 0;
|
||||
estart = start;
|
||||
esize = size;
|
||||
etype = type;
|
||||
e820_map_overflow++;
|
||||
DPR((L"AMR: %3d OVER %016llx/%012lx/%d\n",
|
||||
e820_map_overflow, start, size, type));
|
||||
return;
|
||||
}
|
||||
/* same type and no hole, merge it */
|
||||
estart += esize;
|
||||
esize += size;
|
||||
merge++;
|
||||
}
|
||||
|
||||
void fill_e820map(boot_params_t *bp, mmap_desc_t *mdesc)
|
||||
|
@ -427,6 +580,7 @@ void fill_e820map(boot_params_t *bp, mmap_desc_t *mdesc)
|
|||
break;
|
||||
default:
|
||||
/* We should not hit this case */
|
||||
DBG_PRT((L"hit default!?"));
|
||||
add_memory_region(e820_map, &e820_nr_map,
|
||||
md->PhysicalStart,
|
||||
md->NumberOfPages << EFI_PAGE_SHIFT,
|
||||
|
@ -440,6 +594,8 @@ void fill_e820map(boot_params_t *bp, mmap_desc_t *mdesc)
|
|||
|
||||
/*
|
||||
* x86_64 specific boot parameters initialization routine
|
||||
*
|
||||
* Note: debug and verbose messages have already been turned off!
|
||||
*/
|
||||
INTN
|
||||
sysdeps_create_boot_params(
|
||||
|
@ -455,11 +611,17 @@ sysdeps_create_boot_params(
|
|||
UINT8 row, col;
|
||||
UINT8 mode;
|
||||
UINT16 hdr_version;
|
||||
UINT8 e820_map_overflow_warned = 0;
|
||||
|
||||
#if DEBUG_CREATE_BOOT_PARAMS
|
||||
elilo_opt.debug=1;
|
||||
elilo_opt.verbose=5;
|
||||
#endif
|
||||
|
||||
DBG_PRT((L"fill_boot_params()\n"));
|
||||
|
||||
if (!bp || !cmdline || !initrd || !cookie) {
|
||||
ERR_PRT((L"bp=0x%x cmdline=0x%x initrd=0x%x cookie=0x%x",
|
||||
ERR_PRT((L"bp="PTR_FMT" cmdline="PTR_FMT" initrd="PTR_FMT" cookie="PTR_FMT"",
|
||||
bp, cmdline, initrd, cookie));
|
||||
|
||||
if (param_start != NULL) {
|
||||
|
@ -479,27 +641,17 @@ sysdeps_create_boot_params(
|
|||
*/
|
||||
if (param_start != NULL) {
|
||||
CopyMem(bp, param_start, 0x2000);
|
||||
free(param_start);
|
||||
param_start = NULL;
|
||||
param_size = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Save off our header revision information.
|
||||
*/
|
||||
hdr_version = (bp->s.hdr_major << 8) | bp->s.hdr_minor;
|
||||
|
||||
/*
|
||||
* Clear out unused memory in boot sector image.
|
||||
* Do NOT clear out unknown memory in boot sector image.
|
||||
* This breaks boot protocol >= 2.10 (2.6.31).
|
||||
*/
|
||||
bp->s.unused_1 = 0;
|
||||
bp->s.unused_2 = 0;
|
||||
ZeroMem(&bp->s.unused_3, sizeof bp->s.unused_3);
|
||||
ZeroMem(&bp->s.unused_4, sizeof bp->s.unused_4);
|
||||
ZeroMem(&bp->s.unused_51, sizeof bp->s.unused_51);
|
||||
ZeroMem(&bp->s.unused_52, sizeof bp->s.unused_52);
|
||||
bp->s.unused_6 = 0;
|
||||
bp->s.unused_7 = 0;
|
||||
ZeroMem(bp->s.unused_8, sizeof bp->s.unused_8);
|
||||
|
||||
/*
|
||||
* Tell kernel this was loaded by an advanced loader type.
|
||||
|
@ -546,22 +698,20 @@ sysdeps_create_boot_params(
|
|||
* Initial RAMdisk and root device stuff.
|
||||
*/
|
||||
|
||||
DBG_PRT((L"initrd->start_addr=0x%x initrd->pgcnt=%d\n",
|
||||
DBG_PRT((L"initrd->start_addr="PTR_FMT" initrd->pgcnt=%d\n",
|
||||
initrd->start_addr, initrd->pgcnt));
|
||||
|
||||
/* These RAMdisk flags are not needed, just zero them. */
|
||||
bp->s.ramdisk_flags = 0;
|
||||
|
||||
/* 'ramdisk_flags' (@0x1F8) is called 'ram_size' in the meantime, */
|
||||
/* see Documentation/x86/boot.txt. */
|
||||
if (initrd->start_addr && initrd->pgcnt) {
|
||||
if ( (UINT64)initrd->start_addr > UINT32_MAX ) {
|
||||
ERR_PRT((L"Start of initrd out of reach (>4GB)."));
|
||||
free_kmem();
|
||||
return -1;
|
||||
}
|
||||
/* %%TBD - This will probably have to be changed. */
|
||||
bp->s.initrd_start = (UINT32)initrd->start_addr;
|
||||
bp->s.initrd_start = (UINT32)(UINT64)initrd->start_addr;
|
||||
bp->s.initrd_size = (UINT32)(initrd->size);
|
||||
/*
|
||||
* This is the RAMdisk root device for RedHat 2.2.x
|
||||
* kernels (major 0x01, minor 0x00).
|
||||
*/
|
||||
|
||||
bp->s.orig_root_dev = 0x0100;
|
||||
} else {
|
||||
bp->s.initrd_start = 0;
|
||||
bp->s.initrd_size = 0;
|
||||
|
@ -585,11 +735,6 @@ sysdeps_create_boot_params(
|
|||
bp->s.mca_info_len = 0;
|
||||
ZeroMem(bp->s.mca_info_buf, sizeof bp->s.mca_info_buf);
|
||||
|
||||
/*
|
||||
* Pointing device presence. The kernel will detect this.
|
||||
*/
|
||||
bp->s.aux_dev_info = NO_MOUSE;
|
||||
|
||||
/*
|
||||
* EFI loader signature
|
||||
*/
|
||||
|
@ -598,7 +743,12 @@ sysdeps_create_boot_params(
|
|||
/*
|
||||
* Kernel entry point.
|
||||
*/
|
||||
bp->s.kernel_start = (UINT32)kernel_start;
|
||||
if ( (UINT64)kernel_start != (UINT32)(UINT64)kernel_start ) {
|
||||
ERR_PRT((L"Start of kernel (will be) out of reach (>4GB)."));
|
||||
free_kmem();
|
||||
return -1;
|
||||
}
|
||||
bp->s.kernel_start = (UINT32)(UINT64)kernel_start;
|
||||
|
||||
/*
|
||||
* When changing stuff in the parameter structure compare
|
||||
|
@ -688,11 +838,9 @@ sysdeps_create_boot_params(
|
|||
CHECK_OFFSET(setup_sectors, 0x1F1, L"%xh");
|
||||
CHECK_OFFSET(mount_root_rdonly, 0x1F2, L"%xh");
|
||||
CHECK_OFFSET(sys_size, 0x1F4, L"%xh");
|
||||
CHECK_OFFSET(swap_dev, 0x1F6, L"%xh");
|
||||
CHECK_OFFSET(ramdisk_flags, 0x1F8, L"%xh");
|
||||
CHECK_OFFSET(video_mode_flag, 0x1FA, L"%xh");
|
||||
CHECK_OFFSET(orig_root_dev, 0x1FC, L"%xh");
|
||||
CHECK_OFFSET(aux_dev_info, 0x1FF, L"%xh");
|
||||
CHECK_OFFSET(boot_flag, 0x1FE, L"%xh");
|
||||
CHECK_OFFSET(jump, 0x200, L"%xh");
|
||||
CHECK_OFFSET(setup_sig, 0x202, L"'%-4.4a'");
|
||||
CHECK_OFFSET(hdr_minor, 0x206, L"%xh");
|
||||
|
@ -706,9 +854,9 @@ sysdeps_create_boot_params(
|
|||
CHECK_OFFSET(kernel_start, 0x214, L"%xh");
|
||||
CHECK_OFFSET(initrd_start, 0x218, L"%xh");
|
||||
CHECK_OFFSET(initrd_size, 0x21C, L"%xh");
|
||||
CHECK_OFFSET(bootsect_helper, 0x220, L"%xh");
|
||||
CHECK_OFFSET(heap_end_ptr, 0x224, L"%xh");
|
||||
CHECK_OFFSET(cmdline_addr, 0x228, L"%xh");
|
||||
CHECK_OFFSET(e820_map, 0x2D0, L"%xh");
|
||||
|
||||
if (test) {
|
||||
ERR_PRT((L"Boot sector and/or setup parameter alignment error."));
|
||||
|
@ -798,6 +946,31 @@ do_memmap:
|
|||
* and update the bootparam accordingly
|
||||
*/
|
||||
fill_e820map(bp, &mdesc);
|
||||
|
||||
#if DEBUG_CREATE_BOOT_PARAMS
|
||||
if ( e820_map_overflow == 0 )
|
||||
e820_map_overflow = -1; /* force second get_memmap()! */
|
||||
#endif
|
||||
if (e820_map_overflow && !e820_map_overflow_warned) {
|
||||
CHAR8 *aem = (CHAR8 *)"add_efi_memmap";
|
||||
e820_map_overflow_warned++;
|
||||
|
||||
#if DEBUG_CREATE_BOOT_PARAMS
|
||||
elilo_opt.debug=0;
|
||||
elilo_opt.verbose=0;
|
||||
#endif
|
||||
if (e820_map_overflow == -1 || StrStr8(cmdline, aem)) {
|
||||
/* Print(L"...mapping again, silently!\n"); */
|
||||
goto do_memmap;
|
||||
}
|
||||
|
||||
Print(L"\nCAUTION: EFI memory map has %d more entr%a"
|
||||
" than E820 map supports.\n"
|
||||
"To access all memory, '%a' may be necessary.\n\n",
|
||||
e820_map_overflow, (e820_map_overflow==1)?"y":"ies",
|
||||
aem);
|
||||
goto do_memmap;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue