d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make GPT style partitiong endian-safe in U-Boot support library.

Browse Source 
Submitted by:	Piotr Ziecik
Obtained from:	Semihalf
This commit is contained in:
Rafal Jaworowski 2009-06-03 16:28:29 +00:00
parent 52d9a478fe
commit f439325342
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/boot/uboot/lib/disk.c
View File

@ -34,6 +34,7 @@
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/endian.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <machine/stdarg.h> #include <machine/stdarg.h>
@ -122,6 +123,15 @@ struct devsw uboot_storage = {
stor_print stor_print
}; };
static void
uuid_letoh(uuid_t *uuid)
{
uuid->time_low = le32toh(uuid->time_low);
uuid->time_mid = le16toh(uuid->time_mid);
uuid->time_hi_and_version = le16toh(uuid->time_hi_and_version);
}
static int static int
stor_init(void) stor_init(void)
{ {
@ -251,7 +261,7 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
} }
/* Check the slice table magic. */ /* Check the slice table magic. */
if (*((uint16_t *)(buf + DOSMAGICOFFSET)) != DOSMAGIC) { if (le16toh(*((uint16_t *)(buf + DOSMAGICOFFSET))) != DOSMAGIC) {
err = ENXIO; err = ENXIO;
goto out; goto out;
} }
@ -286,9 +296,10 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
/* Check GPT header */ /* Check GPT header */
if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 || if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 ||
hdr->hdr_lba_self != 1 || hdr->hdr_revision < 0x00010000 || le64toh(hdr->hdr_lba_self) != 1 ||
hdr->hdr_entsz < sizeof(*ent) || le32toh(hdr->hdr_revision) < 0x00010000 ||
od->od_bsize % hdr->hdr_entsz != 0) { le32toh(hdr->hdr_entsz) < sizeof(*ent) ||
od->od_bsize % le32toh(hdr->hdr_entsz) != 0) {
debugf("Invalid GPT header!\n"); debugf("Invalid GPT header!\n");
err = EINVAL; err = EINVAL;
goto out; goto out;
@ -296,9 +307,9 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
/* Count number of valid partitions */ /* Count number of valid partitions */
part = 0; part = 0;
eps = od->od_bsize / hdr->hdr_entsz; eps = od->od_bsize / le32toh(hdr->hdr_entsz);
slba = hdr->hdr_lba_table; slba = le64toh(hdr->hdr_lba_table);
elba = slba + hdr->hdr_entries / eps; elba = slba + le32toh(hdr->hdr_entries) / eps;
for (lba = slba; lba < elba; lba++) { for (lba = slba; lba < elba; lba++) {
err = stor_readdev(dev, lba, 1, buf); err = stor_readdev(dev, lba, 1, buf);
@ -312,8 +323,9 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
for (i = 0; i < eps; i++) { for (i = 0; i < eps; i++) {
if (uuid_is_nil(&ent[i].ent_type, NULL) || if (uuid_is_nil(&ent[i].ent_type, NULL) ||
ent[i].ent_lba_start == 0 || le64toh(ent[i].ent_lba_start) == 0 ||
ent[i].ent_lba_end < ent[i].ent_lba_start) le64toh(ent[i].ent_lba_end) <
le64toh(ent[i].ent_lba_start))
continue; continue;
part += 1; part += 1;
@ -343,8 +355,9 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
for (i = 0; i < eps; i++) { for (i = 0; i < eps; i++) {
if (uuid_is_nil(&ent[i].ent_type, NULL) || if (uuid_is_nil(&ent[i].ent_type, NULL) ||
ent[i].ent_lba_start == 0 || le64toh(ent[i].ent_lba_start) == 0 ||
ent[i].ent_lba_end < ent[i].ent_lba_start) le64toh(ent[i].ent_lba_end) <
le64toh(ent[i].ent_lba_start))
continue; continue;
od->od_partitions[part].gp_index = (lba - slba) od->od_partitions[part].gp_index = (lba - slba)
@ -352,9 +365,11 @@ stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev)
od->od_partitions[part].gp_type = od->od_partitions[part].gp_type =
ent[i].ent_type; ent[i].ent_type;
od->od_partitions[part].gp_start = od->od_partitions[part].gp_start =
ent[i].ent_lba_start; le64toh(ent[i].ent_lba_start);
od->od_partitions[part].gp_end = od->od_partitions[part].gp_end =
ent[i].ent_lba_end; le64toh(ent[i].ent_lba_end);
uuid_letoh(&od->od_partitions[part].gp_type);
part += 1; part += 1;
} }
} }