From c00ace75f2658989625d99e0a4e49f4428924555 Mon Sep 17 00:00:00 2001 From: Jonas Aaberg Date: Mon, 1 Feb 2010 08:29:27 +0100 Subject: Boottime changes. Moved generic boottime code from lib_arm to common. Boottime now internally uses us instead of ticks. Reviewed-by: Michael Brandt Signed-off-by: Jonas Aaberg Change-Id: If30d2eb384d6e82daa86c3cab7a6fd2a22baefb5 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/3053 Reviewed-by: Michael BRANDT --- include/asm-arm/boottime.h | 41 ----------------------------------------- include/asm-arm/setup.h | 13 ++++++------- include/boottime.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ include/common.h | 1 + include/configs/u8500.h | 2 -- 5 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 include/asm-arm/boottime.h create mode 100644 include/boottime.h (limited to 'include') diff --git a/include/asm-arm/boottime.h b/include/asm-arm/boottime.h deleted file mode 100644 index c9a43e259..000000000 --- a/include/asm-arm/boottime.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * (C) Copyright 2009 ST-Ericsson AB - * Jonas Aaberg - * - * 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 - * - */ - - - -#ifndef BOOTTIME_H -#define BOOTTIME_H - -#include - -#ifdef CONFIG_BOOTTIME -int boottime_tag(char *name); -void boottime_remove_last(void); -struct boottime_entry *boottime_get_entry(unsigned int i); -ulong boottime_idle_get(void); -ulong boottime_idle_done(void); -void boottime_idle_add(ulong i); -#else -#define boottime_tag(x) 0 -#define boottime_remove_last() -#define boottime_idle_add(x) -#endif - -#endif diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h index 467f6d9dd..36b11c459 100644 --- a/include/asm-arm/setup.h +++ b/include/asm-arm/setup.h @@ -21,6 +21,8 @@ #ifndef __ASMARM_SETUP_H #define __ASMARM_SETUP_H +#include + /* * Usage: * - do not go blindly adding fields, add them at the end @@ -206,22 +208,19 @@ struct tag_memclk { }; /* for automatic boot timing testcases */ + #define ATAG_BOOTTIME 0x41000403 -#define BOOTTIME_MAX_NAME_LEN 64 #define BOOTTIME_MAX 10 -struct boottime_entry { - u32 tick; - u8 name[BOOTTIME_MAX_NAME_LEN]; -}; struct tag_boottime { struct boottime_entry entry[BOOTTIME_MAX]; - u32 idle; - u32 total; + u32 idle; /* in us */ + u32 total; /* in us */ u8 num; }; + struct tag { struct tag_header hdr; union { diff --git a/include/boottime.h b/include/boottime.h new file mode 100644 index 000000000..907033a6f --- /dev/null +++ b/include/boottime.h @@ -0,0 +1,45 @@ +/* + * Copyright (C) 2009-2010 ST-Ericsson AB + * Jonas Aaberg + * + * 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 + * + */ + +#ifndef BOOTTIME_H +#define BOOTTIME_H + + +#define BOOTTIME_MAX_NAME_LEN 64 + +struct boottime_entry { + u32 time; /* in us */ + u8 name[BOOTTIME_MAX_NAME_LEN]; +}; + +#ifdef CONFIG_BOOTTIME +int boottime_tag(char *name); +void boottime_remove_last(void); +struct boottime_entry *boottime_get_entry(unsigned int i); +unsigned long boottime_idle_get(void); +unsigned long boottime_idle_done(void); +void boottime_idle_add(unsigned long time); +#else +#define boottime_tag(x) 0 +#define boottime_remove_last() +#define boottime_idle_add(x) +#endif + +#endif diff --git a/include/common.h b/include/common.h index 07897f682..eae93b16c 100644 --- a/include/common.h +++ b/include/common.h @@ -569,6 +569,7 @@ void irq_free_handler (int); void reset_timer (void); ulong get_timer (ulong base); void set_timer (ulong t); +u64 get_timer_us (void); void enable_interrupts (void); int disable_interrupts (void); diff --git a/include/configs/u8500.h b/include/configs/u8500.h index 2eff34aee..21c48fe66 100644 --- a/include/configs/u8500.h +++ b/include/configs/u8500.h @@ -31,8 +31,6 @@ #define CONFIG_U8500_ED 1 #define CONFIG_L2_OFF 1 -#undef CONFIG_BOOTTIME /* enable boot time stamps */ - #define CONFIG_SYS_MEMTEST_START 0x00000000 #define CONFIG_SYS_MEMTEST_END 0x1FFFFFFF #define CONFIG_SYS_HZ 1000 /* must be 1000 */ -- cgit v1.2.3