RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsp/qoriq: Do not touch MMU as hypervisor guest

Browse Source 
Update #3085.
This commit is contained in:
Sebastian Huber
2017-09-08 10:50:08 +02:00
parent 20fc4f95aa
commit 0ce5bfb984
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
c/src/lib/libbsp/powerpc/qoriq/start/start.S
View File

@@ -22,7 +22,7 @@
#include <rtems/score/percpu.h> #include <rtems/score/percpu.h>
#include <bspopts.h> #include <bsp.h>
#include <libcpu/powerpc-utility.h> #include <libcpu/powerpc-utility.h>
@@ -177,7 +177,7 @@ _start:
isync isync
#endif #endif
#ifdef QORIQ_INITIAL_HID0 #if defined(QORIQ_INITIAL_HID0) && !defined(QORIQ_IS_HYPERVISOR_GUEST)
/* HID0 initialization */ /* HID0 initialization */
LWI r0, QORIQ_INITIAL_HID0 LWI r0, QORIQ_INITIAL_HID0
mtspr HID0, r0 mtspr HID0, r0
@@ -200,6 +200,13 @@ _start:
.Linitmore: .Linitmore:
mflr SAVED_LINK_REGISTER 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 */ /* Invalidate all TS1 MMU entries */
li r3, 1 li r3, 1
bl qoriq_tlb1_invalidate_all_by_ts bl qoriq_tlb1_invalidate_all_by_ts
@@ -221,6 +228,7 @@ _start:
ori r0, INITIAL_MSR, MSR_IS | MSR_DS ori r0, INITIAL_MSR, MSR_IS | MSR_DS
mtmsr r0 mtmsr r0
isync isync
#endif
/* /*
* Initialize start stack. Make sure that we do not share a cache line * Initialize start stack. Make sure that we do not share a cache line
@@ -240,6 +248,7 @@ _start:
blr blr
.Linitmmu: .Linitmmu:
#ifndef QORIQ_IS_HYPERVISOR_GUEST
mflr SAVED_LINK_REGISTER mflr SAVED_LINK_REGISTER
/* Configure MMU */ /* Configure MMU */
@@ -254,6 +263,7 @@ _start:
PPC64_NOP_FOR_LINKER_TOC_POINTER_RESTORE PPC64_NOP_FOR_LINKER_TOC_POINTER_RESTORE
mtlr SAVED_LINK_REGISTER mtlr SAVED_LINK_REGISTER
#endif
blr blr
#ifdef INITIALIZE_FPU #ifdef INITIALIZE_FPU