X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_of.c;h=13f5e2cd93acc1b7ec8292a59e7a15b694251dc9;hp=d40f9381bc2c925ed4f0f50ca8831bc148a3bbef;hb=94b9f91a346ceed386faf284ad2e549922a1a385;hpb=1110d149dc41114e22297244ca274b9a52487356

diff --git a/second/fs_of.c b/second/fs_of.c
index d40f938..13f5e2c 100644
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -44,20 +44,21 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS		0x1000000
-#define LOAD_BUFFER_SIZE	0x1400000
+#define LOAD_BUFFER_SIZE	0x2000000
 
-static int of_open(struct boot_file_t* file, const char* dev_name,
-		   struct partition_t* part, const char* file_name);
+static int of_open(struct boot_file_t* file,
+		   struct partition_t* part, struct boot_fspec_t* fspec);
 static int of_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_seek(struct boot_file_t* file, unsigned int newpos);
 static int of_close(struct boot_file_t* file);
+static int of_ino_size(struct boot_file_t* file, unsigned int *size);
 
 
-static int of_net_open(struct boot_file_t* file, const char* dev_name,
-		       struct partition_t* part, const char* file_name);
+static int of_net_open(struct boot_file_t* file,
+		       struct partition_t* part, struct boot_fspec_t* fspec);
 static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer);
 static int of_net_seek(struct boot_file_t* file, unsigned int newpos);
+static int of_net_ino_size(struct boot_file_t* file, unsigned int *size);
 
 
 struct fs_t of_filesystem =
@@ -66,7 +67,8 @@ struct fs_t of_filesystem =
      of_open,
      of_read,
      of_seek,
-     of_close
+     of_close,
+     of_ino_size,
 };
 
 struct fs_t of_net_filesystem =
@@ -75,12 +77,13 @@ struct fs_t of_net_filesystem =
      of_net_open,
      of_net_read,
      of_net_seek,
-     of_close
+     of_close,
+     of_net_ino_size,
 };
 
 static int
-of_open(struct boot_file_t* file, const char* dev_name,
-	struct partition_t* part, const char* file_name)
+of_open(struct boot_file_t* file,
+	struct partition_t* part, struct boot_fspec_t* fspec)
 {
      static char	buffer[1024];
      char               *filename;
@@ -89,11 +92,12 @@ of_open(struct boot_file_t* file, const char* dev_name,
      DEBUG_ENTER;
      DEBUG_OPEN;
 
-     strncpy(buffer, dev_name, 768);
+     strncpy(buffer, fspec->dev, 768);
      strcat(buffer, ":");
      if (part) {
-          if (part->sys_ind == LINUX_RAID) {
-	       DEBUG_F("skipping because partition is marked LINUX_RAID\n");
+          if (part->sys_ind == LINUX_RAID || part->sys_ind == LINUX_NATIVE) {
+	       DEBUG_F("skipping because partition is tagged %08x\n",
+                       part->sys_ind  );
 	       DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
 	       return FILE_ERR_BAD_FSYS;
 	  }
@@ -101,10 +105,10 @@ of_open(struct boot_file_t* file, const char* dev_name,
 	  sprintf(pn, "%02d", part->part_number);
 	  strcat(buffer, pn);
      }
-     if (file_name && strlen(file_name)) {
+     if (fspec->file && strlen(fspec->file)) {
 	  if (part)
 	       strcat(buffer, ",");
-	  filename = strdup(file_name);
+	  filename = strdup(fspec->file);
 	  for (p = filename; *p; p++)
 	       if (*p == '/')
 		    *p = '\\';
@@ -120,6 +124,8 @@ of_open(struct boot_file_t* file, const char* dev_name,
 
      file->pos = 0;
      file->buffer = NULL;
+     file->devspec_cache = strdup(buffer);
+
      if ((file->of_device == PROM_INVALID_HANDLE) || (file->of_device == 0))
      {
 	  DEBUG_LEAVE(FILE_ERR_BAD_FSYS);
@@ -131,25 +137,76 @@ of_open(struct boot_file_t* file, const char* dev_name,
 }
 
 static int
-of_net_open(struct boot_file_t* file, const char* dev_name,
-	    struct partition_t* part, const char* file_name)
+of_net_open(struct boot_file_t* file,
+	    struct partition_t* part, struct boot_fspec_t* fspec)
 {
      static char	buffer[1024];
-     char               *filename;
+     char               *filename = NULL;
      char               *p;
+     int                new_tftp;
+     prom_handle        root;
+     ihandle            prom_net;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
 
-     strncpy(buffer, dev_name, 768);
-     if (file_name && strlen(file_name)) {
-	  strcat(buffer, ",");
-	  filename = strdup(file_name);
+     if (fspec->file && strlen(fspec->file)) {
+	  filename = strdup(fspec->file);
 	  for (p = filename; *p; p++)
 	       if (*p == '/')
 		    *p = '\\';
-	  strcat(buffer, filename);
-	  free(filename);
+     }
+
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
+             " ipv6 <%d>; vtag <%s>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6, fspec->vtag);
+
+     strncpy(buffer, fspec->dev, 768);
+     /* If we didn't get a ':' include one */
+     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+          strcat(buffer, ":");
+
+     /* If /ibm,fw-net-compatibility exists the we have a "new skool" tftp.
+      * This means that siaddr is the tftp server and that we can add
+      * {tftp,bootp}_retrys, subnet mask and tftp block size to the load
+      * method */
+     new_tftp = 0;
+     root = prom_finddevice("/");
+     if (prom_getprop(root, "ibm,fw-net-compatibility", &prom_net, sizeof(ihandle)) > 0)
+          new_tftp = 1;
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          if (fspec->is_ipv6)
+	       strcat(buffer, "ipv6,");
+
+          if (fspec->vtag) {
+	       strcat(buffer, fspec->vtag);
+	       strcat(buffer, ",");
+	  }
+          strcat(buffer, fspec->siaddr);
+          strcat(buffer, ",");
+
+          if (fspec->is_ipv6 && (strstr(filename, "filename=") == NULL))
+               strcat(buffer, "filename=");
+
+          strcat(buffer, filename);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->ciaddr);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->giaddr);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->bootp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->tftp_retries);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->subnetmask);
+          strcat(buffer, ",");
+          strcat(buffer, fspec->addl_params);
+     } else {
+          strcat(buffer, ",");
+          strcat(buffer, filename);
      }
 
      DEBUG_F("Opening: \"%s\"\n", buffer);
@@ -166,8 +223,7 @@ of_net_open(struct boot_file_t* file, const char* dev_name,
      }
 
 
-     file->buffer = prom_claim_chunk((void *)LOAD_BUFFER_POS,
-                                     LOAD_BUFFER_SIZE, 0);
+     file->buffer = prom_claim_chunk_top(LOAD_BUFFER_SIZE, 0);
      if (file->buffer == (void *)-1) {
 	  prom_printf("Can't claim memory for TFTP download\n");
 	  prom_close(file->of_device);
@@ -243,6 +299,47 @@ of_close(struct boot_file_t* file)
      return 0;
 }
 
+static int
+of_ino_size(struct boot_file_t* file, unsigned int *size)
+{
+     static char buffer[1<<20];
+     int read_count = 0;
+
+     if (file->len == 0) {
+          DEBUG_F("Estimating size of: %p\n", file->of_device);
+          while (prom_read(file->of_device, (void *)&buffer, sizeof(buffer))
+                 != 0) {
+               read_count++;
+               DEBUG_F("read_count == %d\n", read_count);
+          }
+          file->pos = 0;
+          file->len = read_count * sizeof(buffer);
+          /* sigh:
+           * prom_seek(file->of_device, file->pos);
+           * doen't work */
+          prom_close(file->of_device);
+          DEBUG_F("Re-Opening: \"%s\"\n", file->devspec_cache);
+          file->of_device = prom_open(file->devspec_cache);
+          DEBUG_F("file->of_device = %p\n", file->of_device);
+          if (file->of_device == 0) {
+               file->len = 0;
+               return FILE_IOERR;
+          }
+     }
+
+     DEBUG_F("Estimated size is: %Lu(%d)\n", (unsigned long long)file->len,
+             read_count);
+     *size = file->len;
+     return FILE_ERR_OK;
+}
+
+static int
+of_net_ino_size(struct boot_file_t* file, unsigned int *size)
+{
+	*size = file->len;
+	return FILE_ERR_OK;
+}
+
 /*
  * Local variables:
  * c-file-style: "k&r"