X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fyaboot.c;h=66f288b82aea9eaff21c59ed1fd3bf52c26224b5;hp=0232d33153b58da3c9c0fafecde8016437324f17;hb=8e64db245a2d402dc89fa1f68a3789203815b238;hpb=1bea6140c2894b1259fd07f323b25fd846bd5acf diff --git a/second/yaboot.c b/second/yaboot.c index 0232d33..66f288b 100644 --- a/second/yaboot.c +++ b/second/yaboot.c @@ -114,6 +114,9 @@ int useconf = 0; 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; @@ -178,6 +181,7 @@ 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 */ @@ -196,7 +200,10 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) prom_init ((prom_entry) r5); /* Allocate some memory for malloc'ator */ - malloc_base = prom_claim((void *)MALLOCADDR, MALLOCSIZE, 0); + for (addr = MALLOCADDR; addr <= MALLOCADDR * 16 ;addr+=0x100000) { + malloc_base = prom_claim((void *)addr, MALLOCSIZE, 0); + if (malloc_base != (void *)-1) break; + } if (malloc_base == (void *)-1) { prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n", MALLOCSIZE, MALLOCADDR); @@ -219,7 +226,10 @@ 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 { @@ -290,6 +300,7 @@ void print_message_file(char *filename) } 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; @@ -455,11 +466,13 @@ 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) ? "/etc/" : ""; + 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 @@ -654,6 +667,8 @@ int get_params(struct boot_param_t* params) 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)); @@ -665,7 +680,7 @@ int get_params(struct boot_param_t* params) cmdinit(); - if (first) { + if (first && !fw_reboot_cnt) { first = 0; imagename = bootargs; word_split(&imagename, ¶ms->args); @@ -680,6 +695,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) { @@ -716,7 +738,9 @@ int get_params(struct boot_param_t* params) if (!imagename) { if (bootoncelabel[0] != 0) imagename = bootoncelabel; - else + else if (bootlastlabel[0] != 0) + imagename = bootlastlabel; + else imagename = cfg_get_default(); } if (imagename) @@ -733,10 +757,53 @@ 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 */ + prom_set_options("boot-last-label", imagename, strlen(imagename)); + label = 0; defdevice = boot.dev; @@ -794,6 +861,12 @@ 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" + "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." @@ -918,19 +991,29 @@ 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); @@ -941,6 +1024,7 @@ int get_params(struct boot_param_t* params) if (p && *p) { DEBUG_F("Parsing sysmap path <%s>\n", p); strncpy(sysmappath, p, 1024); + params->sysmap = boot; /* Copy all the original paramters */ if (!parse_device_path(sysmappath, defdevice, defpart, "/boot/System.map", ¶ms->sysmap)) { prom_printf("%s: Unable to parse\n", imagepath); @@ -1233,7 +1317,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) Elf32_Ehdr *e = &(loadinfo->elf.elf32hdr); Elf32_Phdr *p, *ph; 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) { @@ -1321,13 +1405,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) 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"); goto bail; @@ -1377,7 +1455,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) Elf64_Ehdr *e = &(loadinfo->elf.elf64hdr); Elf64_Phdr *p, *ph; 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) { @@ -1465,13 +1543,7 @@ 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"); goto bail; @@ -1540,7 +1612,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); } @@ -1625,6 +1697,7 @@ int yaboot_main(void) { char *ptype; + char *endp; int conf_given = 0; char conf_path[1024]; @@ -1635,6 +1708,11 @@ yaboot_main(void) 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 @@ -1678,11 +1756,13 @@ yaboot_main(void) 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 (!conf_given) { - if (_machine == _MACH_chrp) + if (_machine == _MACH_chrp || _machine == _MACH_bplan) boot.file = "/etc/"; else if (strlen(boot.file)) { if (!strncmp(boot.file, "\\\\", 2))