#define CONFIG_FILE_NAME "yaboot.conf"
#define CONFIG_FILE_MAX 0x8000 /* 32k */
+#define MESSAGE_FILE_MAX 2048
+
#ifdef USE_MD5_PASSWORDS
#include "md5.h"
#endif /* USE_MD5_PASSWORDS */
char bootdevice[BOOTDEVSZ];
char bootoncelabel[1024];
char bootargs[1024];
+char bootlastlabel[BOOTLASTSZ] = {0};
+char fw_nbr_reboots[FW_NBR_REBOOTSZ] = {0};
+long fw_reboot_cnt = 0;
char *password = NULL;
struct boot_fspec_t boot;
int _machine = _MACH_Pmac;
int bgcolor = 0;
#endif /* CONFIG_COLOR_TEXT */
-#if DEBUG
-static int test_bss;
-static int test_data = 0;
-#endif
static int pause_after;
static char *pause_message = "Type go<return> to continue.\n";
static char given_bootargs[1024];
#define DEFAULT_TIMEOUT -1
-/* Entry, currently called directly by crt0 (bss not inited) */
-
-extern char* __bss_start;
-extern char* _end;
-
-static struct first_info *quik_fip = NULL;
-
int
yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
{
int result;
void* malloc_base = NULL;
- unsigned long addr;
prom_handle root;
- /* OF seems to do it, but I'm not very confident */
- memset(&__bss_start, 0, &_end - &__bss_start);
-
- /* Check for quik first stage bootloader (but I don't think we are
- * compatible with it anyway, I'll look into backporting to older OF
- * versions later
- */
- if (r5 == 0xdeadbeef) {
- r5 = r3;
- quik_fip = (struct first_info *)r4;
- }
-
/* Initialize OF interface */
prom_init ((prom_entry) r5);
+ prom_print_available();
+
/* Allocate some memory for malloc'ator */
- for (addr = MALLOCADDR; addr <= MALLOCADDR * 16 ;addr+=0x100000) {
- malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0);
- if (malloc_base != (void *)-1) break;
- }
+ malloc_base = prom_claim_chunk_top(MALLOCSIZE, 0);
if (malloc_base == (void *)-1) {
- prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n",
- MALLOCSIZE, MALLOCADDR);
+ prom_printf("Can't claim malloc buffer of %d bytes\n",
+ MALLOCSIZE);
return -1;
}
malloc_init(malloc_base, MALLOCSIZE);
/* A few useless DEBUG_F's */
DEBUG_F("reloc_offset : %ld (should be 0)\n", reloc_offset());
- DEBUG_F("test_bss : %d (should be 0)\n", test_bss);
- DEBUG_F("test_data : %d (should be 0)\n", test_data);
- DEBUG_F("&test_data : %p\n", &test_data);
- DEBUG_F("&test_bss : %p\n", &test_bss);
DEBUG_F("linked at : 0x%08x\n", TEXTADDR);
/* ask the OF info if we're a chrp or pmac */
else if (prom_getprop(root, "device_type", model, 256 ) > 0 &&
!strncmp("chrp", model, 4))
_machine = _MACH_chrp;
+ else if (prom_getprop(root, "compatible", model, 256 ) > 0 &&
+ strstr(model, "ibm,powernv"))
+ _machine = _MACH_chrp;
else {
if (prom_getprop(root, "model", model, 256 ) > 0 &&
!strncmp(model, "IBM", 3))
}
strncpy(msgpath, filename, sizeof(msgpath));
+ msgfile = boot; /* Copy all the original paramters */
if (!parse_device_path(msgpath, defdev, defpart, "/etc/yaboot.msg", &msgfile)) {
prom_printf("%s: Unable to parse\n", msgpath);
goto done;
} else
opened = 1;
- msg = malloc(2001);
+ msg = malloc(MESSAGE_FILE_MAX + 1);
if (!msg)
goto done;
else
- memset(msg, 0, 2001);
+ memset(msg, 0, MESSAGE_FILE_MAX + 1);
- if (file.fs->read(&file, 2000, msg) <= 0)
+ if (file.fs->read(&file, MESSAGE_FILE_MAX, msg) <= 0)
goto done;
else
prom_printf("%s", msg);
int minlen;
packet = prom_get_netinfo();
+ if (!packet)
+ goto out;
/*
* First, try to match on mac address with the hardware type
prom_printf ("\n");
#ifdef USE_MD5_PASSWORDS
if (!strncmp (password, "$1$", 3)) {
- if (!check_md5_password(passwdbuff, password))
+ if (!check_md5_password((unsigned char*)passwdbuff, (unsigned char*)password))
return;
}
else if (!strcmp (password, passwdbuff))
static int first = 1;
static char imagepath[1024];
static char initrdpath[1024];
- static char sysmappath[1024];
static char manualinitrd[1024];
static int definitrd = 1, hasarg = 0;
params->args = "";
params->kernel.part = -1;
params->rd.part = -1;
- params->sysmap.part = -1;
defpart = boot.part;
cmdinit();
- if (first) {
+ if (first && !fw_reboot_cnt) {
first = 0;
imagename = bootargs;
word_split(&imagename, ¶ms->args);
timeout = simple_strtol(q, NULL, 0);
}
+ /* If this is a reboot due to FW detecting CAS changes then
+ * set timeout to 1. The last kernel booted will be booted
+ * again automatically. It should seem seamless to the user
+ */
+ if (fw_reboot_cnt)
+ timeout = 1;
+
prom_printf("boot: ");
c = -1;
if (timeout != -1) {
if (!imagename) {
if (bootoncelabel[0] != 0)
imagename = bootoncelabel;
- else
+ else if (bootlastlabel[0] != 0) {
+ imagename = bootlastlabel;
+ word_split(&imagename, ¶ms->args);
+ } else
imagename = cfg_get_default();
}
if (imagename)
if ( useconf && (!imagename || imagename[0] == 0 ))
imagename = cfg_get_default();
+ /* write the imagename out so it can be reused on reboot if necessary */
+ strcpy(bootlastlabel, imagename);
+ if (params->args && params->args[0]) {
+ strcat(bootlastlabel, " ");
+ strcat(bootlastlabel, params->args);
+ }
+ prom_set_options("boot-last-label", bootlastlabel,
+ strlen(bootlastlabel) + 1);
+
label = 0;
defdevice = boot.dev;
if (!label && password)
check_password ("To boot a custom image you must enter the password.");
+ params->kernel = boot; /* Copy all the original paramters */
if (!parse_device_path(imagepath, defdevice, defpart,
"/vmlinux", ¶ms->kernel)) {
prom_printf("%s: Unable to parse\n", imagepath);
/* check if user seted to use a initrd file from boot console */
if (!definitrd && p != manualinitrd) {
- if (manualinitrd[0] != "/" && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) {
+ if (manualinitrd[0] != '/' && (prom_get_devtype(defdevice_bak) != FILE_DEVICE_NET)) {
strcpy(initrdpath, "/");
strcat(initrdpath, manualinitrd);
} else
strncpy(initrdpath, p, 1024);
DEBUG_F("Parsing initrd path <%s>\n", initrdpath);
+ params->rd = boot; /* Copy all the original paramters */
if (!parse_device_path(initrdpath, defdevice, defpart,
"/root.bin", ¶ms->rd)) {
prom_printf("%s: Unable to parse\n", imagepath);
return 0;
}
}
- p = cfg_get_strg(label, "sysmap");
- if (p && *p) {
- DEBUG_F("Parsing sysmap path <%s>\n", p);
- strncpy(sysmappath, p, 1024);
- if (!parse_device_path(sysmappath, defdevice, defpart,
- "/boot/System.map", ¶ms->sysmap)) {
- prom_printf("%s: Unable to parse\n", imagepath);
- return 0;
- }
- }
}
return 0;
}
void
yaboot_text_ui(void)
{
-#define MAX_HEADERS 32
-
struct boot_file_t file;
int result;
static struct boot_param_t params;
void *initrd_base;
unsigned long initrd_size;
- void *sysmap_base;
- unsigned long sysmap_size;
kernel_entry_t kernel_entry;
- struct bi_record* birec;
char* loc=NULL;
loadinfo_t loadinfo;
void *initrd_more,*initrd_want;
for (;;) {
initrd_size = 0;
initrd_base = 0;
- sysmap_base = 0;
- sysmap_size = 0;
if (get_params(¶ms))
return;
file.fs->close(&file);
memset(&file, 0, sizeof(file));
- /* If sysmap, load it (only if booting a vmlinux).
- */
- if (flat_vmlinux && params.sysmap.file) {
- prom_printf("Loading System.map ...\n");
- if(strlen(boot.file) && !strcmp(boot.file,"\\\\") && params.sysmap.file[0] != '/'
- && params.sysmap.file[0] != '\\') {
- if (loc) free(loc);
- loc=(char*)malloc(strlen(params.sysmap.file)+3);
- if (!loc) {
- prom_printf ("malloc error\n");
- goto next;
- }
- strcpy(loc,boot.file);
- strcat(loc,params.sysmap.file);
- free(params.sysmap.file);
- params.sysmap.file=loc;
- }
-
- result = open_file(¶ms.sysmap, &file);
- if (result != FILE_ERR_OK) {
- prom_printf("%s:%d,", params.sysmap.dev, params.sysmap.part);
- prom_perror(result, params.sysmap.file);
- }
- else {
- sysmap_base = prom_claim(loadinfo.base+loadinfo.memsize, 0x100000, 0);
- if (sysmap_base == (void *)-1) {
- prom_printf("Claim failed for sysmap memory\n");
- prom_pause();
- sysmap_base = 0;
- } else {
- sysmap_size = file.fs->read(&file, 0xfffff, sysmap_base);
- if (sysmap_size == 0)
- sysmap_base = 0;
- else
- ((char *)sysmap_base)[sysmap_size++] = 0;
- }
- file.fs->close(&file);
- memset(&file, 0, sizeof(file));
- }
- if (sysmap_base) {
- prom_printf("System.map loaded at %p, size: %lu Kbytes\n",
- sysmap_base, sysmap_size >> 10);
- loadinfo.memsize += _ALIGN(0x100000, 0x1000);
- } else {
- prom_printf("System.map load failed !\n");
- prom_pause();
- }
- }
-
/* If ramdisk, load it (only if booting a vmlinux). For now, we
* can't tell the size it will be so we claim an arbitrary amount
* of 4Mb.
}
else {
#define INITRD_CHUNKSIZE 0x100000
- initrd_base = prom_claim(loadinfo.base+loadinfo.memsize, INITRD_CHUNKSIZE, 0);
+ unsigned int len = INITRD_CHUNKSIZE;
+
+ /* We add a bit to the actual size so the loop below doesn't think
+ * there is more to load.
+ */
+ if (file.fs->ino_size && file.fs->ino_size(&file) > 0)
+ len = file.fs->ino_size(&file) + 0x1000;
+
+ initrd_base = prom_claim_chunk(loadinfo.base+loadinfo.memsize, len, 0);
if (initrd_base == (void *)-1) {
prom_printf("Claim failed for initrd memory\n");
initrd_base = 0;
} else {
- initrd_size = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_base);
+ initrd_size = file.fs->read(&file, len, initrd_base);
if (initrd_size == 0)
initrd_base = 0;
initrd_read = initrd_size;
initrd_more = initrd_base;
- while (initrd_read == INITRD_CHUNKSIZE ) { /* need to read more? */
- initrd_want = (void *)((unsigned long)initrd_more+INITRD_CHUNKSIZE);
- initrd_more = prom_claim(initrd_want, INITRD_CHUNKSIZE, 0);
+ while (initrd_read == len ) { /* need to read more? */
+ initrd_want = (void *)((unsigned long)initrd_more+len);
+ initrd_more = prom_claim(initrd_want, len, 0);
if (initrd_more != initrd_want) {
prom_printf("Claim failed for initrd memory at %p rc=%p\n",initrd_want,initrd_more);
prom_pause();
break;
}
- initrd_read = file.fs->read(&file, INITRD_CHUNKSIZE, initrd_more);
+ initrd_read = file.fs->read(&file, len, initrd_more);
DEBUG_F(" block at %p rc=%lu\n",initrd_more,initrd_read);
initrd_size += initrd_read;
}
flush_icache_range ((long)loadinfo.base, (long)loadinfo.base+loadinfo.memsize);
DEBUG_F(" done\n");
- if (flat_vmlinux) {
- /*
- * Fill new boot infos (only if booting a vmlinux).
- *
- * The birec is low on memory, probably inside the malloc pool,
- * so we don't write it earlier. At this point, we should not
- * use anything coming from the malloc pool.
- */
- birec = (struct bi_record *)_ALIGN(loadinfo.filesize+(1<<20)-1,(1<<20));
-
- /* We make sure it's mapped. We map only 64k for now, it's
- * plenty enough we don't claim since this precise memory
- * range may already be claimed by the malloc pool.
- */
- prom_map (birec, birec, 0x10000);
- DEBUG_F("birec at %p\n", birec);
- DEBUG_SLEEP;
-
- birec->tag = BI_FIRST;
- birec->size = sizeof(struct bi_record);
- birec = (struct bi_record *)((ulong)birec + birec->size);
-
- birec->tag = BI_BOOTLOADER_ID;
- sprintf( (char *)birec->data, "yaboot");
- birec->size = sizeof(struct bi_record) + strlen("yaboot") + 1;
- birec = (struct bi_record *)((ulong)birec + birec->size);
-
- birec->tag = BI_MACHTYPE;
- birec->data[0] = _machine;
- birec->size = sizeof(struct bi_record) + sizeof(ulong);
- birec = (struct bi_record *)((ulong)birec + birec->size);
-
- if (sysmap_base) {
- birec->tag = BI_SYSMAP;
- birec->data[0] = (ulong)sysmap_base;
- birec->data[1] = sysmap_size;
- birec->size = sizeof(struct bi_record) + sizeof(ulong)*2;
- birec = (struct bi_record *)((ulong)birec + birec->size);
- }
- birec->tag = BI_LAST;
- birec->size = sizeof(struct bi_record);
- birec = (struct bi_record *)((ulong)birec + birec->size);
- }
-
/* compute the kernel's entry point. */
kernel_entry = loadinfo.base + loadinfo.entry - loadinfo.load_loc;
DEBUG_F("Entering kernel...\n");
+ prom_print_available();
+
/* call the kernel with our stack. */
kernel_entry(initrd_base + loadinfo.load_loc, initrd_size, prom, 0, 0);
continue;
loadinfo->entry = e->e_entry;
- if (e->e_phnum > MAX_HEADERS) {
- prom_printf ("Can only load kernels with one program header\n");
- goto bail;
- }
-
ph = (Elf32_Phdr *)malloc(sizeof(Elf32_Phdr) * e->e_phnum);
if (!ph) {
prom_printf ("Malloc error\n");
loadinfo->entry = e->e_entry;
- if (e->e_phnum > MAX_HEADERS) {
- prom_printf ("Can only load kernels with one program header\n");
- goto bail;
- }
-
ph = (Elf64_Phdr *)malloc(sizeof(Elf64_Phdr) * e->e_phnum);
if (!ph) {
prom_printf ("Malloc error\n");
goto bail;
}
- /* leave some room (1Mb) for boot infos */
- loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20)) + 0x100000;
+ loadinfo->memsize = _ALIGN(loadinfo->memsize,(1<<20));
/* Claim OF memory */
DEBUG_F("Before prom_claim, mem_sz: 0x%08lx\n", loadinfo->memsize);
e->e_ident[EI_MAG3] == ELFMAG3 &&
e->e_ident[EI_CLASS] == ELFCLASS64 &&
e->e_ident[EI_DATA] == ELFDATA2MSB &&
- e->e_type == ET_EXEC &&
+ (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
e->e_machine == EM_PPC64);
}
yaboot_main(void)
{
char *ptype;
+ char *endp;
int conf_given = 0;
char conf_path[1024];
DEBUG_F("/chosen/bootargs = %s\n", bootargs);
prom_get_chosen("bootpath", bootdevice, BOOTDEVSZ);
DEBUG_F("/chosen/bootpath = %s\n", bootdevice);
+ if (prom_get_options("ibm,client-architecture-support-reboot",fw_nbr_reboots, FW_NBR_REBOOTSZ) == -1 )
+ prom_get_options("ibm,fw-nbr-reboots",fw_nbr_reboots, FW_NBR_REBOOTSZ);
+ fw_reboot_cnt = simple_strtol(fw_nbr_reboots,&endp,10);
+ if (fw_reboot_cnt > 0L)
+ prom_get_options("boot-last-label", bootlastlabel, BOOTLASTSZ);
/* If conf= specified on command line, it overrides
Usage: conf=device:partition,/path/to/conffile
prom_printf("%s: Unable to parse\n", bootdevice);
return -1;
}
- if (_machine == _MACH_bplan)
+ if (_machine == _MACH_bplan && !conf_given)
boot.part++;
DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
boot.dev, boot.part, boot.file);
projects / yaboot.git / blobdiff