Skip to contentSkip to conversation

Patches to allow running u-boot on vocore2 board

PATCH New Mauro Condarelli 3 participants 10 messages Sep 20, 2020 – Sep 23, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Patches to allow running u-boot on vocore2 board

There are two distinct things here:
- a few small fixes specific to vocore2 board.
- fixes to SquashFS to allow compilation on 32-bit architectures.

Mauro Condarelli (3):
Small fixes to reduce size and ensure correct console output. Enlarge SPL malloc area to prevent failure in lzma decompression. Fix missing __udivdi3 in SquashFS implementation.

 arch/mips/dts/vocore_vocore2.dts |  2 +-
 configs/vocore2_defconfig        |  2 +-
 fs/squashfs/sqfs.c               | 45 ++++++++++++++++++++------------
 fs/squashfs/sqfs_inode.c         |  8 +++---
 include/configs/vocore2.h        |  4 ++-
 5 files changed, 38 insertions(+), 23 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 Small fixes to reduce size and ensure correct console output.

---
 arch/mips/dts/vocore_vocore2.dts | 2 +-
 include/configs/vocore2.h        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
arch/mips/dts/vocore_vocore2.dts +1 -1
index 3502e4b8b7..9adf39652f 100644
@@ -59,7 +59,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		spi-max-frequency = <25000000>;
+		spi-max-frequency = <40000000>;
 		reg = <0>;
 	};
 };
include/configs/vocore2.h +2 -0
index 40467b737c..29a57ad233 100644
@@ -25,6 +25,7 @@
 #define CONFIG_SPL_BSS_START_ADDR	0x80010000
 #define CONFIG_SPL_BSS_MAX_SIZE		0x10000
 #define CONFIG_SPL_MAX_SIZE		0x10000
+#define CONFIG_SPL_PAD_TO		0
 
 /* Dummy value */
 #define CONFIG_SYS_UBOOT_BASE		0
@@ -34,6 +35,7 @@
 #define CONFIG_SYS_NS16550_CLK		40000000
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
 #define CONFIG_SYS_NS16550_COM3		0xb0000e00
+#define CONFIG_CONS_INDEX		3
 
 /* RAM */
 
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/3 Enlarge SPL malloc area to prevent failure in lzma decompression.

In reply to Mauro Condarelli
---
 configs/vocore2_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/vocore2_defconfig +1 -1
index 99a1143e6e..5776aada15 100644
@@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x1000
 CONFIG_ENV_OFFSET=0x04e000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SYS_BOOTCOUNT_ADDR=0xb000006c
-CONFIG_SPL_SYS_MALLOC_F_LEN=0x20000
+CONFIG_SPL_SYS_MALLOC_F_LEN=0x40000
 CONFIG_SPL=y
 CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
 CONFIG_ARCH_MTMIPS=y
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

In reply to Mauro Condarelli
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-
 3 files changed, 34 insertions(+), 21 deletions(-)
fs/squashfs/sqfs.c +29 -16
index 15208b4dab..b49331ce93 100644
@@ -18,6 +18,8 @@
 #include <string.h>
 #include <squashfs.h>
 #include <part.h>
+#include <div64.h>
+#include <stdio.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -82,13 +84,16 @@ static int sqfs_count_tokens(const char *filename)
  */
 static int sqfs_calc_n_blks(__le64 start, __le64 end, u64 *offset)
 {
-	u64 start_, table_size;
+	u64 start_, table_size, blks;
 
 	table_size = le64_to_cpu(end) - le64_to_cpu(start);
-	start_ = le64_to_cpu(start) / ctxt.cur_dev->blksz;
+	start_ = le64_to_cpu(start);
+	do_div(start_, ctxt.cur_dev->blksz);
 	*offset = le64_to_cpu(start) - (start_ * ctxt.cur_dev->blksz);
 
-	return DIV_ROUND_UP(table_size + *offset, ctxt.cur_dev->blksz);
+	blks = table_size + *offset;
+	if (do_div(blks, ctxt.cur_dev->blksz)) blks++;
+	return blks;
 }
 
 /*
@@ -109,8 +114,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	if (inode_fragment_index >= get_unaligned_le32(&sblk->fragments))
 		return -EINVAL;
 
-	start = get_unaligned_le64(&sblk->fragment_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->fragment_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->fragment_table_start,
 				  sblk->export_table_start,
 				  &table_offset);
@@ -135,7 +140,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	start_block = get_unaligned_le64(table + table_offset + block *
 					 sizeof(u64));
 
-	start = start_block / ctxt.cur_dev->blksz;
+	start = start_block;
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(cpu_to_le64(start_block),
 				  sblk->fragment_table_start, &table_offset);
 
@@ -641,8 +647,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table)
 
 	table_size = get_unaligned_le64(&sblk->directory_table_start) -
 		get_unaligned_le64(&sblk->inode_table_start);
-	start = get_unaligned_le64(&sblk->inode_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->inode_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->inode_table_start,
 				  sblk->directory_table_start, &table_offset);
 
@@ -725,8 +731,8 @@ static int sqfs_read_directory_table(unsigned char **dir_table, u32 **pos_list)
 	/* DIRECTORY TABLE */
 	table_size = get_unaligned_le64(&sblk->fragment_table_start) -
 		get_unaligned_le64(&sblk->directory_table_start);
-	start = get_unaligned_le64(&sblk->directory_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->directory_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->directory_table_start,
 				  sblk->fragment_table_start, &table_offset);
 
@@ -1158,6 +1164,7 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
 				       fentry);
 		if (ret < 0)
 			return -EINVAL;
+
 		finfo->comp = true;
 		if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
 			return -EINVAL;
@@ -1328,17 +1335,19 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		data_offset = finfo.start;
 		datablock = malloc(get_unaligned_le32(&sblk->block_size));
 		if (!datablock) {
+			printf("Error: malloc(%u) failed.\n", get_unaligned_le32(&sblk->block_size));
 			ret = -ENOMEM;
 			goto free_paths;
 		}
 	}
 
 	for (j = 0; j < datablk_count; j++) {
-		start = data_offset / ctxt.cur_dev->blksz;
+		start = data_offset;
+		do_div(start, ctxt.cur_dev->blksz);
 		table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
 		table_offset = data_offset - (start * ctxt.cur_dev->blksz);
-		n_blks = DIV_ROUND_UP(table_size + table_offset,
-				      ctxt.cur_dev->blksz);
+		n_blks = table_size + table_offset;
+		if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 		data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
@@ -1365,8 +1374,10 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 			dest_len = get_unaligned_le32(&sblk->block_size);
 			ret = sqfs_decompress(&ctxt, datablock, &dest_len,
 					      data, table_size);
-			if (ret)
+			if (ret) {
+				printf("Errrt: block decompress failed.\n");
 				goto free_buffer;
+			}
 
 			memcpy(buf + offset + *actread, datablock, dest_len);
 			*actread += dest_len;
@@ -1388,10 +1399,12 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		goto free_buffer;
 	}
 
-	start = frag_entry.start / ctxt.cur_dev->blksz;
+	start = frag_entry.start;
+	do_div(start, ctxt.cur_dev->blksz);
 	table_size = SQFS_BLOCK_SIZE(frag_entry.size);
 	table_offset = frag_entry.start - (start * ctxt.cur_dev->blksz);
-	n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz);
+	n_blks = table_size + table_offset;
+	if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 	fragment = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
fs/squashfs/sqfs_inode.c +4 -4
index 1368f3063c..c330e32a0e 100644
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <div64.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -67,10 +68,9 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
 		u64 file_size = get_unaligned_le64(&lreg->file_size);
 		unsigned int blk_list_size;
 
-		if (fragment == 0xFFFFFFFF)
-			blk_list_size = DIV_ROUND_UP(file_size, blk_size);
-		else
-			blk_list_size = file_size / blk_size;
+		if (do_div(file_size, blk_size) && (fragment == 0xFFFFFFFF))
+		    file_size++;
+		blk_list_size = file_size;
 
 		return sizeof(*lreg) + blk_list_size * sizeof(u32);
 	}
include/configs/vocore2.h +1 -1
index 29a57ad233..dfdb8fcc04 100644
@@ -41,7 +41,7 @@
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS		64
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
 #define CONFIG_SYS_CBSIZE		512
 
Signature · 1 line
2.25.1
#4 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

Quoted 172 lines · Mauro Condarelli
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-
 3 files changed, 34 insertions(+), 21 deletions(-)
fs/squashfs/sqfs.c +29 -16
index 15208b4dab..b49331ce93 100644
@@ -18,6 +18,8 @@
 #include <string.h>
 #include <squashfs.h>
 #include <part.h>
+#include <div64.h>
+#include <stdio.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -82,13 +84,16 @@ static int sqfs_count_tokens(const char *filename)
  */
 static int sqfs_calc_n_blks(__le64 start, __le64 end, u64 *offset)
 {
-	u64 start_, table_size;
+	u64 start_, table_size, blks;
 
 	table_size = le64_to_cpu(end) - le64_to_cpu(start);
-	start_ = le64_to_cpu(start) / ctxt.cur_dev->blksz;
+	start_ = le64_to_cpu(start);
+	do_div(start_, ctxt.cur_dev->blksz);
 	*offset = le64_to_cpu(start) - (start_ * ctxt.cur_dev->blksz);
 
-	return DIV_ROUND_UP(table_size + *offset, ctxt.cur_dev->blksz);
+	blks = table_size + *offset;
+	if (do_div(blks, ctxt.cur_dev->blksz)) blks++;
+	return blks;
 }
 
 /*
@@ -109,8 +114,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	if (inode_fragment_index >= get_unaligned_le32(&sblk->fragments))
 		return -EINVAL;
 
-	start = get_unaligned_le64(&sblk->fragment_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->fragment_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->fragment_table_start,
 				  sblk->export_table_start,
 				  &table_offset);
@@ -135,7 +140,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	start_block = get_unaligned_le64(table + table_offset + block *
 					 sizeof(u64));
 
-	start = start_block / ctxt.cur_dev->blksz;
+	start = start_block;
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(cpu_to_le64(start_block),
 				  sblk->fragment_table_start, &table_offset);
 
@@ -641,8 +647,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table)
 
 	table_size = get_unaligned_le64(&sblk->directory_table_start) -
 		get_unaligned_le64(&sblk->inode_table_start);
-	start = get_unaligned_le64(&sblk->inode_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->inode_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->inode_table_start,
 				  sblk->directory_table_start, &table_offset);
 
@@ -725,8 +731,8 @@ static int sqfs_read_directory_table(unsigned char **dir_table, u32 **pos_list)
 	/* DIRECTORY TABLE */
 	table_size = get_unaligned_le64(&sblk->fragment_table_start) -
 		get_unaligned_le64(&sblk->directory_table_start);
-	start = get_unaligned_le64(&sblk->directory_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->directory_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->directory_table_start,
 				  sblk->fragment_table_start, &table_offset);
 
@@ -1158,6 +1164,7 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
 				       fentry);
 		if (ret < 0)
 			return -EINVAL;
+
 		finfo->comp = true;
 		if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
 			return -EINVAL;
@@ -1328,17 +1335,19 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		data_offset = finfo.start;
 		datablock = malloc(get_unaligned_le32(&sblk->block_size));
 		if (!datablock) {
+			printf("Error: malloc(%u) failed.\n", get_unaligned_le32(&sblk->block_size));
 			ret = -ENOMEM;
 			goto free_paths;
 		}
 	}
 
 	for (j = 0; j < datablk_count; j++) {
-		start = data_offset / ctxt.cur_dev->blksz;
+		start = data_offset;
+		do_div(start, ctxt.cur_dev->blksz);
 		table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
 		table_offset = data_offset - (start * ctxt.cur_dev->blksz);
-		n_blks = DIV_ROUND_UP(table_size + table_offset,
-				      ctxt.cur_dev->blksz);
+		n_blks = table_size + table_offset;
+		if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 		data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
@@ -1365,8 +1374,10 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 			dest_len = get_unaligned_le32(&sblk->block_size);
 			ret = sqfs_decompress(&ctxt, datablock, &dest_len,
 					      data, table_size);
-			if (ret)
+			if (ret) {
+				printf("Errrt: block decompress failed.\n");
 				goto free_buffer;
+			}
 
 			memcpy(buf + offset + *actread, datablock, dest_len);
 			*actread += dest_len;
@@ -1388,10 +1399,12 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		goto free_buffer;
 	}
 
-	start = frag_entry.start / ctxt.cur_dev->blksz;
+	start = frag_entry.start;
+	do_div(start, ctxt.cur_dev->blksz);
 	table_size = SQFS_BLOCK_SIZE(frag_entry.size);
 	table_offset = frag_entry.start - (start * ctxt.cur_dev->blksz);
-	n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz);
+	n_blks = table_size + table_offset;
+	if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 	fragment = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
fs/squashfs/sqfs_inode.c +4 -4
index 1368f3063c..c330e32a0e 100644
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <div64.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -67,10 +68,9 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
 		u64 file_size = get_unaligned_le64(&lreg->file_size);
 		unsigned int blk_list_size;
 
-		if (fragment == 0xFFFFFFFF)
-			blk_list_size = DIV_ROUND_UP(file_size, blk_size);
-		else
-			blk_list_size = file_size / blk_size;
+		if (do_div(file_size, blk_size) && (fragment == 0xFFFFFFFF))
+		    file_size++;
+		blk_list_size = file_size;
 
 		return sizeof(*lreg) + blk_list_size * sizeof(u32);
 	}
include/configs/vocore2.h +0 -0
index 29a57ad233..dfdb8fcc04 100644

include/configs/vocore2.h line 46

Quoted 7 lines
include/configs/vocore2.h +1 -1
@@ -41,7 +41,7 @@
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS		64
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
 #define CONFIG_SYS_CBSIZE		512

Add in maintainers..

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200920/afbf3c6c/attachment.sig>
#5 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

Am Sonntag, den 20.09.2020, 21:21 -0400 schrieb Tom Rini:

Quoted 7 lines · Mauro Condarelli
Quoted 6 lines
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-

remove that file which is unrelated to this patch

Quoted 22 lines
Quoted 22 lines
 3 files changed, 34 insertions(+), 21 deletions(-)
fs/squashfs/sqfs.c +3 -1
index 15208b4dab..b49331ce93 100644
@@ -18,6 +18,8 @@
 #include <string.h>
 #include <squashfs.h>
 #include <part.h>
+#include <div64.h>
+#include <stdio.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -82,13 +84,16 @@ static int sqfs_count_tokens(const char *filename)
  */
 static int sqfs_calc_n_blks(__le64 start, __le64 end, u64 *offset)
 {
-	u64 start_, table_size;
+	u64 start_, table_size, blks;
 
Quoted 4 lines

fs/squashfs/sqfs.c static int sqfs_count_tokens(const char *filename) · line 91

Quoted 4 lines
fs/squashfs/sqfs.c +2 -1
 	table_size = le64_to_cpu(end) - le64_to_cpu(start);
-	start_ = le64_to_cpu(start) / ctxt.cur_dev->blksz;
+	start_ = le64_to_cpu(start);
+	do_div(start_, ctxt.cur_dev->blksz);

have you tried with lldiv() which returns the 64bit result? Also it would be a little cleaner:

    start_ = lldiv(le64_to_cpu(start), ctxt.cur_dev->blksz);
Quoted 6 lines

fs/squashfs/sqfs.c static int sqfs_count_tokens(const char *filename) · line 96

Quoted 6 lines
fs/squashfs/sqfs.c +3 -1
 	*offset = le64_to_cpu(start) - (start_ * ctxt.cur_dev->blksz);
 
-	return DIV_ROUND_UP(table_size + *offset, ctxt.cur_dev->blksz);
+	blks = table_size + *offset;
+	if (do_div(blks, ctxt.cur_dev->blksz)) blks++;
+	return blks;

maybe define something like this and use that instead of DIV_ROUND_UP:

    #define lldiv_round_up(n, d) lldiv((n) + (d) - 1, (d))
Quoted 145 lines
Quoted 135 lines
fs/squashfs/sqfs.c +21 -13
 }
 
 /*
@@ -109,8 +114,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	if (inode_fragment_index >= get_unaligned_le32(&sblk->fragments))
 		return -EINVAL;
 
-	start = get_unaligned_le64(&sblk->fragment_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->fragment_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->fragment_table_start,
 				  sblk->export_table_start,
 				  &table_offset);
@@ -135,7 +140,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	start_block = get_unaligned_le64(table + table_offset + block *
 					 sizeof(u64));
 
-	start = start_block / ctxt.cur_dev->blksz;
+	start = start_block;
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(cpu_to_le64(start_block),
 				  sblk->fragment_table_start, &table_offset);
 
@@ -641,8 +647,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table)
 
 	table_size = get_unaligned_le64(&sblk->directory_table_start) -
 		get_unaligned_le64(&sblk->inode_table_start);
-	start = get_unaligned_le64(&sblk->inode_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->inode_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->inode_table_start,
 				  sblk->directory_table_start, &table_offset);
 
@@ -725,8 +731,8 @@ static int sqfs_read_directory_table(unsigned char **dir_table, u32 **pos_list)
 	/* DIRECTORY TABLE */
 	table_size = get_unaligned_le64(&sblk->fragment_table_start) -
 		get_unaligned_le64(&sblk->directory_table_start);
-	start = get_unaligned_le64(&sblk->directory_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->directory_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->directory_table_start,
 				  sblk->fragment_table_start, &table_offset);
 
@@ -1158,6 +1164,7 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
 				       fentry);
 		if (ret < 0)
 			return -EINVAL;
+
 		finfo->comp = true;
 		if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
 			return -EINVAL;
@@ -1328,17 +1335,19 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		data_offset = finfo.start;
 		datablock = malloc(get_unaligned_le32(&sblk->block_size));
 		if (!datablock) {
+			printf("Error: malloc(%u) failed.\n", get_unaligned_le32(&sblk->block_size));
 			ret = -ENOMEM;
 			goto free_paths;
 		}
 	}
 
 	for (j = 0; j < datablk_count; j++) {
-		start = data_offset / ctxt.cur_dev->blksz;
+		start = data_offset;
+		do_div(start, ctxt.cur_dev->blksz);
 		table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
 		table_offset = data_offset - (start * ctxt.cur_dev->blksz);
-		n_blks = DIV_ROUND_UP(table_size + table_offset,
-				      ctxt.cur_dev->blksz);
+		n_blks = table_size + table_offset;
+		if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 		data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
@@ -1365,8 +1374,10 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 			dest_len = get_unaligned_le32(&sblk->block_size);
 			ret = sqfs_decompress(&ctxt, datablock, &dest_len,
 					      data, table_size);
-			if (ret)
+			if (ret) {
+				printf("Errrt: block decompress failed.\n");
 				goto free_buffer;
+			}
 
 			memcpy(buf + offset + *actread, datablock, dest_len);
 			*actread += dest_len;
@@ -1388,10 +1399,12 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		goto free_buffer;
 	}
 
-	start = frag_entry.start / ctxt.cur_dev->blksz;
+	start = frag_entry.start;
+	do_div(start, ctxt.cur_dev->blksz);
 	table_size = SQFS_BLOCK_SIZE(frag_entry.size);
 	table_offset = frag_entry.start - (start * ctxt.cur_dev->blksz);
-	n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz);
+	n_blks = table_size + table_offset;
+	if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 	fragment = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
fs/squashfs/sqfs_inode.c +4 -4
index 1368f3063c..c330e32a0e 100644
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <div64.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -67,10 +68,9 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
 		u64 file_size = get_unaligned_le64(&lreg->file_size);
 		unsigned int blk_list_size;
 
-		if (fragment == 0xFFFFFFFF)
-			blk_list_size = DIV_ROUND_UP(file_size, blk_size);
-		else
-			blk_list_size = file_size / blk_size;
+		if (do_div(file_size, blk_size) && (fragment == 0xFFFFFFFF))
+		    file_size++;
+		blk_list_size = file_size;
 
 		return sizeof(*lreg) + blk_list_size * sizeof(u32);
 	}
include/configs/vocore2.h +0 -0
index 29a57ad233..dfdb8fcc04 100644

include/configs/vocore2.h line 46

Quoted 7 lines
include/configs/vocore2.h +1 -1
@@ -41,7 +41,7 @@
 
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS		64
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
 #define CONFIG_SYS_CBSIZE		512

Add in maintainers..

Signature · 1 line
- Daniel
#6 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

Thanks for the review,
I'll prepare a v2 ASAP.

Quoted 9 lines · Daniel Schwierzeck

Am Sonntag, den 20.09.2020, 21:21 -0400 schrieb Tom Rini:

Quoted 7 lines · Mauro Condarelli
Quoted 6 lines
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-

remove that file which is unrelated to this patch

I will as this is fixing things just for my target and that is clearly wrong. OTOH I feel some provision should be implemented (probably at Config.in level) to ensure SquashFS has enough malloc space for its needs. What are the best practices to handle this?

Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
 3 files changed, 34 insertions(+), 21 deletions(-)
fs/squashfs/sqfs.c +3 -1
index 15208b4dab..b49331ce93 100644
@@ -18,6 +18,8 @@
 #include <string.h>
 #include <squashfs.h>
 #include <part.h>
+#include <div64.h>
+#include <stdio.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -82,13 +84,16 @@ static int sqfs_count_tokens(const char *filename)
  */
 static int sqfs_calc_n_blks(__le64 start, __le64 end, u64 *offset)
 {
-	u64 start_, table_size;
+	u64 start_, table_size, blks;
 
Quoted 8 lines
Quoted 4 lines

fs/squashfs/sqfs.c static int sqfs_count_tokens(const char *filename) · line 91

Quoted 4 lines
fs/squashfs/sqfs.c +2 -1
 	table_size = le64_to_cpu(end) - le64_to_cpu(start);
-	start_ = le64_to_cpu(start) / ctxt.cur_dev->blksz;
+	start_ = le64_to_cpu(start);
+	do_div(start_, ctxt.cur_dev->blksz);

have you tried with lldiv() which returns the 64bit result? Also it would be a little cleaner:

    start_ = lldiv(le64_to_cpu(start), ctxt.cur_dev->blksz);

I thought of that (actually my first attempt was quite similar, but I noticed that lldiv() actually uses do_div() internally and so I decided to go directly for the lower level (and presumably faster) solution.
If You (or the maintainers) feel otherwise I can revert with no problems.

Quoted 9 lines
Quoted 6 lines

fs/squashfs/sqfs.c static int sqfs_count_tokens(const char *filename) · line 96

Quoted 6 lines
fs/squashfs/sqfs.c +3 -1
 	*offset = le64_to_cpu(start) - (start_ * ctxt.cur_dev->blksz);
 
-	return DIV_ROUND_UP(table_size + *offset, ctxt.cur_dev->blksz);
+	blks = table_size + *offset;
+	if (do_div(blks, ctxt.cur_dev->blksz)) blks++;
+	return blks;

maybe define something like this and use that instead of DIV_ROUND_UP:

    #define lldiv_round_up(n, d) lldiv((n) + (d) - 1, (d))

Again: IMHO having a macro does not add much value here and using lldiv() only adds a further level of call nesting, but I'm open to switch; I would like to understand the rationale behind these requests, though.

Quoted 136 lines
Quoted 136 lines
Quoted 136 lines
fs/squashfs/sqfs.c +21 -13
 }
 
 /*
@@ -109,8 +114,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	if (inode_fragment_index >= get_unaligned_le32(&sblk->fragments))
 		return -EINVAL;
 
-	start = get_unaligned_le64(&sblk->fragment_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->fragment_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->fragment_table_start,
 				  sblk->export_table_start,
 				  &table_offset);
@@ -135,7 +140,8 @@ static int sqfs_frag_lookup(u32 inode_fragment_index,
 	start_block = get_unaligned_le64(table + table_offset + block *
 					 sizeof(u64));
 
-	start = start_block / ctxt.cur_dev->blksz;
+	start = start_block;
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(cpu_to_le64(start_block),
 				  sblk->fragment_table_start, &table_offset);
 
@@ -641,8 +647,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table)
 
 	table_size = get_unaligned_le64(&sblk->directory_table_start) -
 		get_unaligned_le64(&sblk->inode_table_start);
-	start = get_unaligned_le64(&sblk->inode_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->inode_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->inode_table_start,
 				  sblk->directory_table_start, &table_offset);
 
@@ -725,8 +731,8 @@ static int sqfs_read_directory_table(unsigned char **dir_table, u32 **pos_list)
 	/* DIRECTORY TABLE */
 	table_size = get_unaligned_le64(&sblk->fragment_table_start) -
 		get_unaligned_le64(&sblk->directory_table_start);
-	start = get_unaligned_le64(&sblk->directory_table_start) /
-		ctxt.cur_dev->blksz;
+	start = get_unaligned_le64(&sblk->directory_table_start);
+	do_div(start, ctxt.cur_dev->blksz);
 	n_blks = sqfs_calc_n_blks(sblk->directory_table_start,
 				  sblk->fragment_table_start, &table_offset);
 
@@ -1158,6 +1164,7 @@ static int sqfs_get_regfile_info(struct squashfs_reg_inode *reg,
 				       fentry);
 		if (ret < 0)
 			return -EINVAL;
+
 		finfo->comp = true;
 		if (fentry->size < 1 || fentry->start == 0x7FFFFFFF)
 			return -EINVAL;
@@ -1328,17 +1335,19 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		data_offset = finfo.start;
 		datablock = malloc(get_unaligned_le32(&sblk->block_size));
 		if (!datablock) {
+			printf("Error: malloc(%u) failed.\n", get_unaligned_le32(&sblk->block_size));
 			ret = -ENOMEM;
 			goto free_paths;
 		}
 	}
 
 	for (j = 0; j < datablk_count; j++) {
-		start = data_offset / ctxt.cur_dev->blksz;
+		start = data_offset;
+		do_div(start, ctxt.cur_dev->blksz);
 		table_size = SQFS_BLOCK_SIZE(finfo.blk_sizes[j]);
 		table_offset = data_offset - (start * ctxt.cur_dev->blksz);
-		n_blks = DIV_ROUND_UP(table_size + table_offset,
-				      ctxt.cur_dev->blksz);
+		n_blks = table_size + table_offset;
+		if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 		data_buffer = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
@@ -1365,8 +1374,10 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 			dest_len = get_unaligned_le32(&sblk->block_size);
 			ret = sqfs_decompress(&ctxt, datablock, &dest_len,
 					      data, table_size);
-			if (ret)
+			if (ret) {
+				printf("Errrt: block decompress failed.\n");
 				goto free_buffer;
+			}
 
 			memcpy(buf + offset + *actread, datablock, dest_len);
 			*actread += dest_len;
@@ -1388,10 +1399,12 @@ int sqfs_read(const char *filename, void *buf, loff_t offset, loff_t len,
 		goto free_buffer;
 	}
 
-	start = frag_entry.start / ctxt.cur_dev->blksz;
+	start = frag_entry.start;
+	do_div(start, ctxt.cur_dev->blksz);
 	table_size = SQFS_BLOCK_SIZE(frag_entry.size);
 	table_offset = frag_entry.start - (start * ctxt.cur_dev->blksz);
-	n_blks = DIV_ROUND_UP(table_size + table_offset, ctxt.cur_dev->blksz);
+	n_blks = table_size + table_offset;
+	if (do_div(n_blks, ctxt.cur_dev->blksz)) n_blks++;
 
 	fragment = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz);
 
fs/squashfs/sqfs_inode.c +4 -4
index 1368f3063c..c330e32a0e 100644
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <div64.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -67,10 +68,9 @@ int sqfs_inode_size(struct squashfs_base_inode *inode, u32 blk_size)
 		u64 file_size = get_unaligned_le64(&lreg->file_size);
 		unsigned int blk_list_size;
 
-		if (fragment == 0xFFFFFFFF)
-			blk_list_size = DIV_ROUND_UP(file_size, blk_size);
-		else
-			blk_list_size = file_size / blk_size;
+		if (do_div(file_size, blk_size) && (fragment == 0xFFFFFFFF))
+		    file_size++;
+		blk_list_size = file_size;
 
 		return sizeof(*lreg) + blk_list_size * sizeof(u32);
 	}
include/configs/vocore2.h +0 -0
index 29a57ad233..dfdb8fcc04 100644
@@ -41,7 +41,7 @@
 
Quoted 7 lines
Quoted 7 lines

include/configs/vocore2.h line 46

Quoted 6 lines
include/configs/vocore2.h +1 -1
 /* Memory usage */
 #define CONFIG_SYS_MAXARGS		64
-#define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(16 * 1024 * 1024)
 #define CONFIG_SYS_BOOTPARAMS_LEN	(128 * 1024)
 #define CONFIG_SYS_CBSIZE		512

Add in maintainers..

done ;)

I just rebased on later master (some patches did not apply cleanly). I will check again before submitting v2.

Regards
Mauro

#7 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

Quoted 12 lines · Mauro Condarelli

Thanks for the review,
I'll prepare a v2 ASAP.

Quoted 8 lines · Daniel Schwierzeck

Am Sonntag, den 20.09.2020, 21:21 -0400 schrieb Tom Rini:

Quoted 7 lines · Mauro Condarelli
Quoted 6 lines
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-
Quoted 5 lines
Quoted 1 line

remove that file which is unrelated to this patch

I will as this is fixing things just for my target and that is clearly wrong. OTOH I feel some provision should be implemented (probably at Config.in level) to ensure SquashFS has enough malloc space for its needs. What are the best practices to handle this?

I don't recall why CONFIG_SYS_MALLOC_LEN hasn't been fully moved to Kconfig right now, there may be a good reason, or it just may be hard. I don't think Kconfig logic supports something like "depends on FOO > 0x4000" so the only way is to note in the squashfs help how much space may be used for malloc in worst cases.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200923/188d920d/attachment.sig>
#8 lore raw

PATCH 3/3 Fix missing __udivdi3 in SquashFS implementation.

In reply to Mauro Condarelli

Am Mittwoch, den 23.09.2020, 20:27 +0200 schrieb Mauro Condarelli:

Quoted 48 lines

Thanks for the review,
I'll prepare a v2 ASAP.

Quoted 9 lines · Daniel Schwierzeck

Am Sonntag, den 20.09.2020, 21:21 -0400 schrieb Tom Rini:

Quoted 7 lines · Mauro Condarelli
Quoted 6 lines
---
 fs/squashfs/sqfs.c        | 45 +++++++++++++++++++++++++--------------
 fs/squashfs/sqfs_inode.c  |  8 +++----
 include/configs/vocore2.h |  2 +-

remove that file which is unrelated to this patch

I will as this is fixing things just for my target and that is clearly wrong. OTOH I feel some provision should be implemented (probably at Config.in level) to ensure SquashFS has enough malloc space for its needs. What are the best practices to handle this?

Quoted 29 lines
Quoted 22 lines
Quoted 22 lines
 3 files changed, 34 insertions(+), 21 deletions(-)
fs/squashfs/sqfs.c +3 -1
index 15208b4dab..b49331ce93 100644
@@ -18,6 +18,8 @@
 #include <string.h>
 #include <squashfs.h>
 #include <part.h>
+#include <div64.h>
+#include <stdio.h>
 
 #include "sqfs_decompressor.h"
 #include "sqfs_filesystem.h"
@@ -82,13 +84,16 @@ static int sqfs_count_tokens(const char *filename)
  */
 static int sqfs_calc_n_blks(__le64 start, __le64 end, u64 *offset)
 {
-	u64 start_, table_size;
+	u64 start_, table_size, blks;
 
Quoted 4 lines

fs/squashfs/sqfs.c static int sqfs_count_tokens(const char *filename) · line 91

Quoted 4 lines
fs/squashfs/sqfs.c +2 -1
 	table_size = le64_to_cpu(end) - le64_to_cpu(start);
-	start_ = le64_to_cpu(start) / ctxt.cur_dev->blksz;
+	start_ = le64_to_cpu(start);
+	do_div(start_, ctxt.cur_dev->blksz);

have you tried with lldiv() which returns the 64bit result? Also it would be a little cleaner:

Quoted 7 lines
Quoted 1 line
    start_ = lldiv(le64_to_cpu(start), ctxt.cur_dev->blksz);

I thought of that (actually my first attempt was quite similar, but I noticed that lldiv() actually uses do_div() internally and so I decided to go directly for the lower level (and presumably faster) solution.
If You (or the maintainers) feel otherwise I can revert with no problems.

because do_div() replaces the dividend with the division remainder and lldiv() returns the division result without modifying the dividend.

Anyway I had a look at the Linux code and other U-Boot file systems and there is a better solution. "struct blk_desc" has a member "int log2blksz" which is initialized as "desc->log2blksz = LOG2(desc-

Quoted 1 line

blksz) in blk-uclass.c. With that you can replace all divisions with

"desc->blksz" as divisor with a simple right bit shift like so:

    start_ = le64_to_cpu(start) >> ctxt.cur_dev->log2blksz;

Likewise all multiplications can be replaced with a left bit shift, e.g.:

    *offset = le64_to_cpu(start) - (start_ << ctxt.cur_dev->log2blksz);

Also the Linux code never uses DIV_ROUND_UP() for any block related calculations. So maybe all DIV_ROUND_UP() calls can be replaced with a bit shift too.

Signature · 1 line
- Daniel
#9 lore raw

cover Patches to allow running u-boot on vocore2 board

In reply to Mauro Condarelli

Am Sonntag, den 20.09.2020, 18:28 +0200 schrieb Mauro Condarelli:

Quoted 9 lines

There are two distinct things here:
- a few small fixes specific to vocore2 board.
- fixes to SquashFS to allow compilation on 32-bit architectures.

Mauro Condarelli (3):
Small fixes to reduce size and ensure correct console output. Enlarge SPL malloc area to prevent failure in lzma decompression. Fix missing __udivdi3 in SquashFS implementation.

Quoted 7 lines
 arch/mips/dts/vocore_vocore2.dts |  2 +-
 configs/vocore2_defconfig        |  2 +-
 fs/squashfs/sqfs.c               | 45 ++++++++++++++++++++------------
 fs/squashfs/sqfs_inode.c         |  8 +++---
 include/configs/vocore2.h        |  4 ++-
 5 files changed, 38 insertions(+), 23 deletions(-)

all vocore2 patches applied to u-boot-mips/fixes, thanks.

Next time please prefix the commit subjects with the subsystem you're changing e.g. "mips: vocore2: XXX" or "squashfs: XXX". I've taken all vocore2 changes and squashed them into one commit to save another patch submission round and to squeeze the fixes into v2020.10.

Signature · 1 line
- Daniel