浏览代码

Merge pull request #256 from grissiom/qemu-realview-vmm

Qemu realview vmm
Bernard Xiong 11 年之前
父节点
当前提交
f4c732ae91
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 0 3
      libcpu/arm/realview-a8-vmm/context_gcc.S
  2. 3 0
      libcpu/arm/realview-a8-vmm/gic.c

+ 0 - 3
libcpu/arm/realview-a8-vmm/context_gcc.S

@@ -57,9 +57,6 @@ rt_hw_context_switch_to:
     ldmfd sp!, {r4}         @ pop new task spsr
     msr spsr_cxsf, r4
 
-    bic r4, r4, #0x20       @ must be ARM mode
-    msr cpsr_cxsf, r4
-
     ldmfd sp!, {r0-r12, lr, pc}^   @ pop new task r0-r12, lr & pc
 
 .section .bss.share.isr

+ 3 - 0
libcpu/arm/realview-a8-vmm/gic.c

@@ -249,6 +249,9 @@ int arm_gic_dist_init(rt_uint32_t index, rt_uint32_t dist_base, int irq_start)
     for (i = 0; i < _gic_max_irq; i += 32)
         GIC_DIST_IGROUP(dist_base, i) = 0xffffffff;
 
+    /* Enable group0 and group1 interrupt forwarding. */
+    GIC_DIST_CTRL(dist_base) = 0x03;
+
     return 0;
 }