August 2012 - U-Boot

[U-Boot] [PATCH v5] Consolidate bootcount code into drivers/bootcount
by Stefan Roese 01 Sep '12

01 Sep '12

This patch moves all bootcount implementations into a common directory: drivers/bootcount. The generic bootcount driver is now usable not only by powerpc platforms, but others as well. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Valentin Longchamp <valentin.longchamp(a)keymile.com> Cc: Christian Riesch <christian.riesch(a)omicron.at> Cc: Manfred Rudigier <manfred.rudigier(a)omicron.at> Cc: Mike Frysinger <vapier(a)gentoo.org> Cc: Rob Herring <rob.herring(a)calxeda.com> Cc: Reinhard Meyer <reinhard.meyer(a)emk-elektronik.de> Tested-by: Valentin Longchamp <valentin.longchamp(a)keymile.com> Tested-by: Christian Riesch <christian.riesch(a)omicron.at> Acked-by: Rob Herring <rob.herring(a)calxeda.com> --- v5: - Removed bootcount target from arch/blackfin/cpu/Makefile as pointer out by Mike (thanks) v4: - Rebased against TOT - Addressed Mike's comments v3: - Moved le-/be-accessors into header so that they now can be used by all bootcount drivers. - Changed CONFIG_BOOTCOUNT_LE to CONFIG_SYS_BOOTCOUNT_LE - Enabled CONFIG_SYS_BOOTCOUNT_LE in highbank - Enabled CONFIG_SYS_BOOTCOUNT_SINGLEWORD in highbank v2: - Added CONFIG_BOOTCOUNT_LE to bootcount_davinci.c and enabled it in calimain.h to select little-endian accessors. Makefile | 1 + arch/arm/cpu/arm926ejs/at91/cpu.c | 26 -------- arch/arm/cpu/armv7/highbank/Makefile | 2 +- arch/arm/cpu/armv7/highbank/bootcount.c | 36 ----------- arch/arm/cpu/ixp/cpu.c | 22 ------- arch/blackfin/cpu/Makefile | 1 - arch/powerpc/lib/Makefile | 1 - board/enbw/enbw_cmc/enbw_cmc.c | 29 --------- board/keymile/km_arm/km_arm.c | 51 --------------- board/omicron/calimain/calimain.c | 29 --------- drivers/bootcount/Makefile | 45 ++++++++++++++ .../powerpc/lib => drivers/bootcount}/bootcount.c | 25 ++++---- drivers/bootcount/bootcount_at91.c | 43 +++++++++++++ .../bootcount/bootcount_blackfin.c | 0 drivers/bootcount/bootcount_davinci.c | 49 +++++++++++++++ drivers/bootcount/bootcount_ram.c | 72 ++++++++++++++++++++++ include/bootcount.h | 51 +++++++++++++++ include/configs/calimain.h | 1 + include/configs/enbw_cmc.h | 1 + include/configs/highbank.h | 2 + include/configs/km/km_arm.h | 2 + 21 files changed, 282 insertions(+), 207 deletions(-) delete mode 100644 arch/arm/cpu/armv7/highbank/bootcount.c create mode 100644 drivers/bootcount/Makefile rename {arch/powerpc/lib => drivers/bootcount}/bootcount.c (82%) create mode 100644 drivers/bootcount/bootcount_at91.c rename arch/blackfin/cpu/bootcount.c => drivers/bootcount/bootcount_blackfin.c (100%) create mode 100644 drivers/bootcount/bootcount_davinci.c create mode 100644 drivers/bootcount/bootcount_ram.c create mode 100644 include/bootcount.h diff --git a/Makefile b/Makefile index 5ce5cc3..2b662b4 100644 --- a/Makefile +++ b/Makefile @@ -249,6 +249,7 @@ LIBS-y += net/libnet.o LIBS-y += disk/libdisk.o LIBS-y += drivers/bios_emulator/libatibiosemu.o LIBS-y += drivers/block/libblock.o +LIBS-$(CONFIG_BOOTCOUNT_LIMIT) += drivers/bootcount/libbootcount.o LIBS-y += drivers/dma/libdma.o LIBS-y += drivers/fpga/libfpga.o LIBS-y += drivers/gpio/libgpio.o diff --git a/arch/arm/cpu/arm926ejs/at91/cpu.c b/arch/arm/cpu/arm926ejs/at91/cpu.c index c47fb31..5cf4fad 100644 --- a/arch/arm/cpu/arm926ejs/at91/cpu.c +++ b/arch/arm/cpu/arm926ejs/at91/cpu.c @@ -71,29 +71,3 @@ int print_cpuinfo(void) return 0; } #endif - -#ifdef CONFIG_BOOTCOUNT_LIMIT -/* - * We combine the BOOTCOUNT_MAGIC and bootcount in one 32-bit register. - * This is done so we need to use only one of the four GPBR registers. - */ -void bootcount_store (ulong a) -{ - at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR; - - writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff), - &gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); -} - -ulong bootcount_load (void) -{ - at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR; - - ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); - if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) - return 0; - else - return val & 0x0000ffff; -} - -#endif /* CONFIG_BOOTCOUNT_LIMIT */ diff --git a/arch/arm/cpu/armv7/highbank/Makefile b/arch/arm/cpu/armv7/highbank/Makefile index 917c3a3..76faeb0 100644 --- a/arch/arm/cpu/armv7/highbank/Makefile +++ b/arch/arm/cpu/armv7/highbank/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(SOC).o -COBJS := timer.o bootcount.o +COBJS := timer.o SOBJS := SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/arch/arm/cpu/armv7/highbank/bootcount.c b/arch/arm/cpu/armv7/highbank/bootcount.c deleted file mode 100644 index 9ca0656..0000000 --- a/arch/arm/cpu/armv7/highbank/bootcount.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2011 Calxeda, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <common.h> -#include <asm/io.h> - -#ifdef CONFIG_BOOTCOUNT_LIMIT -void bootcount_store(ulong a) -{ - writel((BOOTCOUNT_MAGIC & 0xffff0000) | a, CONFIG_SYS_BOOTCOUNT_ADDR); -} - -ulong bootcount_load(void) -{ - u32 tmp = readl(CONFIG_SYS_BOOTCOUNT_ADDR); - - if ((tmp & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) - return 0; - else - return tmp & 0x0000ffff; -} -#endif diff --git a/arch/arm/cpu/ixp/cpu.c b/arch/arm/cpu/ixp/cpu.c index 942845d..f1864d6 100644 --- a/arch/arm/cpu/ixp/cpu.c +++ b/arch/arm/cpu/ixp/cpu.c @@ -107,28 +107,6 @@ void pci_init(void) } */ -#ifdef CONFIG_BOOTCOUNT_LIMIT - -void bootcount_store (ulong a) -{ - volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR); - - save_addr[0] = a; - save_addr[1] = BOOTCOUNT_MAGIC; -} - -ulong bootcount_load (void) -{ - volatile ulong *save_addr = (volatile ulong *)(CONFIG_SYS_BOOTCOUNT_ADDR); - - if (save_addr[1] != BOOTCOUNT_MAGIC) - return 0; - else - return save_addr[0]; -} - -#endif /* CONFIG_BOOTCOUNT_LIMIT */ - int cpu_eth_init(bd_t *bis) { #ifdef CONFIG_IXP4XX_NPE diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index 5deaa9e..0a72ec5 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -17,7 +17,6 @@ EXTRA := init.elf CEXTRA := initcode.o SEXTRA := start.o SOBJS := interrupt.o cache.o -COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o COBJS-y += cpu.o COBJS-y += gpio.o COBJS-y += interrupts.o diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index cdd62a2..965f9ea 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -46,7 +46,6 @@ SOBJS-y += reloc.o COBJS-$(CONFIG_BAT_RW) += bat_rw.o COBJS-y += board.o COBJS-y += bootm.o -COBJS-$(CONFIG_BOOTCOUNT_LIMIT) += bootcount.o COBJS-y += cache.o COBJS-y += extable.o COBJS-y += interrupts.o diff --git a/board/enbw/enbw_cmc/enbw_cmc.c b/board/enbw/enbw_cmc/enbw_cmc.c index 0874e9c..67d5d4d 100644 --- a/board/enbw/enbw_cmc/enbw_cmc.c +++ b/board/enbw/enbw_cmc/enbw_cmc.c @@ -778,35 +778,6 @@ void arch_memory_failure_handle(void) } #endif -#if defined(CONFIG_BOOTCOUNT_LIMIT) -void bootcount_store(ulong a) -{ - struct davinci_rtc *reg = - (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; - - /* - * write RTC kick register to enable write - * for RTC Scratch registers. Scratch0 and 1 are - * used for bootcount values. - */ - writel(RTC_KICK0R_WE, &reg->kick0r); - writel(RTC_KICK1R_WE, &reg->kick1r); - out_be32(&reg->scratch0, a); - out_be32(&reg->scratch1, BOOTCOUNT_MAGIC); -} - -ulong bootcount_load(void) -{ - struct davinci_rtc *reg = - (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; - - if (in_be32(&reg->scratch1) != BOOTCOUNT_MAGIC) - return 0; - else - return in_be32(&reg->scratch0); -} -#endif - ulong post_word_load(void) { struct davinci_rtc *reg = diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2b2ca39..930c80e 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -408,57 +408,6 @@ int hush_init_var(void) } #endif -#if defined(CONFIG_BOOTCOUNT_LIMIT) -const ulong patterns[] = { 0x00000000, - 0xFFFFFFFF, - 0xFF00FF00, - 0x0F0F0F0F, - 0xF0F0F0F0}; -const ulong NBR_OF_PATTERNS = ARRAY_SIZE(patterns); -const ulong OFFS_PATTERN = 3; -const ulong REPEAT_PATTERN = 1000; - -void bootcount_store(ulong a) -{ - ulong *save_addr; - ulong size = 0; - int i; - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) - size += gd->bd->bi_dram[i].size; - save_addr = (ulong *)(size - BOOTCOUNT_ADDR); - writel(a, save_addr); - writel(BOOTCOUNT_MAGIC, &save_addr[1]); - - for (i = 0; i < REPEAT_PATTERN; i++) - writel(patterns[i % NBR_OF_PATTERNS], - &save_addr[i+OFFS_PATTERN]); - -} - -ulong bootcount_load(void) -{ - ulong *save_addr; - ulong size = 0; - ulong counter = 0; - int i, tmp; - - for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) - size += gd->bd->bi_dram[i].size; - save_addr = (ulong *)(size - BOOTCOUNT_ADDR); - - counter = readl(&save_addr[0]); - - /* Is the counter reliable, check in the big pattern for bit errors */ - for (i = 0; (i < REPEAT_PATTERN) && (counter != 0); i++) { - tmp = readl(&save_addr[i+OFFS_PATTERN]); - if (tmp != patterns[i % NBR_OF_PATTERNS]) - counter = 0; - } - return counter; -} -#endif - #if defined(CONFIG_SOFT_I2C) void set_sda(int state) { diff --git a/board/omicron/calimain/calimain.c b/board/omicron/calimain/calimain.c index 54415ce..1060a1f 100644 --- a/board/omicron/calimain/calimain.c +++ b/board/omicron/calimain/calimain.c @@ -157,32 +157,3 @@ void hw_watchdog_reset(void) davinci_hw_watchdog_reset(); } #endif - -#if defined(CONFIG_BOOTCOUNT_LIMIT) -void bootcount_store(ulong a) -{ - struct davinci_rtc *reg = - (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; - - /* - * write RTC kick register to enable write - * for RTC Scratch registers. Scratch0 and 1 are - * used for bootcount values. - */ - writel(RTC_KICK0R_WE, &reg->kick0r); - writel(RTC_KICK1R_WE, &reg->kick1r); - writel(a, &reg->scratch0); - writel(BOOTCOUNT_MAGIC, &reg->scratch1); -} - -ulong bootcount_load(void) -{ - struct davinci_rtc *reg = - (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; - - if (readl(&reg->scratch1) != BOOTCOUNT_MAGIC) - return 0; - else - return readl(&reg->scratch0); -} -#endif diff --git a/drivers/bootcount/Makefile b/drivers/bootcount/Makefile new file mode 100644 index 0000000..a8d0ac7 --- /dev/null +++ b/drivers/bootcount/Makefile @@ -0,0 +1,45 @@ +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, +# MA 02111-1307 USA +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libbootcount.o + +COBJS-y += bootcount.o +COBJS-$(CONFIG_AT91SAM9XE) += bootcount_at91.o +COBJS-$(CONFIG_BLACKFIN) += bootcount_blackfin.o +COBJS-$(CONFIG_SOC_DA8XX) += bootcount_davinci.o +COBJS-$(CONFIG_BOOTCOUNT_RAM) += bootcount_ram.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################## diff --git a/arch/powerpc/lib/bootcount.c b/drivers/bootcount/bootcount.c similarity index 82% rename from arch/powerpc/lib/bootcount.c rename to drivers/bootcount/bootcount.c index f9ce539..80eb717 100644 --- a/arch/powerpc/lib/bootcount.c +++ b/drivers/bootcount/bootcount.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010 + * (C) Copyright 2010-2012 * Stefan Roese, DENX Software Engineering, sr(a)denx.de. * * See file CREDITS for list of people who contributed to this @@ -21,8 +21,8 @@ * MA 02111-1307 USA */ -#include <common.h> -#include <asm/io.h> +#include <bootcount.h> +#include <linux/compiler.h> /* * Only override CONFIG_SYS_BOOTCOUNT_ADDR if not already defined. This @@ -65,33 +65,36 @@ #endif /* !defined(CONFIG_SYS_BOOTCOUNT_ADDR) */ -void bootcount_store(ulong a) +/* Now implement the generic default functions */ +#if defined(CONFIG_SYS_BOOTCOUNT_ADDR) +__weak void bootcount_store(ulong a) { void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR; #if defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) - out_be32(reg, (BOOTCOUNT_MAGIC & 0xffff0000) | a); + raw_bootcount_store(reg, (BOOTCOUNT_MAGIC & 0xffff0000) | a); #else - out_be32(reg, a); - out_be32(reg + 4, BOOTCOUNT_MAGIC); + raw_bootcount_store(reg, a); + raw_bootcount_store(reg + 4, BOOTCOUNT_MAGIC); #endif } -ulong bootcount_load(void) +__weak ulong bootcount_load(void) { void *reg = (void *)CONFIG_SYS_BOOTCOUNT_ADDR; #if defined(CONFIG_SYS_BOOTCOUNT_SINGLEWORD) - u32 tmp = in_be32(reg); + u32 tmp = raw_bootcount_load(reg); if ((tmp & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) return 0; else return (tmp & 0x0000ffff); #else - if (in_be32(reg + 4) != BOOTCOUNT_MAGIC) + if (raw_bootcount_load(reg + 4) != BOOTCOUNT_MAGIC) return 0; else - return in_be32(reg); + return raw_bootcount_load(reg); #endif } +#endif diff --git a/drivers/bootcount/bootcount_at91.c b/drivers/bootcount/bootcount_at91.c new file mode 100644 index 0000000..7cfe14d --- /dev/null +++ b/drivers/bootcount/bootcount_at91.c @@ -0,0 +1,43 @@ +/* + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/hardware.h> +#include <asm/arch/at91_gpbr.h> + +/* + * We combine the BOOTCOUNT_MAGIC and bootcount in one 32-bit register. + * This is done so we need to use only one of the four GPBR registers. + */ +void bootcount_store(ulong a) +{ + at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR; + + writel((BOOTCOUNT_MAGIC & 0xffff0000) | (a & 0x0000ffff), + &gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); +} + +ulong bootcount_load(void) +{ + at91_gpbr_t *gpbr = (at91_gpbr_t *) ATMEL_BASE_GPBR; + + ulong val = readl(&gpbr->reg[AT91_GPBR_INDEX_BOOTCOUNT]); + if ((val & 0xffff0000) != (BOOTCOUNT_MAGIC & 0xffff0000)) + return 0; + else + return val & 0x0000ffff; +} diff --git a/arch/blackfin/cpu/bootcount.c b/drivers/bootcount/bootcount_blackfin.c similarity index 100% rename from arch/blackfin/cpu/bootcount.c rename to drivers/bootcount/bootcount_blackfin.c diff --git a/drivers/bootcount/bootcount_davinci.c b/drivers/bootcount/bootcount_davinci.c new file mode 100644 index 0000000..1cd9436 --- /dev/null +++ b/drivers/bootcount/bootcount_davinci.c @@ -0,0 +1,49 @@ +/* + * (C) Copyright 2011 + * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <bootcount.h> +#include <asm/arch/da850_lowlevel.h> +#include <asm/arch/davinci_misc.h> + +void bootcount_store(ulong a) +{ + struct davinci_rtc *reg = + (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; + + /* + * write RTC kick register to enable write + * for RTC Scratch registers. Scratch0 and 1 are + * used for bootcount values. + */ + writel(RTC_KICK0R_WE, &reg->kick0r); + writel(RTC_KICK1R_WE, &reg->kick1r); + raw_bootcount_store(&reg->scratch0, a); + raw_bootcount_store(&reg->scratch1, BOOTCOUNT_MAGIC); +} + +ulong bootcount_load(void) +{ + struct davinci_rtc *reg = + (struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; + + if (raw_bootcount_load(&reg->scratch1) != BOOTCOUNT_MAGIC) + return 0; + else + return raw_bootcount_load(&reg->scratch0); +} diff --git a/drivers/bootcount/bootcount_ram.c b/drivers/bootcount/bootcount_ram.c new file mode 100644 index 0000000..8655af7 --- /dev/null +++ b/drivers/bootcount/bootcount_ram.c @@ -0,0 +1,72 @@ +/* + * (C) Copyright 2010 + * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <common.h> +#include <asm/io.h> + +DECLARE_GLOBAL_DATA_PTR; + +const ulong patterns[] = { 0x00000000, + 0xFFFFFFFF, + 0xFF00FF00, + 0x0F0F0F0F, + 0xF0F0F0F0}; +const ulong NBR_OF_PATTERNS = sizeof(patterns) / sizeof(*patterns); +const ulong OFFS_PATTERN = 3; +const ulong REPEAT_PATTERN = 1000; + +void bootcount_store(ulong a) +{ + ulong *save_addr; + ulong size = 0; + int i; + + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) + size += gd->bd->bi_dram[i].size; + save_addr = (ulong *)(size - BOOTCOUNT_ADDR); + writel(a, save_addr); + writel(BOOTCOUNT_MAGIC, &save_addr[1]); + + for (i = 0; i < REPEAT_PATTERN; i++) + writel(patterns[i % NBR_OF_PATTERNS], + &save_addr[i + OFFS_PATTERN]); + +} + +ulong bootcount_load(void) +{ + ulong *save_addr; + ulong size = 0; + ulong counter = 0; + int i, tmp; + + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) + size += gd->bd->bi_dram[i].size; + save_addr = (ulong *)(size - BOOTCOUNT_ADDR); + + counter = readl(&save_addr[0]); + + /* Is the counter reliable, check in the big pattern for bit errors */ + for (i = 0; (i < REPEAT_PATTERN) && (counter != 0); i++) { + tmp = readl(&save_addr[i + OFFS_PATTERN]); + if (tmp != patterns[i % NBR_OF_PATTERNS]) + counter = 0; + } + return counter; +} diff --git a/include/bootcount.h b/include/bootcount.h new file mode 100644 index 0000000..3ec1aec --- /dev/null +++ b/include/bootcount.h @@ -0,0 +1,51 @@ +/* + * (C) Copyright 2012 + * Stefan Roese, DENX Software Engineering, sr(a)denx.de. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/byteorder.h> + +#if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE) +# if __BYTE_ORDER == __LITTLE_ENDIAN +# define CONFIG_SYS_BOOTCOUNT_LE +# else +# define CONFIG_SYS_BOOTCOUNT_BE +# endif +#endif + +#ifdef CONFIG_SYS_BOOTCOUNT_LE +static inline void raw_bootcount_store(volatile u32 *addr, u32 data) +{ + out_le32(addr, data); +} + +static inline u32 raw_bootcount_load(volatile u32 *addr) +{ + return in_le32(addr); +} +#else +static inline void raw_bootcount_store(volatile u32 *addr, u32 data) +{ + out_be32(addr, data); +} + +static inline u32 raw_bootcount_load(volatile u32 *addr) +{ + return in_be32(addr); +} +#endif diff --git a/include/configs/calimain.h b/include/configs/calimain.h index e31e40b..8141fd7 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -352,6 +352,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (0x8001ff00) #define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ #define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE #ifndef __ASSEMBLY__ diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h index 3fc07e6..b99492c 100644 --- a/include/configs/enbw_cmc.h +++ b/include/configs/enbw_cmc.h @@ -458,6 +458,7 @@ #define CONFIG_BOOTCOUNT_LIMIT #define CONFIG_SYS_BOOTCOUNT_ADDR DAVINCI_RTC_BASE +#define CONFIG_SYS_BOOTCOUNT_BE #define CONFIG_SYS_NAND_U_BOOT_DST 0xc0080000 #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x60004000 diff --git a/include/configs/highbank.h b/include/configs/highbank.h index 791f3f5..897bc39 100644 --- a/include/configs/highbank.h +++ b/include/configs/highbank.h @@ -41,6 +41,8 @@ #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_SYS_BOOTCOUNT_SINGLEWORD +#define CONFIG_SYS_BOOTCOUNT_LE /* Use little-endian accessors */ #define CONFIG_SYS_BOOTCOUNT_ADDR 0xfff3cf0c #define CONFIG_MISC_INIT_R diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 3aa5ca1..0d5ecd5 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -307,6 +307,8 @@ int get_scl(void); #define CONFIG_KM_RESERVED_PRAM 0x801000 /* address for the bootcount (taken from end of RAM) */ #define BOOTCOUNT_ADDR (CONFIG_KM_RESERVED_PRAM) +/* Use generic bootcount RAM driver */ +#define CONFIG_BOOTCOUNT_RAM /* enable POST tests */ #define CONFIG_POST (CONFIG_SYS_POST_MEM_REGIONS) -- 1.7.11.3

4 3

[U-Boot] [PATCH 1/4] mpc5xxx: add pci_mpc5xxx_init prototype to common header
by Anatolij Gustschin 01 Sep '12

01 Sep '12

Add pci_mpc5xxx_init() prototype to the header file, so board .c files do not need to add extern pci_mpc5xxx_init() declaration. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- include/mpc5xxx.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/mpc5xxx.h b/include/mpc5xxx.h index 859d696..84d27c9 100644 --- a/include/mpc5xxx.h +++ b/include/mpc5xxx.h @@ -898,8 +898,11 @@ struct mpc5xxx_xlb { volatile u32 snoop_window; /* XLB + 0x70 */ }; +struct pci_controller; + /* function prototypes */ void loadtask(int basetask, int tasks); +void pci_mpc5xxx_init(struct pci_controller *); #endif /* __ASSEMBLY__ */ -- 1.7.7.6

2 11

[U-Boot] Request pull: u-boot-sh
by Nobuhiro Iwamatsu 01 Sep '12

01 Sep '12

Dear Wolfgang. Please pull u-boot-sh master branch. Best regards, Nobuhiro The following changes since commit e66443fdb5355e68cfdbbdd37248c4b7eb4968f5: Makefile: fix HAVE_VENDOR_COMMON_LIB (2012-08-17 18:07:12 +0200) are available in the git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to 31d4fe8d405c4b9e27f7eca6c6710092ba14b49d: sh: tmu: Removed arch/sh/include/asm/clk.h (2012-08-21 15:00:34 +0900) ---------------------------------------------------------------- Nobuhiro Iwamatsu (3): sh: tmu: Changed TMU driver using array of structures sh: tmu: Changed switch statement to shift operation sh: tmu: Removed arch/sh/include/asm/clk.h arch/sh/include/asm/clk.h | 35 ---------------------------- arch/sh/include/asm/cpu_sh7706.h | 5 +--- arch/sh/include/asm/cpu_sh7710.h | 5 +--- arch/sh/include/asm/cpu_sh7720.h | 10 -------- arch/sh/include/asm/cpu_sh7722.h | 11 +-------- arch/sh/include/asm/cpu_sh7723.h | 11 +-------- arch/sh/include/asm/cpu_sh7724.h | 11 +-------- arch/sh/include/asm/cpu_sh7734.h | 4 +--- arch/sh/include/asm/cpu_sh7750.h | 21 +---------------- arch/sh/include/asm/cpu_sh7757.h | 14 +----------- arch/sh/include/asm/cpu_sh7763.h | 5 +--- arch/sh/include/asm/cpu_sh7780.h | 24 +------------------ arch/sh/include/asm/cpu_sh7785.h | 24 +------------------ arch/sh/lib/time.c | 72 +++++++++++++++++++++++++-------------------------------- include/sh_tmu.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 15 files changed, 117 insertions(+), 210 deletions(-) delete mode 100644 arch/sh/include/asm/clk.h create mode 100644 include/sh_tmu.h -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 01 Sep '12

01 Sep '12

Dear Albert ARIBAUD, The following changes since commit 5f50310588e87f2ff501992564d1b05df71419f4: davinci, c6x: Always use C version of reset code (2012-08-25 13:40:03 +0200) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to 76f60ac2246d433c6995041d1aaf9f5d4e59b941: arm:cache:trats: Enable PL310 L2 Cache Controller at TRATS Samsung board (2012-08-27 12:25:09 +0900) ---------------------------------------------------------------- Donghwa Lee (9): video: support exynos fimd driver for various exynos series EXYNOS5: support exynos5 lcd clock control EXYNOS5: support display system register control EXYNOS5: support display port phy control function EXYNOS5: add display port base address video: support exynos display port drivers video: add dp_enabled variable in vidinfo structure video: exynos fb driver supports display port feature video: support exynos pwm backlight driver Jaehoon Chung (1): ARM: EXYNOS: fixed compiler warning message Rajeshwari Shinde (10): ARCH: SPL: Add parametric board initializer SMDK5250: SPL: Define parametric board initializer SMDK5250: Add smdk5250-uboot-spl.lds EXYNOS5: CLOCK: define additional clock registers for Exynos5250 Rev 1.0 EXYNOS5: CLOCK: Add clock support for Exynos5250 Rev 1.0 Exynos5: DDR3: Add DDR3 memory setup for Exynos5250 Rev 1.0 EXYNOS5: CLOCK: Modify MPLL clock out for Exynos5250 Rev 1.0 EXYNOS5: CLOCK: Add BPLL support EXYNOS5 : Modify pinnumx settings as per Exynos5250 Rev 1.0 Zhong Hongbo (1): arm/s5pxx: Fix get_timer_masked to get the time. Łukasz Majewski (3): arm:trats: loaduimage environment variable defied for TRATS target arm:exynos: Enable data cache at exynos based processors. arm:cache:trats: Enable PL310 L2 Cache Controller at TRATS Samsung board arch/arm/cpu/armv7/exynos/clock.c | 139 ++- arch/arm/cpu/armv7/exynos/pinmux.c | 22 +- arch/arm/cpu/armv7/exynos/power.c | 21 + arch/arm/cpu/armv7/exynos/soc.c | 8 + arch/arm/cpu/armv7/exynos/system.c | 18 + arch/arm/cpu/armv7/s5p-common/pwm.c | 2 +- arch/arm/cpu/armv7/s5p-common/timer.c | 20 +- arch/arm/include/asm/arch-exynos/clk.h | 1 + arch/arm/include/asm/arch-exynos/clock.h | 237 ++-- arch/arm/include/asm/arch-exynos/cpu.h | 3 + arch/arm/include/asm/arch-exynos/dmc.h | 65 ++ arch/arm/include/asm/arch-exynos/dp.h | 751 +++++++++++++ arch/arm/include/asm/arch-exynos/dp_info.h | 214 ++++ arch/arm/include/asm/arch-exynos/fb.h | 27 +- arch/arm/include/asm/arch-exynos/gpio.h | 7 +- arch/arm/include/asm/arch-exynos/power.h | 5 + arch/arm/include/asm/arch-exynos/pwm_backlight.h | 34 + arch/arm/include/asm/arch-exynos/spl.h | 97 ++ board/samsung/smdk5250/Makefile | 3 +- board/samsung/smdk5250/clock_init.c | 714 +++++++++--- board/samsung/smdk5250/clock_init.h | 149 +++ board/samsung/smdk5250/dmc_common.c | 199 ++++ board/samsung/smdk5250/dmc_init.c | 462 -------- board/samsung/smdk5250/dmc_init_ddr3.c | 228 ++++ board/samsung/smdk5250/setup.h | 763 +++++++------ board/samsung/smdk5250/smdk5250-uboot-spl.lds | 66 ++ board/samsung/smdk5250/smdk5250.c | 6 +- board/samsung/smdk5250/smdk5250_spl.c | 68 ++ drivers/video/Makefile | 2 + drivers/video/exynos_dp.c | 925 ++++++++++++++++ drivers/video/exynos_dp_lowlevel.c | 1291 ++++++++++++++++++++++ drivers/video/exynos_dp_lowlevel.h | 80 ++ drivers/video/exynos_fb.c | 5 +- drivers/video/exynos_fimd.c | 91 +- drivers/video/exynos_pwm_bl.c | 57 + include/configs/smdk5250.h | 7 +- include/configs/trats.h | 7 +- include/lcd.h | 1 + 38 files changed, 5730 insertions(+), 1065 deletions(-) create mode 100644 arch/arm/include/asm/arch-exynos/dp.h create mode 100644 arch/arm/include/asm/arch-exynos/dp_info.h create mode 100644 arch/arm/include/asm/arch-exynos/pwm_backlight.h create mode 100644 arch/arm/include/asm/arch-exynos/spl.h create mode 100644 board/samsung/smdk5250/clock_init.h create mode 100644 board/samsung/smdk5250/dmc_common.c delete mode 100644 board/samsung/smdk5250/dmc_init.c create mode 100644 board/samsung/smdk5250/dmc_init_ddr3.c create mode 100644 board/samsung/smdk5250/smdk5250-uboot-spl.lds create mode 100644 board/samsung/smdk5250/smdk5250_spl.c create mode 100644 drivers/video/exynos_dp.c create mode 100644 drivers/video/exynos_dp_lowlevel.c create mode 100644 drivers/video/exynos_dp_lowlevel.h create mode 100644 drivers/video/exynos_pwm_bl.c -- from. prom. www.promsoft.net

2 1

[U-Boot] please pull u-boot-avr32/master
by Andreas Bießmann 01 Sep '12

01 Sep '12

The following changes since commit 81316a902a2c76bc880ab49c6d157e3e9754806d: mtd/cfi_flash: fix write problems for Numonyx P33/30 32 MBit flashs (2012-08-13 14:34:44 +0200) are available in the git repository at: git://git.denx.de/u-boot-avr32.git master for you to fetch changes up to 5b80e07e87df9f5270d5c9a8a95881762b845d68: avr32: Remove redundant LDSCRIPT definition (2012-08-14 07:38:57 +0200) ---------------------------------------------------------------- Benoît Thébaudeau (1): avr32: Remove redundant LDSCRIPT definition arch/avr32/config.mk | 2 -- 1 file changed, 2 deletions(-)

4 5

[U-Boot] Please pull u-boot-staging/trini@ti.com
by Tom Rini 01 Sep '12

01 Sep '12

Hello, The following changes since commit 092592c3b79aa3974ea12ae4f408db7679e6a109: ARM: add Raspberry Pi model B board, using BCM2835 SoC (2012-08-30 08:50:50 +0200) are available in the git repository at: git://git.denx.de/u-boot-staging trini(a)ti.com for you to fetch changes up to a2d4138ccbe6c38ac0db21ac900f05fadfdf0f02: ARM: Remove unused stack and irq config defines (2012-08-31 15:44:13 -0700) ---------------------------------------------------------------- Rob Herring (1): ARM: Remove unused stack and irq config defines Tetsuyuki Kobayashi (1): arm: bugfix: save_boot_params_default accesses uninitalized stack when -O0 arch/arm/cpu/armv7/cpu.c | 7 ------- arch/arm/cpu/armv7/start.S | 14 ++++++++++++++ include/configs/SX1.h | 13 ------------- include/configs/VCMA9.h | 12 ------------ include/configs/a320evb.h | 13 ------------- include/configs/actux1.h | 6 ------ include/configs/actux2.h | 6 ------ include/configs/actux3.h | 7 ------- include/configs/actux4.h | 6 ------ include/configs/adp-ag101.h | 7 ------- include/configs/adp-ag101p.h | 7 ------- include/configs/adp-ag102.h | 7 ------- include/configs/afeb9260.h | 5 ----- include/configs/am335x_evm.h | 3 --- include/configs/am3517_crane.h | 8 -------- include/configs/am3517_evm.h | 8 -------- include/configs/apollon.h | 8 -------- include/configs/at91rm9200ek.h | 3 --- include/configs/at91sam9260ek.h | 7 ------- include/configs/at91sam9261ek.h | 7 ------- include/configs/at91sam9263ek.h | 5 ----- include/configs/at91sam9m10g45ek.h | 7 ------- include/configs/at91sam9rlek.h | 5 ----- include/configs/balloon3.h | 9 --------- include/configs/ca9x4_ct_vxp.h | 7 ------- include/configs/calimain.h | 1 - include/configs/cam_enc_4xx.h | 2 -- include/configs/cm4008.h | 13 ------------- include/configs/cm41xx.h | 13 ------------- include/configs/cm_t35.h | 8 -------- include/configs/colibri_pxa270.h | 11 ----------- include/configs/cpu9260.h | 7 ------- include/configs/cpuat91.h | 10 ---------- include/configs/da830evm.h | 2 -- include/configs/da850evm.h | 1 - include/configs/davinci_dm355evm.h | 2 -- include/configs/davinci_dm355leopard.h | 2 -- include/configs/davinci_dm365evm.h | 2 -- include/configs/davinci_dm6467evm.h | 2 -- include/configs/davinci_dvevm.h | 2 -- include/configs/davinci_schmoogie.h | 2 -- include/configs/davinci_sffsdr.h | 2 -- include/configs/davinci_sonata.h | 2 -- include/configs/devkit3250.h | 1 - include/configs/devkit8000.h | 4 ---- include/configs/dig297.h | 12 ------------ include/configs/dvlhost.h | 7 ------- include/configs/ea20.h | 1 - include/configs/eb_cpux9k2.h | 2 -- include/configs/edminiv2.h | 1 - include/configs/efikamx.h | 7 ------- include/configs/enbw_cmc.h | 1 - include/configs/ethernut5.h | 5 ++--- include/configs/flea3.h | 8 -------- include/configs/hawkboard.h | 1 - include/configs/highbank.h | 11 ----------- include/configs/igep00x0.h | 7 ------- include/configs/ima3-mx53.h | 3 --- include/configs/imx27lite-common.h | 1 - include/configs/imx31_litekit.h | 7 ------- include/configs/imx31_phycore.h | 7 ------- include/configs/integratorap.h | 11 ----------- include/configs/integratorcp.h | 11 ----------- include/configs/jadecpu.h | 7 ------- include/configs/jornada.h | 7 ------- include/configs/km/km_arm.h | 1 - include/configs/lubbock.h | 12 ------------ include/configs/m28evk.h | 1 - include/configs/mcx.h | 7 ------- include/configs/meesc.h | 7 ------- include/configs/mv-common.h | 1 - include/configs/mx1ads.h | 12 ------------ include/configs/mx25pdk.h | 3 --- include/configs/mx28evk.h | 1 - include/configs/mx31ads.h | 7 ------- include/configs/mx31pdk.h | 7 ------- include/configs/mx35pdk.h | 8 -------- include/configs/mx51evk.h | 7 ------- include/configs/mx53ard.h | 3 --- include/configs/mx53evk.h | 3 --- include/configs/mx53loco.h | 3 --- include/configs/mx53smd.h | 3 --- include/configs/mx6qarm2.h | 1 - include/configs/mx6qsabrelite.h | 1 - include/configs/nhk8815.h | 6 ------ include/configs/ns9750dev.h | 4 ---- include/configs/omap1510inn.h | 13 ------------- include/configs/omap2420h4.h | 12 ------------ include/configs/omap3_beagle.h | 8 -------- include/configs/omap3_evm_common.h | 8 -------- include/configs/omap3_logic.h | 9 --------- include/configs/omap3_mvblx.h | 8 -------- include/configs/omap3_overo.h | 8 -------- include/configs/omap3_pandora.h | 8 -------- include/configs/omap3_sdp3430.h | 8 -------- include/configs/omap3_zoom1.h | 8 -------- include/configs/omap3_zoom2.h | 8 -------- include/configs/omap4_common.h | 12 ------------ include/configs/omap5912osk.h | 13 ------------- include/configs/omap5_evm.h | 12 ------------ include/configs/omap730p2.h | 14 -------------- include/configs/origen.h | 8 -------- include/configs/otc570.h | 7 ------- include/configs/palmld.h | 9 --------- include/configs/palmtc.h | 9 --------- include/configs/pdnb3.h | 11 ----------- include/configs/pm9261.h | 7 ------- include/configs/pm9263.h | 7 ------- include/configs/pm9g45.h | 6 ------ include/configs/pxa255_idp.h | 13 ------------- include/configs/qong.h | 6 ------ include/configs/s5p_goni.h | 3 --- include/configs/s5pc210_universal.h | 3 --- include/configs/sbc35_a9g20.h | 6 ------ include/configs/scb9328.h | 8 -------- include/configs/smdk2410.h | 13 ------------- include/configs/smdk5250.h | 3 --- include/configs/smdk6400.h | 7 ------- include/configs/smdkc100.h | 7 ------- include/configs/smdkv310.h | 8 -------- include/configs/snapper9260.h | 2 -- include/configs/spear-common.h | 8 -------- include/configs/tam3517-common.h | 7 ------- include/configs/tegra2-common.h | 6 ------ include/configs/tnetv107x_evm.h | 1 - include/configs/tny_a9260.h | 7 ------- include/configs/top9000.h | 5 ----- include/configs/trats.h | 3 --- include/configs/tricorder.h | 4 ---- include/configs/trizepsiv.h | 13 ------------- include/configs/tt01.h | 3 --- include/configs/tx25.h | 1 - include/configs/u8500_href.h | 10 ---------- include/configs/vct.h | 1 - include/configs/versatile.h | 11 ----------- include/configs/vision2.h | 5 ----- include/configs/vl_ma2sc.h | 9 --------- include/configs/vpac270.h | 8 -------- include/configs/xaeniax.h | 15 --------------- include/configs/zipitz2.h | 10 ---------- include/configs/zmx25.h | 1 - 141 files changed, 16 insertions(+), 895 deletions(-) A MAKEALL -a arm (not MAKEALL arm) has been run and no changes seen overall. -- Tom

2 1

[U-Boot] [PATCH] fsl_esdhc: Add no-snoop config for default init
by Benoît Thébaudeau 01 Sep '12

01 Sep '12

cfg->no_snoop was available only through custom fsl_esdhc_mmc init functions. Add a config options to make it available also through the default init. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Andy Fleming <afleming(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Kim Phillips <kim.phillips(a)freescale.com> --- .../drivers/mmc/fsl_esdhc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git u-boot-4d3c95f.orig/drivers/mmc/fsl_esdhc.c u-boot-4d3c95f/drivers/mmc/fsl_esdhc.c index b6c969d..21154e5 100644 --- u-boot-4d3c95f.orig/drivers/mmc/fsl_esdhc.c +++ u-boot-4d3c95f/drivers/mmc/fsl_esdhc.c @@ -597,6 +597,9 @@ int fsl_esdhc_mmc_init(bd_t *bis) cfg = malloc(sizeof(struct fsl_esdhc_cfg)); memset(cfg, 0, sizeof(struct fsl_esdhc_cfg)); cfg->esdhc_base = CONFIG_SYS_FSL_ESDHC_ADDR; +#ifdef CONFIG_SYS_FSL_ESDHC_NO_SNOOP + cfg->no_snoop = 1; +#endif return fsl_esdhc_initialize(bis, cfg); }

4 17

Re: [U-Boot] [PATCH] usb: do explicit unaligned accesses
by Marek Vasut 01 Sep '12

01 Sep '12

Dear Albert ARIBAUD, > Hi Marek, > > On Fri, 31 Aug 2012 18:15:30 +0200, Marek Vasut <marex(a)denx.de> wrote: > > Dear Albert ARIBAUD, > > > > > Hi Marek, > > > > > > On Fri, 31 Aug 2012 01:29:05 +0200, Marek Vasut <marex(a)denx.de> > > > > > > wrote: > > > > Dear Lucas Stach, > > > > > > > > > usb_hub_descriptor has to be packed as it's used for > > > > > communication with the device. Member wHubCharacteristics > > > > > violates the natural alignment rules. > > > > > > > > > > Use explicit unaligned access functions for this member. > > > > > Fixes ARMv7 traping while using USB. > > > > > > > > Shouldn't a properly configured compiler prevent such behavior? > > > > > > This has been discussed before. As a summary: > > Argh, I must have missed this. > > > > > 1. A properly configured compiler can pad a structure so that the > > > fields always start at an aligned address (assuming the structure > > > base address is itself aligned). But that alters the structure, and > > > here there must be no alterations to the structure. > > > > There can be ... the compiler can even reorder the structures (that > > happened in Linux kernel, as I'm on a train now with shitty internet > > connection, I can't find it ... search LWN for that please). > > As a compiler bug, this can happen indeed. And we had our share of > compiler alignment bugs ourselves. But a conforming compiler should not > reorder fields. I'm no compiler expert ... so I won't argue here > > > 2. A properly (and differently) configured compiler can > > > automatically generate native unaligned accesses to unaligned > > > fields. This is acceptable on armv6+ architectures, has a > > > performance penalty on earlier architectures, and does not > > > necessarily work depending on the hardware configuration. > > > > Certainly, agreed. > > > > > 3. A properly (and differently yet) configured compiler can > > > automatically generate non-native unaligned accesses to unaligned > > > fields. This is acceptable on all architectures, has a performance > > > penalty on pre-armV6 architectures for all misaligned accesses, > > > whether voluntary or not. > > > > Correct, I'd vote for this solution -- let the compiler handle such > > unaligned cases. > > > > > The conclusion of the discussion is as follows -- or to be more > > > exact, following this discussion, this is my stance as the U-Boot > > > > custodian: > Someone please hold Wolfgang back while I correct myself: "as the *ARM* > U-Boot custodian..." > > :) %^) > > > i) All the code intended to run 'close to' U-Boot (i.e., U-Boot code > > > itself and application code) is controlled enough that we should be > > > able to know and limit which code requires misaligned access (such > > > as here for this USB structure field); > > > > > > ii) On some ARM architectures, and possibly some non-ARM > > > architectures as well, native misaligned access incur a performance > > > hit, and may even simply be impossible or forbidden by a hardware > > > or system design decision. > > > > > > iii) Thus, U-Boot should follow a strict policy of using native > > > aligned accesses only, possibly enforcing misaligned native access > > > prevention in hardware, and of explicitly emulating misaligned > > > accesses when they cannot be avoided. > > > > I do agree with i) and ii), but why not just let compiler handle the > > unaligned access for us? The compiler can optimize across the whole > > code, not only locally over one access, therefore it might be able to > > punt some of the unaligned accesses altogether if the code allows it. > > I think you are talking about lumping small-sized accesses together > into a bigger access possibly aligned. This is exactly what I mean. > If I am correct, then I don't > think this is related to misaligned accesses. Why won't it be? Such access can in the end turn out to be aligned, therefore leveraging all the penalty. > If I am not correct, can > you please detail what you meant? > > > Besides, right now, the code is much more readable. So I really don't > > like adding some strange macros to force crazy aligned access if the > > compiler can do it for us and can do it better. > > I personally would let the compiler do it too, but I prefer it to be > clearly indicated to the reader of the code when an access is > known to be misaligned. I'd enable enable the Alignment trapping in the CPU and die on an unaligned access at runtime -- to indicate the user that he should fix his bloody compiler. > > $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- ./MAKEALL m28evk > > Configuring for m28evk board... > > > > text data bss dec hex filename > > > > 415964 7688 288740 712392 adec8 ./u-boot > > > > 11754 788 12 12554 310a ./spl/u-boot-spl > > > > --------------------- SUMMARY ---------------------------- > > Boards compiled: 1 > > ---------------------------------------------------------- > > $ patch -Np1 -i /tmp/\[PATCH\ v2\]\ usb_do\ explicit\ unaligned\ > > accesses.mbox patching file common/usb_hub.c > > patching file drivers/usb/host/ehci-hcd.c > > Hunk #2 succeeded at 867 with fuzz 1 (offset -10 lines). > > $ ARCH=arm CROSS_COMPILE=arm-linux-gnueabi- ./MAKEALL m28evk > > Configuring for m28evk board... > > > > text data bss dec hex filename > > > > 415968 7688 288736 712392 adec8 ./u-boot > > > > 11754 788 12 12554 310a ./spl/u-boot-spl > > > > --------------------- SUMMARY ---------------------------- > > Boards compiled: 1 > > ---------------------------------------------------------- > > > > Notice the text section grew a bit too, I dunno why, does anyone care > > enough to clarify please? > > > > > Hope this clarifies. > > > > > > Amicalement, > > > > Best regards, > > Marek Vasut > > Amicalement, Best regards, Marek Vasut

2 1

[U-Boot] [PATCH] MX28: SPI: Fix CTRL0 not being written at end of DMA transfer
by Marek Vasut 01 Sep '12

01 Sep '12

The final DMA descriptor doesn't properly write CTRL0 register during the DMA transfer. Properly write CTRL0 to make sure the transmission is complete. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Stefano Babic <sbabic(a)denx.de> --- drivers/spi/mxs_spi.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 168dbe4..5ee0ea1 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -226,6 +226,7 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, uint32_t cache_data_count; int dmach; int tl; + int ret = 0; ALLOC_CACHE_ALIGN_BUFFER(struct mxs_dma_desc, desc, desc_count); @@ -302,12 +303,25 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, MXS_DMA_DESC_IRQ | MXS_DMA_DESC_DEC_SEM; if (flags & SPI_XFER_END) { ctrl0 &= ~SSP_CTRL0_LOCK_CS; - dp->cmd.pio_words[0] = ctrl0 | SSP_CTRL0_IGNORE_CRC; + ctrl0 |= SSP_CTRL0_IGNORE_CRC; + dp->cmd.pio_words[0] = ctrl0; } mxs_dma_desc_append(dmach, dp); if (mxs_dma_go(dmach)) - return -EINVAL; + ret = -EINVAL; + + /* + * The DMA contains further hidden gems, like the last transfer + * not writing the CTRL0 PIO word properly. Write the PIO word + * directly here for proper operation. This issue was detected + * on S25FL064P chip by issuing: + * + * sf probe 2:0 ; sf read 0x42000000 0 0x800000 ; sf probe 2:0 + * + * This resulted in garbled subsequent probe. + */ + writel(ctrl0, &ssp_regs->hw_ssp_ctrl0_reg); /* The data arrived into DRAM, invalidate cache over them */ if (!write) { @@ -315,7 +329,7 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, (uint32_t)(data + cache_data_count)); } - return 0; + return ret; } int spi_xfer(struct spi_slave *slave, unsigned int bitlen, -- 1.7.10.4

2 2

[U-Boot] pull request for u-boot-tegra/master
by Tom Warren 01 Sep '12

01 Sep '12

Albert, Please pull u-boot-tegra/master into arm/master. Hopefully this is the final request for Allen's SPL patchset. Thanks! The following changes since commit 092592c3b79aa3974ea12ae4f408db7679e6a109: Stephen Warren (1): ARM: add Raspberry Pi model B board, using BCM2835 SoC are available in the git repository at: git://git.denx.de/u-boot-tegra master Allen Martin (16): tegra20: rename tegra2 -> tegra20 tegra20: move tegra20 SoC code to arch/arm/cpu/tegra20-common tegra20: rename CONFIG_MACH_TEGRA_GENERIC tegra20: tec: add tegra20-common-post.h tegra20: make board mkdir commands unconditional mkconfig: remove bashisms and cleanup config.mk generation MAKEALL: update to work with new boards.cfg syntax ARM: Fix arm720t SPL build tegra20: remove timer_init from SPL build ARM: add tegra20 support to arm720t tegra20: add u-boot-*-tegra.bin targets tegra20: move SDRAM param save to later in boot tegra20: enable SPL for tegra20 boards arm: enable libgcc build for SPL spl: fix SPL build of private libgcc tegra20: Remove armv4t build flags MAINTAINERS | 18 ++-- MAKEALL | 9 +- Makefile | 26 ++++ arch/arm/cpu/arm720t/cpu.c | 2 + arch/arm/cpu/arm720t/interrupts.c | 5 + arch/arm/cpu/arm720t/start.S | 25 +++- .../cpu/{armv7/tegra2 => arm720t/tegra20}/Makefile | 28 +--- .../arch-tegra2 => cpu/arm720t/tegra20}/board.h | 11 +- .../{armv7/tegra2 => arm720t/tegra20}/config.mk | 12 -- .../{armv7/tegra2/ap20.c => arm720t/tegra20/cpu.c} | 148 ++------------------ .../ap20.h => cpu/arm720t/tegra20/cpu.h} | 15 +-- arch/arm/cpu/arm720t/tegra20/spl.c | 133 ++++++++++++++++++ arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/start.S | 6 +- arch/arm/cpu/armv7/{tegra2 => tegra20}/Makefile | 15 +-- .../cpu/armv7/{tegra2 => tegra20}/cmd_enterrcm.c | 4 +- arch/arm/cpu/armv7/{tegra2 => tegra20}/config.mk | 12 -- arch/arm/cpu/armv7/{tegra2 => tegra20}/usb.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/Makefile | 29 ++--- arch/arm/cpu/tegra20-common/ap20.c | 131 +++++++++++++++++ .../cpu/{armv7/tegra2 => tegra20-common}/board.c | 39 ++---- .../cpu/{armv7/tegra2 => tegra20-common}/clock.c | 10 +- .../cpu/{armv7/tegra2 => tegra20-common}/crypto.c | 0 .../cpu/{armv7/tegra2 => tegra20-common}/crypto.h | 0 .../arm/cpu/{armv7/tegra2 => tegra20-common}/emc.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/funcmux.c | 2 +- .../tegra2 => tegra20-common}/lowlevel_init.S | 0 .../cpu/{armv7/tegra2 => tegra20-common}/pinmux.c | 4 +- .../arm/cpu/{armv7/tegra2 => tegra20-common}/pmu.c | 2 +- .../{armv7/tegra2 => tegra20-common}/sys_info.c | 2 +- .../cpu/{armv7/tegra2 => tegra20-common}/timer.c | 2 +- .../{armv7/tegra2 => tegra20-common}/warmboot.c | 18 ++-- .../tegra2 => tegra20-common}/warmboot_avp.c | 4 +- .../tegra2 => tegra20-common}/warmboot_avp.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/ap20.h | 4 +- .../asm/{arch-tegra2 => arch-tegra20}/apb_misc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/board.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/clk_rst.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/clock.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/emc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/flow.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/funcmux.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/fuse.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/gp_padctrl.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/gpio.h | 2 +- arch/arm/include/asm/arch-tegra20/hardware.h | 29 ++++ .../asm/{arch-tegra2 => arch-tegra20}/mmc.h | 8 +- .../asm/{arch-tegra2 => arch-tegra20}/pinmux.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/pmc.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/pmu.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/scu.h | 0 .../{arch-tegra2 => arch-tegra20}/sdram_param.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/sys_proto.h | 4 +- .../tegra2.h => arch-tegra20/tegra20.h} | 18 ++-- .../asm/{arch-tegra2 => arch-tegra20}/tegra_i2c.h | 2 +- .../asm/{arch-tegra2 => arch-tegra20}/tegra_spi.h | 4 +- .../asm/{arch-tegra2 => arch-tegra20}/timer.h | 6 +- .../uart-spi-switch.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/uart.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/usb.h | 0 .../asm/{arch-tegra2 => arch-tegra20}/warmboot.h | 0 arch/arm/lib/Makefile | 2 +- board/avionic-design/common/tamonten.c | 4 +- .../dts/{tegra2-medcom.dts => tegra20-medcom.dts} | 0 .../dts/{tegra2-plutux.dts => tegra20-plutux.dts} | 0 .../dts/{tegra2-tec.dts => tegra20-tec.dts} | 0 board/avionic-design/medcom/Makefile | 2 - board/avionic-design/plutux/Makefile | 2 - board/avionic-design/tec/Makefile | 2 - .../dts/{tegra2-paz00.dts => tegra20-paz00.dts} | 0 board/compal/paz00/Makefile | 2 - board/compal/paz00/paz00.c | 6 +- ...{tegra2-trimslice.dts => tegra20-trimslice.dts} | 0 board/compulab/trimslice/Makefile | 2 - board/compulab/trimslice/trimslice.c | 6 +- board/nvidia/common/board.c | 17 ++- board/nvidia/common/emc.c | 2 +- board/nvidia/common/uart-spi-switch.c | 2 +- .../{tegra2-harmony.dts => tegra20-harmony.dts} | 2 +- .../{tegra2-seaboard.dts => tegra20-seaboard.dts} | 0 .../{tegra2-ventana.dts => tegra20-ventana.dts} | 2 +- .../{tegra2-whistler.dts => tegra20-whistler.dts} | 2 +- board/nvidia/harmony/harmony.c | 6 +- board/nvidia/seaboard/seaboard.c | 6 +- board/nvidia/whistler/whistler.c | 6 +- boards.cfg | 18 ++-- drivers/gpio/tegra_gpio.c | 12 +- drivers/i2c/tegra_i2c.c | 12 +- drivers/input/Makefile | 2 +- drivers/mmc/tegra_mmc.c | 32 ++-- drivers/mmc/tegra_mmc.h | 12 +- drivers/spi/tegra_spi.c | 10 +- include/configs/harmony.h | 14 +- include/configs/medcom.h | 12 +- include/configs/paz00.h | 12 +- include/configs/plutux.h | 12 +- include/configs/seaboard.h | 20 ++-- include/configs/tec.h | 12 +- ...{tegra2-common-post.h => tegra20-common-post.h} | 73 +++++++++- .../configs/{tegra2-common.h => tegra20-common.h} | 44 ++++-- include/configs/trimslice.h | 14 +- include/configs/ventana.h | 12 +- include/configs/whistler.h | 14 +- include/fdtdec.h | 12 +- include/serial.h | 2 +- mkconfig | 38 +++--- spl/Makefile | 10 ++ 107 files changed, 742 insertions(+), 529 deletions(-) copy arch/arm/cpu/{armv7/tegra2 => arm720t/tegra20}/Makefile (56%) copy arch/arm/{include/asm/arch-tegra2 => cpu/arm720t/tegra20}/board.h (81%) copy arch/arm/cpu/{armv7/tegra2 => arm720t/tegra20}/config.mk (73%) rename arch/arm/cpu/{armv7/tegra2/ap20.c => arm720t/tegra20/cpu.c} (63%) copy arch/arm/{include/asm/arch-tegra2/ap20.h => cpu/arm720t/tegra20/cpu.h} (93%) create mode 100644 arch/arm/cpu/arm720t/tegra20/spl.c copy arch/arm/cpu/armv7/{tegra2 => tegra20}/Makefile (69%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/cmd_enterrcm.c (94%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/config.mk (74%) rename arch/arm/cpu/armv7/{tegra2 => tegra20}/usb.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/Makefile (66%) create mode 100644 arch/arm/cpu/tegra20-common/ap20.c rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/board.c (79%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/clock.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/crypto.c (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/crypto.h (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/emc.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/funcmux.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/lowlevel_init.S (100%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/pinmux.c (99%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/pmu.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/sys_info.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/timer.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot.c (95%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot_avp.c (98%) rename arch/arm/cpu/{armv7/tegra2 => tegra20-common}/warmboot_avp.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/ap20.h (98%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/apb_misc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/board.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/clk_rst.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/clock.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/emc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/flow.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/funcmux.h (97%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/fuse.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/gp_padctrl.h (98%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/gpio.h (99%) create mode 100644 arch/arm/include/asm/arch-tegra20/hardware.h rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/mmc.h (84%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pinmux.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pmc.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/pmu.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/scu.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/sdram_param.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/sys_proto.h (93%) rename arch/arm/include/asm/{arch-tegra2/tegra2.h => arch-tegra20/tegra20.h} (87%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/tegra_i2c.h (99%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/tegra_spi.h (96%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/timer.h (92%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/uart-spi-switch.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/uart.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/usb.h (100%) rename arch/arm/include/asm/{arch-tegra2 => arch-tegra20}/warmboot.h (100%) rename board/avionic-design/dts/{tegra2-medcom.dts => tegra20-medcom.dts} (100%) rename board/avionic-design/dts/{tegra2-plutux.dts => tegra20-plutux.dts} (100%) rename board/avionic-design/dts/{tegra2-tec.dts => tegra20-tec.dts} (100%) rename board/compal/dts/{tegra2-paz00.dts => tegra20-paz00.dts} (100%) rename board/compulab/dts/{tegra2-trimslice.dts => tegra20-trimslice.dts} (100%) rename board/nvidia/dts/{tegra2-harmony.dts => tegra20-harmony.dts} (92%) rename board/nvidia/dts/{tegra2-seaboard.dts => tegra20-seaboard.dts} (100%) rename board/nvidia/dts/{tegra2-ventana.dts => tegra20-ventana.dts} (92%) rename board/nvidia/dts/{tegra2-whistler.dts => tegra20-whistler.dts} (94%) rename include/configs/{tegra2-common-post.h => tegra20-common-post.h} (74%) rename include/configs/{tegra2-common.h => tegra20-common.h} (84%)

2 1