From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 31FD5C43334 for ; Sat, 9 Jul 2022 18:48:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B44F8845CA; Sat, 9 Jul 2022 20:48:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NseEJltE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10799845D9; Sat, 9 Jul 2022 20:48:42 +0200 (CEST) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9AA8B842D1 for ; Sat, 9 Jul 2022 20:48:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jbx6244@gmail.com Received: by mail-ej1-x634.google.com with SMTP id va17so2740481ejb.0 for ; Sat, 09 Jul 2022 11:48:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to:cc :content-language:content-transfer-encoding; bh=Gt+hfrqCc3VEGBjaUNKjqIybU1cXKwEnJuj/4xYFvKs=; b=NseEJltERRCt/EUWgx8LA3/ncGXuEey/IFOpRICaCXam0mFw89bWIlPlqsw1ZPeY7O dVqYRhdmxmPbCJGSYojBnOtzY1TafWkUwa1JNjO52ZHdqd0drIuMhDoJ06rwselSJBzo TPMXFSRUpYEJO5OkhRha/0vv2j/D7k/3QBQg+hiVOa55UCIOhuyJ2Z2rp1Cz+alMMj1z JelH+AyViSsW9wNsyLqFB2GE8c3AYW6DwYe+9Mhhhv9kkN0wCB8K73RJSdEoMml/f6cV 9VkV4WIB50naYLMhFm+pfEUfhZ4RYra/9V5f04DnGFLbxMU1ItvK4BS++l7fggLz0aYd K/rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:cc:content-language:content-transfer-encoding; bh=Gt+hfrqCc3VEGBjaUNKjqIybU1cXKwEnJuj/4xYFvKs=; b=vE6Pl2U5oKL+lZ3Hsijg8T6raRuE89T0Y8LLV3pE6FC4wdbvAaJ5+71eWhbS2bX8nh JNVFGpTqhkWBSFiV8UltIpxnwahcPPc/ne2YadcLCCm/y57QVKiUNuii4R5n5Ek1C5Dh KwMEltwiCG4lnhyuloRXONw2b0bipWQ5I5tU3QS/umXfushP0rHlltirkEEs8f2XgC0R OfG6HIqZEp8PPoCEXMsyOHLzCKrLAYNDVFOteFzIdvSL8Qvhl0to5ptWuzh8MVVFrZ53 +rn90jOhJsXObwoo5lNongGRrL4Ih6jyabWxPKZrE/DZv9vpWLIWznLqDx5E1fggtW/A Roww== X-Gm-Message-State: AJIora+mmmnvQ/Dr4vCc08tgzSydXNlijkXML+D4/a/bGzCDnVxiVf0J y53vot7gwfzC++aBDya6dyg= X-Google-Smtp-Source: AGRyM1tMHBur76vZi9yDHYyNrmjO1h0Uq9Bq2NpbodAd+tV4fMbpsTHLu8L9zYd2dS5Y+AuCVYVNXQ== X-Received: by 2002:a17:907:58e:b0:726:9e67:e7cc with SMTP id vw14-20020a170907058e00b007269e67e7ccmr10106750ejb.740.1657392519167; Sat, 09 Jul 2022 11:48:39 -0700 (PDT) Received: from [192.168.2.1] (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id gs5-20020a170906f18500b0072aa0d9ba93sm840412ejb.134.2022.07.09.11.48.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 09 Jul 2022 11:48:38 -0700 (PDT) Message-ID: Date: Sat, 9 Jul 2022 20:48:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 From: Johan Jonker Subject: [PATCH v2 00/11] Add Rockchip IDB device To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, xypron.glpk@gmx.de, yifeng.zhao@rock-chips.com, jon.lin@rock-chips.com, u-boot@lists.denx.de, linux-rockchip@lists.infradead.org, miquel.raynal@bootlin.com, michael@amarulasolutions.com, dario.binacchi@amarulasolutions.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Add Rockchip IDB device for U-boot. On Rockchip SoCs with a NAND as boot device the information data base (IDB) loaded by the boot ROM is stored at the beginning of several erase blocks. Rewriting NAND blocks makes them wear out, so some spare blocks and a writing strategy are required. A closed source usbplug uses block: 2,3,4,5,6 for example. Block 0 and 1 is in use for other data. For compatible reasons this device follows this approach in line with other Rockchip products and modules for now. The Rockchip boot ROM requires a particular file format for booting from NAND: It starts with 512-byte (IDB sector 0), RC4 encoded header and is aligned to NAND page size. Rockchip fills sector 1,2 and 3 here with more data structures, but that is not required by the boot ROM. It just makes it easier to identify the IDB date and version. Then 2KB pieces (4 x 512 byte sectors) of spl and tpl data aligned to the NAND page size in a fixed pattern with empty pages. Size of spl and tpl must be aligned to 2KB. Empty NAND pages/sectors not in use should fill with 0xFF padding to increase NAND durability. Create a IDB image for the flash tools below with: #### For RK30 with NAND only #### printf "RK30" > tplspl.bin dd if=u-boot-tpl.bin >> tplspl.bin truncate -s %2048 tplspl.bin truncate -s %2048 u-boot-spl.bin ./mkimage -v -n rk3066 -T rksd -d ./tplspl.bin:./u-boot-spl.bin out #### For other Rockchip SoCs with NAND #### ./mkimage -v -n rk3188 -T rksd -d ./u-boot-tpl.bin:./u-boot-spl.bin out or if more data structures for IDB sector 1, 2 (RC4) and 3 (RC4) are needed then use a custom image tool as mainline only has basic support for IDB sector 0. In order to transfer data from a host (PC) via USB existing methods are used. This driver creates an GPT EFI block driver to work with the U-boot commands "rockusb" and "ums". IDB data is inserted 'on the fly' as if it were a normal disk in blocks with 512 byte. Changing disk parameters is not allowed. The IDB device driver looks for block driver sector 64 to start with and calculates the IDB size. When the last sector is received it erases a NAND block and writes IDB sectors to NAND in a pattern. Written data is verified. If not identical that NAND erase block is freed. As last thing the remaining IDB blocks are scanned and made available for reading. Normal U-boot operation contains 2 steps: 1 - start IDB device 2 - start USB gadget (rockusb or ums) U-boot IDB commands: idb start - start IDB device idb stop - stop IDB blk device idb info - show IDB device info Host (PC) tool commands combinations that work: U-boot linux rockusb 0 idb 0 upgrade_tool pl upgrade_tool wl 64 upgrade_tool_wl_64.bin upgrade_tool rl 64 512 upgrade_tool_rl_64_512.bin upgrade_tool rd rkdeveloptool ppt rkdeveloptool wlx loader1 rkdeveloptool_wlx_loader1.bin rkdeveloptool wl 64 rkdeveloptool_wl_64.bin rkdeveloptool rl 64 512 rkdeveloptool_rl_64_512.bin rkdeveloptool rd rkflashtool w 64 512 < rkflashtool_w_64_512.bin rkflashtool r 64 512 > rkflashtool_r_64_512.bin ums 0 idb 0 dd if=ums_0_idb_0_wr.bin of=/dev/sda1 dd if=/dev/sda1 of=ums_0_idb_0_rd.bin Tested with: MK808 rk3066 Not tested: nfc type V8, V9 TODO: This is placed in the mach-rockchip directory, so we can re-use/combine the source with a usbplug or RK NAND FTL driver with no MTD frame work bloatware ;) in a Makefile. IDB header V2 Writing strategy improvement etc, etc Changed V2: remove CamelCases split patch block driver split patch optinal stop and info cmd split patch optinal sector1 info split patch optinal randomizer Johan Jonker (11): rockchip: idb: prepare IDB block device rockchip: idb: add basic functions rockchip: idb: add IDB block device rockchip: idb: add info and stop command rockchip: idb: add sector1 info rockchip: idb: add randomizer option rockchip: spl: allow more boot devices rockchip: rk3066: add Rockchip IDB block device as boot action arm: dts: rockchip: sync rk3066/rk3188 DT files from Linux arm: dts: rockchip: enable nfc node in spl for rk3066 mk808 rockchip: configs: mk808: add idb configs arch/arm/dts/rk3066a-mk808-u-boot.dtsi | 8 + arch/arm/dts/rk3066a-mk808.dts | 18 + arch/arm/dts/rk3066a.dtsi | 3 +- arch/arm/dts/rk3188-radxarock.dts | 3 +- arch/arm/dts/rk3188.dtsi | 24 +- arch/arm/dts/rk3xxx-u-boot.dtsi | 4 + arch/arm/mach-rockchip/Kconfig | 12 + arch/arm/mach-rockchip/Makefile | 1 + arch/arm/mach-rockchip/rk3066/rk3066.c | 11 + arch/arm/mach-rockchip/rockchip_idb.c | 1694 ++++++++++++++++++++++++ arch/arm/mach-rockchip/spl.c | 5 +- configs/mk808_defconfig | 4 + drivers/block/blk-uclass.c | 2 + include/blk.h | 1 + include/dm/uclass-id.h | 1 + include/efi_loader.h | 4 + lib/efi_loader/efi_device_path.c | 30 + 17 files changed, 1812 insertions(+), 13 deletions(-) create mode 100644 arch/arm/mach-rockchip/rockchip_idb.c -- 2.20.1