vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* partmap/gpt.c (MAX_SECTOR_LOG): New definition.

Browse source 
(gpt_partition_map_iterate): Support non-512B sectors.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-07-02 02:47:10 +02:00
parent d9a0c9413e
commit 1c4827beff
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-07-02 Vladimir Serbinenko <phcoder@gmail.com>
* partmap/gpt.c (MAX_SECTOR_LOG): New definition.
(gpt_partition_map_iterate): Support non-512B sectors.
2010-07-02 Vladimir Serbinenko <phcoder@gmail.com> 2010-07-02 Vladimir Serbinenko <phcoder@gmail.com>
* kern/efi/init.c (grub_efi_init): Disable watchdog. * kern/efi/init.c (grub_efi_init): Disable watchdog.

21
partmap/gpt.c
View file

@ -32,6 +32,9 @@ static grub_uint8_t grub_gpt_magic[8] =
static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY; static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTITION_TYPE_EMPTY;
/* 512 << 7 = 65536 byte sectors. */
#define MAX_SECTOR_LOG 7
static struct grub_partition_map grub_gpt_partition_map; static struct grub_partition_map grub_gpt_partition_map;
@ -48,6 +51,7 @@ gpt_partition_map_iterate (grub_disk_t disk,
grub_uint64_t entries; grub_uint64_t entries;
unsigned int i; unsigned int i;
int last_offset = 0; int last_offset = 0;
int sector_log = 0;
/* Read the protective MBR. */ /* Read the protective MBR. */
if (grub_disk_read (disk, 0, 0, sizeof (mbr), &mbr)) if (grub_disk_read (disk, 0, 0, sizeof (mbr), &mbr))
@ -62,15 +66,20 @@ gpt_partition_map_iterate (grub_disk_t disk,
return grub_error (GRUB_ERR_BAD_PART_TABLE, "no GPT partition map found"); return grub_error (GRUB_ERR_BAD_PART_TABLE, "no GPT partition map found");
/* Read the GPT header. */ /* Read the GPT header. */
if (grub_disk_read (disk, 1, 0, sizeof (gpt), &gpt)) for (sector_log = 0; sector_log < MAX_SECTOR_LOG; sector_log++)
return grub_errno; {
if (grub_disk_read (disk, 1 << sector_log, 0, sizeof (gpt), &gpt))
return grub_errno;
if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic))) if (grub_memcmp (gpt.magic, grub_gpt_magic, sizeof (grub_gpt_magic)) == 0)
break;
}
if (sector_log == MAX_SECTOR_LOG)
return grub_error (GRUB_ERR_BAD_PART_TABLE, "no valid GPT header"); return grub_error (GRUB_ERR_BAD_PART_TABLE, "no valid GPT header");
grub_dprintf ("gpt", "Read a valid GPT header\n"); grub_dprintf ("gpt", "Read a valid GPT header\n");
entries = grub_le_to_cpu64 (gpt.partitions); entries = grub_le_to_cpu64 (gpt.partitions) << sector_log;
for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++) for (i = 0; i < grub_le_to_cpu32 (gpt.maxpart); i++)
{ {
if (grub_disk_read (disk, entries, last_offset, if (grub_disk_read (disk, entries, last_offset,
@ -81,9 +90,9 @@ gpt_partition_map_iterate (grub_disk_t disk,
sizeof (grub_gpt_partition_type_empty))) sizeof (grub_gpt_partition_type_empty)))
{ {
/* Calculate the first block and the size of the partition. */ /* Calculate the first block and the size of the partition. */
part.start = grub_le_to_cpu64 (entry.start); part.start = grub_le_to_cpu64 (entry.start) << sector_log;
part.len = (grub_le_to_cpu64 (entry.end) part.len = (grub_le_to_cpu64 (entry.end)
- grub_le_to_cpu64 (entry.start) + 1); - grub_le_to_cpu64 (entry.start) + 1) << sector_log;
part.offset = entries; part.offset = entries;
part.number = i; part.number = i;
part.index = last_offset; part.index = last_offset;