1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
From d0338f68edb7f818b45ee43765cf124c14ccae03 Mon Sep 17 00:00:00 2001
From: Yong Li <yong.b.li@linux.intel.com>
Date: Tue, 22 Jan 2019 16:15:36 +0800
Subject: [PATCH] Add system reset status support
Will display the reset reasons and other CPU information in u-boot,
and save the reset reasons into kernel command line,
for applications to query.
Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
---
arch/arm/include/asm/arch-aspeed/ast_scu.h | 1 +
arch/arm/include/asm/arch-aspeed/platform.h | 2 ++
arch/arm/mach-aspeed/ast-scu.c | 55 +++++++++++++++++++++++++++++
board/aspeed/ast-g5/ast-g5-intel.c | 30 ++++++++++++++++
board/aspeed/ast-g5/ast-g5.c | 7 ++++
5 files changed, 95 insertions(+)
diff --git a/arch/arm/include/asm/arch-aspeed/ast_scu.h b/arch/arm/include/asm/arch-aspeed/ast_scu.h
index c10e6a9..369c4e3 100644
--- a/arch/arm/include/asm/arch-aspeed/ast_scu.h
+++ b/arch/arm/include/asm/arch-aspeed/ast_scu.h
@@ -37,6 +37,7 @@ extern void ast_scu_get_who_init_dram(void);
extern u32 ast_get_clk_source(void);
extern u32 ast_get_h_pll_clk(void);
+extern u32 ast_get_m_pll_clk(void);
extern u32 ast_get_ahbclk(void);
extern u32 ast_scu_get_vga_memsize(void);
diff --git a/arch/arm/include/asm/arch-aspeed/platform.h b/arch/arm/include/asm/arch-aspeed/platform.h
index 3b06e52..4e4140d 100644
--- a/arch/arm/include/asm/arch-aspeed/platform.h
+++ b/arch/arm/include/asm/arch-aspeed/platform.h
@@ -29,6 +29,8 @@
#include <asm/arch/ast_g5_platform.h>
#include <asm/arch/ast-g5-intel.h>
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
+#define CONFIG_BOARD_LATE_INIT 1 /* Call board_late_init */
+#define CONFIG_DISPLAY_CPUINFO 1
#else
#err "No define for platform.h"
#endif
diff --git a/arch/arm/mach-aspeed/ast-scu.c b/arch/arm/mach-aspeed/ast-scu.c
index 63e9c7c..f4268f3 100644
--- a/arch/arm/mach-aspeed/ast-scu.c
+++ b/arch/arm/mach-aspeed/ast-scu.c
@@ -100,6 +100,7 @@ static struct soc_id soc_map_table[] = {
SOC_ID("AST2510-A1", 0x04010103),
SOC_ID("AST2520-A1", 0x04010203),
SOC_ID("AST2530-A1", 0x04010403),
+ SOC_ID("AST2500-A2", 0x04030303),
};
void ast_scu_init_eth(u8 num)
@@ -235,6 +236,29 @@ u32 ast_get_h_pll_clk(void)
return clk;
}
+u32 ast_get_m_pll_clk(void)
+{
+ u32 clk=0;
+ u32 m_pll_set = ast_scu_read(AST_SCU_M_PLL);
+
+ if(m_pll_set & SCU_M_PLL_OFF)
+ return 0;
+
+ // Programming
+ clk = ast_get_clk_source();
+ if(m_pll_set & SCU_M_PLL_BYPASS) {
+ return clk;
+ } else {
+ //PD == SCU20[13:18]
+ //M == SCU20[5:12]
+ //N == SCU20[0:4]
+ //mpll = 24MHz * [(M+1) /(N+1)] / (P+1)
+ clk = ((clk * (SCU_M_PLL_GET_MNUM(m_pll_set) + 1)) / (SCU_M_PLL_GET_NNUM(m_pll_set) + 1))/(SCU_M_PLL_GET_PDNUM(m_pll_set) + 1);
+ }
+ debug("m_pll = %d\n",clk);
+ return clk;
+}
+
u32 ast_get_ahbclk(void)
{
unsigned int axi_div, ahb_div, hpll;
@@ -304,6 +328,33 @@ u32 ast_get_h_pll_clk(void)
return clk;
}
+u32 ast_get_m_pll_clk(void)
+{
+ u32 clk=0;
+ u32 m_pll_set = ast_scu_read(AST_SCU_M_PLL);
+
+ if(m_pll_set & SCU_M_PLL_OFF)
+ return 0;
+
+ // Programming
+ clk = ast_get_clk_source();
+ if(m_pll_set & SCU_M_PLL_BYPASS) {
+ return clk;
+ } else {
+ //OD == SCU24[4]
+ //OD = SCU_M_PLL_GET_DIV(h_pll_set);
+ //Numerator == SCU24[10:5]
+ //num = SCU_M_PLL_GET_NUM(h_pll_set);
+ //Denumerator == SCU24[3:0]
+ //denum = SCU_M_PLL_GET_DENUM(h_pll_set);
+
+ //hpll = 24MHz * (2-OD) * ((Numerator+2)/(Denumerator+1))
+ clk = (clk * (2-SCU_M_PLL_GET_DIV(m_pll_set)) * ((SCU_M_PLL_GET_NUM(m_pll_set)+2)/(SCU_M_PLL_GET_DENUM(m_pll_set)+1)));
+ }
+ debug("m_pll = %d\n",clk);
+ return clk;
+}
+
u32 ast_get_ahbclk(void)
{
unsigned int div, hpll;
@@ -452,6 +503,9 @@ void ast_scu_sys_rest_info(void)
{
u32 rest = ast_scu_read(AST_SCU_SYS_CTRL);
+#ifdef AST_SOC_G5
+ printf("RST : 0x%02x\n", rest);
+#else
if (rest & SCU_SYS_EXT_RESET_FLAG) {
printf("RST : External\n");
ast_scu_write(SCU_SYS_EXT_RESET_FLAG, AST_SCU_SYS_CTRL);
@@ -464,6 +518,7 @@ void ast_scu_sys_rest_info(void)
} else {
printf("RST : CLK en\n");
}
+#endif
}
u32 ast_scu_get_vga_memsize(void)
diff --git a/board/aspeed/ast-g5/ast-g5-intel.c b/board/aspeed/ast-g5/ast-g5-intel.c
index bcaf81e..1e8708a 100644
--- a/board/aspeed/ast-g5/ast-g5-intel.c
+++ b/board/aspeed/ast-g5/ast-g5-intel.c
@@ -303,6 +303,36 @@ static inline void ast_scu_write(uint32_t val, uint32_t reg)
#endif
}
+void ast_g5_intel_late_init(void)
+{
+ char *cmdline = NULL;
+ char *cmdline_new = NULL;
+ char buf[32];
+ u32 rest = 0;
+
+ /* save and clear reset status */
+ rest = ast_scu_read(AST_SCU_SYS_CTRL);
+ snprintf(buf, sizeof(buf), " resetreason=0x%x", rest);
+ ast_scu_write(0, AST_SCU_SYS_CTRL);
+
+ cmdline = getenv("bootargs");
+ if (!cmdline) {
+ printf("Get bootargs fail!\n");
+ return;
+ }
+
+ cmdline_new = malloc(strlen(cmdline) + strlen(buf) + 1);
+ if (!cmdline_new) {
+ printf("Cannot malloc memory!\n");
+ return;
+ }
+
+ /* append the reset status into kernel command line */
+ snprintf(cmdline_new, strlen(cmdline) + strlen(buf) + 1, "%s%s", cmdline, buf);
+ setenv("bootargs", cmdline_new);
+ free(cmdline_new);
+}
+
static void pwm_init(void)
{
uint32_t val;
diff --git a/board/aspeed/ast-g5/ast-g5.c b/board/aspeed/ast-g5/ast-g5.c
index d41ef9c..0953677 100644
--- a/board/aspeed/ast-g5/ast-g5.c
+++ b/board/aspeed/ast-g5/ast-g5.c
@@ -19,6 +19,7 @@
DECLARE_GLOBAL_DATA_PTR;
extern void ast_g5_intel(void);
+extern void ast_g5_intel_late_init(void);
int board_early_init_f(void)
{
@@ -40,6 +41,12 @@ int board_init(void)
return 0;
}
+int board_late_init(void)
+{
+ ast_g5_intel_late_init();
+ return 0;
+}
+
int dram_init(void)
{
u32 vga = ast_scu_get_vga_memsize();
--
2.7.4
|
