print available ranges under control of linux, yaboot-debug property
[yaboot.git] / second / yaboot.c
index 5df07608dacb297eda7352fa03c55013ec3d2f64..c73348845721ee06eaadaff8bab1e5cb8497e37f 100644 (file)
@@ -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 */
@@ -154,10 +156,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<return> to continue.\n";
 static char given_bootargs[1024];
@@ -169,41 +167,20 @@ 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)
 {
      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((void *)MALLOCADDR, MALLOCSIZE, 0);
      if (malloc_base == (void *)-1) {
          prom_printf("Can't claim malloc buffer (%d bytes at 0x%08x)\n",
                      MALLOCSIZE, MALLOCADDR);
@@ -215,10 +192,6 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
 
      /* 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 */
@@ -314,13 +287,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);
@@ -666,7 +639,6 @@ int get_params(struct boot_param_t* params)
      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;
 
@@ -675,7 +647,6 @@ int get_params(struct boot_param_t* params)
      params->args = "";
      params->kernel.part = -1;
      params->rd.part = -1;
-     params->sysmap.part = -1;
      defpart = boot.part;
 
      cmdinit();
@@ -1004,7 +975,7 @@ int get_params(struct boot_param_t* params)
 
            /* 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
@@ -1020,17 +991,6 @@ int get_params(struct boot_param_t* params)
                    return 0;
               }
          }
-         p = cfg_get_strg(label, "sysmap");
-         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", &params->sysmap)) {
-                   prom_printf("%s: Unable to parse\n", imagepath);
-                   return 0;
-              }
-         }
      }
      return 0;
 }
@@ -1043,15 +1003,11 @@ 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;
      char*               loc=NULL;
      loadinfo_t          loadinfo;
@@ -1063,8 +1019,6 @@ yaboot_text_ui(void)
      for (;;) {
          initrd_size = 0;
          initrd_base = 0;
-         sysmap_base = 0;
-         sysmap_size = 0;
 
          if (get_params(&params))
               return;
@@ -1127,55 +1081,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(&params.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.
@@ -1203,25 +1108,33 @@ yaboot_text_ui(void)
               }
               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;
                         }
@@ -1257,6 +1170,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;
@@ -1294,11 +1209,6 @@ 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");
-         goto bail;
-     }
-
      ph = (Elf32_Phdr *)malloc(sizeof(Elf32_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");
@@ -1432,11 +1342,6 @@ 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");
-         goto bail;
-     }
-
      ph = (Elf64_Phdr *)malloc(sizeof(Elf64_Phdr) * e->e_phnum);
      if (!ph) {
          prom_printf ("Malloc error\n");