#include "errors.h"
#include "debug.h"
-#define LOAD_BUFFER_POS 0x1000000
-#define LOAD_BUFFER_SIZE 0x1800000
+#define LOAD_BUFFER_SIZE 0x2000000
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,
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 =
of_open,
of_read,
of_seek,
- of_close
+ of_close,
+ of_ino_size,
};
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
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);
char *filename = NULL;
char *p;
int new_tftp;
+ prom_handle root;
+ ihandle prom_net;
DEBUG_ENTER;
DEBUG_OPEN;
}
DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;"
- " ipv6 <%d>\n",
+ " ipv6 <%d>; vtag <%s>\n",
fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr,
- fspec->is_ipv6);
+ 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 /packages/cas exists the we have a "new skool" tftp.
+ /* 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 = (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE);
+ 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, ",");
}
- 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);
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"