Implement config_table

A section of config symbols for firmware to read and apply. Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
FlyGoat · Feb 11, 2020 · 72a1a37 · 72a1a37
1 parent b3b64af
commit 72a1a37
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 36 deletions.
diff --git a/core/applications/SConscript b/core/applications/SConscript
@@ -1,7 +1,7 @@
 from building import *
 
 cwd     = GetCurrentDir()
-src	= Glob('*.c')
+src	= Glob('*.c') + Glob('*.S')
 
 group = DefineGroup('Applications', src, depend = [''])
 

diff --git a/core/applications/config_table.S b/core/applications/config_table.S
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT OR Apache-2.0 */
+/*
+ * Copyright (C) 2019, 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
+ */
+
+
+#ifndef __ASSEMBLY__
+#define __ASSEMBLY__
+#endif
+
+#include "miku_config.h"
+
+	.section ".config_table", "ax"
+	.set noreorder
+config_table_entry: /* RAM_BASE + 0x800 */
+	.word(MIKU_MODEL_MAGIG) /* Magic Number + 0x0 */
+	.word(MIKU_CURRENT_VERSION) /* Version + 0x4 */
+	.word(0x1) /* Config Table Version + 0x8 */
+	.word(25000000) /* CCFreq + 0xc */ /* FIXME: Coule be other vallues */
+	.word(BASEFREQ / 25 | (1 << 16)) /* CFD and CFM + 0x10 */ /* FIXME: Coule be other vallues */
+	.word(BOOT_DIV | (BOOT_LOOPC << 8) | (BOOT_REFC << 24)) /* PLL CFG + 0x14 */ /* [7:0]: DIV, [8:23]: LOOPC, [24:31]: REFC */
+	.word(BOOT_VID) /* BOOT_VID mV + 0x18 */
+	.word(BOOSTFREQ) /* BOOSTFREQ + 0x1c */
+config_table_end:
+	.ascii "MikuMikuMiku"
diff --git a/core/applications/dvfs_policy_2000 .h → core/applications/dvfs_policy_2000.h b/core/applications/dvfs_policy_2000 .h → core/applications/dvfs_policy_2000.h
@@ -3,15 +3,21 @@
  * Copyright (C) 2019, 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
  */
 
-#include "miku.h"
+#define BASEFREQ	1500
+#define BOOT_VID	1150
+#define BOOT_DIV	1
+#define BOOT_LOOPC	15
+#define BOOT_REFC	1
+#define BOOSTFREQ	2000
 
+#if defined(MIKU_INDVFS) && !defined(__ASSEMBLY__)
 #define NUM_PLL_LEVEL	3
 
 struct pll_level pll_levels[NUM_PLL_LEVEL] = 
 {{/* Idle: Max 725MHz */
-	.refc = 1,
-	.loopc = 15,
-	.div = 1,
+	.refc = BOOT_REFC,
+	.loopc = BOOT_LOOPC,
+	.div = BOOT_DIV,
 	.vid = 1000, /* FIXME: Low down it later */
 	.highest_scale = (4 - 1), /* 4 / 8 */
 	.lowest_scale = 0, /* 1 / 8 */
@@ -22,10 +28,10 @@ struct pll_level pll_levels[NUM_PLL_LEVEL] =
 	.max_temp = 120,
 	.sram_val = 0x1f156f
 },{/* Normal: Max 1500MHz */
-	.refc = 1,
-	.loopc = 15,
-	.div = 1,
-	.vid = 1150,
+	.refc = BOOT_REFC,
+	.loopc = BOOT_LOOPC,
+	.div = BOOT_DIV,
+	.vid = BOOT_VID,
 	.highest_scale = (8 - 1), /* 8 / 8 */
 	.lowest_scale = (5 - 1), /* 5 / 8 */
 	.stable_scale = (8 - 1), /* 8/8, 1500MHz */
@@ -37,8 +43,8 @@ struct pll_level pll_levels[NUM_PLL_LEVEL] =
 },{/* Boost: Max 2000MHz */
 	.refc = 1,
 	.loopc = 20,
-	.div = 1400,
-	.vid = 100,
+	.div = 1,
+	.vid = 1400,
 	.highest_scale = (8 - 1), /* 8 / 8 */
 	.lowest_scale = (5 - 1), /* 5 / 8 */
 	.stable_scale = (6 - 1), /* 6/8, 1500MHz */
@@ -52,6 +58,6 @@ struct pll_level pll_levels[NUM_PLL_LEVEL] =
 /* Shadow means what we tell kernel */
 #define SHADOW_LEVEL_NUM	10
 #define BASEFREQ_SHADOW_LEVEL	7
-#define BASEFREQ	1500
 rt_uint16_t	shadow_level_freq[SHADOW_LEVEL_NUM] = {187, 375, 562, 750, 937, 1312, BASEFREQ, 1750, 2000};
 rt_uint32_t	core_scale_min = 3000;
+#endif
diff --git a/core/applications/dvfs_policy_2200.h b/core/applications/dvfs_policy_2200.h
@@ -3,15 +3,21 @@
  * Copyright (C) 2019, 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
  */
 
-#include "miku.h"
+#define BASEFREQ	1650
+#define BOOT_VID	1150
+#define BOOT_DIV	1
+#define BOOT_LOOPC	33
+#define BOOT_REFC	2
+#define BOOSTFREQ	2200
 
+#if defined(MIKU_INDVFS) && !defined(__ASSEMBLY__)
 #define NUM_PLL_LEVEL	3
 
 struct pll_level pll_levels[NUM_PLL_LEVEL] = 
 {{/* Idle: Max 825MHz */
-	.refc = 2,
-	.loopc = 33,
-	.div = 1,
+	.refc = BOOT_REFC,
+	.loopc = BOOT_LOOPC,
+	.div = BOOT_DIV,
 	.vid = 1000, /* FIXME: Low down it later */
 	.highest_scale = (4 - 1), /* 4 / 8 */
 	.lowest_scale = 0, /* 1 / 8 */
@@ -22,10 +28,10 @@ struct pll_level pll_levels[NUM_PLL_LEVEL] =
 	.max_temp = 120,
 	.sram_val = 0x1f156f
 },{/* Normal: Max 1650MHz */
-	.refc = 2,
-	.loopc = 33,
-	.div = 1,
-	.vid = 1150,
+	.refc = BOOT_REFC,
+	.loopc = BOOT_LOOPC,
+	.div = BOOT_DIV,
+	.vid = BOOT_VID,
 	.highest_scale = (8 - 1), /* 8 / 8 */
 	.lowest_scale = (5 - 1), /* 5 / 8 */
 	.stable_scale = (8 - 1), /* 8/8, 1650MHz */
@@ -53,5 +59,6 @@ struct pll_level pll_levels[NUM_PLL_LEVEL] =
 #define SHADOW_LEVEL_NUM	10
 #define BASEFREQ_SHADOW_LEVEL	7
 #define BASEFREQ	1650
-rt_uint16_t	shadow_level_freq[SHADOW_LEVEL_NUM] = {200, 410, 618, 825, 1030, 1237, 1443, BASEFREQ, 1925, 2200};
+rt_uint16_t	shadow_level_freq[SHADOW_LEVEL_NUM] = {200, 410, 618, 825, 1030, 1237, 1443, BASEFREQ, 1925, BOOSTFREQ};
 rt_uint32_t	core_scale_min = 3000;
+#endif
diff --git a/core/applications/miku.h b/core/applications/miku.h
@@ -9,13 +9,13 @@
 #include <rtthread.h>
 #include <mips.h>
 #include <ls3-smc.h>
+#include "miku_dvfs.h"
 #include "miku_config.h"
 #include "miku_cmd.h"
 #include "miku_features.h"
 #include "miku_sensors.h"
 #include "miku_threads.h"
 #include "miku_fan.h"
-#include "miku_dvfs.h"
 
 #ifdef MIKU_DEBUG
 #define DBG_TAG               "Miku"

diff --git a/core/applications/miku_config.h b/core/applications/miku_config.h
@@ -6,6 +6,10 @@
 #ifndef _MIKU_CONFIG_H__
 #define _MIKU_CONFIG_H__
 
+
+#define MIKU_MODEL_MAGIG	0xbcda1901
+#define MIKU_CURRENT_VERSION 0x1
+
 #define MIKU_DEBUG	1
 #define MIKU_HAVE_SENSORS	1
 #define MIKU_SENSORS_HAVE_PACKAGE	1
@@ -14,7 +18,7 @@
 #define MIKU_FAN_HAVE_PACKAGE	1
 #define MIKU_HAVE_DVFS		1
 
-#define MIKU_DVFS_POLICY_2200	1
-//#define MIKU_DVFS_POLICY_2000	1
+#include "dvfs_policy_2200.h"
+//#include "dvfs_policy_2000.h"
 
 #endif
diff --git a/core/applications/miku_dvfs.c b/core/applications/miku_dvfs.c
@@ -3,16 +3,9 @@
  * Copyright (C) 2019, 2020 Jiaxun Yang <jiaxun.yang@flygoat.com>
  */
 
+#define MIKU_INDVFS	1
 #include "miku.h"
 
-#if defined(MIKU_DVFS_POLICY_2200)
-#include "dvfs_policy_2200.h"
-#elif defined(MIKU_DVFS_POLICY_2000)
-#include "dvfs_policy_2200.h"
-#else
-#error "No DVFS policy supplied"
-#endif
-
 rt_uint16_t	target_shadow_freq[NUM_CORE];
 rt_uint8_t	current_core_scale[NUM_CORE];
 rt_uint32_t	core_scale_last_bump[NUM_CORE];

diff --git a/core/applications/miku_features.c b/core/applications/miku_features.c
@@ -5,8 +5,6 @@
 
 #include "miku.h"
 
-#define MIKU_CURRENT_VERSION 0x1
-
 static rt_uint32_t implemented_feature[MIKU_FEATURE_SET_END];
 static rt_uint32_t enabled_feature[MIKU_FEATURE_SET_END];
 

diff --git a/core/applications/miku_features.h b/core/applications/miku_features.h
@@ -6,8 +6,6 @@
 #ifndef _MIKU_FEATURES_H__
 #define _MIKU_FEATURES_H__
 
-#include <mips.h>
-
 void miku_features_init(void);
 
 #define CMD_GET_VERSION 0x1

diff --git a/core/ls3-smc_rom.lds b/core/ls3-smc_rom.lds
@@ -23,6 +23,8 @@ SECTIONS
     .text : 
     {
 	*(.start);
+	. = ALIGN(0x800);
+     	KEEP(*(.config_table))
         . = ALIGN(0x1000);	
 	__ebase_entry = .;
      	KEEP(*(.exc_vectors))