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

- Make sure we don't trample our metadata pointer in our initial bootstrap.

Browse Source 
- Load metadata parameters.
This commit is contained in:
benno 2002-07-10 12:16:48 +00:00
parent 1c56b71317
commit be33882452
5 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/powerpc/aim/locore.S
View File

@ -153,6 +153,10 @@ __start:
mtdbatu 0,9
isync
/* Save the argument pointer and length */
mr 20,6
mr 21,7
lis 8,openfirmware_entry@ha
stw 5,openfirmware_entry@l(8) /* save client interface handler */
mr 3,5
@ -174,6 +178,10 @@ __start:
lis 3,kernel_text@ha
addi 3,3,kernel_text@l
/* Restore the argument pointer and length */
mr 6,20
mr 7,21
bl powerpc_init
bl mi_startup
b OF_exit

33
sys/powerpc/aim/machdep.c
View File

@ -100,6 +100,7 @@ static const char rcsid[] =
#include <machine/bat.h>
#include <machine/clock.h>
#include <machine/md_var.h>
#include <machine/metadata.h>
#include <machine/reg.h>
#include <machine/fpu.h>
#include <machine/vmparam.h>
@ -137,7 +138,7 @@ void *ksym_start, *ksym_end;
static void cpu_startup(void *);
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
void powerpc_init(u_int, u_int, u_int, char *);
void powerpc_init(u_int, u_int, u_int, void *);
int save_ofw_mapping(void);
int restore_ofw_mapping(void);
@ -335,16 +336,42 @@ extern ipkdblow, ipkdbsize;
#endif
void
powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, char *args)
powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
{
struct pcpu *pc;
vm_offset_t off;
vm_offset_t end, off;
void *kmdp;
end = 0;
kmdp = NULL;
/*
* Parse metadata if present and fetch parameters. Must be done
* before console is inited so cninit gets the right value of
* boothowto.
*/
if (mdp != NULL) {
preload_metadata = mdp;
kmdp = preload_search_by_type("elf kernel");
if (kmdp != NULL) {
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);
end = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t);
}
}
/*
* Initialize the console before printing anything.
*/
cninit();
/*
* Complain if there is no metadata.
*/
if (mdp == NULL || kmdp == NULL) {
printf("powerpc_init: no loader metadata.\n");
}
/*
* XXX: Initialize the interrupt tables.
*/

8
sys/powerpc/powerpc/locore.S
View File

@ -153,6 +153,10 @@ __start:
mtdbatu 0,9
isync
/* Save the argument pointer and length */
mr 20,6
mr 21,7
lis 8,openfirmware_entry@ha
stw 5,openfirmware_entry@l(8) /* save client interface handler */
mr 3,5
@ -174,6 +178,10 @@ __start:
lis 3,kernel_text@ha
addi 3,3,kernel_text@l
/* Restore the argument pointer and length */
mr 6,20
mr 7,21
bl powerpc_init
bl mi_startup
b OF_exit

8
sys/powerpc/powerpc/locore.s
View File

@ -153,6 +153,10 @@ __start:
mtdbatu 0,9
isync
/* Save the argument pointer and length */
mr 20,6
mr 21,7
lis 8,openfirmware_entry@ha
stw 5,openfirmware_entry@l(8) /* save client interface handler */
mr 3,5
@ -174,6 +178,10 @@ __start:
lis 3,kernel_text@ha
addi 3,3,kernel_text@l
/* Restore the argument pointer and length */
mr 6,20
mr 7,21
bl powerpc_init
bl mi_startup
b OF_exit

33
sys/powerpc/powerpc/machdep.c
View File

@ -100,6 +100,7 @@ static const char rcsid[] =
#include <machine/bat.h>
#include <machine/clock.h>
#include <machine/md_var.h>
#include <machine/metadata.h>
#include <machine/reg.h>
#include <machine/fpu.h>
#include <machine/vmparam.h>
@ -137,7 +138,7 @@ void *ksym_start, *ksym_end;
static void cpu_startup(void *);
SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL)
void powerpc_init(u_int, u_int, u_int, char *);
void powerpc_init(u_int, u_int, u_int, void *);
int save_ofw_mapping(void);
int restore_ofw_mapping(void);
@ -335,16 +336,42 @@ extern ipkdblow, ipkdbsize;
#endif
void
powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, char *args)
powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp)
{
struct pcpu *pc;
vm_offset_t off;
vm_offset_t end, off;
void *kmdp;
end = 0;
kmdp = NULL;
/*
* Parse metadata if present and fetch parameters. Must be done
* before console is inited so cninit gets the right value of
* boothowto.
*/
if (mdp != NULL) {
preload_metadata = mdp;
kmdp = preload_search_by_type("elf kernel");
if (kmdp != NULL) {
boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int);
kern_envp = MD_FETCH(kmdp, MODINFOMD_ENVP, char *);
end = MD_FETCH(kmdp, MODINFOMD_KERNEND, vm_offset_t);
}
}
/*
* Initialize the console before printing anything.
*/
cninit();
/*
* Complain if there is no metadata.
*/
if (mdp == NULL || kmdp == NULL) {
printf("powerpc_init: no loader metadata.\n");
}
/*
* XXX: Initialize the interrupt tables.
*/