ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hw vea9x4: let userland timer SP804 0/1 be secure 

Declaring the SP804 0/1 module and its interrupt to be non-secure prevents the
secure Genode from receiving the interrupt and hence the timer driver in the
secure Genode doesn't work.

Fixes #1340
This commit is contained in:
Martin Stein 2015-01-06 14:59:44 +01:00 committed by Christian Helmuth
parent 6f8f9085f3
commit ba321c20d1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
repos/base-hw/src/core/spec/vea9x4/trustzone/platform_support.cc
View File

@ -41,7 +41,6 @@ void Kernel::init_trustzone(Pic * pic)
Cpu::allow_coprocessor_nonsecure();
/* set unsecure IRQs */
pic->unsecure(34); //Timer 0/1
pic->unsecure(35); //Timer 2/3
pic->unsecure(36); //RTC
pic->unsecure(37); //UART0

3
repos/os/src/server/tz_vmm/vea9x4/tsc_380.h
View File

@ -168,7 +168,7 @@ class Tsc_380 : Genode::Mmio
write<Region_attr<REGION14_REG_OFF>::Subreg5>(1);
write<Region_attr<REGION14_REG_OFF>::Subreg6>(1);
/* Access to SP804, and RTC */
/* Access to SP804 2/3, and RTC */
write<Region_low<REGION13_REG_OFF> >(0x10010000);
write<Region_high<REGION13_REG_OFF> >(0x10018000);
write<Region_attr<REGION13_REG_OFF>::Enable>(1);
@ -178,6 +178,7 @@ class Tsc_380 : Genode::Mmio
write<Region_attr<REGION13_REG_OFF>::Secure_read>(1);
write<Region_attr<REGION13_REG_OFF>::Secure_write>(1);
write<Region_attr<REGION13_REG_OFF>::Subreg0>(1);
write<Region_attr<REGION13_REG_OFF>::Subreg1>(1);
write<Region_attr<REGION13_REG_OFF>::Subreg3>(1);
write<Region_attr<REGION13_REG_OFF>::Subreg4>(1);
write<Region_attr<REGION13_REG_OFF>::Subreg5>(1);