JFFS2: Suport norflash by mtd apis

Change-Id: Ief32e11b64c2fd97b3fad88b962964099964fabb
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

cmd: jffs2: Fix compile error

Change-Id: I1a86e94f400db9d1db79da1964472fea672e7935
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

UPSTREAM: ubifs: Use U-Boot assert() from <log.h> in UBI/UBIFS code

U-Boot already provides assert function, so it use also in ubi and ubifs code.

Change-Id: Ia88ff21d19ef155fd3e97c62f4b31bad1c8f78

UPSTREAM: ubifs: Use U-Boot assert() from <log.h> in UBI/UBIFS code

U-Boot already provides assert function, so it use also in ubi and ubifs code.

Change-Id: Ia88ff21d19ef155fd3e97c62f4b31bad1c8f78f5
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit e2e6caa01ba97bcdb82100c6b928b5743e3aae6c)

show more ...

UPSTREAM: ubifs: Fix ubifs_assert_cmt_locked()

U-Boot does not implement down_write_trylock() and its stub always returns
true that lock was acquired. Therefore ubifs_assert_cmt_locked() assert
curr

UPSTREAM: ubifs: Fix ubifs_assert_cmt_locked()

U-Boot does not implement down_write_trylock() and its stub always returns
true that lock was acquired. Therefore ubifs_assert_cmt_locked() assert
currently always fails.

Fix this issue by redefining ubifs_assert_cmt_locked() to just empty stub
as there is nothing to assert.

Change-Id: I8daa938645cd75d0eb4269ff0994163a02c3ff13
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit b4f210563e63e5d4b73e3232fd7156424533063e)

show more ...

UPSTREAM: ubifs: Fix reference count leak in ubifsumount

Original ubifs code was designed that after ubifs_umount() call it is
required to also call ubi_close_volume() which closes underlying UBI
vo

UPSTREAM: ubifs: Fix reference count leak in ubifsumount

Original ubifs code was designed that after ubifs_umount() call it is
required to also call ubi_close_volume() which closes underlying UBI
volume. But U-Boot ubifs modification have not implemented it properly
which caused that ubifsumount command contains resource leak. It can be
observed by calling simple sequence of commands:

=> ubi part mtd2
ubi0: attaching mtd2
...
=> ubifsmount ubi0
=> ubifsumount
Unmounting UBIFS volume rootfs!
=> ubi detach
ubi0 error: ubi_detach_mtd_dev: ubi0 reference count 1, destroy anyway
ubi0: detaching mtd2
ubi0: mtd2 is detached

Fix this issue by calling ubi_close_volume() and mutex_unlock() in
directly in ubifs_umount() function before freeing U-Boot's global
ubifs_sb. And remove duplicate calls of these two functions in remaining
places. Note that when ubifs_umount() is not called then during error
handling is still needed to call ubi_close_volume() and mutex_unlock.

With this change ubifsumount command does not throw that error anymore:

=> ubi part rootfs
ubi0: attaching mtd2
...
=> ubifsmount ubi0
=> ubifsumount
Unmounting UBIFS volume rootfs!
=> ubi detach
ubi0: detaching mtd2
ubi0: mtd2 is detached

Change-Id: I8f5400dbdb98374e3f5a6bce82a5f53e5ecb89bc
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 69ca709d0fb001851f443b0b744c6d65bb6c22c1)

show more ...

UPSTREAM: ubifs: Fix lockup/crash when reading files

Commit b1a14f8a1c2e ("UBIFS: Change ubifsload to not read beyond the
requested size") added optimization to do not read more bytes than it is
rea

UPSTREAM: ubifs: Fix lockup/crash when reading files

Commit b1a14f8a1c2e ("UBIFS: Change ubifsload to not read beyond the
requested size") added optimization to do not read more bytes than it is
really needed. But this commit introduced incorrect handling of the hole at
the end of file. This logic cause U-Boot to crash or lockup when trying to
read from the ubifs filesystem.

When read_block() call returns -ENOENT error (not an error, but the hole)
then dn-> structure is not filled and contain garbage. So using of dn->size
for memcpy() argument cause that U-Boot tries to copy unspecified amount of
bytes from possible unmapped memory. Which randomly cause lockup of P2020
CPU.

Fix this issue by copying UBIFS_BLOCK_SIZE bytes from read buffer when
dn->size is not available. UBIFS_BLOCK_SIZE is the size of the buffer
itself and read_block() fills buffer by zeros when it returns -ENOENT.

This patch fixes ubifsload on P2020.

Fixes: b1a14f8a1c2e ("UBIFS: Change ubifsload to not read beyond the requested size")
Change-Id: I361a8cae545d40475bb540b9ae92f4c04cce484d
Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 339f652992919be11e3f1b791515140de646a3ef)

show more ...

UPSTREAM: ubifs: Fix journal replay wrt. xattr nodes

Backport commit 1cb51a15b576 ("ubifs: Fix journal replay wrt. xattr
nodes") from the Linux Kernel, which has the following Signed-off-by
line:
Ch

UPSTREAM: ubifs: Fix journal replay wrt. xattr nodes

Backport commit 1cb51a15b576 ("ubifs: Fix journal replay wrt. xattr
nodes") from the Linux Kernel, which has the following Signed-off-by
line:
Change-Id: Ib379b76f9617aa0e75d8dd49fdc1ac7ea09f4fe5
Signed-off-by: Richard Weinberger <richard@nod.at>

For U-Boot, after comapring with the upstream commit:
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 749c6a6275a201007d7fd53de63b21cdf108eebf)
Change-Id: I1c107989ccff2e3e6f3ff7e5cb4ffe7b974cada3

show more ...

UPSTREAM: ubifs: do not decide upon uninitialized variable

Before 'if (err)' we have to initialize the variable otherwise we use a
random value from the stack.

Change-Id: I3cca8db88ae7e5f5976e52a8f

UPSTREAM: ubifs: do not decide upon uninitialized variable

Before 'if (err)' we have to initialize the variable otherwise we use a
random value from the stack.

Change-Id: I3cca8db88ae7e5f5976e52a8ffbda70a3027c032
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 81f562719e475b0e13ff7a0201cae19f8cc367fe)

show more ...

UPSTREAM: ubifs: remove useless code

By checking ubifs source code, s_instances parameter is not
used anymore. So, set this parameter and the associated source
code under __UBOOT__ compilation.

Cha

UPSTREAM: ubifs: remove useless code

By checking ubifs source code, s_instances parameter is not
used anymore. So, set this parameter and the associated source
code under __UBOOT__ compilation.

Change-Id: I0f51242a76c8de3ab258f1b5d8f75f542be176c0
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 5a08cfee3967d6e8174d7de135af1daa8e4aea00)

show more ...

UPSTREAM: fs: ubifs: Fix UBIFS decompression on 64 bit

Add local size_t variable to crypto_comp_decompress as intermediate
storage for destination length to avoid memory corruption and incorrect
res

UPSTREAM: fs: ubifs: Fix UBIFS decompression on 64 bit

Add local size_t variable to crypto_comp_decompress as intermediate
storage for destination length to avoid memory corruption and incorrect
results on 64 bit targets.

This is what linux does for the various lz compression implementations.

Change-Id: I8a2de3ff31824f0574370225240fdcf6ef76967d
Signed-off-by: Paul Davey <paul.davey@alliedtelesis.co.nz>
Cc: Heiko Schocher <hs@denx.de>
Tested-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit e4aa10ba5770fc391bf8a4b00c131353901704e7)

show more ...

UPSTREAM: fs: ubifs: Add missing newlines in super.c

I just stumbled over some cluttered UBIFS messages. It seems some
newline chars are missing in the current U-Boot UBI source.

Change-Id: I3537f8

UPSTREAM: fs: ubifs: Add missing newlines in super.c

I just stumbled over some cluttered UBIFS messages. It seems some
newline chars are missing in the current U-Boot UBI source.

Change-Id: I3537f8149a6539a889f17110a7b3b1b7ffd905f2
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 7236e24bc4366e166b9f5f5e156f7b64cdb64949)

show more ...

UPSTREAM: ubifs: Change value of mutex_is_locked()

The mutex lock and unlock functions are stubbed out and mutex_is_locked
was 0. This caused asserts to fail in ubifs code when checking that the
mu

UPSTREAM: ubifs: Change value of mutex_is_locked()

The mutex lock and unlock functions are stubbed out and mutex_is_locked
was 0. This caused asserts to fail in ubifs code when checking that the
mutex was locked. For example,

UBIFS assert failed in ubifs_change_lp at 540
UBIFS assert failed in ubifs_release_lprops at 278

Assume that the "mutex" is locked since that is the normal case when it
is checked in the ubifs code.

Change-Id: I422de1a01ee7110febbd33573aafa190d2df1d96
Signed-off-by: Bradley Bolen <bradleybolen@gmail.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 05ea83b67ed7861c1693187dbf3a2613601c1b15)

show more ...

UPSTREAM: ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd,

UPSTREAM: ubifs: Reintroduce using CONFIG_UBIFS_SILENCE_MSG

Use of CONFIG_UBIFS_SILENCE_MSG was added in
147162dac6 ("ubi: ubifs: Turn off verbose prints")

Then it was removed in
ff94bc40af ("mtd, ubi, ubifs: resync with Linux-3.14")

Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Heiko Schocher <hs@denx.de>
Change-Id: I84bf2147134ee48551a5a539f09b3202033d7ca2
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit e9951281585060a7ba9d9826e286ff3e7ed067bb)

show more ...

UPSTREAM: ubifs: no NULL check needed before free

kfree() calls free.
free() checks if the parameter is NULL.

Change-Id: I77522f68451bac8c2e5db627a65ee179cb6ab0a9
Signed-off-by: Heinrich Schuchardt

UPSTREAM: ubifs: no NULL check needed before free

kfree() calls free.
free() checks if the parameter is NULL.

Change-Id: I77522f68451bac8c2e5db627a65ee179cb6ab0a9
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 4b29975fd0f25256d8e643076a2c4c5f9de00f8f)

show more ...

UPSTREAM: mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUG

All users of this macro have been converted. Remove MTDDEBUG and
related CONFIG options.

ubifs_dbg_msg_key() is kept. It is silent unless DEB

UPSTREAM: mtd: remove MTDDEBUG() and CONFIG_MTD_DEBUG

All users of this macro have been converted. Remove MTDDEBUG and
related CONFIG options.

ubifs_dbg_msg_key() is kept. It is silent unless DEBUG is defined.

I am not touching scripts/config_whitelist.txt. The deprecated options
will be dropped by the next resync.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
(cherry picked from commit 8b7f4b9cc1f31292e5690336f529eca493df3df5)
Change-Id: Ib3182c305e6ce539ee6ac5b75e72600ef1fb0cac
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

show more ...

cmd/fs: Add 'ext4write_sparse' command

Usage:
ext4write_sparse <interface> <dev> <addr> <blk#>

Example:

=> ext4write_sparse mmc 0 0x0a200000 0x00116800

==== sparse header ===
magic:

cmd/fs: Add 'ext4write_sparse' command

Usage:
ext4write_sparse <interface> <dev> <addr> <blk#>

Example:

=> ext4write_sparse mmc 0 0x0a200000 0x00116800

==== sparse header ===
magic: 0xed26ff3a
major_version: 0x1
minor_version: 0x0
file_hdr_sz: 28
chunk_hdr_sz: 12
blk_sz: 4096
total_blks: 19968
total_chunks: 53
image_checksum: 0

=== [chunk.1]
chunk_type: RAW
chunk_sz: 2
total_sz: 8204
offset: 40
buf: 0x0a200028
lba: 0x00116800 - 0x00116810
sha256sum: 5fb865e2b12d61c696e8de1c2efbd83a2da69d385e05ab0636cb3802853e2255
=== [chunk.2]

......

=== [chunk.53]
chunk_type: FILL
chunk_sz: 1258
total_sz: 16
offset: 36020988
buf: 0x0c45a2fc
lba: 0x0013b0b0 - 0x0013d800
fill: 0x00000000

Unsparsed is 78 MiB and 0x00116800 - 0x0013d800 blocks written OK.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Icefacb17da30281584f3b56b91c0ab3176726b90

show more ...

UPSTREAM: ubifs: avoid assert failed in ubifs.c

This patch solves assert failed displayed in the console during a boot.
The root cause is that the ubifs_inode is not already allocated when
ubifs_pri

UPSTREAM: ubifs: avoid assert failed in ubifs.c

This patch solves assert failed displayed in the console during a boot.
The root cause is that the ubifs_inode is not already allocated when
ubifs_printdir and ubifs_finddir functions are called.

Trace showing the issue:
feed 'boot.scr.uimg', ino 94, new f_pos 0x17b40ece
dent->ch.sqnum '7132', creat_sqnum 3886945402880
UBIFS assert failed in ubifs_finddir at 436
INODE ALLOCATION: creat_sqnum '7129'
Found U-Boot script /boot.scr.uimg

Change-Id: Ic506a4613d8209f1a01c118c563736915ca3d975
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 87deefeccc49756ee33b5c0fb6dbe331dfdff487)

show more ...

UPSTREAM: mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit

Before printk.h was introduced and MTDDEBUG was removed,
pr_crit() was calling MTDDEBUG(), which was since then
replaced by the curre

UPSTREAM: mtd: ubi, ubifs debug: Use pr_debug instead of pr_crit

Before printk.h was introduced and MTDDEBUG was removed,
pr_crit() was calling MTDDEBUG(), which was since then
replaced by the current pr_debug().

pr_debug is more appropriate here.

Change-Id: Id553ff366acbb614f7a8adee6e8e46f79535be08
Signed-off-by: Eran Matityahu <eran.m@variscite.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 734b080e78805edbb3430a52c8c5b1aeee02bd9f)

show more ...