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

Remove the bootinfo kludge. We get the address of the bootinfo

Browse Source 
block from the loader.
This commit is contained in:
Marcel Moolenaar 2002-04-19 06:35:55 +00:00
parent 88ff5695c1
commit 81764c987b
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/ia64/ia64/machdep.c
View File

@ -98,9 +98,7 @@ u_int64_t itc_frequency;
int cold = 1;
u_int64_t pa_bootinfo;
u_int64_t va_bootinfo;
struct bootinfo bootinfo;
int bootinfo_error; /* XXX temporary ad-hoc error mask to help debugging */
extern char kstack[];
struct user *proc0uarea;
@ -397,27 +395,12 @@ ia64_init(u_int64_t arg1, u_int64_t arg2)
*/
/*
* Gross and disgusting hack. The bootinfo is written into
* memory at a fixed address.
* To help transitioning to a non-fixed bootinfo block, we
* temporarily have to make this more gross and disgusting:
* o pa_bootinfo is the physical address of the bootinfo block
* as passed to us by the loader (initialized in locore.s)
* (EFI loader version 0.3 and up). We only check this value.
* We don't actively use it yet.
* o va_bootinfo is the hardwired virtual (RR7) address of
* the bootinfo block (old loaders). We still use it for the
* moment.
* pa_bootinfo is the physical address of the bootinfo block as
* passed to us by the loader and set in locore.s.
*/
va_bootinfo = 0xe000000000508000; /* the fixed RR7 address */
if (IA64_PHYS_TO_RR7(pa_bootinfo) != va_bootinfo)
bootinfo_error |= 1; /* XXX loader did not set r8 */
/* copy the bootinfo block */
bootinfo = *(struct bootinfo *)va_bootinfo;
bootinfo = *(struct bootinfo *)(IA64_PHYS_TO_RR7(pa_bootinfo));
if (bootinfo.bi_magic != BOOTINFO_MAGIC || bootinfo.bi_version != 1) {
bootinfo_error |= 2; /* XXX bogus block */
bzero(&bootinfo, sizeof(bootinfo));
bootinfo.bi_kernend = (vm_offset_t) round_page(_end);
}
@ -492,14 +475,6 @@ ia64_init(u_int64_t arg1, u_int64_t arg2)
/* OUTPUT NOW ALLOWED */
if (bootinfo_error & 1)
printf("bootinfo: the loader did not not pass the address "
"of the block in r8.\n");
if (bootinfo_error & 2)
printf("bootinfo: block not valid; possibly not at hardwired "
"address.\n");
if (ia64_pal_base != 0) {
ia64_pal_base &= ~((1 << 28) - 1);
/*