summaryrefslogtreecommitdiff
path: root/cgpt
diff options
context:
space:
mode:
authorAlbert Chaulk <achaulk@chromium.org>2013-04-02 14:31:17 -0700
committerChromeBot <chrome-bot@google.com>2013-07-03 14:22:20 -0700
commit7d401c5cd58ec422e239b28c334fc2e94778f565 (patch)
tree903aaf5102134605fac6a26ac54d74b3c65989ac /cgpt
parent952c2d32452fc582900cc542edd75c7da6b3f830 (diff)
downloadvboot-7d401c5cd58ec422e239b28c334fc2e94778f565.tar.gz
MTD modification commands: add & prioritize
Additionally renames the new functions in add to be CamelCase style BUG=chromium:221745 TEST=MTD version of run_cgpt_tests.sh passes BRANCH=none Original-Change-Id: Ic173f99d7ca4af025403ab11f37061c33c9d59ea Reviewed-on: https://gerrit.chromium.org/gerrit/47173 Tested-by: Albert Chaulk <achaulk@chromium.org> Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Albert Chaulk <achaulk@chromium.org> (cherry picked from commit c3aad2fd06a21097cffd10ec5b168e728616b868) Change-Id: Ib3bb947ffcd5c0f40398a27a721e392b895c9da0 Reviewed-on: https://gerrit.chromium.org/gerrit/49795 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Queue: Albert Chaulk <achaulk@chromium.org> Tested-by: Albert Chaulk <achaulk@chromium.org>
Diffstat (limited to 'cgpt')
-rw-r--r--cgpt/cgpt_add.c136
-rw-r--r--cgpt/cgpt_prioritize.c15
2 files changed, 112 insertions, 39 deletions
diff --git a/cgpt/cgpt_add.c b/cgpt/cgpt_add.c
index 8d4dd555..8332f222 100644
--- a/cgpt/cgpt_add.c
+++ b/cgpt/cgpt_add.c
@@ -96,6 +96,22 @@ static int GptSetEntryAttributes(struct drive *drive,
return 0;
}
+static int MtdSetEntryAttributes(struct drive *drive,
+ uint32_t index,
+ CgptAddParams *params) {
+ MtdDiskPartition *entry;
+
+ entry = MtdGetEntry(&drive->mtd, PRIMARY, index);
+ if (params->set_begin)
+ entry->starting_lba = params->begin;
+ if (params->set_size)
+ entry->ending_lba = entry->starting_lba + params->size - 1;
+ if (params->set_type)
+ MtdSetEntryType(entry, LookupMtdTypeForGuid(&params->type_guid));
+
+ return 0;
+}
+
// This is an internal helper function which assumes no NULL args are passed.
// It sets the given attribute values for a single entry at the given index.
static int SetEntryAttributes(struct drive *drive,
@@ -128,18 +144,25 @@ static int SetEntryAttributes(struct drive *drive,
}
static int CgptCheckAddValidity(struct drive *drive) {
- int gpt_retval;
- if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive->gpt))) {
- Error("GptSanityCheck() returned %d: %s\n",
- gpt_retval, GptError(gpt_retval));
- return -1;
- }
+ if (drive->is_mtd) {
+ if (drive->mtd.primary.crc32 != MtdHeaderCrc(&drive->mtd.primary)) {
+ Error("MTD header CRC is invalid\n");
+ return -1;
+ }
+ } else {
+ int gpt_retval;
+ if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive->gpt))) {
+ Error("GptSanityCheck() returned %d: %s\n",
+ gpt_retval, GptError(gpt_retval));
+ return -1;
+ }
- if (((drive->gpt.valid_headers & MASK_BOTH) != MASK_BOTH) ||
- ((drive->gpt.valid_entries & MASK_BOTH) != MASK_BOTH)) {
- Error("one of the GPT header/entries is invalid.\n"
- "please run 'cgpt repair' before adding anything.\n");
- return -1;
+ if (((drive->gpt.valid_headers & MASK_BOTH) != MASK_BOTH) ||
+ ((drive->gpt.valid_entries & MASK_BOTH) != MASK_BOTH)) {
+ Error("one of the GPT header/entries is invalid.\n"
+ "please run 'cgpt repair' before adding anything.\n");
+ return -1;
+ }
}
return 0;
}
@@ -230,6 +253,10 @@ int CgptGetPartitionDetails(CgptAddParams *params) {
Error("either partition or unique_id must be specified\n");
goto bad;
}
+ if (drive.is_mtd) {
+ Error("MTD partitions cannot be specified by unique_id\n");
+ goto bad;
+ }
for (index = 0; index < max_part; index++) {
GptEntry *entry = GetEntry(&drive.gpt, PRIMARY, index);
if (GuidEqual(&entry->unique, &params->unique_guid)) {
@@ -244,7 +271,18 @@ int CgptGetPartitionDetails(CgptAddParams *params) {
}
index = params->partition - 1;
- {
+ if(drive.is_mtd) {
+ MtdDiskPartition *entry = MtdGetEntry(&drive.mtd, PRIMARY, index);
+ uint64_t start_lba, end_lba;
+ const Guid *guid = LookupGuidForMtdType(MtdGetEntryType(entry));
+ memcpy(&params->type_guid, guid, sizeof(params->type_guid));
+ memset(&params->unique_guid, 0, sizeof(params->unique_guid));
+ start_lba = entry->starting_lba;
+ end_lba = entry->ending_lba;
+ params->begin = start_lba;
+ params->size = end_lba - start_lba + 1;
+ params->raw_value = entry->flags;
+ } else {
// GPT-specific code
GptEntry *entry = GetEntry(&drive.gpt, PRIMARY, index);
params->begin = entry->starting_lba;
@@ -264,12 +302,54 @@ bad:
return result;
}
+int GptAdd(struct drive *drive, CgptAddParams *params, uint32_t index) {
+ GptEntry *entry, backup;
+ int rv;
+
+ entry = GetEntry(&drive->gpt, PRIMARY, index);
+ memcpy(&backup, entry, sizeof(backup));
+
+ if (SetEntryAttributes(drive, index, params) ||
+ GptSetEntryAttributes(drive, index, params)) {
+ memcpy(entry, &backup, sizeof(*entry));
+ return -1;
+ }
+
+ UpdateAllEntries(drive);
+
+ rv = CheckEntries((GptEntry*)drive->gpt.primary_entries,
+ (GptHeader*)drive->gpt.primary_header);
+
+ if (0 != rv) {
+ // If the modified entry is illegal, recover it and return error.
+ memcpy(entry, &backup, sizeof(*entry));
+ Error("%s\n", GptErrorText(rv));
+ Error(DumpCgptAddParams(params));
+ return -1;
+ }
+
+ return 0;
+}
+
+int MtdAdd(struct drive *drive, CgptAddParams *params, uint32_t index) {
+ MtdDiskPartition *entry, backup;
+ entry = MtdGetEntry(&drive->mtd, PRIMARY, index);
+ memcpy(&backup, entry, sizeof(backup));
+
+ if (SetEntryAttributes(drive, index, params) ||
+ MtdSetEntryAttributes(drive, index, params)) {
+ memcpy(entry, &backup, sizeof(*entry));
+ return -1;
+ }
+
+ UpdateAllEntries(drive);
+
+ return 0;
+}
+
int CgptAdd(CgptAddParams *params) {
struct drive drive;
-
- GptEntry *entry, backup;
uint32_t index;
- int rv;
if (params == NULL)
return CGPT_FAILED;
@@ -285,26 +365,12 @@ int CgptAdd(CgptAddParams *params) {
goto bad;
}
- entry = GetEntry(&drive.gpt, PRIMARY, index);
- memcpy(&backup, entry, sizeof(backup));
-
- if (SetEntryAttributes(&drive, index, params) ||
- GptSetEntryAttributes(&drive, index, params)) {
- memcpy(entry, &backup, sizeof(*entry));
- goto bad;
- }
-
- UpdateAllEntries(&drive);
-
- rv = CheckEntries((GptEntry*)drive.gpt.primary_entries,
- (GptHeader*)drive.gpt.primary_header);
-
- if (0 != rv) {
- // If the modified entry is illegal, recover it and return error.
- memcpy(entry, &backup, sizeof(*entry));
- Error("%s\n", GptErrorText(rv));
- Error(DumpCgptAddParams(params));
- goto bad;
+ if (drive.is_mtd) {
+ if (MtdAdd(&drive, params, index))
+ goto bad;
+ } else {
+ if (GptAdd(&drive, params, index))
+ goto bad;
}
// Write it all out.
diff --git a/cgpt/cgpt_prioritize.c b/cgpt/cgpt_prioritize.c
index 45023062..8fc1843e 100644
--- a/cgpt/cgpt_prioritize.c
+++ b/cgpt/cgpt_prioritize.c
@@ -109,10 +109,17 @@ int CgptPrioritize(CgptPrioritizeParams *params) {
if (CGPT_OK != DriveOpen(params->drive_name, &drive, O_RDWR))
return CGPT_FAILED;
- if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) {
- Error("GptSanityCheck() returned %d: %s\n",
- gpt_retval, GptError(gpt_retval));
- return CGPT_FAILED;
+ if (drive.is_mtd) {
+ if (drive.mtd.primary.crc32 != MtdHeaderCrc(&drive.mtd.primary)) {
+ Error("MTD header crc failure\n");
+ return CGPT_FAILED;
+ }
+ } else {
+ if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) {
+ Error("GptSanityCheck() returned %d: %s\n",
+ gpt_retval, GptError(gpt_retval));
+ return CGPT_FAILED;
+ }
}
max_part = GetNumberOfEntries(&drive);