mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-18 13:13:55 +02:00
b3f95490b9
This adds initial support for kernel 4.14 based on the patches for kernel 4.9. In the configuration I deactivated some of the new possible security features like: CONFIG_REFCOUNT_FULL CONFIG_SLAB_FREELIST_HARDENED CONFIG_SOFTLOCKUP_DETECTOR CONFIG_WARN_ALL_UNSEEDED_RANDOM And these overlay FS options are also deactivated: CONFIG_OVERLAY_FS_INDEX CONFIG_OVERLAY_FS_REDIRECT_DIR I activated this: CONFIG_FORTIFY_SOURCE CONFIG_POSIX_TIMERS CONFIG_SLAB_MERGE_DEFAULT CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED I am not sure if I did the porting correct for the following patches: target/linux/generic/backport-4.14/020-backport_netfilter_rtcache.patch target/linux/generic/hack-4.14/220-gc_sections.patch target/linux/generic/hack-4.14/321-powerpc_crtsavres_prereq.patch target/linux/generic/pending-4.14/305-mips_module_reloc.patch target/linux/generic/pending-4.14/611-netfilter_match_bypass_default_table.patch target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
111 lines
2.7 KiB
Diff
111 lines
2.7 KiB
Diff
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Subject: mtd: add support for different partition parser types
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
drivers/mtd/mtdpart.c | 56 ++++++++++++++++++++++++++++++++++++++++
|
|
include/linux/mtd/partitions.h | 11 ++++++++
|
|
2 files changed, 67 insertions(+)
|
|
|
|
--- a/drivers/mtd/mtdpart.c
|
|
+++ b/drivers/mtd/mtdpart.c
|
|
@@ -1034,6 +1034,62 @@ void mtd_part_parser_cleanup(struct mtd_
|
|
}
|
|
}
|
|
|
|
+static struct mtd_part_parser *
|
|
+get_partition_parser_by_type(enum mtd_parser_type type,
|
|
+ struct mtd_part_parser *start)
|
|
+{
|
|
+ struct mtd_part_parser *p, *ret = NULL;
|
|
+
|
|
+ spin_lock(&part_parser_lock);
|
|
+
|
|
+ p = list_prepare_entry(start, &part_parsers, list);
|
|
+ if (start)
|
|
+ mtd_part_parser_put(start);
|
|
+
|
|
+ list_for_each_entry_continue(p, &part_parsers, list) {
|
|
+ if (p->type == type && try_module_get(p->owner)) {
|
|
+ ret = p;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ spin_unlock(&part_parser_lock);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+int parse_mtd_partitions_by_type(struct mtd_info *master,
|
|
+ enum mtd_parser_type type,
|
|
+ const struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data)
|
|
+{
|
|
+ struct mtd_part_parser *prev = NULL;
|
|
+ int ret = 0;
|
|
+
|
|
+ while (1) {
|
|
+ struct mtd_part_parser *parser;
|
|
+
|
|
+ parser = get_partition_parser_by_type(type, prev);
|
|
+ if (!parser)
|
|
+ break;
|
|
+
|
|
+ ret = (*parser->parse_fn)(master, pparts, data);
|
|
+
|
|
+ if (ret > 0) {
|
|
+ mtd_part_parser_put(parser);
|
|
+ printk(KERN_NOTICE
|
|
+ "%d %s partitions found on MTD device %s\n",
|
|
+ ret, parser->name, master->name);
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ prev = parser;
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+EXPORT_SYMBOL_GPL(parse_mtd_partitions_by_type);
|
|
+
|
|
int mtd_is_partition(const struct mtd_info *mtd)
|
|
{
|
|
struct mtd_part *part;
|
|
--- a/include/linux/mtd/partitions.h
|
|
+++ b/include/linux/mtd/partitions.h
|
|
@@ -68,11 +68,14 @@ struct mtd_part_parser_data {
|
|
unsigned long origin;
|
|
};
|
|
|
|
-
|
|
/*
|
|
* Functions dealing with the various ways of partitioning the space
|
|
*/
|
|
|
|
+enum mtd_parser_type {
|
|
+ MTD_PARSER_TYPE_DEVICE = 0,
|
|
+};
|
|
+
|
|
struct mtd_part_parser {
|
|
struct list_head list;
|
|
struct module *owner;
|
|
@@ -80,6 +83,7 @@ struct mtd_part_parser {
|
|
int (*parse_fn)(struct mtd_info *, const struct mtd_partition **,
|
|
struct mtd_part_parser_data *);
|
|
void (*cleanup)(const struct mtd_partition *pparts, int nr_parts);
|
|
+ enum mtd_parser_type type;
|
|
};
|
|
|
|
/* Container for passing around a set of parsed partitions */
|
|
@@ -112,4 +116,9 @@ uint64_t mtd_get_device_size(const struc
|
|
extern void __weak arch_split_mtd_part(struct mtd_info *master,
|
|
const char *name, int offset, int size);
|
|
|
|
+int parse_mtd_partitions_by_type(struct mtd_info *master,
|
|
+ enum mtd_parser_type type,
|
|
+ const struct mtd_partition **pparts,
|
|
+ struct mtd_part_parser_data *data);
|
|
+
|
|
#endif
|