diff options
| author | Sam Hurst <shurst@google.com> | 2018-04-11 08:50:58 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-04-12 23:11:01 -0700 |
| commit | d6f52a05a3b54e3d80f4bded77f33daccbe04e23 (patch) | |
| tree | a80b4215b46776e151e4a64d700171baa84c01fd /tests/vboot_kernel_tests.c | |
| parent | 1fc5daa6b0b5e1763d00735ff1f8c05baeba74de (diff) | |
| download | vboot-d6f52a05a3b54e3d80f4bded77f33daccbe04e23.tar.gz | |
cgpt: Remove hard coded 512 block size.
Remove 512 sector block size restriction so that UFS, with sector block size 4096
or greater, can be used. The sector block size is queried from the kernel with
ioctl(BLKSSZGET) or queried from depthcharge with VbExDiskGetInfo().
BUG=b:77540192
BRANCH=none
TEST=manual
make runtests passed.
Tested firmware on Kevin and boot to kernel from disk.
Executed cgpt show /dev/mmcblk0 on eve device and verified output was correct.
Should be tested on device with sector block size greater than 512.
Change-Id: I8165c8ee4da68180eecc8d12b3fb501cc5c60a5d
Reviewed-on: https://chromium-review.googlesource.com/1007498
Commit-Ready: Sam Hurst <shurst@google.com>
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'tests/vboot_kernel_tests.c')
| -rw-r--r-- | tests/vboot_kernel_tests.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 14bffc91..c9907597 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -96,14 +96,16 @@ static void SetupGptHeader(GptHeader *h, int is_secondary) /* Set LBA pointers for primary or secondary header */ if (is_secondary) { h->my_lba = MOCK_SECTOR_COUNT - GPT_HEADER_SECTORS; - h->entries_lba = h->my_lba - CalculateEntriesSectors(h); + h->entries_lba = h->my_lba - CalculateEntriesSectors(h, + MOCK_SECTOR_SIZE); } else { h->my_lba = GPT_PMBR_SECTORS; h->entries_lba = h->my_lba + 1; } - h->first_usable_lba = 2 + CalculateEntriesSectors(h); - h->last_usable_lba = MOCK_SECTOR_COUNT - 2 - CalculateEntriesSectors(h); + h->first_usable_lba = 2 + CalculateEntriesSectors(h, MOCK_SECTOR_SIZE); + h->last_usable_lba = MOCK_SECTOR_COUNT - 2 - CalculateEntriesSectors(h, + MOCK_SECTOR_SIZE); h->header_crc32 = HeaderCrc(h); } @@ -350,10 +352,10 @@ static void ReadWriteGptTest(void) TEST_EQ(AllocAndReadGptData(handle, &g), 0, "AllocAndRead primary invalid"); TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 1, "Primary header is invalid"); TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 0, "Secondary header is valid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 1023, 1)\n" @@ -369,10 +371,10 @@ static void ReadWriteGptTest(void) TEST_EQ(AllocAndReadGptData(handle, &g), 0, "AllocAndRead secondary invalid"); TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 0, "Primary header is valid"); TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 1, "Secondary header is invalid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 2, 32)\n" @@ -389,10 +391,10 @@ static void ReadWriteGptTest(void) TEST_EQ(AllocAndReadGptData(handle, &g), 1, "AllocAndRead primary and secondary invalid"); TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 1, "Primary header is invalid"); TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 1, "Secondary header is invalid"); TEST_CALLS("VbExDiskRead(h, 1, 1)\n" "VbExDiskRead(h, 1023, 1)\n"); @@ -420,7 +422,7 @@ static void ReadWriteGptTest(void) "VbExDiskWrite(h, 1, 1)\n" "VbExDiskWrite(h, 2, 32)\n"); TEST_EQ(CheckHeader(mock_gpt_primary, 0, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 0, "Fix Primary GPT: Primary header is valid"); /* @@ -445,7 +447,7 @@ static void ReadWriteGptTest(void) "VbExDiskWrite(h, 1023, 1)\n" "VbExDiskWrite(h, 991, 32)\n"); TEST_EQ(CheckHeader(mock_gpt_secondary, 1, g.streaming_drive_sectors, - g.gpt_drive_sectors, 0), + g.gpt_drive_sectors, 0, g.sector_bytes), 0, "Fix Secondary GPT: Secondary header is valid"); /* Data which is changed is written */ |