January 2015 - U-Boot

[U-Boot] [PATCH v3 1/2] Errata/ARM57: Add basic constructs to handle and apply A57 specific erratas
by Bhupesh Sharma 22 Jan '15

22 Jan '15

This patch adds basic constructs in the ARMv8 u-boot code to handle and apply Cortex-A57 specific erratas. As and example, the framework showcases how erratas 833069, 826974 and 828024 can be handled and applied. Later on this framework can be extended to include other erratas. Signed-off-by: Bhupesh Sharma <bhupesh.sharma(a)freescale.com> --- Changes from v2: - Addressed comments regarding incorrect handling of bl and ret sequences. - Reorganized the code to be more readable. Changes from v1: - Addressed Yorks' comments about x29 corruption. arch/arm/cpu/armv8/start.S | 46 ++++++++++++++++++++++++++++++++++++++++++ arch/arm/include/asm/macro.h | 21 +++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 4b11aa4..7cf799a 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -67,6 +67,9 @@ reset: msr cpacr_el1, x0 /* Enable FP/SIMD */ 0: + /* Apply ARM core specific erratas */ + bl apply_core_errata + /* * Cache/BPB/TLB Invalidate * i-cache is invalidated before enabled in icache_enable() @@ -97,6 +100,49 @@ master_cpu: /*-----------------------------------------------------------------------*/ +WEAK(apply_core_errata) + + mov x29, lr /* Save LR */ + /* For now, we support Cortex-A57 specific errata only */ + + /* Check if we are running on a Cortex-A57 core */ + branch_if_a57_core x0, apply_a57_core_errata + b 0f + +apply_a57_core_errata: + +#ifdef CONFIG_ARM_ERRATA_828024 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* Disable non-allocate hint of w-b-n-a memory type */ + mov x0, #0x1 << 49 + /* Disable write streaming no L1-allocate threshold */ + mov x0, #0x3 << 25 + /* Disable write streaming no-allocate threshold */ + mov x0, #0x3 << 27 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + +#ifdef CONFIG_ARM_ERRATA_826974 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* Disable speculative load execution ahead of a DMB */ + mov x0, #0x1 << 59 + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif + +#ifdef CONFIG_ARM_ERRATA_833069 + mrs x0, S3_1_c15_c2_0 /* cpuactlr_el1 */ + /* Disable Enable Invalidates of BTB bit */ + and x0, x0, #0xE + msr S3_1_c15_c2_0, x0 /* cpuactlr_el1 */ +#endif +0: + mov lr, x29 /* Restore LR */ + + ret +ENDPROC(apply_core_errata) + +/*-----------------------------------------------------------------------*/ + WEAK(lowlevel_init) mov x29, lr /* Save LR */ diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h index 1c8c425..44f883d 100644 --- a/arch/arm/include/asm/macro.h +++ b/arch/arm/include/asm/macro.h @@ -74,6 +74,27 @@ lr .req x30 .endm /* + * Branch if current processor is a Cortex-A57 core. + */ +.macro branch_if_a57_core, xreg, a57_label + mrs \xreg, midr_el1 + lsr \xreg, \xreg, #4 + and \xreg, \xreg, #0x00000FFF + cmp \xreg, #0xD07 /* Cortex-A57 MPCore processor. */ + b.eq \a57_label +.endm + +/* + * Branch if current processor is a Cortex-A53 core. + */ +.macro branch_if_a53_core, xreg, a53_label + mrs \xreg, midr_el1 + lsr \xreg, \xreg, #4 + cmp \xreg, #0xD03 /* Cortex-A53 MPCore processor. */ + b.eq \a53_label +.endm + +/* * Branch if current processor is a slave, * choose processor with all zero affinity value as the master. */ -- 1.7.9.5

2 2

[U-Boot] [PATCH 0/2] select default commands in Kconfig
by Alexey Brodkin 22 Jan '15

22 Jan '15

Now when we may select commands via menuconfig let's adjust default settings with "config_cmd_default.h". As the next step we may get rid of "config_cmd_default.h" inclusion in "include/configs/*.h" and "config_cmd_default.h" itself. But while "config_cmd_default.h" is still there we need to work-around compile-time warnings. Alexey Brodkin (2): common: mark commands as default to match "config_cmd_default.h" config_cmd_default.h: wrap each definition in "ifndef" common/Kconfig | 19 +++++++++++++++++++ include/config_cmd_default.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) -- 2.1.0

4 23

[U-Boot] Announcing easy Linux installation on Allwinner devices for non-geek users
by Siarhei Siamashka 22 Jan '15

22 Jan '15

Hello, This is a somewhat long e-mail. 1. The problem 2. A possible solution 3. Relocatable SD card 4. NAND 5. Support more devices! 6. Reliability tests 7. FEL mode installer application 8. A31+ support 9. Summary ===================================================================== == 1. The problem ===================================================================== First of all, let's see what is the difference between various Allwinner boards/devices and the Raspberry Pi (which is considered by many as a role model of being user friendly and easy to use). Raspberry Pi offers only a few hardware variants with minor differences. And Raspberry Pi users are familiar with the concept of downloading SD card images with Raspbian distro and writing them to the SD card (there are tools to easily do this even in Windows). This works as a way to quickly get the system up and running on their devices. And this is the skill that they already have and expect to be applicable to other devices. On the other hand, http://linux-sunxi.org/Category:Devices lists 124 pages dedicated to different Allwinner based devices at the moment. Most of the Allwinner based devices have a HDMI connector and are able to run a "desktop" GNU/Linux system with a big desktop monitor just like the Raspberry Pi. Many Allwinner devices have USB host ports. And the ones which don't, are at least equipped with USB OTG. While definitely not prefect, USB OTG is still suitable for a "desktop" system when used with something like http://linux-sunxi.org/USB_OTG_Charging_Hub And here we have a problem. The linux-sunxi wiki contains a lot of useful information about the hardware and reasonably detailed instructions about compiling the u-boot and the kernel for each of the devices. But that's not what the non-geek users want. The non-geek users expect to find SD card images for their devices, just like this is handled for the Raspberry Pi. What happens if non-geek users do not find the right SD card images for their devices? Do they follow the instructions to compile the u-boot and the kernel themselves? Of course not. The users just pick some random SD card image, which "seems" to be likely compatible. That's why they are trying Cubieboard SD card images on random tablets or other devboards. This rarely ends up well. Want an example? Here it is: https://www.mail-archive.com/linux-sunxi@googlegroups.com/msg08343.html Also have a look at http://olimex.wordpress.com/2014/10/27/a20-olinuxino-lime2-review-and-updat… for a nice warning message "EDIT: Something important! Debian and Android images for LIME and LIME2 are different because of the memory and Gigabit ethernet, so if you have LIME download the images for LIME if you have LIME2 download the images for LIME2!!!". And check the discussion in comments about Cubian, Bananian and other board specific distributions. Surprisingly, compiling u-boot just happens to be rather difficult for non-geeks. Geeks are of course perfectly fine with the nice and detailed instructions, which are readily available: http://lists.denx.de/pipermail/u-boot/2014-December/199351.html ===================================================================== == 2. A possible solution ===================================================================== While working on DRAM controller bugfixes for Allwinner A10/A13/A20, it was discovered that, among other things, DRAM bus width and density autodetection can be implemented: http://lists.denx.de/pipermail/u-boot/2014-July/183981.html This alone provides an obvious opportunity to use the same u-boot binary on multiple devices even if they use different DRAM size/configuration. And the natural evolution of this is the support of Allwinner A10/A13/A20 SoC in the same u-boot binary by just doing runtime SoC type detection: http://lists.denx.de/pipermail/u-boot/2014-August/185218.html This was a cool demo, but having only the u-boot prompt on the serial console and the ability to boot from the SD card is not something that can immediately help non-geek users. Now there is an important thing to consider. The same u-boot binary can boot on different Allwinner devices and initialize DRAM successfully. But what about the other peripherals? Some of the peripherals strictly need configuration parameters, which can't be automatically detected at runtime in any way (LCD displays for example). So what is the safe subset of hardware, which is universally usable in generic u-boot binaries? Basically, we can rely on the assumption that everything that is used by BROM, can be safely autodetected and used by the universal u-boot binaries too. For example, the UART serial console is not really used by BROM, and this was a kind of hack in the previous demo. At that time it looked like the serial console could be configured correctly according to some heuristic rules. However later it turned out that the heuristics does not really work on some A13 devices and they may have mutually incompatible UART configurations: https://www.mail-archive.com/linux-sunxi@googlegroups.com/msg07057.html This particular problem just confirms the general rule about relying only on what is also used by BROM. Oh, and some functionality is also provided by dedicated SoC pins, which are strictly used only for a single purpose and can't be re-configured for doing anything else. This can be safely used too. Anyway, the really missing part was the user friendly output and user friendly input for generic u-boot binaries. HDMI is widely used in Allwinner hardware and it supports autoconfiguration. USB host ports use dedicated pins and only enabling/disabling power can be device specific. The missing USB power can be solved by using a powered USB hub, which is not very convenient, but still a workable solution. After the initial discussion and planning on the IRC, Luc Verhaegen stepped in to implement the video driver for u-boot, together with simplefb support for the linux kernel: http://lists.denx.de/pipermail/u-boot/2014-August/185193.html And Roman Byshko stepped in to implement the USB EHCI support: http://lists.denx.de/pipermail/u-boot/2014-July/183349.html Many thanks to them for spearheading the development of these important features! And of course, Hans de Goede did a great job bugfixing and further improving this code, probably investing even more efforts than the initial contributors. Not to mention the participation in lengthy simplefb political battles, which looked really scary and discouraging, but ended up well. With all these features in place, now we can do something like this: https://github.com/ssvb/sunxi-bootsetup/releases/tag/20141215-sunxi-bootset… It is a demo of a universal SD card image, which should be bootable on any Allwinner A10/A10s/A20 device. With an installer of u-boot v2015.01-rc3 as the initial demo simple payload. By using a HDMI monitor for output and a USB keyboard or FEL button for input, it offers a menu based user interface. The menu allows to select the exact type of the user's Allwinner device and install the right bootloader for it. In principle, even now it is usable as a base for the SD card distro image. Maybe with http://www.berryterminal.com/doku.php/berryboot chained as the next installation stage. There is of course a huge room for improvements, which are yet to be done. Some of the potential improvements are listed below. ===================================================================== == 3. Relocatable SD card ===================================================================== Maybe not every user really needs a full-fledged bootloader, so a basic device independent bootloader with just SD card support and HDMI can be probably used not only for the initial setup of the hardware type, but kept indefinitely for booting the linux kernel too. Naturally, in order to get good performance, the DRAM parameters need to be patched into the SPL, replacing the generic failsafe ones. The DRAM parameters can (and should) be tied to the unique chip ID: http://linux-sunxi.org/SID_Register_Guide So that if anyone tries to move the SD card to a different Allwinner device, this situation can be detected and the menu with the device type selection can be shown again on the HDMI monitor instead of failing in a non-obvious way. Storing SID values and DRAM settings for more than one device is also an option, so repeatedly swapping between two devices will trigger the device type selection menu activation only once for each device. ===================================================================== == 4. NAND ===================================================================== NAND is the hardware, which is supported by BROM. Which means that it should be usable in a generic way by the universal device independent u-boot binary. NAND is a perfect place to store the device specific information. So that the user can avoid the annoying device type selection choices. ===================================================================== == 5. Support more devices! ===================================================================== The number of supported Allwinner devices in u-boot v2015.01 is really small. A few more devices are being added for v2015.04 While the progress is steady, I'm not convinced that the support for all the 100+ Allwinner devices can be added in a reasonable time frame. The owners of some these devices are non-geeks and will not be able to submit patches to u-boot and the linux kernel on their own, even if provided with detailed instructions. This process just does not scale. Moreover, it is not very nice to force the users to master a useless skill, such as FEX knowledge. So I see the automatic conversion as the only reasonable solution. Yes, something like this already supposedly exits: https://github.com/mripard/sunxi-babelfish I don't know how much progress has the 'sunxi-babelfish' project made so far (and to be honest, even did not try it). But in my opinion it has some fatal deficiencies in the design, based on just reading its README: 1. Implemented in the C language, while scripting languages are orders of magnitude more suitable for such task and allow much faster development. 2. This approach does not look very testable/debuggable. 3. It apparently does not help mainlining. The output of the conversion does not look like it is intended to be used as a template for the DTS file submission to the mainline kernel. So the right solution in my opinion is a set of scripts for the sunxi-boards repository. The scripts need to parse the FEX files, which are conveniently already collected in sunxi-boards. They need to support different FEX dialects as input (this is really important!) and 3 types of output: 1. The defconfigs for u-boot 2. The DTS files for the linux kernel 3. The FEX file in a dialect, which is compatible with the sunxi-3.4 kernel The type of the FEX dialect can be derived from the soc-specific directory names in the sunxi-boards repository. Just to get an idea of how this could possibly work, one may look at http://linux-sunxi.org/index.php?title=LCD&oldid=12858 These are the results of automatic conversion of FEX into the LCD parameters for u-boot. The manual work needs to be reduced as much as possible. ===================================================================== == 6. Reliability tests ===================================================================== The problem is explained in http://linux-sunxi.org/Hardware_Reliability_Tests These tests just need to be added as part of the installation process. Maybe also do speed grading of the CPU and DRAM to store this information for use by cpufreq and DRAM init. The undervolting/overclocking functionality can be also provided. Because some users are trying overclocking regardless of any warnings, it's better to provide at least some safety parachute to ensure that they don't hurt themselves. ===================================================================== == 7. FEL mode installer application ===================================================================== Instead of booting from the SD card (which does not require the desktop PC), the installation can be done in FEL mode by running a special application on the desktop PC. Other than this, a lot of functionality can be shared between these two installation methods. This feature is critical for the devices without HDMI, such A13 and A23. ===================================================================== == 8. A31+ support ===================================================================== The current demo only supports A10, A10s and A20. Naturally, A31 support is also very much desired. ===================================================================== == 9. Summary ===================================================================== Here is the demo, please try it and provide feedback: https://github.com/ssvb/sunxi-bootsetup/releases/tag/20141215-sunxi-bootset… This demo may be already fully usable to provide device independent SD card images with Linux distributions for Allwinner devices (maybe with some minor tweaks). If you are maintaining one of these Cubian, Bananian or the other pre-made SD card images, it is possible to extend them to support more devices. Feel free to ask if you need some help. This is not a finished work, more improvements are coming. And this is posted to the mainline u-boot mailing list, because I want to see some essential features implemented in the mainline u-boot. Forking is definitely not the goal. The key assumption about the device independent u-boot binaries: Anything that is supported by BROM, can be autoconfigured and used by the generic device independent u-boot binaries too. The key assumption about FEX files conversion: The FEX files originate from Android devices, do work on Android devices and allow to use all the hardware properly, so all the necessary information is available for conversion. But we need to be aware of mutually incompatible FEX dialects used by different SoC generations and handle them gracefully. Thanks for reading and reaching the end of this e-mail. Special thanks to Luc Verhaegen, Roman Byshko and Hans de Goede for their work on u-boot. -- Best regards, Siarhei Siamashka

6 6

[U-Boot] [PATCH] sunxi: Convert sun7i boards to use auto dram configuration
by Hans de Goede 22 Jan '15

22 Jan '15

Currently we've separate detailed dram settings for all sun7i boards, this moves them over to using auto dram configuration so that we can get rid of all the per board dram_foo.c files. This has been tested on a A20-Olinuxino-Lime, A20-Olinuxino_MICRO, Bananapi, Bananapro, Cubieboard2, Cubietruck, Mele_M3 and a Linksprite_pcDuino3. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/Makefile | 12 +----------- board/sunxi/dram_a20_olinuxino_l.c | 31 ------------------------------- board/sunxi/dram_a20_olinuxino_l2.c | 31 ------------------------------- board/sunxi/dram_cubieboard2.c | 31 ------------------------------- board/sunxi/dram_cubietruck.c | 31 ------------------------------- board/sunxi/dram_linksprite_pcduino3.c | 31 ------------------------------- board/sunxi/dram_sun7i_384_1024_iow16.c | 31 ------------------------------- configs/A20-OLinuXino-Lime2_defconfig | 3 +++ configs/A20-OLinuXino-Lime_defconfig | 3 +++ configs/A20-OLinuXino_MICRO_defconfig | 3 +++ configs/Bananapi_defconfig | 3 +++ configs/Bananapro_defconfig | 3 +++ configs/Cubieboard2_defconfig | 3 +++ configs/Cubietruck_defconfig | 3 +++ configs/Linksprite_pcDuino3_defconfig | 3 +++ configs/Linksprite_pcDuino3_fdt_defconfig | 3 +++ configs/MSI_Primo73_defconfig | 3 +++ configs/Mele_M3_defconfig | 3 +++ 18 files changed, 34 insertions(+), 197 deletions(-) delete mode 100644 board/sunxi/dram_a20_olinuxino_l.c delete mode 100644 board/sunxi/dram_a20_olinuxino_l2.c delete mode 100644 board/sunxi/dram_cubieboard2.c delete mode 100644 board/sunxi/dram_cubietruck.c delete mode 100644 board/sunxi/dram_linksprite_pcduino3.c delete mode 100644 board/sunxi/dram_sun7i_384_1024_iow16.c diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index 0522f3c..71edb83 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -12,21 +12,11 @@ obj-y += board.o obj-$(CONFIG_SUNXI_GMAC) += gmac.o obj-$(CONFIG_SUNXI_AHCI) += ahci.o obj-$(CONFIG_MACH_SUN4I) += dram_sun4i_auto.o +obj-$(CONFIG_MACH_SUN7I) += dram_sun5i_auto.o obj-$(CONFIG_TARGET_A10S_OLINUXINO_M) += dram_a10s_olinuxino_m.o obj-$(CONFIG_TARGET_A13_OLINUXINO) += dram_a13_olinuxino.o obj-$(CONFIG_TARGET_A13_OLINUXINOM) += dram_a13_oli_micro.o -obj-$(CONFIG_TARGET_A20_OLINUXINO_L) += dram_a20_olinuxino_l.o -obj-$(CONFIG_TARGET_A20_OLINUXINO_L2) += dram_a20_olinuxino_l2.o -obj-$(CONFIG_TARGET_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o # This is not a typo, uses the same mem settings as the a10s-olinuxino-m obj-$(CONFIG_TARGET_AUXTEK_T004) += dram_a10s_olinuxino_m.o -obj-$(CONFIG_TARGET_BANANAPI) += dram_bananapi.o -obj-$(CONFIG_TARGET_BANANAPRO) += dram_bananapi.o -obj-$(CONFIG_TARGET_CUBIEBOARD2) += dram_cubieboard2.o -obj-$(CONFIG_TARGET_CUBIETRUCK) += dram_cubietruck.o -obj-$(CONFIG_TARGET_I12_TVBOX) += dram_sun5i_auto.o -obj-$(CONFIG_TARGET_MELE_M3) += dram_sun7i_384_1024_iow16.o obj-$(CONFIG_TARGET_MK802_A10S) += dram_sun5i_auto.o -obj-$(CONFIG_TARGET_MSI_PRIMO73) += dram_sun7i_384_1024_iow16.o -obj-$(CONFIG_TARGET_PCDUINO3) += dram_linksprite_pcduino3.o obj-$(CONFIG_TARGET_R7DONGLE) += dram_r7dongle.o diff --git a/board/sunxi/dram_a20_olinuxino_l.c b/board/sunxi/dram_a20_olinuxino_l.c deleted file mode 100644 index 2c74999..0000000 --- a/board/sunxi/dram_a20_olinuxino_l.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include "common.h" -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 480, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 16, - .bus_width = 16, - .cas = 9, - .zq = 0x7f, - .odt_en = 0, - .size = 512, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0, - .tpr4 = 0, - .tpr5 = 0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/board/sunxi/dram_a20_olinuxino_l2.c b/board/sunxi/dram_a20_olinuxino_l2.c deleted file mode 100644 index 2115d37..0000000 --- a/board/sunxi/dram_a20_olinuxino_l2.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include <common.h> -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 480, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 16, - .bus_width = 32, - .cas = 9, - .zq = 0x7f, - .odt_en = 0, - .size = 1024, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0, - .tpr4 = 0, - .tpr5 = 0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/board/sunxi/dram_cubieboard2.c b/board/sunxi/dram_cubieboard2.c deleted file mode 100644 index 9e75367..0000000 --- a/board/sunxi/dram_cubieboard2.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include <common.h> -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 480, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 16, - .bus_width = 32, - .cas = 9, - .zq = 0x7f, - .odt_en = 0, - .size = 1024, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0x0, - .tpr4 = 0x1, - .tpr5 = 0x0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0x0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/board/sunxi/dram_cubietruck.c b/board/sunxi/dram_cubietruck.c deleted file mode 100644 index fbcd687..0000000 --- a/board/sunxi/dram_cubietruck.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include <common.h> -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 432, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 8, - .bus_width = 32, - .cas = 9, - .zq = 0x7f, - .odt_en = 0, - .size = 2048, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0x0, - .tpr4 = 0x1, - .tpr5 = 0x0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0x0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/board/sunxi/dram_linksprite_pcduino3.c b/board/sunxi/dram_linksprite_pcduino3.c deleted file mode 100644 index 9cc6e19..0000000 --- a/board/sunxi/dram_linksprite_pcduino3.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include <common.h> -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 480, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 16, - .bus_width = 32, - .cas = 9, - .zq = 0x7a, - .odt_en = 0, - .size = 1024, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0, - .tpr4 = 0, - .tpr5 = 0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0x0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/board/sunxi/dram_sun7i_384_1024_iow16.c b/board/sunxi/dram_sun7i_384_1024_iow16.c deleted file mode 100644 index 04e4b1e..0000000 --- a/board/sunxi/dram_sun7i_384_1024_iow16.c +++ /dev/null @@ -1,31 +0,0 @@ -/* this file is generated, don't edit it yourself */ - -#include "common.h" -#include <asm/arch/dram.h> - -static struct dram_para dram_para = { - .clock = 384, - .type = 3, - .rank_num = 1, - .density = 4096, - .io_width = 16, - .bus_width = 32, - .cas = 9, - .zq = 0x7f, - .odt_en = 0, - .size = 1024, - .tpr0 = 0x42d899b7, - .tpr1 = 0xa090, - .tpr2 = 0x22a00, - .tpr3 = 0, - .tpr4 = 0, - .tpr5 = 0, - .emr1 = 0x4, - .emr2 = 0x10, - .emr3 = 0, -}; - -unsigned long sunxi_dram_init(void) -{ - return dramc_init(&dram_para); -} diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index f80b98a..17fd19d 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_A20_OLINUXINO_L2=y ++S:CONFIG_DRAM_CLK=480 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig index d9e66b7..c8243a4 100644 --- a/configs/A20-OLinuXino-Lime_defconfig +++ b/configs/A20-OLinuXino-Lime_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_A20_OLINUXINO_L=y ++S:CONFIG_DRAM_CLK=480 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig index 1c5a6f7..ac94c79 100644 --- a/configs/A20-OLinuXino_MICRO_defconfig +++ b/configs/A20-OLinuXino_MICRO_defconfig @@ -9,3 +9,6 @@ CONFIG_VIDEO_VGA=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_A20_OLINUXINO_M=y ++S:CONFIG_DRAM_CLK=384 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig index 196f682..d94e08e 100644 --- a/configs/Bananapi_defconfig +++ b/configs/Bananapi_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-bananapi.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_BANANAPI=y ++S:CONFIG_DRAM_CLK=432 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig index 7f9ce13..02e4f3e 100644 --- a/configs/Bananapro_defconfig +++ b/configs/Bananapro_defconfig @@ -7,3 +7,6 @@ CONFIG_USB2_VBUS_PIN="PH1" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_BANANAPRO=y ++S:CONFIG_DRAM_CLK=432 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig index 7e7a1ca..ef5b43a 100644 --- a/configs/Cubieboard2_defconfig +++ b/configs/Cubieboard2_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_CUBIEBOARD2=y ++S:CONFIG_DRAM_CLK=480 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index bc44410..f51c491 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -6,3 +6,6 @@ CONFIG_VIDEO_VGA=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_CUBIETRUCK=y ++S:CONFIG_DRAM_CLK=432 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig index a26ff0a..64e01c8 100644 --- a/configs/Linksprite_pcDuino3_defconfig +++ b/configs/Linksprite_pcDuino3_defconfig @@ -5,3 +5,6 @@ CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb" +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_PCDUINO3=y ++S:CONFIG_DRAM_CLK=480 ++S:CONFIG_DRAM_ZQ=122 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Linksprite_pcDuino3_fdt_defconfig b/configs/Linksprite_pcDuino3_fdt_defconfig index a33f3a7..49718c7 100644 --- a/configs/Linksprite_pcDuino3_fdt_defconfig +++ b/configs/Linksprite_pcDuino3_fdt_defconfig @@ -9,3 +9,6 @@ CONFIG_OF_SEPARATE=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_PCDUINO3=y ++S:CONFIG_DRAM_CLK=480 ++S:CONFIG_DRAM_ZQ=122 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/MSI_Primo73_defconfig b/configs/MSI_Primo73_defconfig index d731053..6628184 100644 --- a/configs/MSI_Primo73_defconfig +++ b/configs/MSI_Primo73_defconfig @@ -11,3 +11,6 @@ CONFIG_USB_KEYBOARD=n +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_MSI_PRIMO73=y ++S:CONFIG_DRAM_CLK=384 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig index 141d565..7f1710a 100644 --- a/configs/Mele_M3_defconfig +++ b/configs/Mele_M3_defconfig @@ -8,3 +8,6 @@ CONFIG_VIDEO_VGA=y +S:CONFIG_ARCH_SUNXI=y +S:CONFIG_MACH_SUN7I=y +S:CONFIG_TARGET_MELE_M3=y ++S:CONFIG_DRAM_CLK=384 ++S:CONFIG_DRAM_ZQ=127 ++S:CONFIG_DRAM_EMR1=4 -- 2.1.0

2 5

[U-Boot] [RFC 1/1] ARM: Add ARMv7-M support
by rev13＠wp.pl 22 Jan '15

22 Jan '15

From: Kamil Lulko <rev13(a)wp.pl> I am working on STM32F429-Discovery board support for U-Boot. This is a low-cost and fun board boasting LCD screen, bells and whistles for just under 24$. This board seems to be popular in commercial environments for evaluating ARM in deeply embedded applications. I would like to add support for this board in the mainline U-Boot but "new" architecture support is needed first (ARMv7-M variant is slightly different from other ARMs). This patch implements basic architecture support which I am already using for my own Linux booting setup with this board. I would really appreciate your opinion on feasibility of this board in mainline U-Boot tree and correctness (or not) of this patch. I tried to re-use as much as possible from existing ARM code. Signed-off-by: Kamil Lulko <rev13(a)wp.pl> --- arch/arm/cpu/armv7m/Makefile | 9 ++++ arch/arm/cpu/armv7m/config.mk | 8 ++++ arch/arm/cpu/armv7m/cpu.c | 51 +++++++++++++++++++++++ arch/arm/cpu/armv7m/start.S | 18 ++++++++ arch/arm/include/asm/armv7m.h | 60 +++++++++++++++++++++++++++ arch/arm/lib/Makefile | 8 ++++ arch/arm/lib/crt0.S | 33 +++++++++++++++ arch/arm/lib/interrupts_m.c | 95 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/lib/relocate.S | 4 ++ arch/arm/lib/vectors_m.S | 58 ++++++++++++++++++++++++++ 10 files changed, 344 insertions(+) create mode 100644 arch/arm/cpu/armv7m/Makefile create mode 100644 arch/arm/cpu/armv7m/config.mk create mode 100644 arch/arm/cpu/armv7m/cpu.c create mode 100644 arch/arm/cpu/armv7m/start.S create mode 100644 arch/arm/include/asm/armv7m.h create mode 100644 arch/arm/lib/interrupts_m.c create mode 100644 arch/arm/lib/vectors_m.S diff --git a/arch/arm/cpu/armv7m/Makefile b/arch/arm/cpu/armv7m/Makefile new file mode 100644 index 0000000..3279f12 --- /dev/null +++ b/arch/arm/cpu/armv7m/Makefile @@ -0,0 +1,9 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. +# +# SPDX-License-Identifier: GPL-2.0+ +# + +extra-y = start.o +obj-y = cpu.o diff --git a/arch/arm/cpu/armv7m/config.mk b/arch/arm/cpu/armv7m/config.mk new file mode 100644 index 0000000..37cfff9 --- /dev/null +++ b/arch/arm/cpu/armv7m/config.mk @@ -0,0 +1,8 @@ +# +# (C) Copyright 2014 +# Kamil Lulko, <rev13(a)wp.pl> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +PLATFORM_CPPFLAGS += -march=armv7-m -mthumb diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c new file mode 100644 index 0000000..ee4240a --- /dev/null +++ b/arch/arm/cpu/armv7m/cpu.c @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2010,2011 + * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com + * + * (C) Copyright 2014 + * Kamil Lulko, <rev13(a)wp.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <command.h> +#include <asm/armv7m.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* + * This is called right before passing control to + * the Linux kernel point. + */ +int cleanup_before_linux(void) +{ + return 0; +} + +/* + * H/w WDT strobe routine + */ +#if defined (CONFIG_HW_WATCHDOG) +void hw_watchdog_reset(void) +{ + /* + * Call the h/w-specific WDT strobe. + */ + wdt_strobe(); +} +#endif + +/* + * Perform the low-level reset. + */ +void reset_cpu(ulong addr) +{ + /* + * Perform reset but keep priority group unchanged. + */ + V7M_SCB->aircr = (V7M_AIRCR_VECTKEY << V7M_AIRCR_VECTKEY_SHIFT) | + (V7M_SCB->aircr & + (V7M_AIRCR_PRIGROUP_MSK << V7M_AIRCR_PRIGROUP_SHIFT)) + | V7M_AIRCR_SYSRESET; +} diff --git a/arch/arm/cpu/armv7m/start.S b/arch/arm/cpu/armv7m/start.S new file mode 100644 index 0000000..730c775 --- /dev/null +++ b/arch/arm/cpu/armv7m/start.S @@ -0,0 +1,18 @@ +/* + * (C) Copyright 2014 + * Kamil Lulko, <rev13(a)wp.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <config.h> +#include <linux/linkage.h> + +.globl reset +.type reset, %function +reset: + bl _main + +.globl c_runtime_cpu_setup +c_runtime_cpu_setup: + mov pc, lr diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h new file mode 100644 index 0000000..786ce3c --- /dev/null +++ b/arch/arm/include/asm/armv7m.h @@ -0,0 +1,60 @@ +/* + * (C) Copyright 2010,2011 + * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com + * + * (C) Copyright 2014 + * Kamil Lulko, <rev13(a)wp.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef ARMV7M_H +#define ARMV7M_H + +#if defined(__ASSEMBLY__) +.syntax unified +.thumb +#endif + +#define V7M_SCB_BASE 0xE000ED00 +#define V7M_MPU_BASE 0xE000ED90 + +#if !defined(__ASSEMBLY__) +struct v7m_scb { + uint32_t cpuid; /* CPUID Base Register */ + uint32_t icsr; /* Interrupt Control and State Register */ + uint32_t vtor; /* Vector Table Offset Register */ + uint32_t aircr; /* App Interrupt and Reset Control Register */ +}; +#define V7M_SCB ((volatile struct v7m_scb *)V7M_SCB_BASE) + +#define V7M_AIRCR_VECTKEY 0x5fa +#define V7M_AIRCR_VECTKEY_SHIFT 16 +#define V7M_AIRCR_ENDIAN (1 << 15) +#define V7M_AIRCR_PRIGROUP_MSK 0x7 +#define V7M_AIRCR_PRIGROUP_SHIFT 8 +#define V7M_AIRCR_SYSRESET (1 << 2) + +#define V7M_ICSR_VECTACT_MSK 0xFF + +struct v7m_mpu { + uint32_t type; /* Type Register */ + uint32_t ctrl; /* Control Register */ + uint32_t rnr; /* Region Number Register */ + uint32_t rbar; /* Region Base Address Register */ + uint32_t rasr; /* Region Attribute and Size Register */ +}; +#define V7M_MPU ((volatile struct v7m_mpu *)V7M_MPU_BASE) + +#define V7M_MPU_CTRL_ENABLE (1 << 0) +#define V7M_MPU_CTRL_HFNMIENA (1 << 1) + +#define V7M_MPU_RASR_EN (1 << 0) + +#define V7M_MPU_RASR_SIZE_BITS 1 +#define V7M_MPU_RASR_SIZE_4GB (31 << V7M_MPU_RASR_SIZE_BITS) +#define V7M_MPU_RASR_AP_RW_RW (3 << 24) + +#endif + +#endif /* ARMV7M_H */ diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index d74e4b8..dd3afb8 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -8,11 +8,15 @@ lib-$(CONFIG_USE_PRIVATE_LIBGCC) += _ashldi3.o _ashrdi3.o _divsi3.o \ _lshrdi3.o _modsi3.o _udivsi3.o _umodsi3.o div0.o +ifdef CONFIG_ARMV7M +obj-y += vectors_m.o crt0.o +else ifdef CONFIG_ARM64 obj-y += crt0_64.o else obj-y += vectors.o crt0.o endif +endif ifndef CONFIG_SPL_BUILD ifdef CONFIG_ARM64 @@ -35,12 +39,16 @@ endif obj-$(CONFIG_SEMIHOSTING) += semihosting.o obj-y += sections.o +ifdef CONFIG_ARMV7M +obj-y += interrupts_m.o +else ifdef CONFIG_ARM64 obj-y += gic_64.o obj-y += interrupts_64.o else obj-y += interrupts.o endif +endif obj-y += reset.o obj-y += cache.o diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 22df3e5..21e05e6 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -9,6 +9,9 @@ #include <config.h> #include <asm-offsets.h> #include <linux/linkage.h> +#if defined(CONFIG_ARMV7M) +#include <asm/armv7m.h> +#endif /* * This file handles the target-independent stages of the U-Boot @@ -66,15 +69,32 @@ ENTRY(_main) #else ldr sp, =(CONFIG_SYS_INIT_SP_ADDR) #endif +#if defined(CONFIG_ARMV7M) + /* 8-byte alignment for ABI compliance armv7-m version */ + mov r3, sp + bic r3, r3, #7 + mov sp, r3 +#else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ +#endif mov r2, sp sub sp, sp, #GD_SIZE /* allocate one GD above SP */ +#if defined(CONFIG_ARMV7M) + /* 8-byte alignment for ABI compliance armv7-m version */ + mov r3, sp + bic r3, r3, #7 + mov sp, r3 +#else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ +#endif mov r9, sp /* GD is above SP */ mov r1, sp mov r0, #0 clr_gd: cmp r1, r2 /* while not at end of GD */ +#if defined(CONFIG_ARMV7M) + itt lo +#endif strlo r0, [r1] /* clear 32-bit GD word */ addlo r1, r1, #4 /* move to next */ blo clr_gd @@ -94,13 +114,23 @@ clr_gd: */ ldr sp, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ +#if defined(CONFIG_ARMV7M) + /* 8-byte alignment for ABI compliance armv7-m version */ + mov r3, sp + bic r3, r3, #7 + mov sp, r3 +#else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ +#endif ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ sub r9, r9, #GD_SIZE /* new GD is below bd */ adr lr, here ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 +#if defined(CONFIG_ARMV7M) + orr lr, #1 /* Set bit 0 as required by Thumb-2 */ +#endif ldr r0, [r9, #GD_RELOCADDR] /* r0 = gd->relocaddr */ b relocate_code here: @@ -120,6 +150,9 @@ here: mov r2, #0x00000000 /* prepare zero to clear BSS */ clbss_l:cmp r0, r1 /* while not at end of BSS */ +#if defined(CONFIG_ARMV7M) + itt lo +#endif strlo r2, [r0] /* clear 32-bit BSS word */ addlo r0, r0, #4 /* move to next */ blo clbss_l diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c new file mode 100644 index 0000000..0d7e891 --- /dev/null +++ b/arch/arm/lib/interrupts_m.c @@ -0,0 +1,95 @@ +/* + * (C) Copyright 2014 + * Kamil Lulko, <rev13(a)wp.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> + +/* + * Upon exception entry ARMv7-M processors automatically save stack + * frames containing some registers. For simplicity initial + * implementation uses only this auto-saved stack frame. + * This does not contain complete register set dump, + * only R0-R3, R12, LR, PC and xPSR are saved. + */ + +struct autosave_regs { + long uregs[8]; +}; + +#define ARM_xPSR uregs[7] +#define ARM_PC uregs[6] +#define ARM_LR uregs[5] +#define ARM_R12 uregs[4] +#define ARM_R3 uregs[3] +#define ARM_R2 uregs[2] +#define ARM_R1 uregs[1] +#define ARM_R0 uregs[0] + +int interrupt_init(void) +{ + return 0; +} + +void enable_interrupts(void) +{ + return; +} + +int disable_interrupts(void) +{ + return 0; +} + +void dump_regs(struct autosave_regs *regs) +{ + printf("pc : %08lx lr : %08lx xPSR : %08lx\n", + regs->ARM_PC, regs->ARM_LR, regs->ARM_xPSR); + printf("r12 : %08lx r3 : %08lx r2 : %08lx\n" + "r1 : %08lx r0 : %08lx\n", + regs->ARM_R12, regs->ARM_R3, regs->ARM_R2, + regs->ARM_R1, regs->ARM_R0); +} + +void bad_mode(void) +{ + panic("Resetting CPU ...\n"); + reset_cpu(0); +} + +void do_hard_fault(struct autosave_regs *autosave_regs) +{ + printf("Hard fault\n"); + dump_regs(autosave_regs); + bad_mode(); +} + +void do_mm_fault(struct autosave_regs *autosave_regs) +{ + printf("Memory management fault\n"); + dump_regs(autosave_regs); + bad_mode(); +} + +void do_bus_fault(struct autosave_regs *autosave_regs) +{ + printf("Bus fault\n"); + dump_regs(autosave_regs); + bad_mode(); +} + +void do_usage_fault(struct autosave_regs *autosave_regs) +{ + printf("Usage fault\n"); + dump_regs(autosave_regs); + bad_mode(); +} + +void do_invalid_entry(struct autosave_regs *autosave_regs) +{ + printf("Exception\n"); + dump_regs(autosave_regs); + bad_mode(); +} diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index 92f5314..ef2a274 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -9,6 +9,10 @@ #include <asm-offsets.h> #include <config.h> #include <linux/linkage.h> +#include <config.h> +#if defined(CONFIG_ARMV7M) +#include <asm/armv7m.h> +#endif /* * Default/weak exception vectors relocation routine diff --git a/arch/arm/lib/vectors_m.S b/arch/arm/lib/vectors_m.S new file mode 100644 index 0000000..20a4527 --- /dev/null +++ b/arch/arm/lib/vectors_m.S @@ -0,0 +1,58 @@ +/* + * (C) Copyright 2014 + * Kamil Lulko, <rev13(a)wp.pl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <config.h> +#include <asm/armv7m.h> +#include <linux/linkage.h> + +.type __hard_fault_entry, %function +__hard_fault_entry: + mov r0, sp @ pass auto-saved registers as argument + b do_hard_fault + +.type __mm_fault_entry, %function +__mm_fault_entry: + mov r0, sp @ pass auto-saved registers as argument + b do_mm_fault + +.type __bus_fault_entry, %function +__bus_fault_entry: + mov r0, sp @ pass auto-saved registers as argument + b do_bus_fault + +.type __usage_fault_entry, %function +__usage_fault_entry: + mov r0, sp @ pass auto-saved registers as argument + b do_usage_fault + +.type __invalid_entry, %function +__invalid_entry: + mov r0, sp @ pass auto-saved registers as argument + b do_invalid_entry + + .section .vectors + +ENTRY(_start) + .long CONFIG_SYS_INIT_SP_ADDR @ 0 - Reset stack pointer + .long reset @ 1 - Reset + .long __invalid_entry @ 2 - NMI + .long __hard_fault_entry @ 3 - HardFault + .long __mm_fault_entry @ 4 - MemManage + .long __bus_fault_entry @ 5 - BusFault + .long __usage_fault_entry @ 6 - UsageFault + .long __invalid_entry @ 7 - Reserved + .long __invalid_entry @ 8 - Reserved + .long __invalid_entry @ 9 - Reserved + .long __invalid_entry @ 10 - Reserved + .long __invalid_entry @ 11 - SVCall + .long __invalid_entry @ 12 - Debug Monitor + .long __invalid_entry @ 13 - Reserved + .long __invalid_entry @ 14 - PendSV + .long __invalid_entry @ 15 - SysTick + .rept 107 - 16 + .long __invalid_entry @ 16..107 - External Interrupts + .endr -- 2.2.1.212.gc5b9256

3 2

[U-Boot] [PATCH] sunxi: Add support for Mele M5.
by Ian Campbell 22 Jan '15

22 Jan '15

From: Ian Campbell <ijc(a)hellion.org.uk> HDMI, USB and Ethernet appear functional, I've not done extensive tests of all peripherals though. Signed-off-by: Ian Campbell <ijc(a)hellion.org.uk> --- Hans, dunno if you have one of these, am happy to move to the common bit of MAINTAINERS if you do. Applies on "sunxi: Convert sun7i boards to use auto dram configuration" --- board/sunxi/MAINTAINERS | 5 +++++ configs/Mele_M5_defconfig | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 configs/Mele_M5_defconfig diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index cc04e6c..fea23b8 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -93,3 +93,8 @@ MARSBOARD-A10 BOARD M: Aleksei Mamlin <mamlinav(a)gmail.com> S: Maintained F: configs/Marsboard_A10_defconfig + +MELE M5 BOARD +M: Ian Campbell <ijc(a)hellion.org.uk> +S: Maintained +F: configs/Mele_M5_defconfig diff --git a/configs/Mele_M5_defconfig b/configs/Mele_M5_defconfig new file mode 100644 index 0000000..2165987 --- /dev/null +++ b/configs/Mele_M5_defconfig @@ -0,0 +1,13 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,USB_EHCI,STATUSLED=234" +CONFIG_FDTFILE="sun7i-a20-m5.dtb" +CONFIG_VIDEO_HDMI=y ++S:CONFIG_MMC0_CD_PIN="PH1" ++S:CONFIG_USB1_VBUS_PIN="PH6" ++S:CONFIG_USB2_VBUS_PIN="PH3" ++S:CONFIG_ARM=y ++S:CONFIG_ARCH_SUNXI=y ++S:CONFIG_MACH_SUN7I=y ++S:CONFIG_DRAM_CLK=432 ++S:CONFIG_DRAM_ZQ=122 ++S:CONFIG_DRAM_EMR1=4 -- 2.1.4

2 2

[U-Boot] ot1200: add basic SPL support
by Christian Gmeiner 22 Jan '15

22 Jan '15

This patch series add basic SPL support for the ot1200. In future patches this support will gets extended to support different memory configurations.

2 9

[U-Boot] [PATCH] imx: mx6: Change ENV offset to 512K bytes for larger u-boot image
by Ye.Li 22 Jan '15

22 Jan '15

To align with other mx6 boards, change ENV offset from 384KB to 512KB position to fit a larger u-boot image. Signed-off-by: Ye.Li <B37916(a)freescale.com> --- include/configs/mx6slevk.h | 2 +- include/configs/mx6sxsabresd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index e3e7f76..ed50dfb 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -187,7 +187,7 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_OFFSET (6 * SZ_64K) +#define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 61a7a7a..c5dc982 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -235,7 +235,7 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_OFFSET (6 * SZ_64K) +#define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC -- 1.7.4.1

2 1

[U-Boot] [PATCH] mx6: fix warning in platinum board
by Stefano Babic 22 Jan '15

22 Jan '15

Fix warning due to missing prototype for writel Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- board/barco/platinum/platinum.h | 1 + 1 file changed, 1 insertion(+) diff --git a/board/barco/platinum/platinum.h b/board/barco/platinum/platinum.h index 8650d6d..d3ea8bd 100644 --- a/board/barco/platinum/platinum.h +++ b/board/barco/platinum/platinum.h @@ -9,6 +9,7 @@ #include <miiphy.h> #include <asm/arch/crm_regs.h> +#include <asm/io.h> /* Defines */ -- 1.9.1

2 1

[U-Boot] [PATCH v3 1/2] Enable journal replay for UBIFS
by Anton Habegger 22 Jan '15

22 Jan '15

Hello Heiko Here the second patch you want. This needs to be applied prior the real bug fix, becouse it solves the warning as you mention as well. >From fd0a1377825638d15bc66b5f07a05beb14fe747c Mon Sep 17 00:00:00 2001 From: Anton Habegger <anton.habegger(a)delta-es.com> Date: Wed, 21 Jan 2015 16:20:36 +0100 Subject: [PATCH] ubifs: Import atomic_long operations from Linux The following operations are imported from Linux: - atomic_long_read - atomic_long_inc - atomic_long_dec - atomic_long_sub Therefor "include/asm-generic/atomic-long.h" is imported from Linux 3.15 This commit is a preperation for a subsequent UBIFS commit which needs such atomic_long operations Signed-off-by: Anton Habegger <anton.habegger(a)delta-es.com> --- fs/ubifs/ubifs.c | 6 + fs/ubifs/ubifs.h | 12 +- include/asm-generic/atomic-long.h | 270 ++++++++++++++++++++++++++++++++++++++ include/linux/compat.h | 1 - 4 files changed, 278 insertions(+), 11 deletions(-) create mode 100644 include/asm-generic/atomic-long.h diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 49e6f46..6dd6174 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -150,6 +150,12 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm, return 0; } + +/* from shrinker.c */ + +/* Global clean znode counter (for all mounted UBIFS instances) */ +atomic_long_t ubifs_clean_zn_cnt; + #endif /** diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index c120261..a51b237 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -31,6 +31,8 @@ #include <linux/backing-dev.h> #include "ubifs-media.h" #else +#include <asm/atomic.h> +#include <asm-generic/atomic-long.h> #include <ubi_uboot.h> #include <linux/ctype.h> @@ -63,16 +65,6 @@ struct page { void iput(struct inode *inode); -/* - * The atomic operations are used for budgeting etc which is not - * needed for the read-only U-Boot implementation: - */ -#define atomic_long_inc(a) -#define atomic_long_dec(a) -#define atomic_long_sub(a, b) - -typedef unsigned long atomic_long_t; - /* linux/include/time.h */ #define NSEC_PER_SEC 1000000000L #define get_seconds() 0 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h new file mode 100644 index 0000000..61011ed --- /dev/null +++ b/include/asm-generic/atomic-long.h @@ -0,0 +1,270 @@ +#ifndef _ASM_GENERIC_ATOMIC_LONG_H +#define _ASM_GENERIC_ATOMIC_LONG_H +/* + * Copyright (C) 2005 Silicon Graphics, Inc. + * Christoph Lameter + * + * Allows to provide arch independent atomic definitions without the need to + * edit all arch specific atomic.h files. + */ + +#include <asm/types.h> + +/* + * Suppport for atomic_long_t + * + * Casts for parameters are avoided for existing atomic functions in order to + * avoid issues with cast-as-lval under gcc 4.x and other limitations that the + * macros of a platform may have. + */ + +#if BITS_PER_LONG == 64 + +typedef atomic64_t atomic_long_t; + +#define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i) + +static inline long atomic_long_read(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_read(v); +} + +#ifndef __UBOOT__ +static inline void atomic_long_set(atomic_long_t *l, long i) +{ + atomic64_t *v = (atomic64_t *)l; + + atomic64_set(v, i); +} +#endif + +static inline void atomic_long_inc(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + atomic64_inc(v); +} + +static inline void atomic_long_dec(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + atomic64_dec(v); +} + +#ifndef __UBOOT__ +static inline void atomic_long_add(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + atomic64_add(i, v); +} +#endif + +static inline void atomic_long_sub(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + atomic64_sub(i, v); +} + +#ifndef __UBOOT__ +static inline int atomic_long_sub_and_test(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return atomic64_sub_and_test(i, v); +} + +static inline int atomic_long_dec_and_test(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return atomic64_dec_and_test(v); +} + +static inline int atomic_long_inc_and_test(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return atomic64_inc_and_test(v); +} + +static inline int atomic_long_add_negative(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return atomic64_add_negative(i, v); +} + +static inline long atomic_long_add_return(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_add_return(i, v); +} + +static inline long atomic_long_sub_return(long i, atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_sub_return(i, v); +} + +static inline long atomic_long_inc_return(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_inc_return(v); +} + +static inline long atomic_long_dec_return(atomic_long_t *l) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_dec_return(v); +} + +static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) +{ + atomic64_t *v = (atomic64_t *)l; + + return (long)atomic64_add_unless(v, a, u); +} + +#define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l)) + +#define atomic_long_cmpxchg(l, old, new) \ + (atomic64_cmpxchg((atomic64_t *)(l), (old), (new))) +#define atomic_long_xchg(v, new) \ + (atomic64_xchg((atomic64_t *)(v), (new))) +#endif /* __UBOOT__ */ + +#else /* BITS_PER_LONG == 64 */ + +typedef atomic_t atomic_long_t; + +#define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i) +static inline long atomic_long_read(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_read(v); +} + +#ifndef __UBOOT__ +static inline void atomic_long_set(atomic_long_t *l, long i) +{ + atomic_t *v = (atomic_t *)l; + + atomic_set(v, i); +} +#endif + +static inline void atomic_long_inc(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + atomic_inc(v); +} + +static inline void atomic_long_dec(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + atomic_dec(v); +} + +#ifndef __UBOOT__ +static inline void atomic_long_add(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + atomic_add(i, v); +} +#endif + +static inline void atomic_long_sub(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + atomic_sub(i, v); +} + +#ifndef __UBOOT__ +static inline int atomic_long_sub_and_test(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return atomic_sub_and_test(i, v); +} + +static inline int atomic_long_dec_and_test(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return atomic_dec_and_test(v); +} + +static inline int atomic_long_inc_and_test(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return atomic_inc_and_test(v); +} + +static inline int atomic_long_add_negative(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return atomic_add_negative(i, v); +} + +static inline long atomic_long_add_return(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_add_return(i, v); +} + +static inline long atomic_long_sub_return(long i, atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_sub_return(i, v); +} + +static inline long atomic_long_inc_return(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_inc_return(v); +} + +static inline long atomic_long_dec_return(atomic_long_t *l) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_dec_return(v); +} + +static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) +{ + atomic_t *v = (atomic_t *)l; + + return (long)atomic_add_unless(v, a, u); +} + +#define atomic_long_inc_not_zero(l) atomic_inc_not_zero((atomic_t *)(l)) + +#define atomic_long_cmpxchg(l, old, new) \ + (atomic_cmpxchg((atomic_t *)(l), (old), (new))) +#define atomic_long_xchg(v, new) \ + (atomic_xchg((atomic_t *)(v), (new))) +#endif /* __UBOOT__ */ + +#endif /* BITS_PER_LONG == 64 */ + +#endif /* _ASM_GENERIC_ATOMIC_LONG_H */ diff --git a/include/linux/compat.h b/include/linux/compat.h index b40133c..6eac17f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -262,7 +262,6 @@ typedef struct { /* from include/linux/types.h */ -typedef int atomic_t; /** * struct callback_head - callback structure for use with RCU and task_work * @next: next update requests in a list -- 1.9.1 BR Anton

2 2