Changeset 0ce5bfb in rtems

Timestamp:

09/08/17 08:50:08 (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

b742de2

Parents:

20fc4f9

git-author:

Sebastian Huber <sebastian.huber@…> (09/08/17 08:50:08)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/12/17 08:00:23)

Message:

bsp/qoriq: Do not touch MMU as hypervisor guest

Update #3085.

File:

• c/src/lib/libbsp/powerpc/qoriq/start/start.S (modified) (6 diffs)

c/src/lib/libbsp/powerpc/qoriq/start/start.S

@@ -23 +23 @@
 #include <rtems/score/percpu.h>
 
-#include <bspopts.h>
+#include <bsp.h>
 
 #include <libcpu/powerpc-utility.h>
@@ -178 +178 @@
 #endif
 
-#ifdef QORIQ_INITIAL_HID0
+#if defined(QORIQ_INITIAL_HID0) && !defined(QORIQ_IS_HYPERVISOR_GUEST)
         /* HID0 initialization */
         LWI     r0, QORIQ_INITIAL_HID0
@@ -201 +201 @@
         mflr    SAVED_LINK_REGISTER
 
+#ifdef QORIQ_IS_HYPERVISOR_GUEST
+        /* MSR initialization with guest state */
+        LWI     INITIAL_MSR, QORIQ_INITIAL_MSR
+        oris    r0, INITIAL_MSR, MSR_GS >> 16
+        mtmsr   r0
+        isync
+#else
         /* Invalidate all TS1 MMU entries */
         li      r3, 1
@@ -222 +229 @@
         mtmsr   r0
         isync
+#endif
 
         /*
@@ -241 +249 @@
 
 .Linitmmu:
+#ifndef QORIQ_IS_HYPERVISOR_GUEST
         mflr    SAVED_LINK_REGISTER
 
@@ -255 +264 @@
 
         mtlr    SAVED_LINK_REGISTER
+#endif
         blr