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@denx.de> Cc: Heiko Schocher <hs@denx.de> Cc: Valentin Longchamp <valentin.longchamp@keymile.com> Cc: Christian Riesch <christian.riesch@omicron.at> Cc: Manfred Rudigier <manfred.rudigier@omicron.at> Cc: Mike Frysinger <vapier@gentoo.org> Cc: Rob Herring <rob.herring@calxeda.com> Cc: Reinhard Meyer <reinhard.meyer@emk-elektronik.de> Tested-by: Valentin Longchamp <valentin.longchamp@keymile.com> Tested-by: Christian Riesch <christian.riesch@omicron.at> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Mike Frysinger <vapier@gentoo.org>master
Stefan Roese
12 years ago
committed by
Wolfgang Denk
parent
7fe7701d32
commit
0044c42e94
@ -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 |
||||
@ -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 |
||||
|
||||
########################################################################
|
||||
@ -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; |
||||
} |
||||
@ -0,0 +1,49 @@ |
||||
/*
|
||||
* (C) Copyright 2011 |
||||
* Heiko Schocher, DENX Software Engineering, hs@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, ®->kick0r); |
||||
writel(RTC_KICK1R_WE, ®->kick1r); |
||||
raw_bootcount_store(®->scratch0, a); |
||||
raw_bootcount_store(®->scratch1, BOOTCOUNT_MAGIC); |
||||
} |
||||
|
||||
ulong bootcount_load(void) |
||||
{ |
||||
struct davinci_rtc *reg = |
||||
(struct davinci_rtc *)CONFIG_SYS_BOOTCOUNT_ADDR; |
||||
|
||||
if (raw_bootcount_load(®->scratch1) != BOOTCOUNT_MAGIC) |
||||
return 0; |
||||
else |
||||
return raw_bootcount_load(®->scratch0); |
||||
} |
||||
@ -0,0 +1,72 @@ |
||||
/*
|
||||
* (C) Copyright 2010 |
||||
* Heiko Schocher, DENX Software Engineering, hs@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; |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
/*
|
||||
* (C) Copyright 2012 |
||||
* Stefan Roese, DENX Software Engineering, sr@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 |
||||
Loading…
Reference in new issue