X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fyaboot.c;h=ec0c0859d71813be46db27937154583b744c6a2a;hp=c31578730c7ecf353ff98b6db5f504ae12a8787b;hb=677037569e92173195efa04244cd4291721d8f20;hpb=b58b7f84f40f96f61a1d5fc1f88a1abd9c1a4193 diff --git a/second/yaboot.c b/second/yaboot.c index c315787..ec0c085 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -1,25 +1,25 @@ /* - * Yaboot - secondary boot loader for Linux on PowerPC. + * Yaboot - secondary boot loader for Linux on PowerPC. * * Copyright (C) 2001, 2002 Ethan Benson * * Copyright (C) 1999, 2000, 2001 Benjamin Herrenschmidt - * + * * IBM CHRP support - * + * * Copyright (C) 2001 Peter Bergner * * portions based on poof - * + * * Copyright (C) 1999 Marius Vollmer - * + * * portions based on quik - * + * * Copyright (C) 1996 Paul Mackerras. - * + * * Because this program is derived from the corresponding file in the * silo-0.64 distribution, it is also - * + * * Copyright (C) 1996 Pete A. Zaitcev * 1996 Maurizio Plaza * 1996 David S. Miller @@ -58,6 +58,8 @@ #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 */ @@ -74,6 +76,8 @@ #define KERNEL_LINK_ADDR_PPC32 0xC0000000UL #define KERNEL_LINK_ADDR_PPC64 0xC000000000000000ULL +#define INITRD_CHUNKSIZE 0x100000 + typedef struct { union { Elf32_Ehdr elf32hdr; @@ -111,7 +115,12 @@ static void setup_display(void); /* Locals & globals */ int useconf = 0; -char bootdevice[1024]; +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; @@ -149,10 +158,6 @@ int fgcolor = 15; 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 to continue.\n"; static char given_bootargs[1024]; @@ -164,13 +169,6 @@ extern unsigned char linux_logo_blue[]; #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) { @@ -178,38 +176,24 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) void* malloc_base = NULL; 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 */ - malloc_base = prom_claim((void *)MALLOCADDR, MALLOCSIZE, 0); + 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); DEBUG_F("Malloc buffer allocated at %p (%d bytes)\n", 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 */ @@ -217,16 +201,22 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) root = prom_finddevice("/"); if (root != 0) { static char model[256]; - if (prom_getprop(root, "device_type", model, 256 ) > 0 && + if (prom_getprop(root, "CODEGEN,vendor", model, 256) > 0 && + !strncmp("bplan", model, 5)) + _machine = _MACH_bplan; + 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)) _machine = _MACH_chrp; } } - + DEBUG_F("Running on _machine = %d\n", _machine); DEBUG_SLEEP; @@ -241,9 +231,9 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) /* Return to OF */ prom_exit(); - + return result; - + } #ifdef CONFIG_COLOR_TEXT @@ -260,13 +250,13 @@ check_color_text_ui(char *color) i++; } return -1; -} +} #endif /* CONFIG_COLOR_TEXT */ void print_message_file(char *filename) { - char *msg = NULL; + char *msg = NULL; char *p, *endp; char *defdev = boot.dev; int defpart = boot.part; @@ -284,10 +274,11 @@ void print_message_file(char *filename) if (p) { n = simple_strtol(p, &endp, 10); if (endp != p && *endp == 0) - defpart = n; + defpart = n; } 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; @@ -301,13 +292,13 @@ void print_message_file(char *filename) } 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); @@ -324,13 +315,11 @@ done: * config file. Handle the "\\" (blessed system folder) */ static int -load_config_file(char *device, char* path, int partition) +load_config_file(struct boot_fspec_t *fspec) { char *conf_file = NULL, *p; struct boot_file_t file; int sz, opened = 0, result = 0; - char conf_path[512]; - struct boot_fspec_t fspec; /* Allocate a buffer for the config file */ conf_file = malloc(CONFIG_FILE_MAX); @@ -339,23 +328,11 @@ load_config_file(char *device, char* path, int partition) goto bail; } - /* Build the path to the file */ - if (_machine == _MACH_chrp) - strcpy(conf_path, "/etc/"); - else if (path && *path) - strcpy(conf_path, path); - else - conf_path[0] = 0; - strcat(conf_path, CONFIG_FILE_NAME); - /* Open it */ - fspec.dev = device; - fspec.file = conf_path; - fspec.part = partition; - result = open_file(&fspec, &file); + result = open_file(fspec, &file); if (result != FILE_ERR_OK) { - prom_printf("%s:%d,", fspec.dev, fspec.part); - prom_perror(result, fspec.file); + prom_printf("%s:%d,", fspec->dev, fspec->part); + prom_perror(result, fspec->file); prom_printf("Can't open config file\n"); goto bail; } @@ -375,11 +352,27 @@ load_config_file(char *device, char* path, int partition) opened = 0; /* Call the parsing code in cfg.c */ - if (cfg_parse(conf_path, conf_file, sz) < 0) { + if (cfg_parse(fspec->file, conf_file, sz) < 0) { prom_printf ("Syntax error or read error config\n"); goto bail; } + /* + * set the default cf_option to label that has the same MAC addr + * it only works if there is a label with the MAC addr on yaboot.conf + */ + if (prom_get_devtype(fspec->dev) == FILE_DEVICE_NET) { + /* change the variable bellow to get the MAC dinamicaly */ + char * macaddr = NULL; + int default_mac = 0; + + macaddr = prom_get_mac(prom_get_netinfo()); + default_mac = cfg_set_default_by_mac(macaddr); + if (default_mac >= 1) { + prom_printf("Default label was changed to macaddr label.\n"); + } + } + DEBUG_F("Config file successfully parsed, %d bytes\n", sz); /* Now, we do the initialisations stored in the config file */ @@ -388,7 +381,7 @@ load_config_file(char *device, char* path, int partition) prom_interpret(p); password = cfg_get_strg(0, "password"); - + #ifdef CONFIG_COLOR_TEXT p = cfg_get_strg(0, "fgcolor"); if (p) { @@ -407,19 +400,19 @@ load_config_file(char *device, char* path, int partition) } if (bgcolor >= 0) { char temp[64]; - sprintf(temp, "%x to background-color", bgcolor); - prom_interpret(temp); + sprintf(temp, "%x to background-color", bgcolor); + prom_interpret(temp); #if !DEBUG prom_printf("\xc"); #endif /* !DEBUG */ } if (fgcolor >= 0) { char temp[64]; - sprintf(temp, "%x to foreground-color", fgcolor); - prom_interpret(temp); + sprintf(temp, "%x to foreground-color", fgcolor); + prom_interpret(temp); } #endif /* CONFIG_COLOR_TEXT */ - + p = cfg_get_strg(0, "init-message"); if (p) prom_printf("%s\n", p); @@ -429,18 +422,76 @@ load_config_file(char *device, char* path, int partition) print_message_file(p); result = 1; - + bail: if (opened) file.fs->close(&file); - - if (result != 1 && conf_file) + + if (conf_file) free(conf_file); - + return result; } +/* + * Search for config file by MAC address, then by IP address. + * Basically copying pxelinux's algorithm. + * http://syslinux.zytor.com/pxe.php#config + */ +static int load_my_config_file(struct boot_fspec_t *orig_fspec) +{ + struct bootp_packet *packet; + int rc = 0; + struct boot_fspec_t fspec = *orig_fspec; + char *cfgpath = (_machine == _MACH_chrp || _machine == _MACH_bplan) ? "/etc/" : ""; + int flen; + int minlen; + + packet = prom_get_netinfo(); + if (!packet) + goto out; + + /* + * First, try to match on mac address with the hardware type + * prepended. + */ + + /* 3 chars per byte in chaddr + 2 chars for htype + /etc/ +\0 */ + fspec.file = malloc(packet->hlen * 3 + 2 + 6); + if (!fspec.file) + goto out; + + sprintf(fspec.file, "%s%02x-", cfgpath, packet->htype); + strcat(fspec.file, prom_get_mac(packet)); + + rc = load_config_file(&fspec); + if (rc) + goto out; + + /* + * Now try to match on IP. + */ + /* no need to realloc for /etc/ + 8 chars in yiaddr + \0 */ + sprintf(fspec.file, "%s%s", cfgpath, prom_get_ip(packet)); + + for (flen = strlen(fspec.file), + minlen = strlen(cfgpath); flen > minlen; flen--) { + rc = load_config_file(&fspec); + if (rc) + goto out; + /* Chop one digit off the end, try again */ + fspec.file[flen - 1] = '\0'; + } + + out: + if (rc) /* modify original only on success */ + orig_fspec->file = fspec.file; + else + free(fspec.file); + return rc; +} + void maintabfunc (void) { if (useconf) { @@ -557,9 +608,9 @@ void check_password(char *str) 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)) return; #else /* !MD5 */ @@ -582,6 +633,7 @@ int get_params(struct boot_param_t* params) { int defpart; char *defdevice = 0; + char defdevice_bak[1024]; char *p, *q, *endp; int c, n; char *imagename = 0, *label; @@ -590,24 +642,22 @@ int get_params(struct boot_param_t* params) int singlekey = 0; int restricted = 0; static int first = 1; - static char bootargs[1024]; static char imagepath[1024]; static char initrdpath[1024]; - static char sysmappath[1024]; + static char manualinitrd[1024]; + static int definitrd = 1, hasarg = 0; pause_after = 0; memset(params, 0, sizeof(*params)); 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; - prom_get_chosen("bootargs", bootargs, sizeof(bootargs)); imagename = bootargs; word_split(&imagename, ¶ms->args); timeout = DEFAULT_TIMEOUT; @@ -621,6 +671,13 @@ int get_params(struct boot_param_t* params) 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) { @@ -654,8 +711,15 @@ int get_params(struct boot_param_t* params) } if (c == '\n' || c == '\r') { - if (!imagename) - imagename = cfg_get_default(); + if (!imagename) { + if (bootoncelabel[0] != 0) + imagename = bootoncelabel; + else if (bootlastlabel[0] != 0) { + imagename = bootlastlabel; + word_split(&imagename, ¶ms->args); + } else + imagename = cfg_get_default(); + } if (imagename) prom_printf("%s", imagename); if (params->args) @@ -670,13 +734,64 @@ int get_params(struct boot_param_t* params) word_split(&imagename, ¶ms->args); } + /* initrd setup via cmd console */ + /* first, check if the user uses it with some label */ + if (!strncmp(params->args, "initrd=", 7)) { + DEBUG_F("params->args: %s\n", params->args); + definitrd = 0; + } + /* after, check if there is the 'initrd=' in the imagename string */ + if (!strncmp(imagename, "initrd=", 7) || !definitrd) { + + /* return the value of definitrd to 1 */ + if (!definitrd) + definitrd = 1; + + /* args = "initrd=blah" */ + char *args = NULL; + + if (params->args) { + args = params->args; + params->args = NULL; + hasarg = 1; + } else + args = imagename; + + if (strlen(args)){ + /* copy the string after the '=' to manualinitrd */ + strcpy(manualinitrd, args+7); + definitrd = 0; + prom_printf("New initrd file specified: %s\n", manualinitrd); + } else { + prom_printf("ERROR: no initrd specified!\n"); + return 0; + } + + /* set imagename with the default values of the config file */ + if ((prom_get_devtype(boot.dev) == FILE_DEVICE_NET) && !hasarg) + imagename = cfg_get_default(); + else + imagename = cfg_get_default(); + } + /* chrp gets this wrong, force it -- Cort */ 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; + strcpy(defdevice_bak,defdevice); + if (useconf) { defdevice = cfg_get_strg(0, "device"); p = cfg_get_strg(0, "partition"); @@ -729,10 +844,21 @@ int get_params(struct boot_param_t* params) "resides on, and \"partno\" is the partition number the image resides on.\n" "Note that the comma (,) is only required if you specify an OpenFirmware\n" "device, if you only specify a filename you should not start it with a \",\"\n\n" - "If you omit \"device:\" and \"partno\" yaboot will use the values of \n" - "\"device=\" and \"partition=\" in yaboot.conf, right now those are set to: \n" - "device=%s\n" - "partition=%d\n\n", defdevice, defpart); + "To boot a alternative initrd file rather than specified in the yaboot\n" + "configuration file, use the \"initrd\" command on Yaboot's prompt: \n" + "\"initrd=[name.img]\". This will load the \"name.img\" file after the default\n" + "kernel image. You can, also, specify a different initrd file to any other\n" + "label of the yaboot configuration file. Just type \"label initrd=[name.img]\"\n" + "and the specified initrd file will be loaded.\n\n" + "To load an alternative config file rather than /etc/yaboot.conf, enter\n" + "its device, partno and path, on Open Firmware Prompt:\n" + "boot conf=device:partno,/path/to/configfile\n." + "To reload the config file or load a new one, use the \"conf\" command\n" + "on Yaboot's prompt:\n" + "conf [device=device] [partition=partno] [file=/path/to/configfile]\n\n" + "If you omit \"device\" and \"partno\", Yaboot will use their current\n" + "values. You can check them by entering \"conf\" on Yaboot's prompt.\n"); + return 0; } @@ -747,7 +873,92 @@ int get_params(struct boot_param_t* params) check_password ("Restricted command."); return 1; } - return 1; + return 1; + } + + if (!strncmp (imagename, "conf", 4)) { + + // imagename = "conf file=blah dev=bleh part=blih" + DEBUG_F("Loading user-specified config file: %s\n",imagename); + if (password) { + check_password ("Restricted command."); + return 1; + } + + // args= "file=blah dev=bleh part=blih" + char *args = params->args; + + if (strlen(args)){ + + // set a pointer to the first space in args + char *space = strchr(args,' '); + + int loop = 3; + while (loop > 0){ + char temp[1024] = "0"; + + // copy next argument to temp + strncpy(temp, args, space-args); + + // parse temp and set boot arguments + if (!strncmp (temp, "file=", 5)){ + DEBUG_F("conf file: %s\n", temp+5); + strcpy(boot.file, temp+5); + } else if (!strncmp (temp, "device=", 7)){ + DEBUG_F("conf device: %s\n", temp+7); + strcpy(boot.dev, temp+7); + } else if (!strncmp (temp, "partition=", 10)){ + DEBUG_F("conf partition: %s\n", temp+10); + boot.part=simple_strtol(temp+10,NULL,10); + } else + space = NULL; + + // set the pointer to the next space in args; + // set the loop control variable + if (strlen(space)>1){ + // Go to the next argument + args = space+1; + + loop--; + if (strchr(args,' ') == NULL) + space = &args[strlen(args)]; + else + space = strchr(args,' '); + } else { + loop = -1; + space = NULL; + } + } + + prom_printf("Loading config file...\n"); + useconf = load_config_file(&boot); + if (useconf > 0){ + if ((q = cfg_get_strg(0, "timeout")) != 0 && *q != 0) + timeout = simple_strtol(q, NULL, 0); + } else { + prom_printf("Restoring default values.\n"); + strcpy(boot.file,""); + strcpy(boot.dev, defdevice_bak); + boot.part = defpart; + } + + } else { + prom_printf("Current configuration:\n"); + prom_printf("device: %s\n", boot.dev); + if (boot.part < 0) + prom_printf("partition: auto\n"); + else + prom_printf("partition: %d\n", boot.part); + if (strlen(boot.file)) + prom_printf("file: %s\n", boot.file); + else + prom_printf("file: /etc/%s\n",CONFIG_FILE_NAME); + } + + imagename = "\0"; + params->args = "\0"; + + return 0; } if (imagename[0] == '$') { @@ -763,35 +974,35 @@ int get_params(struct boot_param_t* params) 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); return 0; } - DEBUG_F("after parse_device_path: dev=%s part=%d file=%s\n", params->kernel.dev, - params->kernel.part, params->kernel.file); - + DEBUG_F("after parse_device_path: dev=%s part=%d file=%s\n", params->kernel.dev, params->kernel.part, params->kernel.file); if (useconf) { p = cfg_get_strg(label, "initrd"); if (p && *p) { - DEBUG_F("Parsing initrd path <%s>\n", p); - strncpy(initrdpath, p, 1024); + + /* 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)) { + strcpy(initrdpath, "/"); + strcat(initrdpath, manualinitrd); + } else + strncpy(initrdpath, manualinitrd, 1024); + } 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; } @@ -804,35 +1015,29 @@ int get_params(struct boot_param_t* params) 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; unsigned long initrd_read; - + unsigned int len = INITRD_CHUNKSIZE; + loadinfo.load_loc = 0; for (;;) { initrd_size = 0; initrd_base = 0; - sysmap_base = 0; - sysmap_size = 0; - + if (get_params(¶ms)) return; if (!params.kernel.file) continue; - + prom_printf("Please wait, loading kernel...\n"); memset(&file, 0, sizeof(file)); @@ -889,54 +1094,6 @@ yaboot_text_ui(void) 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"); - 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. @@ -958,30 +1115,38 @@ yaboot_text_ui(void) } prom_printf("Loading ramdisk...\n"); result = open_file(¶ms.rd, &file); + if (result == FILE_ERR_OK && file.fs->ino_size) { + result = file.fs->ino_size(&file, &len); + } if (result != FILE_ERR_OK) { prom_printf("%s:%d,", params.rd.dev, params.rd.part); prom_perror(result, params.rd.file); } else { -#define INITRD_CHUNKSIZE 0x400000 - initrd_base = prom_claim(loadinfo.base+loadinfo.memsize, INITRD_CHUNKSIZE, 0); + /* We add a bit to the actual size so the loop below + * doesn't think there is more to load. + */ + len += 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; } @@ -1004,50 +1169,6 @@ yaboot_text_ui(void) 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; @@ -1061,6 +1182,8 @@ yaboot_text_ui(void) 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; @@ -1074,14 +1197,14 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) { int i; Elf32_Ehdr *e = &(loadinfo->elf.elf32hdr); - Elf32_Phdr *p, *ph; + Elf32_Phdr *p, *ph = NULL; int size = sizeof(Elf32_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { prom_printf("\nCan't read Elf32 image header\n"); - return 0; + goto bail; } DEBUG_F("Elf32 header:\n"); @@ -1098,26 +1221,21 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) loadinfo->entry = e->e_entry; - if (e->e_phnum > MAX_HEADERS) { - prom_printf ("Can only load kernels with one program header\n"); - return 0; - } - ph = (Elf32_Phdr *)malloc(sizeof(Elf32_Phdr) * e->e_phnum); if (!ph) { prom_printf ("Malloc error\n"); - return 0; + goto bail; } /* Now, we read the section header */ if ((*(file->fs->seek))(file, e->e_phoff) != FILE_ERR_OK) { prom_printf ("seek error\n"); - return 0; + goto bail; } if ((*(file->fs->read))(file, sizeof(Elf32_Phdr) * e->e_phnum, ph) != sizeof(Elf32_Phdr) * e->e_phnum) { prom_printf ("read error\n"); - return 0; + goto bail; } /* Scan through the program header @@ -1144,7 +1262,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) if (loadinfo->memsize == 0) { prom_printf("Can't find a loadable segment !\n"); - return 0; + goto bail; } /* leave some room (1Mb) for boot infos */ @@ -1161,20 +1279,14 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = KERNELADDR; } else { flat_vmlinux = 0; - loadaddr = e->e_entry; + loadaddr = loadinfo->load_loc; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); - return 0; - } + goto bail; + } DEBUG_F("After ELF parsing, load base: %p, mem_sz: 0x%08lx\n", loadinfo->base, loadinfo->memsize); @@ -1192,20 +1304,25 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) if ((*(file->fs->seek))(file, p->p_offset) != FILE_ERR_OK) { prom_printf ("Seek error\n"); prom_release(loadinfo->base, loadinfo->memsize); - return 0; + goto bail; } offset = p->p_vaddr - loadinfo->load_loc; if ((*(file->fs->read))(file, p->p_filesz, loadinfo->base+offset) != p->p_filesz) { prom_printf ("Read failed\n"); prom_release(loadinfo->base, loadinfo->memsize); - return 0; + goto bail; } } free(ph); - + /* Return success at loading the Elf32 kernel */ return 1; + +bail: + if (ph) + free(ph); + return 0; } static int @@ -1213,14 +1330,14 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) { int i; Elf64_Ehdr *e = &(loadinfo->elf.elf64hdr); - Elf64_Phdr *p, *ph; + Elf64_Phdr *p, *ph = NULL; int size = sizeof(Elf64_Ehdr) - sizeof(Elf_Ident); - unsigned long addr, loadaddr; + unsigned long loadaddr; /* Read the rest of the Elf header... */ if ((*(file->fs->read))(file, size, &e->e_version) < size) { prom_printf("\nCan't read Elf64 image header\n"); - return 0; + goto bail; } DEBUG_F("Elf64 header:\n"); @@ -1237,26 +1354,21 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) loadinfo->entry = e->e_entry; - if (e->e_phnum > MAX_HEADERS) { - prom_printf ("Can only load kernels with one program header\n"); - return 0; - } - ph = (Elf64_Phdr *)malloc(sizeof(Elf64_Phdr) * e->e_phnum); if (!ph) { prom_printf ("Malloc error\n"); - return 0; + goto bail; } /* Now, we read the section header */ if ((*(file->fs->seek))(file, e->e_phoff) != FILE_ERR_OK) { prom_printf ("Seek error\n"); - return 0; + goto bail; } if ((*(file->fs->read))(file, sizeof(Elf64_Phdr) * e->e_phnum, ph) != sizeof(Elf64_Phdr) * e->e_phnum) { prom_printf ("Read error\n"); - return 0; + goto bail; } /* Scan through the program header @@ -1283,11 +1395,10 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) if (loadinfo->memsize == 0) { prom_printf("Can't find a loadable segment !\n"); - return 0; + 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); @@ -1303,17 +1414,11 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) loadaddr = e->e_entry; } - /* On some systems, loadaddr may already be claimed, so try some - * other nearby addresses before giving up. - */ - for(addr=loadaddr; addr <= loadaddr * 8 ;addr+=0x100000) { - loadinfo->base = prom_claim((void *)addr, loadinfo->memsize, 0); - if (loadinfo->base != (void *)-1) break; - } + loadinfo->base = prom_claim_chunk((void *)loadaddr, loadinfo->memsize, 0); if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); - return 0; - } + goto bail; + } DEBUG_F("After ELF parsing, load base: %p, mem_sz: 0x%08lx\n", loadinfo->base, loadinfo->memsize); @@ -1331,20 +1436,25 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) if ((*(file->fs->seek))(file, p->p_offset) != FILE_ERR_OK) { prom_printf ("Seek error\n"); prom_release(loadinfo->base, loadinfo->memsize); - return 0; + goto bail; } offset = p->p_vaddr - loadinfo->load_loc; if ((*(file->fs->read))(file, p->p_filesz, loadinfo->base+offset) != p->p_filesz) { prom_printf ("Read failed\n"); prom_release(loadinfo->base, loadinfo->memsize); - return 0; + goto bail; } } free(ph); - + /* Return success at loading the Elf64 kernel */ return 1; + +bail: + if (ph) + free(ph); + return 0; } static int @@ -1373,7 +1483,7 @@ is_elf64(loadinfo_t *loadinfo) 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); } @@ -1421,16 +1531,16 @@ setup_display(void) DEBUG_F("Open screen result: %p\n", scrn); } } - + if (scrn == PROM_INVALID_HANDLE) { - prom_printf("No screen device found !/n"); + prom_printf("No screen device found !\n"); return; } for(i=0;i<16;i++) { prom_set_color(scrn, i, default_colors[i*3], default_colors[i*3+1], default_colors[i*3+2]); } - prom_printf("\x1b[1;37m\x1b[2;40m"); + prom_printf("\x1b[1;37m\x1b[2;40m"); #ifdef COLOR_TEST for (i=0;i<16; i++) { prom_printf("\x1b[%d;%dm\x1b[1;47m%s \x1b[2;40m %s\n", @@ -1444,7 +1554,7 @@ setup_display(void) ansi_color_table[i].name, ansi_color_table[i].name); } - prom_printf("\x1b[1;37m\x1b[2;40m"); + prom_printf("\x1b[1;37m\x1b[2;40m"); #endif /* COLOR_TEST */ #if !DEBUG @@ -1458,14 +1568,46 @@ int yaboot_main(void) { char *ptype; + char *endp; + int conf_given = 0; + char conf_path[1024]; if (_machine == _MACH_Pmac) setup_display(); - - prom_get_chosen("bootpath", bootdevice, sizeof(bootdevice)); + + prom_get_chosen("bootargs", bootargs, sizeof(bootargs)); + 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 + Example: On Open Firmware Prompt, type + boot conf=/pci@8000000f8000000/pci@1/pci1014,028C@1/scsi@0/sd@1,0:3,/etc/yaboot.conf */ + + if (!strncmp(bootargs, "conf=", 5)) { + DEBUG_F("Using conf argument in Open Firmware\n"); + char *end = strchr(bootargs,' '); + if (end) + *end = 0; + + strcpy(bootdevice, bootargs + 5); + conf_given = 1; + DEBUG_F("Using conf=%s\n", bootdevice); + + /* Remove conf=xxx from bootargs */ + if (end) + memmove(bootargs, end+1, strlen(end+1)+1); + else + bootargs[0] = 0; + } if (bootdevice[0] == 0) { - prom_get_options("boot-device", bootdevice, sizeof(bootdevice)); + prom_get_options("boot-device", bootdevice, BOOTDEVSZ); DEBUG_F("boot-device = %s\n", bootdevice); } if (bootdevice[0] == 0) { @@ -1473,36 +1615,63 @@ yaboot_main(void) return -1; } + if (bootoncelabel[0] == 0) { + prom_get_options("boot-once", bootoncelabel, + sizeof(bootoncelabel)); + if (bootoncelabel[0] != 0) + DEBUG_F("boot-once: [%s]\n", bootoncelabel); + } + prom_set_options("boot-once", NULL, 0); + if (!parse_device_path(bootdevice, NULL, -1, "", &boot)) { prom_printf("%s: Unable to parse\n", bootdevice); return -1; } + 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); - if (strlen(boot.file)) { - if (!strncmp(boot.file, "\\\\", 2)) - boot.file = "\\\\"; - else { - char *p, *last; - p = last = boot.file; - while(*p) { - if (*p == '\\') - last = p; - p++; - } - if (p) - *(last) = 0; - else - boot.file = ""; - if (strlen(boot.file)) - strcat(boot.file, "\\"); - } + if (!conf_given) { + if (_machine == _MACH_chrp || _machine == _MACH_bplan) + boot.file = "/etc/"; + else if (strlen(boot.file)) { + if (!strncmp(boot.file, "\\\\", 2)) + boot.file = "\\\\"; + else { + char *p, *last; + p = last = boot.file; + while(*p) { + if (*p == '\\') + last = p; + p++; + } + if (p) + *(last) = 0; + else + boot.file = ""; + if (strlen(boot.file)) + strcat(boot.file, "\\"); + } + } + strcpy(conf_path, boot.file); + strcat(conf_path, CONFIG_FILE_NAME); + boot.file = conf_path; + DEBUG_F("After path kludgeup: dev=%s, part=%d, file=%s\n", + boot.dev, boot.part, boot.file); + } + + /* + * If we're doing a netboot, first look for one which matches our + * MAC address. + */ + if (prom_get_devtype(boot.dev) == FILE_DEVICE_NET) { + prom_printf("Try to netboot\n"); + useconf = load_my_config_file(&boot); } - DEBUG_F("After pmac path kludgeup: dev=%s, part=%d, file=%s\n", - boot.dev, boot.part, boot.file); - useconf = load_config_file(boot.dev, boot.file, boot.part); + if (!useconf) + useconf = load_config_file(&boot); prom_printf("Welcome to yaboot version " VERSION "\n"); prom_printf("Enter \"help\" to get some basic usage information\n"); @@ -1521,16 +1690,18 @@ yaboot_main(void) if ((ptype != NULL) && (strcmp(ptype, "Apple_Bootstrap"))) prom_printf("\nWARNING: Bootstrap partition type is wrong: \"%s\"\n" " type should be: \"Apple_Bootstrap\"\n\n", ptype); + if (ptype) + free(ptype); } } yaboot_text_ui(); - + prom_printf("Bye.\n"); return 0; } -/* +/* * Local variables: * c-file-style: "k&r" * c-basic-offset: 5