leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: partitions: use DT info for parsing partitions with "compatible" prop

Browse Source 
So far only flash devices could be described in DT regarding partitions
parsing. That could be done with "partitions" subnode and a proper
"compatible" string.

Some devices may use hierarchical (multi-level) layouts and may mix used
layouts (fixed and dynamic). Describing that in DT is done by specifying
"compatible" for DT-represented partition plus optionally more
properties and/or subnodes.

To support such layouts each DT partition has to be checked for
additional description.

Please note this implementation will work in parallel with support for
partition type specified for non-DT setups. That already works since
commit 1a0915be19 ("mtd: partitions: add support for partition
parsers").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Rafał Miłecki 2018-07-13 16:32:21 +02:00 committed by Boris Brezillon
parent d2ad00eb78
commit 76a832254a
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/mtd/mtdpart.c
View File

@ -322,22 +322,6 @@ static inline void free_partition(struct mtd_part *p)
kfree(p); kfree(p);
} }
/**
* mtd_parse_part - parse MTD partition looking for subpartitions
*
* @slave: part that is supposed to be a container and should be parsed
* @types: NULL-terminated array with names of partition parsers to try
*
* Some partitions are kind of containers with extra subpartitions (volumes).
* There can be various formats of such containers. This function tries to use
* specified parsers to analyze given partition and registers found
* subpartitions on success.
*/
static int mtd_parse_part(struct mtd_part *slave, const char *const *types)
{
return parse_mtd_partitions(&slave->mtd, types, NULL);
}
static struct mtd_part *allocate_partition(struct mtd_info *parent, static struct mtd_part *allocate_partition(struct mtd_info *parent,
const struct mtd_partition *part, int partno, const struct mtd_partition *part, int partno,
uint64_t cur_offset) uint64_t cur_offset)
@ -735,8 +719,8 @@ int add_mtd_partitions(struct mtd_info *master,
add_mtd_device(&slave->mtd); add_mtd_device(&slave->mtd);
mtd_add_partition_attrs(slave); mtd_add_partition_attrs(slave);
if (parts[i].types) /* Look for subpartitions */
mtd_parse_part(slave, parts[i].types); parse_mtd_partitions(&slave->mtd, parts[i].types, NULL);
cur_offset = slave->offset + slave->mtd.size; cur_offset = slave->offset + slave->mtd.size;
} }
@ -812,6 +796,12 @@ static const char * const default_mtd_part_types[] = {
NULL NULL
}; };
/* Check DT only when looking for subpartitions. */
static const char * const default_subpartition_types[] = {
"ofpart",
NULL
};
static int mtd_part_do_parse(struct mtd_part_parser *parser, static int mtd_part_do_parse(struct mtd_part_parser *parser,
struct mtd_info *master, struct mtd_info *master,
struct mtd_partitions *pparts, struct mtd_partitions *pparts,
@ -882,7 +872,9 @@ static int mtd_part_of_parse(struct mtd_info *master,
const char *fixed = "fixed-partitions"; const char *fixed = "fixed-partitions";
int ret, err = 0; int ret, err = 0;
np = of_get_child_by_name(mtd_get_of_node(master), "partitions"); np = mtd_get_of_node(master);
if (!mtd_is_partition(master))
np = of_get_child_by_name(np, "partitions");
of_property_for_each_string(np, "compatible", prop, compat) { of_property_for_each_string(np, "compatible", prop, compat) {
parser = mtd_part_get_compatible_parser(compat); parser = mtd_part_get_compatible_parser(compat);
if (!parser) if (!parser)
@ -945,7 +937,8 @@ int parse_mtd_partitions(struct mtd_info *master, const char *const *types,
int ret, err = 0; int ret, err = 0;
if (!types) if (!types)
types = default_mtd_part_types; types = mtd_is_partition(master) ? default_subpartition_types :
default_mtd_part_types;
for ( ; *types; types++) { for ( ; *types; types++) {
/* /*