mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 18:07:03 +00:00
mtd: abstract last MTD partition parser argument
Encapsulate last MTD partition parser argument into a separate structure. Currently it holds only 'origin' field for RedBoot parser, but will be extended in future to contain at least device_node for OF devices. Amended commentary to make kerneldoc happy Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
This commit is contained in:
parent
f722013ee9
commit
c797533015
@ -162,8 +162,8 @@ afs_read_iis(struct mtd_info *mtd, struct image_info_struct *iis, u_int ptr)
|
||||
}
|
||||
|
||||
static int parse_afs_partitions(struct mtd_info *mtd,
|
||||
struct mtd_partition **pparts,
|
||||
unsigned long origin)
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
struct mtd_partition *parts;
|
||||
u_int mask, off, idx, sz;
|
||||
|
@ -46,7 +46,7 @@ struct ar7_bin_rec {
|
||||
|
||||
static int create_mtd_partitions(struct mtd_info *master,
|
||||
struct mtd_partition **pparts,
|
||||
unsigned long origin)
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
struct ar7_bin_rec header;
|
||||
unsigned int offset;
|
||||
|
@ -313,8 +313,8 @@ static int mtdpart_setup_real(char *s)
|
||||
* the first one in the chain if a NULL mtd_id is passed in.
|
||||
*/
|
||||
static int parse_cmdline_partitions(struct mtd_info *master,
|
||||
struct mtd_partition **pparts,
|
||||
unsigned long origin)
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
unsigned long offset;
|
||||
int i;
|
||||
|
@ -457,7 +457,7 @@ EXPORT_SYMBOL_GPL(mtd_device_register);
|
||||
* @mtd: the MTD device to register
|
||||
* @types: the list of MTD partition probes to try, see
|
||||
* 'parse_mtd_partitions()' for more information
|
||||
* @origin: start address of MTD device, %0 unless you are sure you need this.
|
||||
* @parser_data: MTD partition parser-specific data
|
||||
* @parts: fallback partition information to register, if parsing fails;
|
||||
* only valid if %nr_parts > %0
|
||||
* @nr_parts: the number of partitions in parts, if zero then the full
|
||||
@ -480,14 +480,14 @@ EXPORT_SYMBOL_GPL(mtd_device_register);
|
||||
* Returns zero in case of success and a negative error code in case of failure.
|
||||
*/
|
||||
int mtd_device_parse_register(struct mtd_info *mtd, const char **types,
|
||||
unsigned long origin,
|
||||
struct mtd_part_parser_data *parser_data,
|
||||
const struct mtd_partition *parts,
|
||||
int nr_parts)
|
||||
{
|
||||
int err;
|
||||
struct mtd_partition *real_parts;
|
||||
|
||||
err = parse_mtd_partitions(mtd, types, &real_parts, origin);
|
||||
err = parse_mtd_partitions(mtd, types, &real_parts, parser_data);
|
||||
if (err <= 0 && nr_parts) {
|
||||
real_parts = kmemdup(parts, sizeof(*parts) * nr_parts,
|
||||
GFP_KERNEL);
|
||||
|
@ -736,7 +736,7 @@ static const char *default_mtd_part_types[] = {"cmdlinepart", NULL};
|
||||
* @master: the master partition (describes whole MTD device)
|
||||
* @types: names of partition parsers to try or %NULL
|
||||
* @pparts: array of partitions found is returned here
|
||||
* @origin: MTD device start address (use %0 if unsure)
|
||||
* @data: MTD partition parser-specific data
|
||||
*
|
||||
* This function tries to find partition on MTD device @master. It uses MTD
|
||||
* partition parsers, specified in @types. However, if @types is %NULL, then
|
||||
@ -750,7 +750,8 @@ static const char *default_mtd_part_types[] = {"cmdlinepart", NULL};
|
||||
* point to an array containing this number of &struct mtd_info objects.
|
||||
*/
|
||||
int parse_mtd_partitions(struct mtd_info *master, const char **types,
|
||||
struct mtd_partition **pparts, unsigned long origin)
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
struct mtd_part_parser *parser;
|
||||
int ret = 0;
|
||||
@ -764,7 +765,7 @@ int parse_mtd_partitions(struct mtd_info *master, const char **types,
|
||||
parser = get_partition_parser(*types);
|
||||
if (!parser)
|
||||
continue;
|
||||
ret = (*parser->parse_fn)(master, pparts, origin);
|
||||
ret = (*parser->parse_fn)(master, pparts, data);
|
||||
if (ret > 0) {
|
||||
printk(KERN_NOTICE "%d %s partitions found on MTD device %s\n",
|
||||
ret, parser->name, master->name);
|
||||
|
@ -56,8 +56,8 @@ static inline int redboot_checksum(struct fis_image_desc *img)
|
||||
}
|
||||
|
||||
static int parse_redboot_partitions(struct mtd_info *master,
|
||||
struct mtd_partition **pparts,
|
||||
unsigned long fis_origin)
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data)
|
||||
{
|
||||
int nrparts = 0;
|
||||
struct fis_image_desc *buf;
|
||||
@ -197,11 +197,10 @@ static int parse_redboot_partitions(struct mtd_info *master,
|
||||
goto out;
|
||||
}
|
||||
new_fl->img = &buf[i];
|
||||
if (fis_origin) {
|
||||
buf[i].flash_base -= fis_origin;
|
||||
} else {
|
||||
buf[i].flash_base &= master->size-1;
|
||||
}
|
||||
if (data && data->origin)
|
||||
buf[i].flash_base -= data->origin;
|
||||
else
|
||||
buf[i].flash_base &= master->size-1;
|
||||
|
||||
/* I'm sure the JFFS2 code has done me permanent damage.
|
||||
* I now think the following is _normal_
|
||||
|
@ -323,13 +323,14 @@ static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
|
||||
/* Kernel-side ioctl definitions */
|
||||
|
||||
struct mtd_partition;
|
||||
struct mtd_part_parser_data;
|
||||
|
||||
extern int mtd_device_register(struct mtd_info *master,
|
||||
const struct mtd_partition *parts,
|
||||
int nr_parts);
|
||||
extern int mtd_device_parse_register(struct mtd_info *mtd,
|
||||
const char **part_probe_types,
|
||||
unsigned long origin,
|
||||
struct mtd_part_parser_data *parser_data,
|
||||
const struct mtd_partition *defparts,
|
||||
int defnr_parts);
|
||||
extern int mtd_device_unregister(struct mtd_info *master);
|
||||
|
@ -52,6 +52,15 @@ struct mtd_partition {
|
||||
|
||||
struct mtd_info;
|
||||
|
||||
/**
|
||||
* struct mtd_part_parser_data - used to pass data to MTD partition parsers.
|
||||
* @origin: for RedBoot, start address of MTD device
|
||||
*/
|
||||
struct mtd_part_parser_data {
|
||||
unsigned long origin;
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Functions dealing with the various ways of partitioning the space
|
||||
*/
|
||||
@ -60,13 +69,15 @@ struct mtd_part_parser {
|
||||
struct list_head list;
|
||||
struct module *owner;
|
||||
const char *name;
|
||||
int (*parse_fn)(struct mtd_info *, struct mtd_partition **, unsigned long);
|
||||
int (*parse_fn)(struct mtd_info *, struct mtd_partition **,
|
||||
struct mtd_part_parser_data *);
|
||||
};
|
||||
|
||||
extern int register_mtd_parser(struct mtd_part_parser *parser);
|
||||
extern int deregister_mtd_parser(struct mtd_part_parser *parser);
|
||||
extern int parse_mtd_partitions(struct mtd_info *master, const char **types,
|
||||
struct mtd_partition **pparts, unsigned long origin);
|
||||
struct mtd_partition **pparts,
|
||||
struct mtd_part_parser_data *data);
|
||||
|
||||
#define put_partition_parser(p) do { module_put((p)->owner); } while(0)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user