Changed haskell kernel to match new fastpath homogenisation changes

dnm · May 27, 2015 · 4625b65 · 4625b65
1 parent 4ccf65e
commit 4625b65
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/haskell/src/SEL4/Kernel/VSpace/ARM.lhs b/haskell/src/SEL4/Kernel/VSpace/ARM.lhs
@@ -781,6 +781,11 @@ This helper function checks that the mapping installed at a given PT or PD slot
 >         _ -> throw InvalidRoot
 
 
+> armv_contextSwitch_HWASID :: PPtr PDE -> HardwareASID -> Kernel ()
+> armv_contextSwitch_HWASID pd hwasid = do
+>    doMachineOp $ setCurrentPD $ addrFromPPtr pd
+>    setHardwareASID hwasid
+
 > armv_contextSwitch :: PPtr PDE -> ASID -> Kernel ()
 > armv_contextSwitch pd asid = do
 >    doMachineOp $ setCurrentPD $ addrFromPPtr pd

diff --git a/haskell/src/SEL4/Machine/Hardware/ARM.lhs b/haskell/src/SEL4/Machine/Hardware/ARM.lhs
@@ -212,10 +212,16 @@ caches must be done separately.
 
 \subsubsection{Address Space Setup}
 
+> writeTTBR0 :: PAddr -> MachineMonad ()
+> writeTTBR0 pd = do
+>     cbptr <- ask
+>     liftIO $ Platform.writeTTBR0 cbptr pd
+
 > setCurrentPD :: PAddr -> MachineMonad ()
 > setCurrentPD pd = do
->     cbptr <- ask
->     liftIO $ Platform.setCurrentPD cbptr pd
+>     dsb
+>     writeTTBR0 pd
+>     isb
 
 > setHardwareASID :: HardwareASID -> MachineMonad ()
 > setHardwareASID (HardwareASID hw_asid) = do

diff --git a/haskell/src/SEL4/Machine/Hardware/ARM/QEmu.hs b/haskell/src/SEL4/Machine/Hardware/ARM/QEmu.hs
@@ -192,7 +192,7 @@ foreign import ccall unsafe "qemu_set_asid"
     setHardwareASID :: Ptr CallbackData -> Word8 -> IO ()
 
 foreign import ccall unsafe "qemu_set_root"
-    setCurrentPD :: Ptr CallbackData -> PAddr -> IO ()
+    writeTTBR0 :: Ptr CallbackData -> PAddr -> IO ()
 
 foreign import ccall unsafe "qemu_arm_get_ifsr"
     getIFSR :: Ptr CallbackData -> IO Word