X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fyaboot.c;h=20296dfb5bfd6216bfca32b4e552bc9ef31f5078;hp=cf920a1646f2f5ae4290c64120ba5c7934b33871;hb=117cc2a76cc76227a5dd99d3435afb6737a41879;hpb=15b93b378020b59031b991abe31b130ca105be03 diff --git a/second/yaboot.c b/second/yaboot.c index cf920a1..20296df 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 @@ -111,7 +111,8 @@ static void setup_display(void); /* Locals & globals */ int useconf = 0; -char bootdevice[1024]; +char bootdevice[BOOTDEVSZ]; +char bootargs[1024]; char *password = NULL; struct boot_fspec_t boot; int _machine = _MACH_Pmac; @@ -180,7 +181,7 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) /* 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 @@ -192,7 +193,7 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) /* Initialize OF interface */ prom_init ((prom_entry) r5); - + /* Allocate some memory for malloc'ator */ malloc_base = prom_claim((void *)MALLOCADDR, MALLOCSIZE, 0); if (malloc_base == (void *)-1) { @@ -203,7 +204,7 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) 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); @@ -226,7 +227,7 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5) _machine = _MACH_chrp; } } - + DEBUG_F("Running on _machine = %d\n", _machine); DEBUG_SLEEP; @@ -241,9 +242,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 +261,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,7 +285,7 @@ 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)); @@ -324,13 +325,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 +338,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,7 +362,7 @@ 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; } @@ -388,7 +375,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 +394,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 +416,143 @@ load_config_file(char *device, char* path, int partition) print_message_file(p); result = 1; - + bail: if (opened) file.fs->close(&file); - + if (conf_file) free(conf_file); - + return result; } +/* + * "bootp-response" is the property name which is specified in + * the recommended practice doc for obp-tftp. However, pmac + * provides a "dhcp-response" property and chrp provides a + * "bootpreply-packet" property. The latter appears to begin the + * bootp packet at offset 0x2a in the property for some reason. + */ + +struct bootp_property_offset { + char *name; /* property name */ + int offset; /* offset into property where bootp packet occurs */ +}; +static const struct bootp_property_offset bootp_response_properties[] = { + { .name = "bootp-response", .offset = 0 }, + { .name = "dhcp-response", .offset = 0 }, + { .name = "bootpreply-packet", .offset = 0x2a }, +}; + +struct bootp_packet { + u8 op, htype, hlen, hops; + u32 xid; + u16 secs, flags; + u32 ciaddr, yiaddr, siaddr, giaddr; + unsigned char chaddr[16]; + unsigned char sname[64]; + unsigned char file[128]; + /* vendor options go here if we need them */ +}; + +/* + * 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) +{ + void *bootp_response = NULL; + char *propname; + struct bootp_packet *packet; + int i = 0, size, offset = 0, rc = 0; + prom_handle chosen; + struct boot_fspec_t fspec = *orig_fspec; +#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + + chosen = prom_finddevice("/chosen"); + if (chosen < 0) { + prom_printf("chosen=%d\n", chosen); + return 0; + } + + for (i = 0; i < ARRAY_SIZE(bootp_response_properties); i++) { + propname = bootp_response_properties[i].name; + size = prom_getproplen(chosen, propname); + if (size <= 0) + continue; + + DEBUG_F("using /chosen/%s\n", propname); + offset = bootp_response_properties[i].offset; + break; + } + + if (size <= 0) + goto out; + + if (sizeof(*packet) > size - offset) { + prom_printf("Malformed %s property?\n", propname); + goto out; + } + + bootp_response = malloc(size); + if (!bootp_response) + goto out; + + if (prom_getprop(chosen, propname, bootp_response, size) < 0) + goto out; + + packet = bootp_response + offset; + + /* + * First, try to match on mac address with the hardware type + * prepended. + */ + + /* 3 chars per byte in chaddr + 2 chars for htype + \0 */ + fspec.file = malloc(packet->hlen * 3 + 2 + 1); + if (!fspec.file) + goto out; + + sprintf(fspec.file, "%02x", packet->htype); + + for (i = 0; i < packet->hlen; i++) { + char tmp[4]; + sprintf(tmp, "-%02x", packet->chaddr[i]); + strcat(fspec.file, tmp); + } + + rc = load_config_file(&fspec); + if (rc) + goto out; + + + /* + * Now try to match on IP. + */ + free(fspec.file); + fspec.file = malloc(9); + sprintf(fspec.file, "%08X", packet->yiaddr); + + while (strlen(fspec.file)) { + rc = load_config_file(&fspec); + if (rc) + goto out; + /* Chop one digit off the end, try again */ + fspec.file[strlen(fspec.file) - 1] = '\0'; + } + + out: + if (rc) /* modify original only on success */ + orig_fspec->file = fspec.file; + else + free(fspec.file); + free(bootp_response); + return rc; +} + void maintabfunc (void) { if (useconf) { @@ -559,7 +671,7 @@ void check_password(char *str) if (!strncmp (password, "$1$", 3)) { if (!check_md5_password(passwdbuff, password)) return; - } + } else if (!strcmp (password, passwdbuff)) return; #else /* !MD5 */ @@ -590,7 +702,6 @@ 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]; @@ -602,12 +713,11 @@ int get_params(struct boot_param_t* params) params->rd.part = -1; params->sysmap.part = -1; defpart = boot.part; - + cmdinit(); if (first) { first = 0; - prom_get_chosen("bootargs", bootargs, sizeof(bootargs)); imagename = bootargs; word_split(&imagename, ¶ms->args); timeout = DEFAULT_TIMEOUT; @@ -732,7 +842,11 @@ int get_params(struct boot_param_t* params) "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); + "partition=%d\n\n" + "To use an alternative config file rather than /etc/yaboot.conf, type on\n" + " Open FirmWare Prompt: \"boot conf=device:partition,/path/to/configfile\"\n" + "where \"device\" and \"partition\" are defined like above.\n\n", defdevice, defpart); + return 0; } @@ -747,7 +861,7 @@ int get_params(struct boot_param_t* params) check_password ("Restricted command."); return 1; } - return 1; + return 1; } if (imagename[0] == '$') { @@ -819,7 +933,7 @@ yaboot_text_ui(void) loadinfo_t loadinfo; void *initrd_more,*initrd_want; unsigned long initrd_read; - + loadinfo.load_loc = 0; for (;;) { @@ -827,12 +941,12 @@ yaboot_text_ui(void) 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)); @@ -906,7 +1020,7 @@ yaboot_text_ui(void) 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); @@ -916,6 +1030,7 @@ yaboot_text_ui(void) 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); @@ -963,7 +1078,7 @@ yaboot_text_ui(void) prom_perror(result, params.rd.file); } else { -#define INITRD_CHUNKSIZE 0x400000 +#define INITRD_CHUNKSIZE 0x100000 initrd_base = prom_claim(loadinfo.base+loadinfo.memsize, INITRD_CHUNKSIZE, 0); if (initrd_base == (void *)-1) { prom_printf("Claim failed for initrd memory\n"); @@ -979,6 +1094,7 @@ yaboot_text_ui(void) initrd_more = prom_claim(initrd_want, INITRD_CHUNKSIZE, 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); @@ -1005,7 +1121,7 @@ yaboot_text_ui(void) 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, @@ -1025,12 +1141,12 @@ yaboot_text_ui(void) 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); @@ -1161,7 +1277,7 @@ 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 @@ -1174,7 +1290,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; - } + } DEBUG_F("After ELF parsing, load base: %p, mem_sz: 0x%08lx\n", loadinfo->base, loadinfo->memsize); @@ -1203,7 +1319,7 @@ load_elf32(struct boot_file_t *file, loadinfo_t *loadinfo) } free(ph); - + /* Return success at loading the Elf32 kernel */ return 1; @@ -1318,7 +1434,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) if (loadinfo->base == (void *)-1) { prom_printf("Claim error, can't allocate kernel memory\n"); goto bail; - } + } DEBUG_F("After ELF parsing, load base: %p, mem_sz: 0x%08lx\n", loadinfo->base, loadinfo->memsize); @@ -1347,7 +1463,7 @@ load_elf64(struct boot_file_t *file, loadinfo_t *loadinfo) } free(ph); - + /* Return success at loading the Elf64 kernel */ return 1; @@ -1431,7 +1547,7 @@ setup_display(void) DEBUG_F("Open screen result: %p\n", scrn); } } - + if (scrn == PROM_INVALID_HANDLE) { prom_printf("No screen device found !/n"); return; @@ -1440,7 +1556,7 @@ setup_display(void) 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", @@ -1454,7 +1570,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 @@ -1468,14 +1584,40 @@ int yaboot_main(void) { char *ptype; + 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 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) { @@ -1490,29 +1632,46 @@ yaboot_main(void) 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) + 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"); @@ -1542,7 +1701,7 @@ yaboot_main(void) return 0; } -/* +/* * Local variables: * c-file-style: "k&r" * c-basic-offset: 5