| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1316818998-30711-4-git-send-email-sjg@chromium.org>
Date: Fri, 23 Sep 2011 16:03:18 -0700
From: Simon Glass <sjg@...omium.org>
To: linux-kernel@...r.kernel.org
Cc: linux-arm-kernel@...ts.infradead.org,
Da Zheng <zhengda@...omium.org>,
Da Zheng <zhengda@...omium.com>
Subject: [RFC PATCH 3/3] bootstage: Get u-boot timing from the device tree.
From: Da Zheng <zhengda@...omium.org>
From: Da Zheng <zhengda@...omium.org>
The bootstage driver accesses the u-boot timings in the device tree
and copies them to its array during initialization.
Signed-off-by: Da Zheng <zhengda@...omium.com>
---
arch/arm/kernel/time.c | 29 +++++++++++++++++++++++++++++
include/linux/bootstage.h | 1 +
init/bootstage.c | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index cb634c3..524a1f5 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -24,6 +24,8 @@
#include <linux/syscore_ops.h>
#include <linux/timer.h>
#include <linux/irq.h>
+#include <linux/bootstage.h>
+#include <linux/of.h>
#include <linux/mc146818rtc.h>
@@ -156,3 +158,30 @@ void __init time_init(void)
#endif
}
+#ifdef CONFIG_BOOTSTAGE
+int get_prekernel_timing(void)
+{
+ struct device_node *node;
+ struct device_node *child;
+ int i = 0;
+
+ printk(KERN_INFO "TEST: bootstage_init is called in tegra\n");
+ node = of_find_node_by_path("/bootstage");
+ if (node == NULL)
+ return 0;
+
+ for_each_child_of_node(node, child) {
+ const char *name = of_get_property(child, "name", NULL);
+ const int *timep = of_get_property(child, "time", NULL);
+
+ if (name && timep) {
+ insert_bootstage(i, name,
+ (unsigned long) be32_to_cpu(*timep));
+ i++;
+ }
+ }
+ of_node_put(node);
+
+ return 0;
+}
+#endif
diff --git a/include/linux/bootstage.h b/include/linux/bootstage.h
index 08df102..95e837c 100644
--- a/include/linux/bootstage.h
+++ b/include/linux/bootstage.h
@@ -4,6 +4,7 @@
#ifdef CONFIG_BOOTSTAGE
unsigned long bootstage_mark(const char *name);
unsigned long bootstage_mark_early(const char *name);
+void insert_bootstage(int idx, const char *name, unsigned long time);
#else
static inline unsigned long bootstage_mark(const char *name)
{
diff --git a/init/bootstage.c b/init/bootstage.c
index 6f4668f..51f731d 100644
--- a/init/bootstage.c
+++ b/init/bootstage.c
@@ -75,6 +75,32 @@ static inline int __inc_bootstages(void)
}
/*
+ * Insert a new bootstage in the slot specified by `idx'.
+ * If the slot is already used, move it and slots behind it
+ * before inserting the new bootstage.
+ */
+void insert_bootstage(int idx, const char *name, unsigned long time)
+{
+ mutex_lock(&bootstage_mutex);
+
+ if (num_bootstages == cap_bootstages) {
+ if (__inc_bootstages() < 0) {
+ mutex_unlock(&bootstage_mutex);
+ return;
+ }
+ }
+
+ if (idx < num_bootstages)
+ memmove(&full_bootstages[idx + 1], &full_bootstages[idx],
+ sizeof(*full_bootstages) * (num_bootstages - idx));
+
+ strlcpy(full_bootstages[idx].name, name, MAX_NAME);
+ full_bootstages[idx].time = time;
+ num_bootstages++;
+ mutex_unlock(&bootstage_mutex);
+}
+
+/*
* This is used during the initialization of the kernel.
*/
unsigned long bootstage_mark(const char *name)
@@ -211,10 +237,20 @@ static const struct file_operations mark_operations = {
.write = bootstage_write,
};
+/*
+ * Get the timings that were recorded before the kernel is initialized.
+ */
+int __attribute__((weak)) get_prekernel_timing(void)
+{
+ return 0;
+}
+
static int __init bootstage_init(void)
{
struct dentry *dir;
+ get_prekernel_timing();
+
dir = debugfs_create_dir("bootstage", NULL);
if (dir && !IS_ERR(dir)) {
debugfs_create_file("report", S_IFREG|S_IRUSR|S_IRGRP|S_IROTH,
--
1.7.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists