-
Notifications
You must be signed in to change notification settings - Fork 3k
bd: Add MBR block device for standard storage partitioning #3936
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
590a40d
bd: Added MBRBlockDevice for handling a master boot record on a block…
geky d1468a6
FAT: Removed implicit MBR from FAT filesystem during format
geky 3f92a15
FAT: Added support for multiple active filesystems
geky 3ee77e3
FAT: Fixed volume count check when formatted without MBR
geky File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,226 @@ | ||
/* mbed Microcontroller Library | ||
* Copyright (c) 2017 ARM Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#include "mbed.h" | ||
#include "greentea-client/test_env.h" | ||
#include "unity.h" | ||
#include "utest.h" | ||
|
||
#include "HeapBlockDevice.h" | ||
#include "MBRBlockDevice.h" | ||
#include <stdlib.h> | ||
|
||
using namespace utest::v1; | ||
|
||
#define BLOCK_COUNT 16 | ||
#define BLOCK_SIZE 512 | ||
|
||
HeapBlockDevice bd(BLOCK_COUNT*BLOCK_SIZE, BLOCK_SIZE); | ||
|
||
// Testing formatting of master boot record | ||
void test_mbr_format() | ||
{ | ||
// Create two partitions splitting device in ~half | ||
int err = MBRBlockDevice::partition(&bd, 1, 0x83, 0, (BLOCK_COUNT/2)*BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = MBRBlockDevice::partition(&bd, 2, 0x83, -(BLOCK_COUNT/2)*BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Load both partitions, as well as a third to check for invalid partitions | ||
MBRBlockDevice part1(&bd, 1); | ||
err = part1.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
MBRBlockDevice part2(&bd, 2); | ||
err = part2.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
MBRBlockDevice part3(&bd, 3); | ||
err = part3.init(); | ||
TEST_ASSERT_EQUAL(BD_ERROR_INVALID_PARTITION, err); | ||
|
||
// Deinit partitions | ||
err = part1.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part2.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
} | ||
|
||
// Testing mbr attributes | ||
void test_mbr_attr() | ||
{ | ||
// Load partitions | ||
MBRBlockDevice part1(&bd, 1); | ||
int err = part1.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
MBRBlockDevice part2(&bd, 2); | ||
err = part2.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Test attributes on partitions | ||
printf("partition 1 partition number: %d\n", part1.get_partition_number()); | ||
printf("partition 1 partition start: 0x%llx\n", part1.get_partition_start()); | ||
printf("partition 1 partition stop: 0x%llx\n", part1.get_partition_stop()); | ||
printf("partition 1 partition type: 0x%02x\n", part1.get_partition_type()); | ||
printf("partition 1 read size: %llu bytes\n", part1.get_read_size()); | ||
printf("partition 1 program size: %llu bytes\n", part1.get_program_size()); | ||
printf("partition 1 erase size: %llu bytes\n", part1.get_erase_size()); | ||
printf("partition 1 size: %llu bytes\n", part1.size()); | ||
TEST_ASSERT_EQUAL(1, part1.get_partition_number()); | ||
TEST_ASSERT_EQUAL(1*BLOCK_SIZE, part1.get_partition_start()); | ||
TEST_ASSERT_EQUAL((BLOCK_COUNT/2)*BLOCK_SIZE, part1.get_partition_stop()); | ||
TEST_ASSERT_EQUAL(0x83, part1.get_partition_type()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part1.get_read_size()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part1.get_program_size()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part1.get_erase_size()); | ||
TEST_ASSERT_EQUAL(((BLOCK_COUNT/2)-1)*BLOCK_SIZE, part1.size()); | ||
|
||
printf("partition 2 partition number: %d\n", part2.get_partition_number()); | ||
printf("partition 2 partition start: 0x%llx\n", part2.get_partition_start()); | ||
printf("partition 2 partition stop: 0x%llx\n", part2.get_partition_stop()); | ||
printf("partition 2 partition type: 0x%02x\n", part2.get_partition_type()); | ||
printf("partition 2 read size: %llu bytes\n", part2.get_read_size()); | ||
printf("partition 2 program size: %llu bytes\n", part2.get_program_size()); | ||
printf("partition 2 erase size: %llu bytes\n", part2.get_erase_size()); | ||
printf("partition 2 size: %llu bytes\n", part2.size()); | ||
TEST_ASSERT_EQUAL(2, part2.get_partition_number()); | ||
TEST_ASSERT_EQUAL((BLOCK_COUNT/2)*BLOCK_SIZE, part2.get_partition_start()); | ||
TEST_ASSERT_EQUAL(BLOCK_COUNT*BLOCK_SIZE, part2.get_partition_stop()); | ||
TEST_ASSERT_EQUAL(0x83, part2.get_partition_type()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part2.get_read_size()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part2.get_program_size()); | ||
TEST_ASSERT_EQUAL(BLOCK_SIZE, part2.get_erase_size()); | ||
TEST_ASSERT_EQUAL((BLOCK_COUNT/2)*BLOCK_SIZE, part2.size()); | ||
|
||
// Deinit partitions | ||
err = part1.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part2.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
} | ||
|
||
// Testing mbr read write | ||
void test_mbr_read_write() | ||
{ | ||
// Load partitions | ||
MBRBlockDevice part1(&bd, 1); | ||
int err = part1.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
MBRBlockDevice part2(&bd, 2); | ||
err = part2.init(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Test reading/writing the partitions | ||
uint8_t *write_block = new uint8_t[BLOCK_SIZE]; | ||
uint8_t *read_block = new uint8_t[BLOCK_SIZE]; | ||
|
||
// Fill with random sequence | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
write_block[i] = 0xff & rand(); | ||
} | ||
|
||
// Write, sync, and read the block | ||
err = part1.erase(0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part1.program(write_block, 0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part1.read(read_block, 0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Check that the data was unmodified | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
TEST_ASSERT_EQUAL(0xff & rand(), read_block[i]); | ||
} | ||
|
||
// Check with original block device | ||
err = bd.read(read_block, 1*BLOCK_SIZE, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Check that the data was unmodified | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
TEST_ASSERT_EQUAL(0xff & rand(), read_block[i]); | ||
} | ||
|
||
// Test with second slice of block device | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
write_block[i] = 0xff & rand(); | ||
} | ||
|
||
// Write, sync, and read the block | ||
err = part2.erase(0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part2.program(write_block, 0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part2.read(read_block, 0, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Check that the data was unmodified | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
TEST_ASSERT_EQUAL(0xff & rand(), read_block[i]); | ||
} | ||
|
||
// Check with original block device | ||
err = bd.read(read_block, (BLOCK_COUNT/2)*BLOCK_SIZE, BLOCK_SIZE); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
// Check that the data was unmodified | ||
srand(1); | ||
for (int i = 0; i < BLOCK_SIZE; i++) { | ||
TEST_ASSERT_EQUAL(0xff & rand(), read_block[i]); | ||
} | ||
|
||
// Clean up | ||
delete[] write_block; | ||
delete[] read_block; | ||
|
||
err = part1.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
|
||
err = part2.deinit(); | ||
TEST_ASSERT_EQUAL(0, err); | ||
} | ||
|
||
|
||
// Test setup | ||
utest::v1::status_t test_setup(const size_t number_of_cases) { | ||
GREENTEA_SETUP(10, "default_auto"); | ||
return verbose_test_setup_handler(number_of_cases); | ||
} | ||
|
||
Case cases[] = { | ||
Case("Testing formatting of master boot record", test_mbr_format), | ||
Case("Testing mbr attributes", test_mbr_attr), | ||
Case("Testing mbr read write", test_mbr_read_write), | ||
}; | ||
|
||
Specification specification(test_setup, cases); | ||
|
||
int main() { | ||
return !Harness::run(specification); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need all these prints? if they fail, these numbers will be printed as part of the error?
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The output would help debugging what went wrong in the test. Multiple attributes may be wrong, but the assert would stop after the first.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understood, but still the test should not print anything if is all green ? This is more for future request (than solving it here with this PR) - having logging library. Some tests already have something like
DEBUG_PRINT
that is a config attribute and by default disabled. Is it time now to consider having something similar to it - a proper replacement?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I rambled grumpily over here: #4317 (comment), there's also related discussion over there.
It does seem like we should have a configurable logging/debug we can remove at compile time, but I'm going to leave these as is for now. They aren't currently causing a problem, and we should probably apply a consistent solution to all of the tests we have in a seperate pr.