diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-04-29 10:54:40 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-04-29 10:54:40 -0700 |
| commit | 66776bbc3efce7fb4176ca03fb949f556c2c2d57 (patch) | |
| tree | a05be0f4527f9c58fadc934b652a59457d009561 /machine/minit.c | |
| parent | de16a763e6bf266ad49384fa131a502a6174e7ba (diff) | |
| download | pk-66776bbc3efce7fb4176ca03fb949f556c2c2d57.zip pk-66776bbc3efce7fb4176ca03fb949f556c2c2d57.tar.gz pk-66776bbc3efce7fb4176ca03fb949f556c2c2d57.tar.bz2 | |
Remove mtime/mtimecmp
Diffstat (limited to 'machine/minit.c')
| -rw-r--r-- | machine/minit.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/machine/minit.c b/machine/minit.c index 055fdb3..c19e9e1 100644 --- a/machine/minit.c +++ b/machine/minit.c @@ -8,6 +8,7 @@ pte_t* root_page_table; uintptr_t first_free_paddr; uintptr_t mem_size; uintptr_t num_harts; +volatile uint64_t* mtime; static void mstatus_init() { @@ -62,11 +63,11 @@ static void fp_init() #endif } -void hls_init(uintptr_t id, csr_t* csrs) +hls_t* hls_init(uintptr_t id) { hls_t* hls = OTHER_HLS(id); memset(hls, 0, sizeof(*hls)); - hls->csrs = csrs; + return hls; } static uintptr_t sbi_top_paddr() @@ -91,7 +92,7 @@ static void hart_init() void init_first_hart() { hart_init(); - hls_init(0, NULL); // this might get called again from parse_config_string + hls_init(0); // this might get called again from parse_config_string parse_config_string(); memory_init(); boot_loader(); @@ -102,7 +103,7 @@ void init_other_hart() hart_init(); // wait until hart 0 discovers us - while (*(csr_t * volatile *)&HLS()->csrs == NULL) + while (*(uint64_t * volatile *)&HLS()->timecmp == NULL) ; boot_other_hart(); |