rockusb: modify the erase protection of UFS

The first 4MB of the user partition in UFS can also be erased.
When erasing data, the data stored by the vendor_storage can
also be erased.

Signed-off-by

rockusb: modify the erase protection of UFS

The first 4MB of the user partition in UFS can also be erased.
When erasing data, the data stored by the vendor_storage can
also be erased.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I7eafad85909c6a20c8650ea7ed82abf06632881d

show more ...

cmd: rockusb: Fix usb3 switch for multi block dev

For multi block dev, the upgrade tool support to switch
block dev, however, if switch to usb3, the current code
will do rkusb_fini() to reinitialize

cmd: rockusb: Fix usb3 switch for multi block dev

For multi block dev, the upgrade tool support to switch
block dev, however, if switch to usb3, the current code
will do rkusb_fini() to reinitialize the g_rkusb->ums,
and get the default the block dev.

Test on RK3576 EVB1 with EMMC and UFS block device.

1. Enter Maskrom.
2. Download loader.
3. Switch to EMMC via upgrade tool.
4. Switch to USB3 via upgrade tool.

We can find that after switch to usb3, the block dev
switch back to UFS, rather than the expected EMMC.

Scandev: scsi 0 m0
Bootdev: scsi 0
RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0xee4c000
|usb device is high-speed
-mmc@2a330000: 0
scandev: mmc 0 m0
RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x747c000
\rockusb switch to usb3
RKUSB: LUN 0, dev 0, hwpart 0, sector 0x0, count 0xee4c000
usb device is super-speed

With this patch, when do switch to usb3, it avoid to
call the rkusb_fini() and rkusb_init().

Change-Id: I26ae7e12e1c014c53e7c69b93f813cb5041af263
Signed-off-by: William Wu <william.wu@rock-chips.com>

show more ...

rockchip: rockusb: add erase boot for ufs

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Iaa035da0976a8c774aadab7028957560b7a7ec47

cmd: rockusb: Fix wrong BLK_MTD_CONT_WRITE input

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

cmd: rockusb: add support ufs

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Id7efa5891d49960e646fe47edc2a3ff3558428fc

cmd: rockusb: Fix null pointer when enter fastboot

Fix the following null pointer exception when enter fastboot.

Call trace:
PC: [< 00211020 >] rkusb_force_usb2_enabled+0x8/0x10 cmd/rockus

cmd: rockusb: Fix null pointer when enter fastboot

Fix the following null pointer exception when enter fastboot.

Call trace:
PC: [< 00211020 >] rkusb_force_usb2_enabled+0x8/0x10 cmd/rockusb.c:162
LR: [< 00274098 >] dwc3_uboot_init+0x220/0x2dc drivers/usb/dwc3/core.c:760

Stack:
[< 00211020 >] rkusb_force_usb2_enabled+0x8/0x10
[< 0021258c >] do_fastboot+0xa4/0x168
[< 0022eb20 >] cmd_process+0xd8/0x10c
[< 0021735c >] run_list_real+0x6fc/0x72c
[< 002174fc >] parse_stream_outer+0x170/0x67c
[< 00217a40 >] parse_file_outer+0x38/0x40
[< 0022e1cc >] cli_loop+0xc/0x10
[< 002159d8 >] main_loop+0x60/0x6c
[< 00218260 >] run_main_loop+0xc/0x10
[< 00290384 >] initcall_run_list+0x58/0x94
[< 0021847c >] board_init_r+0x20/0x24
[< 00201c00 >] relocation_return+0x4/0x0

Change-Id: Ied2393f30c3db3f6048253032f063685ac1a3d97
Signed-off-by: William Wu <william.wu@rock-chips.com>

show more ...

usb: rockusb: Add support for usb3 download

This patch improve the usb gadget drivers and the usb
dwc3 controller drivers to support rockusb usb3 download
images.

With this patch, it can support:
1

usb: rockusb: Add support for usb3 download

This patch improve the usb gadget drivers and the usb
dwc3 controller drivers to support rockusb usb3 download
images.

With this patch, it can support:
1. Maskrom usbplug usb2 switch to usb3 automatically
if the boards and the upgrade tool support usb3.

2. Loader enter usb3 automatically if the boards support usb3.

3. Force Maskrom/Loader usb fall back to usb2 if wait
for usb3 enumeration time out.

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Signed-off-by: william.wu <william.wu@rock-chips.com>
Change-Id: I9ad13fb42ae59cc9075545e22627f237f0eb1f32

show more ...

cmd: rockusb: support sata without partition table

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I2bc968d4ad203a1b13543010fe6d008959859a97

cmd: rockusb: support nvme without partition table

Add partnum ":0" to active 'allow_whole_dev' partition
search mechanism on multi storage, where there maybe not
valid partition table.

Signed-off-

cmd: rockusb: support nvme without partition table

Add partnum ":0" to active 'allow_whole_dev' partition
search mechanism on multi storage, where there maybe not
valid partition table.

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

show more ...

cmd: rockusb: fix null pointer when ctrl-c

Fix below null pointer exception when execute CTRL+C operation.

"Error" handler, esr 0xbe000011

* Reason: Exception from SError interrupt
* PC

cmd: rockusb: fix null pointer when ctrl-c

Fix below null pointer exception when execute CTRL+C operation.

"Error" handler, esr 0xbe000011

* Reason: Exception from SError interrupt
* PC = 00000000002831b8
* LR = 00000000002848a8
* SP = 00000000edbf94d0
* ESR_EL2 = 00000000be000011
* Reloc Off = 00000000efcdb000

[...]

Call trace:
PC: [< 002831b8 >]
LR: [< 002848a8 >]

Stack:
[< 002831b8 >]
[< 00284abc >]
[< 0020f740 >]
[< 002281dc >]
[< 00216410 >]
[< 002165b0 >]
[< 00216af4 >]
[< 00227888 >]
[...]

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I379d0f7be3582b051bb38005592ee505e25b7acc

show more ...

cmd: rockusb: convert return vlaue from block layer

Due to block layer return 0 represent error, so convert it to
negative vlaue to ensure that UMS can check status correctly.

Change-Id: I5faf3d50c

cmd: rockusb: convert return vlaue from block layer

Due to block layer return 0 represent error, so convert it to
negative vlaue to ensure that UMS can check status correctly.

Change-Id: I5faf3d50c19ae85f7ea05cdc57c372983e29e137
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

show more ...

cmd: rockusb: reboot to boot ROM rockusb while using slc nand

The rockusb in u-boot could not support BLK_MTD_NAND and
BLK_MTD_SPI_NAND, need reboot to boot ROM.

Signed-off-by: Yifeng Zhao <yifeng.

cmd: rockusb: reboot to boot ROM rockusb while using slc nand

The rockusb in u-boot could not support BLK_MTD_NAND and
BLK_MTD_SPI_NAND, need reboot to boot ROM.

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I16d9f25d84322c9752e2e62451cd7b8c0aa16f02
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>

show more ...

cmd: rockusb: Add block continue write flag

1.It's good for Nand devices P/E align
2.But actually 0x200 sector(USB limit) is aligned with Nand flash block size

Change-Id: I69510161c32e15ee739c99d36

cmd: rockusb: Add block continue write flag

1.It's good for Nand devices P/E align
2.But actually 0x200 sector(USB limit) is aligned with Nand flash block size

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

show more ...

cmd: rockusb: import U_BOOT_CMD_ALWAYS

rockusb command is required for usbplug feature in the furture.

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

cmd: rockusb: import U_BOOT_CMD_ALWAYS

rockusb command is required for usbplug feature in the furture.

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

show more ...

Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: gadget: Do not call board_usb_xxx() directly in USB gadget drivers

Add 2 functions to wrap the calls to board_usb_init() and
board_usb_cleanup().
This is a preparatory work for DM sup

UPSTREAM: usb: gadget: Do not call board_usb_xxx() directly in USB gadget drivers

Add 2 functions to wrap the calls to board_usb_init() and
board_usb_cleanup().
This is a preparatory work for DM support for UDC drivers (DM_USB_GADGET).

Conflicts:
cmd/fastboot.c
cmd/rockusb.c
cmd/usb_mass_storage.c

Change-Id: I2b3a567d9dff75a03176d76d9fd9775cd8a0792e
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a06955ae1ef2a942f18025d4fefceea2c638a76f)

show more ...

Merge branch 'next-dev' into thunder-boot

cmd: rockusb: forbid to flash mmc 1(sdcard)

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

cmd: rockusb: fix usb serial number bug

Some special characters will be treated as a path in windows environment,
such as '\\' and '/'. If the usb upload its serial number with these
special charact

cmd: rockusb: fix usb serial number bug

Some special characters will be treated as a path in windows environment,
such as '\\' and '/'. If the usb upload its serial number with these
special characters, the usb drive will unwork. So use '_' to replace them.

Change-Id: Ic249316f2b03b0dcb73680078f122e23003e6e3d
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

show more ...

usb: rockusb: Forbid data beyond 32MB reading

Simply return magic char if one is trying to read data beyond 32MB.

Fixes: 628c827 ("usb: rockusb: forbid reading data beyond addr 32MB")

Change-Id: I

usb: rockusb: Forbid data beyond 32MB reading

Simply return magic char if one is trying to read data beyond 32MB.

Fixes: 628c827 ("usb: rockusb: forbid reading data beyond addr 32MB")

Change-Id: If2cdf05dbf9d6dcdd4cf8f9605ab84480fbca32d
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>

show more ...

usb: rockusb: forbid reading data beyond addr 32MB

Forbid reading data beyong addr 32MB to protect user data & firmware. Excess
partial is filled with 0xcc. The addr 32MB is quoted from pre-loader.

usb: rockusb: forbid reading data beyond addr 32MB

Forbid reading data beyong addr 32MB to protect user data & firmware. Excess
partial is filled with 0xcc. The addr 32MB is quoted from pre-loader.

Change-Id: I96f4fb3bb0d88a309fef20650863011cd9f0dfd9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

show more ...

rockush: add serialnumber to usb_device_descriptor

Change-Id: I498be22dd73ffa8e8844bd9ceedb294b5bba72ce
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>

treewide: replace with error() with pr_err()

U-Boot widely uses error() as a bit noisier variant of printf().

This macro causes name conflict with the following line in
include/linux/compiler-gcc.h

treewide: replace with error() with pr_err()

U-Boot widely uses error() as a bit noisier variant of printf().

This macro causes name conflict with the following line in
include/linux/compiler-gcc.h:

# define __compiletime_error(message) __attribute__((error(message)))

This prevents us from using __compiletime_error(), and makes it
difficult to fully sync BUILD_BUG macros with Linux. (Notice
Linux's BUILD_BUG_ON_MSG is implemented by using compiletime_assert().)

Let's convert error() into now treewide-available pr_err().

Done with the help of Coccinelle, excluing tools/ directory.

The semantic patch I used is as follows:

// <smpl>
@@@@
-error
+pr_err
(...)
// </smpl>

Change-Id: I921807c1770d36a91e692c48ab477558bb2ed0b8
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Re-run Coccinelle]
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 9b643e312d528f291966c1f30b0d90bf3b1d43dc)

show more ...

cmd: rockusb: fix upgrade failed when gpt partitions exist

We found rockusb upgraded failed when there had gpt partitions in
system caused by total sectors checking, this change expose all mmc
parti

cmd: rockusb: fix upgrade failed when gpt partitions exist

We found rockusb upgraded failed when there had gpt partitions in
system caused by total sectors checking, this change expose all mmc
partitions for rockusb command.

Change-Id: I8847c3c7885d17d47189c55765f97abb4965e8b4
Reported-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

show more ...

cmd: rockusb: add rockusb command support

This patch add a new rockusb command support.

Rockusb command provides a way to upgrade firmware for Rockchip SoC
based devices, its design make use of USB

cmd: rockusb: add rockusb command support

This patch add a new rockusb command support.

Rockusb command provides a way to upgrade firmware for Rockchip SoC
based devices, its design make use of USB Bulk-Only Transport based
on USB Mass Storage framework.

Change-Id: Idb04c62a8f6fb7ba84641bd4ee00f67920a7cfc8
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

show more ...