- 21 Mar, 2016 1 commit
-
-
Jens Kuske authored
This workaround is necessary for A80, which sometimes fails at reading DACR. Signed-off-by:
Jens Kuske <jenskuske@gmail.com> Reviewed-by:
Siarhei Siamashka <siarhei.siamashka@gmail.com>
-
- 20 Mar, 2016 2 commits
-
-
Bernhard Nortmann authored
See https://github.com/linux-sunxi/sunxi-tools/issues/37 The patch was originally inspired by https://github.com/NextThingCo/sunxi-tools/commit/16386a7 and https://github.com/NextThingCo/sunxi-tools/commit/47bafaf It introduces a "--dev" (-d) option to specify the desired FEL device. This is useful if multiple target devices are connected to the same host. Signed-off-by:
Bernhard Nortmann <bernhard.nortmann@web.de> Reviewed-by:
-
Lourens Rozema authored
Closes #24. See https://groups.google.com/forum/#!topic/linux-sunxi/sEJ1eTBoCvw Tested-by:
-
- 17 Dec, 2015 3 commits
-
-
Bernhard Nortmann authored
The aw_fel_process_spl_and_uboot() was missing a free() for the file buffer. This patch also adds a proper libusb cleanup/shutdown. Signed-off-by:
-
Bernhard Nortmann authored
This patch forces relevant options to be placed at the beginning of the command line, but also makes sure that their specific order does not matter. Currently this applies to "-p" (--progress) and "-v" (--verbose). Signed-off-by:
-
Bernhard Nortmann authored
Commit d99d59c0 introduces a bug when the "spl" command is used with a file that contains a U-Boot binary. "spl" will now try to execute it, while it's not supposed to. (The command should only start the SPL.) This patch brings back the `uboot_autostart` flag, which is meant to remain `false` for the "spl" command, and gets set by "uboot" only. Signed-off-by:
-
- 16 Dec, 2015 4 commits
-
-
Bernhard Nortmann authored
This patch adds an "echo-gauge" command that is intended for use with sunxi-fel's output piped into the dialog utility. "echo-gauge" will output its string argument in a way that updates (i.e. overwrites) the prompt text that dialog displays, so it's possible to change that inbetween file transfers from sunxi-fel. Example: sunxi-fel uboot ${UBOOT} \ echo-gauge "Uploading kernel (1/2)" \ write-with-gauge 0x42000000 ${KERNEL} \ write 0x43100000 ${SCRIPT} \ echo-gauge "Uploading rootfs (2/2)" \ write-with-gauge 0x44000000 ${ROOTFS} \ | dialog --gauge "" 6 70 Signed-off-by: -
Bernhard Nortmann authored
This patch adds some additional commands, and implements corresponding progress callbacks that produce output for the 'dialog' utility: http://invisible-island.net/dialog/dialog.html The simple "*-with-gauge" just emits percentage numbers, line by line, while "*-with-xgauge" outputs extended information to update the dialog prompt. Both are meant for directly piping the output: sunxi-fel write-with-gauge <...> | dialog --gauge "FEL upload" 6 70 Signed-off-by:
-
Bernhard Nortmann authored
The two new commands both imply that a (simple) progress bar display is requested. "multi[write]" allows to upload a group of files with a single command, resulting in their transfer showing a common, 'overall' progress status. Signed-off-by:
-
Bernhard Nortmann authored
This patch moves some code out of the "write" handler, with the intention to reuse it later for similar commands. At the same time, it also discards the previous transfer rate output when using "-v", as that has become redundant with the 'progress bar' display available by "-p". Signed-off-by:
-
- 07 Dec, 2015 4 commits
-
-
Bernhard Nortmann authored
Add "--progress" option and a progress bar display for FEL transfers. This picks up on a suggestion from Alexander Kaplan and the discussion at https://groups.google.com/forum/#!topic/linux-sunxi/lz0oQBwjex0 Signed-off-by:
-
Bernhard Nortmann authored
This patch adds a boolean parameter "progress" to several functions. When set (true), it will cause usb_bulk_send() to notify the progress framework, using progress_update() to convey the current transfer status. The feature gets enabled for the "write" command, and is forced inactive in most other places, e.g. aw_fel_write_uboot_image(). Also, we specifically want the internal use of aw_fel_write() to never use it. Signed-off-by:
-
Bernhard Nortmann authored
This patch introduces a new function aw_write_buffer() to allow a better distinction between FEL write operations. aw_fel_write() is meant for "privileged" internal use, while aw_write_buffer() now represents the preferred entry point for user code like the "write", "fill" or "clear" commands. There is some deliberate code duplication here that makes sense when combined with the next patch, where the aw_usb_write() call will differ. We want aw_fel_write() to enforce no progress update/callback, while aw_write_buffer() will (optionally) support it. Signed-off-by:
-
Bernhard Nortmann authored
This patch adds two new source files that will deal with code related to progress callbacks and display. I have decided to keep this separate, as there will be many smaller routines involved, which otherwise would bloat fel.c unnecessarily. For starters, let's also move the gettime() function there. Signed-off-by:
-
- 24 Nov, 2015 3 commits
-
-
Siarhei Siamashka authored
When the CPU clock speed is set to 480 MHz by the U-Boot SPL, the performance of 'sunxi-fel write' transfers to DRAM improves from ~95 KB/s to ~510 KB/s. When the CPU clock speed is set to 1008 MHz by the U-Boot SPL, the performance of 'sunxi-fel write' transfers to DRAM improves from ~180 KB/s to ~510 KB/s. This means that the CPU is not a bottleneck for FEL transfers anymore. Further performance improvements are possible by increasing the AHB1 clock speed in the U-Boot SPL (up to something like ~900 KB/s). Signed-off-by:
Peter Korsgaard <peter@korsgaard.com>
-
Siarhei Siamashka authored
The BROM in newer SoC variants doesn't enable MMU by default anymore. So in order to benefit from e4b3da2b ("fel: Faster USB transfers via 'fel write' to DRAM"), we need to be able to enable it from the 'sunxi-fel' tool. This patch can be interpreted as simply reverting the changes done by Allwinner and bringing back the MMU support in roughly the same way as it was before. That's why the values in the hardware registers and the translation table entries replicate the A20 setup. Additionally, the code is now more defensive and introduces new "canary" checks for certain known magic values in the coprocessor registers in order to safeguard against any unpleasant surprises. MMU tuning for A80 and A64 will probably need a more sophisticated setup with a second level page table. Because both the SRAM and the BROM reside in the same 1MB section there and we need finer granularity. In other words, enabling the MMU on A80 and A64 is not supported yet. Signed-off-by:
-
Siarhei Siamashka authored
This helps to reduce code duplication if we want to read and write many different kinds of coprocessor registers. Signed-off-by:
-
- 19 Nov, 2015 2 commits
-
-
Bernhard Nortmann authored
Signed-off-by:
-
Bernhard Nortmann authored
- get rid of double includes - fix U-Boot source reference - get rid of "uboot_autostart" variable Signed-off-by:
-
- 03 Oct, 2015 3 commits
-
-
Bernhard Nortmann authored
This patch makes use of a new sunxi SPL header format, where fields for passing data to U-Boot are reserved. This allows the "fel" utility to provide specific pieces of information by setting these fields (which will be evaluated by U-Boot then). For now, we provide the memory location of the boot script file (boot.scr) this way. A suitably modified U-Boot can adjust the boot process accordingly and will auto-execute the script. Signed-off-by:
-
Bernhard Nortmann authored
Information about the SoC-specific memory layout may be required across several places in the fel utility code. To avoid having to retrieve this information repeatedly, this patch modifies the aw_fel_get_sram_info() function to cache its result (via an internal static pointer). This makes it safe to call aw_fel_get_sram_info() wherever needed, while avoiding additional aw_fel_get_version() lookups, and potential surplus "no 'soc_sram_info' data for your SoC" warnings. Signed-off-by:
-
Bernhard Nortmann authored
This patch moves retrieving the image header type into a function of its own. The idea is that fel "write" can and will also make use of this function to detect boot scripts (by IH_TYPE_SCRIPT). Signed-off-by:
-
- 13 Sep, 2015 2 commits
-
-
Bernhard Nortmann authored
With glibc 2.20 (and newer), defining _BSD_SOURCE (only) will now generate compiler warnings similar to: /usr/include/features.h:148:3: warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Wcpp] See the glibc 2.20 release notes, https://lwn.net/Articles/611162/ . This patch adds the required _DEFAULT_SOURCE. Signed-off-by:
-
Bernhard Nortmann authored
Signed-off-by:
-
- 08 Sep, 2015 3 commits
-
-
Siarhei Siamashka authored
Add a new field 'spl_addr' to the SoC description structure and adjust the code to honor it. This is needed for supporting Allwinner A80. Tested on Allwinner A20 by changing the 'spl_addr' to 0x28000 in the 'fel' tool and using a custom build of U-Boot (CONFIG_SPL_TEXT_BASE changed from 0x20 to 0x28020). Signed-off-by:
Hans de Goede <hdegoede@redhat.com>
-
Siarhei Siamashka authored
The safe area to upload and execute code via FEL may be different for different SoC variants (0x12000 for A80, 0x2000 for everything else), so we can't have it as a global compile time constant, but need need to treat it as a property of the SoC. This patch changes the code to pass the SoC info structure to a number of functions and adds a new 'scrath_addr' struct field to it. Signed-off-by:
-
Siarhei Siamashka authored
This is may be useful when adding support for new SoC variants. We want to be sure that the IRQ stack and the regular stack both reside at predictable locations in SRAM and such extra diagnostic message can confirm this. Signed-off-by:
-
- 29 Aug, 2015 2 commits
-
-
Bernhard Nortmann authored
Narrow down the scope of the "uboot_autostart" variable. The flag can be made local to main(), there's no need to keep it global. Signed-off-by:
-
Bernhard Nortmann authored
This patch is to prevent the call to aw_fel_write_uboot_image() with insufficient file size. If a user passes a boot file smaller than 32K, e.g. on "fel spl sunxi-spl.bin", the expression (size - SPL_LEN_LIMIT) would end up negative, and causes a numeric underflow when passed to aw_fel_write_uboot_image() as "size_t len". This might incorrectly let that function assume a u-boot binary was passed, when actually it isn't supposed to act on the buffer at all. Signed-off-by:
-
- 19 Aug, 2015 4 commits
-
-
Vishnu Patekar authored
Added fel spl support for H3. For H3 MMU is not enabled by BROM. This is tested on Orange Pi H3 Board. Reported-by:
Cam Hutchison <camh@xdna.net> Signed-off-by:
Vishnu Patekar <vishnupatekar0510@gmail.com> Tested-by:
-
Vishnu Patekar authored
For A83T MMU is not enabled by BROM. U-boot SPL support is not yet added for A83T. tested using A33 u-boot binary. $fel spl u-boot-sunxi-with-spl.bin U-Boot SPL 2015.10-rc1-g1a8cf6d (Aug 17 2015 - 15:14:46) DRAM:Timeout initialising DRAM. it jumped to SPL and on serial it displayed above log from SPL. I'll try to add U-boot SPL support for A83T soon. Signed-off-by:
-
Vishnu Patekar authored
Signed-off-by:
-
Vishnu Patekar authored
On allwinner SOCs A33,H3, A83T MMU is not enabled by BROM, so don't exit if MMU is not enabled by BROM and return NULL. It was reported on A33 tablet and Orange Pi H3 Board. I've tested it on A33 tablet and A83T Dev Board by allwinner. Signed-off-by:
-
- 01 Aug, 2015 1 commit
-
-
Bernhard Nortmann authored
A patch to extend the "fel spl" command to properly handle not only the SPL part of a combined u-boot-sunxi-with-spl.bin boot file, but additionally also transfer the main u-boot binary (image) contained within the second part of such files. This can simplify the boot process / steps required to get a proper FEL setup - e.g. it avoids having to select u-boot.bin vs. u-boot-dtb.bin, see e.g. http://lists.denx.de/pipermail/u-boot/2015-June/217476.html On top of that a new "fel uboot" command is introduced. As per suggestions on the mailing list, it will take such a combined (SPL + U-Boot) file and actually start U-Boot execution before the program exits. "uboot" may thus also be combined with other "write" commands to transfer additional files required for the boot (e.g. boot script, kernel, initrd). Signed-off-by:
-
- 26 Feb, 2015 6 commits
-
-
Hans de Goede authored
Signed-off-by:
-
Siarhei Siamashka authored
This is needed to have feature parity with the normal boot mode, where the L2EN bit in the CP15 Auxiliary Control Register is set by the BROM code right from the start. And if L2EN is not set, then the Linux system ends up booted with the L2 cache disabled. According to the Cortex-A8 TRM, the L2 cache is only enabled when both L2EN bit and the C bit from the CP15 Control Register c1 are set. Because the BROM does not set the C bit, this change should not affect the functionality of the FEL mode in any way. Signed-off-by:
-
Siarhei Siamashka authored
Trying to use oversized initrd files (20 MB or more) can fail with the "libusb usb_bulk_send error -1" error message. To address this problem, we can split the transfer into smaller chunks and the problem disappears. Effectively, this is a revert of the older "fel: Increase timeout to 60 seconds instead of splitting bulk transfers" commmit. Signed-off-by:
-
Siarhei Siamashka authored
By adjusting the MMU translation table before restoring it and by enabling the I-cache with branch prediction, we can improve performance. The DRAM area (0x40000000-0xC0000000) becomes write-combine mapped and the BROM code becomes mapped as cacheable memory. This is expected to be safe and should not cause any coherency problems. Transfer speed improvements: A10 : ~330 KB/s -> ~600 KB/s A13 : ~330 KB/s -> ~600 KB/s A20 : ~320 KB/s -> ~960 KB/s A31s : ~250 KB/s -> ~510 KB/s Signed-off-by:
-
Siarhei Siamashka authored
The FEL BROM code has the MMU enabled for some reason (while I-cache and D-cache are disabled). Most likely the intention was to get a somewhat better performance. Everything is mapped as TEXCB=00000 (strongly ordered), except for the 0x00000000 (SRAM) and 0xFFF00000 (BROM) sections, which are mapped as TEXCB=00100 (normal uncached memory). This becomes a problem for the A13 SoC, because it has less SRAM than the other chips. A13 stores the MMU addresses translation table at 0x8000 and uses up 16 KiB of the SRAM space there (while the A10, A20 and A31s keep the MMU table in the secure SRAM at 0x20000). And because the 'spl' command needs space for backing up the FEL stacks, it was clashing with the MMU table. The solution is simple. We just backup the addresses translation table and disable the MMU before running the SPL. And then restore it back to the original state. This fixes problems on A13. Re-enabling the MMU in the end is only necessary to avoid performance losses. For example, the transfer speed of the 'fel write' command on A20 would drop from ~320 KB/s to ~260 KB/s without MMU. Signed-off-by:
-
Siarhei Siamashka authored
This allows to measure the USB data transfer speed for performance tuning purposes. Signed-off-by:
-
