X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Ffs_of.c;h=f6bf50f334b9a04ab5f639707b589ea0ffcfb5e8;hp=d9caa3226be9b24a29779354cf6fded84b193fb9;hb=0df88bef1fd2fb7bba04a7381bd8fe05ee2b230c;hpb=b58b7f84f40f96f61a1d5fc1f88a1abd9c1a4193 diff --git a/second/fs_of.c b/second/fs_of.c index d9caa32..f6bf50f 100644 --- a/second/fs_of.c +++ b/second/fs_of.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* +/* * BrokenFirmware cannot "read" from the network. We use tftp "load" * method for network boot for now, we may provide our own NFS * implementation in a later version. That means that we allocate a @@ -39,22 +39,23 @@ #include "prom.h" #include "string.h" #include "partition.h" +#include "fdisk-part.h" #include "fs.h" #include "errors.h" #include "debug.h" -#define LOAD_BUFFER_POS 0x600000 -#define LOAD_BUFFER_SIZE 0x400000 +#define LOAD_BUFFER_POS 0x1000000 +#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); @@ -78,29 +79,34 @@ struct fs_t of_net_filesystem = }; 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; char *p; - + 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"); + DEBUG_LEAVE(FILE_ERR_BAD_FSYS); + return FILE_ERR_BAD_FSYS; + } char pn[3]; 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 == '/') + if (*p == '/') *p = '\\'; strcat(buffer, filename); free(filename); @@ -119,33 +125,55 @@ of_open(struct boot_file_t* file, const char* dev_name, DEBUG_LEAVE(FILE_ERR_BAD_FSYS); return FILE_ERR_BAD_FSYS; } - + DEBUG_LEAVE(FILE_ERR_OK); return FILE_ERR_OK; } 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; 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 == '/') + if (*p == '/') *p = '\\'; - strcat(buffer, filename); - free(filename); } - + + DEBUG_F("siaddr <%s>; filename <%s>; ciaddr <%s>; giaddr <%s>;\n", + fspec->siaddr, filename, fspec->ciaddr, fspec->giaddr); + strncpy(buffer, fspec->dev, 768); + /* If we didn't get a ':' include one */ + if (fspec->dev[strlen(fspec->dev)-1] != ':') + strcat(buffer, ":"); + strcat(buffer, fspec->siaddr); + strcat(buffer, ","); + strcat(buffer, filename); + strcat(buffer, ","); + strcat(buffer, fspec->ciaddr); + strcat(buffer, ","); + strcat(buffer, fspec->giaddr); + + /* If /packages/cas exists the we have a "new skool" tftp */ + if (prom_finddevice("/packages/cas") != PROM_INVALID_HANDLE) { + strcat(buffer, ","); + strcat(buffer, fspec->bootp_retries); + strcat(buffer, ","); + strcat(buffer, fspec->tftp_retries); + strcat(buffer, ","); + strcat(buffer, fspec->addl_params); + } else { + DEBUG_F("No \"/packages/cas\" using simple args\n") + } + DEBUG_F("Opening: \"%s\"\n", buffer); file->of_device = prom_open(buffer); @@ -158,8 +186,10 @@ of_net_open(struct boot_file_t* file, const char* dev_name, DEBUG_LEAVE(FILE_ERR_BAD_FSYS); return FILE_ERR_BAD_FSYS; } - - file->buffer = prom_claim((void *)LOAD_BUFFER_POS, LOAD_BUFFER_SIZE, 0); + + + file->buffer = prom_claim_chunk((void *)LOAD_BUFFER_POS, + LOAD_BUFFER_SIZE, 0); if (file->buffer == (void *)-1) { prom_printf("Can't claim memory for TFTP download\n"); prom_close(file->of_device); @@ -171,9 +201,9 @@ of_net_open(struct boot_file_t* file, const char* dev_name, DEBUG_F("TFP...\n"); file->len = prom_loadmethod(file->of_device, file->buffer); - + DEBUG_F("result: %Ld\n", file->len); - + DEBUG_LEAVE(FILE_ERR_OK); return FILE_ERR_OK; } @@ -182,7 +212,7 @@ static int of_read(struct boot_file_t* file, unsigned int size, void* buffer) { unsigned int count; - + count = prom_read(file->of_device, buffer, size); file->pos += count; return count; @@ -192,9 +222,9 @@ static int of_net_read(struct boot_file_t* file, unsigned int size, void* buffer) { unsigned int count, av; - + av = file->len - file->pos; - count = size > av ? av : size; + count = size > av ? av : size; memcpy(buffer, file->buffer + file->pos, count); file->pos += count; return count; @@ -207,7 +237,7 @@ of_seek(struct boot_file_t* file, unsigned int newpos) file->pos = newpos; return FILE_ERR_OK; } - + return FILE_CANT_SEEK; } @@ -231,11 +261,11 @@ of_close(struct boot_file_t* file) prom_close(file->of_device); DEBUG_F("of_close called\n"); - DEBUG_LEAVE(0); + DEBUG_LEAVE(0); return 0; } -/* +/* * Local variables: * c-file-style: "k&r" * c-basic-offset: 5