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 /cgpt/cgpt_show.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 'cgpt/cgpt_show.c')
| -rw-r--r-- | cgpt/cgpt_show.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cgpt/cgpt_show.c b/cgpt/cgpt_show.c index 60d73ec7..72217419 100644 --- a/cgpt/cgpt_show.c +++ b/cgpt/cgpt_show.c @@ -302,7 +302,8 @@ static int GptShow(struct drive *drive, CgptShowParams *params) { GptHeader* primary_header = (GptHeader*)drive->gpt.primary_header; printf(GPT_FMT, (uint64_t)primary_header->entries_lba, - (uint64_t)CalculateEntriesSectors(primary_header), + (uint64_t)CalculateEntriesSectors(primary_header, + drive->gpt.sector_bytes), drive->gpt.valid_entries & MASK_PRIMARY ? "" : "INVALID", "Pri GPT table"); @@ -319,7 +320,8 @@ static int GptShow(struct drive *drive, CgptShowParams *params) { } else { GptHeader* secondary_header = (GptHeader*)drive->gpt.secondary_header; printf(GPT_FMT, (uint64_t)secondary_header->entries_lba, - (uint64_t)CalculateEntriesSectors(secondary_header), + (uint64_t)CalculateEntriesSectors(secondary_header, + drive->gpt.sector_bytes), drive->gpt.valid_entries & MASK_SECONDARY ? "" : "INVALID", "Sec GPT table"); /* We show secondary table details if any of following is true. |