pmu config working, no interrupts yet

maskedarray · Aug 7, 2023 · 76b5d0f · 76b5d0f
1 parent 18c2ff1
commit 76b5d0f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/bao-hypervisor/configs/alsaqr-baremetal/config.c b/bao-hypervisor/configs/alsaqr-baremetal/config.c
@@ -30,7 +30,7 @@ struct config config = {
                     }
                 },
 
-                .dev_num = 3,
+                .dev_num = 2,
                 .devs =  (struct dev_region[]) {
                     {
                         .pa = 0x40000000,   
@@ -46,13 +46,6 @@ struct config config = {
                         .interrupt_num = 4,
                         .interrupts = (uint64_t[]) {4,5,6,7}
                     },
-		    {
-                        .pa = 0x10404000,   
-                        .va = 0x10404000,  
-                        .size = 0x00001000,  
-                        .interrupt_num = 4,
-                        .interrupts = (uint64_t[]) {142,143,144,145}
-                    },
                 },
 
                 .arch = {

diff --git a/bao-hypervisor/src/core/init.c b/bao-hypervisor/src/core/init.c
@@ -83,6 +83,7 @@ void init(uint64_t cpu_id, uint64_t load_addr, uint64_t config_addr)
 
     interrupts_init();
 
+
     vmm_init();
 
     /* Should never reach here */

diff --git a/bao-hypervisor/src/core/vmm.c b/bao-hypervisor/src/core/vmm.c
@@ -173,7 +173,7 @@ void vmm_init()
     bool assigned = false;
     size_t vm_id = 0;
     vm_config_t *vm_config = NULL;
-
+    printk("Uart page size is: \n\r");
     /**
      * Assign cpus according to vm affinity.
      */
@@ -227,7 +227,7 @@ void vmm_init()
     }
 
     cpu_sync_barrier(&cpu_glb_sync);
-
+    printk("Uart page size is: \n\r");
     if (assigned) {
         vm_config = &vm_config_ptr->vmlist[vm_id];
         if (master) {
@@ -248,15 +248,16 @@ void vmm_init()
     }
 
     cpu_sync_barrier(&cpu_glb_sync);
-
+    printk("Uart page size is: \n\r");
     if (cpu.id == CPU_MASTER) {
         mem_free_vpage(&cpu.as, (void*)vm_assign, vmass_npages, true);
     }
 
     ipc_init(vm_config, master);
-
+    printk("Uart page size is: final \n\r");
     if (assigned) {
         vm_init((void*)BAO_VM_BASE, vm_config, master, vm_id);
+        printk("Uart page size is: final2 \n\r");
         unsigned long _stime = CSRR(CSR_TIME);
         printk("The time is: %lu\r\n", _stime);
         pmu_v1_run_localrun();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -83,6 +83,7 @@ void init(uint64_t cpu_id, uint64_t load_addr, uint64_t config_addr)

		interrupts_init();


		vmm_init();

		/* Should never reach here */
Expand Down