X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_of.c;h=77113b14ed8bb68f1f8e83a8aacda769c2510d74;hp=ecc0366dae5c62ccf017ceac2f9e1aab69d40819;hb=ad973226cb9266ce5cf6946833387c0549c4f3f2;hpb=98eacaa1983cde1532e80e67466dfa615e5564a2

diff --git a/second/fs_of.c b/second/fs_of.c
index ecc0366..77113b1 100644
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -44,8 +44,7 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS		0x1000000
-#define LOAD_BUFFER_SIZE	0x1400000
+#define LOAD_BUFFER_SIZE	0x1800000
 
 static int of_open(struct boot_file_t* file,
 		   struct partition_t* part, struct boot_fspec_t* fspec);
@@ -58,6 +57,7 @@ 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 unsigned int of_net_ino_size(struct boot_file_t* file);
 
 
 struct fs_t of_filesystem =
@@ -75,7 +75,8 @@ 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
@@ -92,8 +93,9 @@ of_open(struct boot_file_t* file,
      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;
 	  }
@@ -137,6 +139,7 @@ of_net_open(struct boot_file_t* file,
      static char	buffer[1024];
      char               *filename = NULL;
      char               *p;
+     int                new_tftp;
 
      DEBUG_ENTER;
      DEBUG_OPEN;
@@ -148,22 +151,47 @@ of_net_open(struct boot_file_t* file,
 		    *p = '\\';
      }
 
-     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;\n",
-		fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr);
+     DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
+             " ipv6 <%d>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6);
+
      strncpy(buffer, fspec->dev, 768);
-     strcat(buffer, fspec->siaddr);
-     strcat(buffer, ",");
-     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->addl_params);
+     /* If we didn't get a ':' include one */
+     if (fspec->dev[strlen(fspec->dev)-1] != ':')
+          strcat(buffer, ":");
+
+     /* If /packages/cas 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 = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+     DEBUG_F("Using %s tftp style\n", (new_tftp? "new": "old"));
+
+     if (new_tftp) {
+          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);
 
@@ -179,8 +207,7 @@ of_net_open(struct boot_file_t* file,
      }
 
 
-     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);
@@ -256,6 +283,12 @@ of_close(struct boot_file_t* file)
      return 0;
 }
 
+static unsigned int
+of_net_ino_size(struct boot_file_t* file)
+{
+	return file->len;
+}
+
 /*
  * Local variables:
  * c-file-style: "k&r"