Skip to content
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.

Sign up for GitHub

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

Jump to bottom

drivers/mtd_mapper: inherit physical properties #18113

Merged
merged 2 commits into from
Jun 5, 2022
Merged

drivers/mtd_mapper: inherit physical properties #18113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d8ba01
drivers/mtd_mapper: inherit physical properties
benpicco May 17, 2022
53f891e
tests/mtd_mapper: don't set device properites for regions
benpicco May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions drivers/mtd_mapper/mtd_mapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,21 @@ static int _init(mtd_dev_t *mtd)
mtd_mapper_region_t *region = container_of(mtd, mtd_mapper_region_t, mtd);
mtd_dev_t *backing_mtd = region->parent->mtd;

/* Configuration sanity checks */
assert(backing_mtd->page_size == region->mtd.page_size);
assert(backing_mtd->pages_per_sector == region->mtd.pages_per_sector);
/* inherit physical properties */
if (region->mtd.page_size == 0) {
region->mtd.page_size = backing_mtd->page_size;
}
if (region->mtd.pages_per_sector == 0) {
region->mtd.pages_per_sector = backing_mtd->pages_per_sector;
}
region->mtd.write_size = backing_mtd->write_size;

/* Configuration sanity check */
assert(backing_mtd->page_size >= region->mtd.page_size);
assert(backing_mtd->write_size <= region->mtd.page_size);
assert(region->mtd.page_size * region->mtd.pages_per_sector
== backing_mtd->page_size * backing_mtd->pages_per_sector);
assert(backing_mtd->sector_count >= region->mtd.sector_count);
assert(backing_mtd->write_size == region->mtd.write_size);

/* offset + region size must not exceed the backing device */
assert(region->sector + region->mtd.sector_count <= backing_mtd->sector_count);
Expand Down
6 changes: 0 additions & 6 deletions tests/mtd_mapper/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ static mtd_mapper_region_t _region_a = {
.mtd = {
.driver = &mtd_mapper_driver,
.sector_count = SECTOR_COUNT / 2,
.pages_per_sector = PAGE_PER_SECTOR,
.page_size = PAGE_SIZE,
.write_size = WRITE_SIZE,
},
.parent = &_parent,
.sector = 0,
Expand All @@ -204,9 +201,6 @@ static mtd_mapper_region_t _region_b = {
.mtd = {
.driver = &mtd_mapper_driver,
.sector_count = SECTOR_COUNT / 2,
.pages_per_sector = PAGE_PER_SECTOR,
.page_size = PAGE_SIZE,
.write_size = WRITE_SIZE,
},
.parent = &_parent,
.sector = SECTOR_COUNT / 2,
Expand Down