ofpath: Add support for ethernet and HFI devices

[yaboot.git] / second / fs_of.c

diff --git a/second/fs_of.c b/second/fs_of.c
index 76474ee29744dc85158efee7b14bfb6fb63f9628..77113b14ed8bb68f1f8e83a8aacda769c2510d74 100644 (file)
--- a/second/fs_of.c
+++ b/second/fs_of.c
@@ -44,21 +44,20 @@
 #include "errors.h"
 #include "debug.h"
 
-#define LOAD_BUFFER_POS                0x600000
-/* this cannot be safely increased any further */
-#define LOAD_BUFFER_SIZE       0x600000
+#define LOAD_BUFFER_SIZE       0x1800000
 
-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_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 unsigned int of_net_ino_size(struct boot_file_t* file);
 
 
 struct fs_t of_filesystem =
@@ -76,12 +75,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;
@@ -90,11 +90,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;
          }
@@ -102,10 +103,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 = '\\';
@@ -132,25 +133,64 @@ 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;
 
      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>\n",
+             fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
+             fspec->is_ipv6);
+
+     strncpy(buffer, fspec->dev, 768);
+     /* 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);
@@ -166,7 +206,8 @@ of_net_open(struct boot_file_t* file, const char* dev_name,
          return FILE_ERR_BAD_FSYS;
      }
 
-     file->buffer = prom_claim((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);
@@ -242,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"