X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fpartition.c;h=0cb8ae85f1768bb7aef755c6ef37f64b64f5f168;hp=e3ab4c58855d7adfbfc48fe17366dc063fbe667f;hb=1bea6140c2894b1259fd07f323b25fd846bd5acf;hpb=70ca99a5e21616ae261f6c49c8955b516b4219d6 diff --git a/second/partition.c b/second/partition.c index e3ab4c5..0cb8ae8 100644 --- a/second/partition.c +++ b/second/partition.c @@ -40,6 +40,7 @@ #include "linux/iso_fs.h" #include "debug.h" #include "errors.h" +#include "byteorder.h" /* We currently don't check the partition type, some users * are putting crap there and still expect it to work... @@ -56,10 +57,7 @@ static const char *valid_mac_partition_types[] = { NULL }; #endif - -/* Local functions */ -static unsigned long swab32(unsigned long value); #define MAX_BLOCK_SIZE 2048 static unsigned char block_buffer[MAX_BLOCK_SIZE]; @@ -67,17 +65,18 @@ static unsigned char block_buffer[MAX_BLOCK_SIZE]; static void add_new_partition(struct partition_t** list, int part_number, const char *part_type, const char *part_name, unsigned long part_start, unsigned long part_size, - unsigned short part_blocksize) + unsigned short part_blocksize, int sys_ind) { struct partition_t* part; part = (struct partition_t*)malloc(sizeof(struct partition_t)); - + part->part_number = part_number; strncpy(part->part_type, part_type, MAX_PART_NAME); strncpy(part->part_name, part_name, MAX_PART_NAME); part->part_start = part_start; part->part_size = part_size; part->blocksize = part_blocksize; + part->sys_ind = sys_ind; /* Tack this entry onto the list */ part->next = *list; @@ -98,7 +97,7 @@ partition_mac_lookup( const char *dev_name, prom_handle disk, struct mac_partition* part = (struct mac_partition *)block_buffer; unsigned short ptable_block_size = ((struct mac_driver_desc *)block_buffer)->block_size; - + map_size = 1; for (block=1; block < map_size + 1; block++) { @@ -118,9 +117,9 @@ partition_mac_lookup( const char *dev_name, prom_handle disk, } if (block == 1) map_size = part->map_count; - + #ifdef CHECK_FOR_VALID_MAC_PARTITION_TYPE - /* We don't bother looking at swap partitions of any type, + /* We don't bother looking at swap partitions of any type, * and the rest are the ones we know about */ for (ptype = valid_mac_partition_types; ptype; ptype++) if (!strcmp (part->type, ptype)) @@ -149,11 +148,12 @@ partition_mac_lookup( const char *dev_name, prom_handle disk, part->name, /* name */ part->start_block + part->data_start, /* start */ part->data_count, /* size */ - ptable_block_size ); + ptable_block_size, + 0); } } -/* +/* * Same function as partition_mac_lookup(), except for fdisk * partitioned disks. */ @@ -166,18 +166,19 @@ partition_fdisk_lookup( const char *dev_name, prom_handle disk, /* fdisk partition tables start at offset 0x1be * from byte 0 of the boot drive. */ - struct fdisk_partition* part = + struct fdisk_partition* part = (struct fdisk_partition *) (block_buffer + 0x1be); for (partition=1; partition <= 4 ;partition++, part++) { - if (part->sys_ind == LINUX_NATIVE) { + if (part->sys_ind == LINUX_NATIVE || part->sys_ind == LINUX_RAID) { add_new_partition( list, partition, "Linux", /* type */ '\0', /* name */ - swab32(*(unsigned int *)(part->start4)), - swab32(*(unsigned int *)(part->size4)), - 512 /*blksize*/ ); + le32_to_cpu(*(unsigned int *)part->start4), + le32_to_cpu(*(unsigned int *)part->size4), + 512 /*blksize*/, + part->sys_ind /* partition type */ ); } } } @@ -200,11 +201,11 @@ identify_iso_fs(ihandle device, unsigned int *iso_root_block) prom_printf("Can't read volume desc block %d\n", block); break; } - + vdp = (struct iso_volume_descriptor *)block_buffer; - - /* Due to the overlapping physical location of the descriptors, - * ISO CDs can match hdp->id==HS_STANDARD_ID as well. To ensure + + /* Due to the overlapping physical location of the descriptors, + * ISO CDs can match hdp->id==HS_STANDARD_ID as well. To ensure * proper identification in this case, we first check for ISO. */ if (strncmp (vdp->id, ISO_STANDARD_ID, sizeof vdp->id) == 0) { @@ -212,11 +213,11 @@ identify_iso_fs(ihandle device, unsigned int *iso_root_block) return 1; } } - + return 0; } -/* +/* * Detects and read amiga partition tables. */ @@ -248,7 +249,7 @@ _amiga_find_rdb (const char *dev_name, prom_handle disk, unsigned int prom_blksi if (prom_readblocks(disk, i, 1, block_buffer) != 1) { prom_printf("Can't read boot block %d\n", i); break; - } + } } if ((amiga_block[AMIGA_ID] == AMIGA_ID_RDB) && (_amiga_checksum (prom_blksize) == 0)) return 1; @@ -257,7 +258,7 @@ _amiga_find_rdb (const char *dev_name, prom_handle disk, unsigned int prom_blksi if (prom_readblocks(disk, 0, 1, block_buffer) != 1) { prom_printf("Can't read boot blocks\n"); return 0; /* TODO: something bad happened, should fail more verbosely */ - } + } return 0; } @@ -277,6 +278,10 @@ partition_amiga_lookup( const char *dev_name, prom_handle disk, possible = amiga_block[AMIGA_RDBLIMIT]/32 +1; used = (unsigned int *) malloc (sizeof (unsigned int) * (possible + 1)); + if (!used) { + prom_printf("Can't allocate memory\n"); + return; + } for (i=0; i < possible; i++) used[i] = 0; @@ -288,7 +293,7 @@ partition_amiga_lookup( const char *dev_name, prom_handle disk, if (prom_readblocks(disk, part, 1, block_buffer) != 1) { prom_printf("Can't read partition block %d\n", part); break; - } + } checksum = _amiga_checksum (prom_blksize); if ((amiga_block[AMIGA_ID] == AMIGA_ID_PART) && (checksum == 0) && @@ -316,8 +321,11 @@ partition_amiga_lookup( const char *dev_name, prom_handle disk, '\0', /* name */ blockspercyl * amiga_block[AMIGA_PART_LOWCYL], /* start */ blockspercyl * (amiga_block[AMIGA_PART_HIGHCYL] - amiga_block[AMIGA_PART_LOWCYL] + 1), /* size */ - prom_blksize ); + prom_blksize, + 0 ); } + if (used) + free(used); } struct partition_t* @@ -327,10 +335,10 @@ partitions_lookup(const char *device) struct mac_driver_desc *desc = (struct mac_driver_desc *)block_buffer; struct partition_t* list = NULL; unsigned int prom_blksize, iso_root_block; - + strncpy(block_buffer, device, 2040); strcat(block_buffer, ":0"); - + /* Open device */ disk = prom_open(block_buffer); if (disk == NULL) { @@ -346,12 +354,12 @@ partitions_lookup(const char *device) prom_printf("block_size %d not supported !\n", prom_blksize); goto bail; } - + /* Read boot blocs */ if (prom_readblocks(disk, 0, 1, block_buffer) != 1) { prom_printf("Can't read boot blocks\n"); goto bail; - } + } if (desc->signature == MAC_DRIVER_MAGIC) { /* pdisk partition format */ partition_mac_lookup(device, disk, prom_blksize, &list); @@ -365,7 +373,8 @@ partitions_lookup(const char *device) '\0', iso_root_block, 0, - prom_blksize); + prom_blksize, + 0); prom_printf("ISO9660 disk\n"); } else if (_amiga_find_rdb(device, disk, prom_blksize) != -1) { /* amiga partition format */ @@ -377,7 +386,7 @@ partitions_lookup(const char *device) bail: prom_close(disk); - + return list; } @@ -404,7 +413,7 @@ get_part_type(char *device, int partition) if ((partition >= 0) && (partition == p->part_number)) { type = strdup(p->part_type); break; - } + } } if (parts) partitions_free(parts); @@ -416,28 +425,16 @@ void partitions_free(struct partition_t* list) { struct partition_t* next; - + while(list) { next = list->next; free(list); list = next; } } -unsigned long -swab32(unsigned long value) -{ - __u32 result; - - __asm__("rlwimi %0,%1,24,16,23\n\t" - "rlwimi %0,%1,8,8,15\n\t" - "rlwimi %0,%1,24,0,7" - : "=r" (result) - : "r" (value), "0" (value >> 24)); - return result; -} -/* +/* * Local variables: * c-file-style: "k&r" * c-basic-offset: 5