May 2016 - U-Boot

[U-Boot] uboot xHCI driver crash sometimes when endpoint stalls
by Mohammed Mohisin 20 May '16

20 May '16

Hi All, Sometimes crash is observed, when the endpoint stalls. And the crash happens in xhci_ctrl_tx() -> xhci_acknowledge_event() In my case, 1) scsi read command is sent successfully, 2) Then for Get data command stall is received (as i mentioned issue is seen sometimes, which means data is being sent and received correctly other times.) 3) As a response to STALL event, i do the following (as endpoint stall is not handled in u-boot) - send reset endpoint command - wait for trb completion event - call abort_td() which stops endpoint ring and sets deq pointer to enq pointer. - Now return error STALL status to application - Now application sends a) reset device (0xFF) command ----> issue is seen here... Issue description: - when control setup and status TRBs are enq'ed and doorbell is rung, event is received. - while acknowledging this event, crash is seen b) clear stall on both bulk in and out endpoints 4) Now the scsi read command is retried. Can anyone tell what might be happening, ?? Regards

1 0

[U-Boot] why so little use of ft_system_setup()?
by Robert P. J. Day 20 May '16

20 May '16

still crawling through the code related to FDTs, and while i see a pile of boards that define CONFIG_OF_SYSTEM_SETUP, i see very few that define the corresponding(?) ft_system_setup() routine. $ grep -r CONFIG_OF_SYSTEM_SETUP * cmd/fdt.c:#ifdef CONFIG_OF_SYSTEM_SETUP cmd/fdt.c:#ifdef CONFIG_OF_SYSTEM_SETUP configs/apalis_t30_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/paz00_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/plutux_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/venice2_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/p2571_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/beaver_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/ventana_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/p2371-0000_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/tec-ng_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/seaboard_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/dalmore_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/harmony_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/cardhu_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/p2371-2180_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/trimslice_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/colibri_t30_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/colibri_t20_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/whistler_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/tec_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/jetson-tk1_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/e2220-1170_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/medcom-wide_defconfig:CONFIG_OF_SYSTEM_SETUP=y configs/nyan-big_defconfig:CONFIG_OF_SYSTEM_SETUP=y include/image.h:#ifdef CONFIG_OF_SYSTEM_SETUP include/fdt_support.h: * This function is called if CONFIG_OF_SYSTEM_SETUP is defined README: CONFIG_OF_SYSTEM_SETUP $ and yet ... $ grep -rw ft_system_setup * arch/arm/mach-tegra/board2.c:int ft_system_setup(void *blob, bd_t *bd) cmd/fdt.c: int err = ft_system_setup(working_fdt, gd->bd); common/image-fdt.c: fdt_ret = ft_system_setup(blob, gd->bd); include/fdt_support.h:int ft_system_setup(void *blob, bd_t *bd); Kconfig: This causes U-Boot to call ft_system_setup() before booting into README: This causes ft_system_setup() to be called before booting $ am i missing something? what is the point of a board defining that setting but not defining the associated(?) ft_system_setup() function? what else is that CONFIG setting being used for? thanks. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 2

[U-Boot] [PATCH] mmc: tegra: add basic Tegra186 support
by Stephen Warren 20 May '16

20 May '16

From: Stephen Warren <swarren(a)nvidia.com> Tegra186's MMC controller needs to be explicitly identified. Add another compatible value for it. Tegra186 will use an entirely different clock/reset control mechanism to existing chips, and will use standard clock/reset APIs rather than the existing Tegra-specific custom APIs. The driver support for that isn't ready yet, so simply disable all clock/reset usage if compiling for Tegra186. This must happen at compile time rather than run-time since the custom APIs won't even be compiled in on Tegra186. In the long term, the plan would be to convert the existing custom APIs to standard APIs and get rid of the ifdefs completely. The system's main eMMC will work without any clock/reset support, since the firmware will have already initialized the controller in order to load U-Boot. Hence the driver is useful even in this apparently crippled state. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- This patch is needed at compile-time for the upcoming Tegra186 core patches to compile. As such, it's probably best if it gets applied via the Tegra tree. arch/arm/include/asm/arch-tegra/tegra_mmc.h | 2 ++ drivers/mmc/tegra_mmc.c | 32 ++++++++++++++++++++++++++++- include/fdtdec.h | 1 + lib/fdtdec.c | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-tegra/tegra_mmc.h b/arch/arm/include/asm/arch-tegra/tegra_mmc.h index a20bdaa61872..75e56c4ea786 100644 --- a/arch/arm/include/asm/arch-tegra/tegra_mmc.h +++ b/arch/arm/include/asm/arch-tegra/tegra_mmc.h @@ -134,7 +134,9 @@ struct mmc_host { int id; /* device id/number, 0-3 */ int enabled; /* 1 to enable, 0 to disable */ int width; /* Bus Width, 1, 4 or 8 */ +#ifndef CONFIG_TEGRA186 enum periph_id mmc_id; /* Peripheral ID: PERIPH_ID_... */ +#endif struct gpio_desc cd_gpio; /* Change Detect GPIO */ struct gpio_desc pwr_gpio; /* Power GPIO */ struct gpio_desc wp_gpio; /* Write Protect GPIO */ diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c index 573819a01e21..c9d9432e5e87 100644 --- a/drivers/mmc/tegra_mmc.c +++ b/drivers/mmc/tegra_mmc.c @@ -11,8 +11,10 @@ #include <common.h> #include <asm/gpio.h> #include <asm/io.h> +#ifndef CONFIG_TEGRA186 #include <asm/arch/clock.h> #include <asm/arch-tegra/clk_rst.h> +#endif #include <asm/arch-tegra/mmc.h> #include <asm/arch-tegra/tegra_mmc.h> #include <mmc.h> @@ -357,8 +359,12 @@ static void mmc_change_clock(struct mmc_host *host, uint clock) */ if (clock == 0) goto out; +#ifndef CONFIG_TEGRA186 clock_adjust_periph_pll_div(host->mmc_id, CLOCK_ID_PERIPH, clock, &div); +#else + div = (20000000 + clock - 1) / clock; +#endif debug("div = %d\n", div); writew(0, &host->reg->clkcon); @@ -543,7 +549,9 @@ static int do_mmc_init(int dev_index, bool removable) gpio_get_number(&host->cd_gpio)); host->clock = 0; +#ifndef CONFIG_TEGRA186 clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000); +#endif if (dm_gpio_is_valid(&host->pwr_gpio)) dm_gpio_set_value(&host->pwr_gpio, 1); @@ -568,7 +576,11 @@ static int do_mmc_init(int dev_index, bool removable) * (actually 52MHz) */ host->cfg.f_min = 375000; +#ifndef CONFIG_TEGRA186 host->cfg.f_max = 48000000; +#else + host->cfg.f_max = 375000; +#endif host->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; @@ -600,11 +612,13 @@ static int mmc_get_config(const void *blob, int node, struct mmc_host *host, return -FDT_ERR_NOTFOUND; } +#ifndef CONFIG_TEGRA186 host->mmc_id = clock_decode_periph_id(blob, node); if (host->mmc_id == PERIPH_ID_NONE) { debug("%s: could not decode periph id\n", __func__); return -FDT_ERR_NOTFOUND; } +#endif /* * NOTE: mmc->bus_width is determined by mmc.c dynamically. @@ -624,7 +638,13 @@ static int mmc_get_config(const void *blob, int node, struct mmc_host *host, *removablep = !fdtdec_get_bool(blob, node, "non-removable"); debug("%s: found controller at %p, width = %d, periph_id = %d\n", - __func__, host->reg, host->width, host->mmc_id); + __func__, host->reg, host->width, +#ifndef CONFIG_TEGRA186 + host->mmc_id +#else + -1 +#endif + ); return 0; } @@ -668,6 +688,16 @@ void tegra_mmc_init(void) const void *blob = gd->fdt_blob; debug("%s entry\n", __func__); + /* See if any Tegra186 MMC controllers are present */ + count = fdtdec_find_aliases_for_id(blob, "sdhci", + COMPAT_NVIDIA_TEGRA186_SDMMC, node_list, + CONFIG_SYS_MMC_MAX_DEVICE); + debug("%s: count of Tegra186 sdhci nodes is %d\n", __func__, count); + if (process_nodes(blob, node_list, count)) { + printf("%s: Error processing T186 mmc node(s)!\n", __func__); + return; + } + /* See if any Tegra210 MMC controllers are present */ count = fdtdec_find_aliases_for_id(blob, "sdhci", COMPAT_NVIDIA_TEGRA210_SDMMC, node_list, diff --git a/include/fdtdec.h b/include/fdtdec.h index fb8827393552..5580462f7daa 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -123,6 +123,7 @@ enum fdt_compat_id { COMPAT_NVIDIA_TEGRA124_SOR, /* Tegra 124 Serial Output Resource */ COMPAT_NVIDIA_TEGRA124_PMC, /* Tegra 124 power mgmt controller */ COMPAT_NVIDIA_TEGRA20_DC, /* Tegra 2 Display controller */ + COMPAT_NVIDIA_TEGRA186_SDMMC, /* Tegra186 SDMMC controller */ COMPAT_NVIDIA_TEGRA210_SDMMC, /* Tegra210 SDMMC controller */ COMPAT_NVIDIA_TEGRA124_SDMMC, /* Tegra124 SDMMC controller */ COMPAT_NVIDIA_TEGRA30_SDMMC, /* Tegra30 SDMMC controller */ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 70acc29c924d..ab002e9fa3e5 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -30,6 +30,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(NVIDIA_TEGRA124_SOR, "nvidia,tegra124-sor"), COMPAT(NVIDIA_TEGRA124_PMC, "nvidia,tegra124-pmc"), COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), + COMPAT(NVIDIA_TEGRA186_SDMMC, "nvidia,tegra186-sdhci"), COMPAT(NVIDIA_TEGRA210_SDMMC, "nvidia,tegra210-sdhci"), COMPAT(NVIDIA_TEGRA124_SDMMC, "nvidia,tegra124-sdhci"), COMPAT(NVIDIA_TEGRA30_SDMMC, "nvidia,tegra30-sdhci"), -- 2.8.2

2 2

[U-Boot] Breakage on gw_ventana
by Stefano Babic 20 May '16

20 May '16

Hi Tim, last changes break build for the gw_ventana board. In fact, in case kernel is on a fs, we need to pass the name for kernel. These two defines should be set into gw_ventana.h: CONFIG_SPL_FS_LOAD_KERNEL_NAME CONFIG_SPL_FS_LOAD_ARGS_NAME I could simply fix it, but it does not make sense without asking you :-) I have also seen that SPL for gw_ventana raises an exception because SPL is bigger as the value set into imx6_spl.h (CONFIG_SPL_MAX_SIZE = 64Kb). Anyway, CONFIG_SPL_MAX_SIZE for i.MX& iss too restrictive, and even the mx6 with smaller SRAM has at least 128KB. Best regards, Stefano -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

3 10

[U-Boot] coding style question: when to use __weak function attributes?
by Robert P. J. Day 20 May '16

20 May '16

pardon yet another question on coding style and pedantry, but i'm curious about the following. i'm crawling through the code in common/image-fdt.c, specifically in image_setup_libfdt(), and first i see the following: __weak int arch_fixup_fdt(void *blob) { return 0; } ... snip ... if (arch_fixup_fdt(blob) < 0) { printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } which is perfectly understandable -- use the weak function attribute, and let each architecture decide if it wants to override that. same thing here in that same file: __weak int ft_verify_fdt(void *fdt) { return 1; } ... snip ... if (!ft_verify_fdt(blob)) goto err; which then makes me wonder why the same approach wasn't used for these routines as well: if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { printf("ERROR: board-specific fdt fixup failed: %s\n", fdt_strerror(fdt_ret)); goto err; } } if (IMAGE_OF_SYSTEM_SETUP) { fdt_ret = ft_system_setup(blob, gd->bd); if (fdt_ret) { printf("ERROR: system-specific fdt fixup failed: %s\n", fdt_strerror(fdt_ret)); goto err; } } couldn't ft_board_setup() and ft_system_setup() have been defined the same way? or is there something different about those two routines that wouldn't allow the weak function attribute and do away with all the OF_BOARD_SETUP and OF_SYSTEM_SETUP usage? rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

1 0

[U-Boot] Issue with USB mass storage (thumb drives)
by Schrempf Frieder 20 May '16

20 May '16

Hello, I'm using U-Boot on a custom i.MX6 board and I'm having problems while reading (large) files from USB thumb drives. I wouldn't really mind if this only happened with some specific USB device, but the problem occurs with 3 out of 4 tested thumb drives while loading a 100M test file. The devices that work seem to be rather old ones. The same issue is also reported here: https://community.freescale.com/thread/377911 I can reproduce this behaviour with u-boot-imx v2014.04 and with mainline u-boot v2015.10 and v2016.01. Can someone tell me if this is a known issue? What could be the reason for this and how can I get this working? Thanks! U-Boot 2016.01 (Feb 02 2016 - 10:31:32 +0100) CPU: Freescale i.MX6SOLO rev1.3 at 792MHz CPU: Industrial temperature grade (-40C to 105C) at 31C Reset cause: POR Board: MX6EXCEET DRAM: 1 GiB NAND: 256 MiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 SF: Detected EN25Q80 with page size 256 Bytes, erase size 4 KiB, total 1 MiB No panel detected: default to Hannstar-XGA Display: Hannstar-XGA (1024x768) In: serial Out: serial Err: serial Net: Found Micrel KS8051/KS8081 PHY FEC Hit any key to stop autoboot: 0 => usb start starting USB... USB0: Port not available. USB1: USB EHCI 1.00 scanning bus 1 for devices... 2 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found scanning usb for ethernet devices... 0 Ethernet Device(s) found => fatload usb 0 0x18000000 test.file reading test.file EHCI timed out on TD - token=0xac008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x128d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x801f8c80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x801f8c80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x801f8c80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x801f8c80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 EHCI timed out on TD - token=0x80008d80 Error reading cluster ** Unable to read file test.file **

10 50

[U-Boot] abbreviating header files with CONFIG_IS_ENABLED()?
by Robert P. J. Day 20 May '16

20 May '16

just want to make sure i'm interpreting the use of this macro correctly in that, if i look in include/image.h, i see (abbreviated snippet): #if IMAGE_ENABLE_FIT # ifdef CONFIG_SPL_BUILD # ifdef CONFIG_SPL_CRC32_SUPPORT # define IMAGE_ENABLE_CRC32 1 # endif # ifdef CONFIG_SPL_MD5_SUPPORT # define IMAGE_ENABLE_MD5 1 # endif # ifdef CONFIG_SPL_SHA1_SUPPORT # define IMAGE_ENABLE_SHA1 1 # endif # ifdef CONFIG_SPL_SHA256_SUPPORT # define IMAGE_ENABLE_SHA256 1 # endif # else # define CONFIG_CRC32 /* FIT images need CRC32 support */ # define CONFIG_MD5 /* and MD5 */ # define CONFIG_SHA1 /* and SHA1 */ # define CONFIG_SHA256 /* and SHA256 */ # define IMAGE_ENABLE_CRC32 1 # define IMAGE_ENABLE_MD5 1 # define IMAGE_ENABLE_SHA1 1 # define IMAGE_ENABLE_SHA256 1 # endif ... #ifndef IMAGE_ENABLE_CRC32 #define IMAGE_ENABLE_CRC32 0 #endif ... snip ... which i *assume* could be written with more brevity as: #if IMAGE_ENABLE_FIT # ifdef CONFIG_SPL_BUILD # define IMAGE_ENABLE_CRC32 CONFIG_IS_ENABLED(SPL_CRC32_SUPPORT) # define IMAGE_ENABLE_MD5 CONFIG_IS_ENABLED(SPL_MD5_SUPPORT) # define IMAGE_ENABLE_SHA1 CONFIG_IS_ENABLED(SPL_SHA1_SUPPORT) # define IMAGE_ENABLE_SHA256 CONFIG_IS_ENABLED(SPL_SHA256_SUPPORT) # else ... snip ... that sort of thing. if i'm reading that correctly, i can do a bit of cleanup this weekend and submit a patch for whatever looks obvious. rday p.s. i mentioned this before in that i have one nitpick with some of the usage of this in that, in the above, *i* would have used: #ifdef CONFIG_FIT rather than: #define IMAGE_ENABLE_FIT CONFIG_IS_ENABLED(FIT) ... #if IMAGE_ENABLE_FIT that is, i would use the CONFIG_* checks for preprocessor work, and reserve the IMAGE_ENABLE_* conditionals exclusively for run-time testing, just for consistency. but that's just me.

1 0

[U-Boot] [PATCH] arm: mvebu: theadorable: Enable CONFIG_ZERO_BOOTDELAY_CHECK
by Stefan Roese 20 May '16

20 May '16

Enable bootdelay 0 check so that booting can be interrupted even with bootdelay configured to 0. Signed-off-by: Stefan Roese <sr(a)denx.de> --- include/configs/theadorable.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 5864f27..6c0e7dc 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -76,6 +76,7 @@ #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_PREBOOT -- 2.8.1

1 1

[U-Boot] [PATCH] arm: mvebu: a38x: Weed out floating point use
by Marek Vasut 20 May '16

20 May '16

For reason unknown, recently, the DDR init code writers are really fond of hiding some small floating point operating deep in their creations. This patch removes one from the Marvell A38x code. Instead of returning size of chip as float from ddr3_get_device_size() in GiB units, return it as int in MiB units. Since this would interfere with the huge switch code in ddr3_calc_mem_cs_size(), rework the code to match the change. Before this patch, the cs_mem_size variable could have these values: ( { 16, 32 } x { 8, 16 } x { 0.01, 0.5, 1, 2, 4, 8 } ) / 8 = { 0.000000, 0.001250, 0.002500, 0.005000, 0.062500, 0.125000, 0.250000, 0.500000, 1.000000, 2.000000, 4.000000, } The switch code checked for a subset of the resulting RAM sizes, which is in range 128 MiB ... 2048 MiB. With this patch, the cs_mem_size variable can have these values: ( { 16, 32 } x { 8, 16 } x { 0, 512, 1024, 2048, 4096, 8192 } ) / 8 = { 0, 64, 128, 256, 512, 1024, 2048, 4096 } To retain previous behavior, filter out 0 MiB (invalid size), 64 MiB and 4096 MiB options. Removing the floating point stuff also saves 1.5k from text segment: clearfog : spl/u-boot-spl:all -1592 spl/u-boot-spl:text -1592 Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Dirk Eibach <dirk.eibach(a)gdsys.cc> Cc: Stefan Roese <sr(a)denx.de> --- drivers/ddr/marvell/a38x/ddr3_init.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/drivers/ddr/marvell/a38x/ddr3_init.c b/drivers/ddr/marvell/a38x/ddr3_init.c index ee05f57..55baad4 100644 --- a/drivers/ddr/marvell/a38x/ddr3_init.c +++ b/drivers/ddr/marvell/a38x/ddr3_init.c @@ -678,7 +678,7 @@ u32 ddr3_get_device_width(u32 cs) return (device_width == 0) ? 8 : 16; } -float ddr3_get_device_size(u32 cs) +static int ddr3_get_device_size(u32 cs) { u32 device_size_low, device_size_high, device_size; u32 data, cs_low_offset, cs_high_offset; @@ -695,15 +695,15 @@ float ddr3_get_device_size(u32 cs) switch (device_size) { case 0: - return 2; + return 2048; case 2: - return 0.5; + return 512; case 3: - return 1; + return 1024; case 4: - return 4; + return 4096; case 5: - return 8; + return 8192; case 1: default: DEBUG_INIT_C("Error: Wrong device size of Cs: ", cs, 1); @@ -711,13 +711,13 @@ float ddr3_get_device_size(u32 cs) * Small value will give wrong emem size in * ddr3_calc_mem_cs_size */ - return 0.01; + return 0; } } int ddr3_calc_mem_cs_size(u32 cs, u32 *cs_size) { - float cs_mem_size; + int cs_mem_size; /* Calculate in GiB */ cs_mem_size = ((ddr3_get_bus_width() / ddr3_get_device_width(cs)) * @@ -731,21 +731,12 @@ int ddr3_calc_mem_cs_size(u32 cs, u32 *cs_size) */ cs_mem_size *= DDR_CONTROLLER_BUS_WIDTH_MULTIPLIER; - if (cs_mem_size == 0.125) { - *cs_size = 128 << 20; - } else if (cs_mem_size == 0.25) { - *cs_size = 256 << 20; - } else if (cs_mem_size == 0.5) { - *cs_size = 512 << 20; - } else if (cs_mem_size == 1) { - *cs_size = 1 << 30; - } else if (cs_mem_size == 2) { - *cs_size = 2 << 30; - } else { + if (!cs_mem_size || (cs_mem_size == 64) || (cs_mem_size == 4096)) { DEBUG_INIT_C("Error: Wrong Memory size of Cs: ", cs, 1); return MV_BAD_VALUE; } + *cs_size = cs_mem_size << 20; return MV_OK; } -- 2.7.0

2 2

[U-Boot] [PATCH v2 0/2] armv8: Support loading 32-bit OS in AArch32 execution state
by Alison Wang 20 May '16

20 May '16

This series is to support loading a 32-bit OS, the execution state will change from AArch64 to AArch32 when jumping to kernel. The architecture information will be got through checking FIT image, then U-Boot will load 32-bit OS or 64-bit OS automatically. Spin-table method is used for secondary cores to load 32-bit OS. The architecture information will be got through checking FIT image and saved in the os_arch element of spin-table, then the secondary cores will check os_arch and jump to 32-bit OS or 64-bit OS automatically. Changes in v2: - armv8_switch_to_el2_aarch32() is removed. armv8_switch_to_el2_m is used to switch to AArch64 EL2 or AArch32 Hyp. - armv8_switch_to_el1_aarch32() is removed. armv8_switch_to_el1_m is used to switch to AArch64 EL1 or AArch32 SVC. ---------------------------------------------------------------- Alison Wang (2): armv8: Support loading 32-bit OS in AArch32 execution state armv8: fsl-layerscape: SMP support for loading 32-bit OS arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 35 +++++++++++++++++++++++++++++++---- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 10 ++++++++++ arch/arm/cpu/armv8/transition.S | 8 ++++---- arch/arm/include/asm/arch-fsl-layerscape/mp.h | 6 ++++++ arch/arm/include/asm/macro.h | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------- arch/arm/include/asm/system.h | 25 +++++++++++++++++++++++-- arch/arm/lib/bootm.c | 31 +++++++++++++++++++++++++++---- common/image-fit.c | 12 +++++++++++- 8 files changed, 185 insertions(+), 22 deletions(-)

3 8