[OpenWrt-Devel] [PATCH][RFC] kernel: switch to the squashfs-split parser (splitter) by default

Rafał Miłecki zajec5 at gmail.com
Sat Sep 27 10:44:37 EDT 2014


This cleans mtdpart.c removing old (built-in) code responsible for
splitting SquashFS "rootfs" partition.

Signed-off-by: Rafał Miłecki <zajec5 at gmail.com>
---
 target/linux/generic/config-3.14                   |  3 +-
 .../400-mtd-add-rootfs-split-support.patch         | 50 ++--------------------
 ...port-for-different-partition-parser-types.patch |  4 +-
 ...mtd-parsers-for-rootfs-and-firmware-split.patch | 22 +++++-----
 .../403-mtd-hook-mtdsplit-to-Kbuild.patch          |  2 +-
 .../405-mtd-add-more-helper-functions.patch        |  2 +-
 6 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/target/linux/generic/config-3.14 b/target/linux/generic/config-3.14
index bdc27ee..9ccc263 100644
--- a/target/linux/generic/config-3.14
+++ b/target/linux/generic/config-3.14
@@ -2119,7 +2119,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_ROM is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
-CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SPINAND_MT29F is not set
 CONFIG_MTD_SPLIT=y
@@ -2127,7 +2126,7 @@ CONFIG_MTD_SPLIT=y
 CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware"
 # CONFIG_MTD_SPLIT_LZMA_FW is not set
 # CONFIG_MTD_SPLIT_SEAMA_FW is not set
-# CONFIG_MTD_SPLIT_SQUASHFS_ROOT is not set
+CONFIG_MTD_SPLIT_SQUASHFS_ROOT=y
 # CONFIG_MTD_SPLIT_UIMAGE_FW is not set
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SWAP is not set
diff --git a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
index 4e68d8c..1987553 100644
--- a/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
+++ b/target/linux/generic/patches-3.14/400-mtd-add-rootfs-split-support.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -12,6 +12,33 @@ menuconfig MTD
+@@ -12,6 +12,28 @@ menuconfig MTD
  
  if MTD
  
@@ -10,11 +10,6 @@
 +	bool "Automatically set 'rootfs' partition to be root filesystem"
 +	default y
 +
-+config MTD_ROOTFS_SPLIT
-+	bool "Automatically split 'rootfs' partition for squashfs"
-+	select MTD_SPLIT
-+	default y
-+
 +config MTD_SPLIT_FIRMWARE
 +	bool "Automatically split firmware partition for kernel+rootfs"
 +	default y
@@ -125,7 +120,7 @@
  int mtd_del_partition(struct mtd_info *master, int partno)
  {
  	struct mtd_part *slave, *next;
-@@ -614,6 +628,117 @@ int mtd_del_partition(struct mtd_info *m
+@@ -614,6 +628,80 @@ int mtd_del_partition(struct mtd_info *m
  }
  EXPORT_SYMBOL_GPL(mtd_del_partition);
  
@@ -140,42 +135,6 @@
 +	return len;
 +}
 +
-+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset)
-+{
-+	size_t squashfs_len;
-+	int len, ret;
-+
-+	ret = mtd_get_squashfs_len(master, offset, &squashfs_len);
-+	if (ret)
-+		return ret;
-+
-+	len = mtd_pad_erasesize(master, offset, squashfs_len);
-+	*split_offset = offset + len;
-+
-+	return 0;
-+}
-+
-+static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part)
-+{
-+	unsigned int split_offset = 0;
-+	unsigned int split_size;
-+	int ret;
-+
-+	ret = split_squashfs(master, part->offset, &split_offset);
-+	if (ret)
-+		return;
-+
-+	if (split_offset <= 0)
-+		return;
-+
-+	split_size = part->mtd.size - (split_offset - part->offset);
-+	printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n",
-+		ROOTFS_SPLIT_NAME, split_offset, split_size);
-+
-+	__mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset,
-+			    split_size, false);
-+}
-+
 +#define UBOOT_MAGIC	0x27051956
 +
 +static void split_uimage(struct mtd_info *master, struct mtd_part *part)
@@ -229,8 +188,7 @@
 +	if (!strcmp(part->mtd.name, "rootfs")) {
 +		rootfs_found = 1;
 +
-+		if (config_enabled(CONFIG_MTD_ROOTFS_SPLIT))
-+			split_rootfs_data(master, part);
++		/* TODO: split rootfs */
 +	}
 +
 +	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
@@ -243,7 +201,7 @@
  /*
   * This function, given a master MTD object and a partition table, creates
   * and registers slave MTD objects which are bound to the master according to
-@@ -643,6 +768,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -643,6 +731,7 @@ int add_mtd_partitions(struct mtd_info *
  		mutex_unlock(&mtd_partitions_mutex);
  
  		add_mtd_device(&slave->mtd);
diff --git a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch b/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
index a434f6e..5104375 100644
--- a/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
+++ b/target/linux/generic/patches-3.14/401-mtd-add-support-for-different-partition-parser-types.patch
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -798,6 +798,30 @@ static struct mtd_part_parser *get_parti
+@@ -761,6 +761,30 @@ static struct mtd_part_parser *get_parti
  
  #define put_partition_parser(p) do { module_put((p)->owner); } while (0)
  
@@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
  void register_mtd_parser(struct mtd_part_parser *p)
  {
  	spin_lock(&part_parser_lock);
-@@ -871,6 +895,38 @@ int parse_mtd_partitions(struct mtd_info
+@@ -834,6 +858,38 @@ int parse_mtd_partitions(struct mtd_info
  	return ret;
  }
  
diff --git a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index 92a3ee7..485c6d8 100644
--- a/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++ b/target/linux/generic/patches-3.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -38,18 +38,7 @@
  static inline unsigned long
  mtd_pad_erasesize(struct mtd_info *mtd, int offset, int len)
  {
-@@ -660,6 +691,10 @@ static void split_rootfs_data(struct mtd
- 	unsigned int split_size;
- 	int ret;
- 
-+	ret = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
-+	if (ret > 0)
-+		return;
-+
- 	ret = split_squashfs(master, part->offset, &split_offset);
- 	if (ret)
- 		return;
-@@ -709,6 +744,12 @@ static void split_uimage(struct mtd_info
+@@ -673,6 +704,12 @@ static void split_uimage(struct mtd_info
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {
@@ -62,6 +51,15 @@
  	if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT))
  		split_uimage(master, part);
  }
+@@ -692,7 +729,7 @@ static void mtd_partition_split(struct m
+ 	if (!strcmp(part->mtd.name, "rootfs")) {
+ 		rootfs_found = 1;
+ 
+-		/* TODO: split rootfs */
++		run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS);
+ 	}
+ 
+ 	if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
 --- a/include/linux/mtd/partitions.h
 +++ b/include/linux/mtd/partitions.h
 @@ -70,6 +70,8 @@ struct mtd_part_parser_data {
diff --git a/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch b/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
index be2ee69..a70f818 100644
--- a/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
+++ b/target/linux/generic/patches-3.14/403-mtd-hook-mtdsplit-to-Kbuild.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/Kconfig
 +++ b/drivers/mtd/Kconfig
-@@ -37,6 +37,11 @@ config MTD_UIMAGE_SPLIT
+@@ -32,6 +32,11 @@ config MTD_UIMAGE_SPLIT
  	depends on MTD_SPLIT_FIRMWARE
  	default y
  
diff --git a/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch b/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
index c6ce872..30292e9 100644
--- a/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
+++ b/target/linux/generic/patches-3.14/405-mtd-add-more-helper-functions.patch
@@ -18,7 +18,7 @@
  	}
  	if (slave->offset == MTDPART_OFS_RETAIN) {
  		slave->offset = cur_offset;
-@@ -985,6 +983,24 @@ int mtd_is_partition(const struct mtd_in
+@@ -944,6 +942,24 @@ int mtd_is_partition(const struct mtd_in
  }
  EXPORT_SYMBOL_GPL(mtd_is_partition);
  
-- 
1.8.4.5
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list