Changeset 31540bf in rtems


Ignore:
Timestamp:
Sep 19, 2017, 12:34:21 PM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
f100a58
Parents:
2720fbf0
Message:

bsp/qoriq: MMU configuration as hypervisor guest

Re-enable MMU configuration as hypervisor guest. Make sure the
QORIQ_TLB1_ENTRY_COUNT is set according to the hypervisor configuration.

Update #3085.

Location:
c/src/lib/libbsp/powerpc/qoriq
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/qoriq/start/start.S

    r2720fbf0 r31540bf  
    201201        mflr    SAVED_LINK_REGISTER
    202202
    203 #ifdef QORIQ_IS_HYPERVISOR_GUEST
    204         /* MSR initialization with guest state */
    205         LWI     INITIAL_MSR, QORIQ_INITIAL_MSR
    206         oris    r0, INITIAL_MSR, MSR_GS >> 16
    207         mtmsr   r0
    208         isync
    209 #else
    210203        /* Invalidate all TS1 MMU entries */
    211204        li      r3, 1
     
    227220        LWI     INITIAL_MSR, QORIQ_INITIAL_MSR
    228221        ori     r0, INITIAL_MSR, MSR_IS | MSR_DS
     222#ifdef QORIQ_IS_HYPERVISOR_GUEST
     223        oris    r0, r0, MSR_GS >> 16
     224#endif
    229225        mtmsr   r0
    230226        isync
    231 #endif
    232227
    233228        /*
     
    249244
    250245.Linitmmu:
    251 #ifndef QORIQ_IS_HYPERVISOR_GUEST
    252246        mflr    SAVED_LINK_REGISTER
    253247
     
    264258
    265259        mtlr    SAVED_LINK_REGISTER
    266 #endif
    267260        blr
    268261
  • c/src/lib/libbsp/powerpc/qoriq/startup/mmu-config.c

    r2720fbf0 r31540bf  
    136136        ENTRY_IO(bsp_section_nocache_begin, bsp_section_nocache_size),
    137137        ENTRY_IO(bsp_section_nocachenoload_begin, bsp_section_nocachenoload_size),
     138#ifndef QORIQ_IS_HYPERVISOR_GUEST
    138139#if QORIQ_CHIP_IS_T_VARIANT(QORIQ_CHIP_VARIANT)
    139140        /* BMan Portals */
     
    145146#endif
    146147        ENTRY_DEV(&qoriq, sizeof(qoriq))
     148#endif
    147149};
    148150
Note: See TracChangeset for help on using the changeset viewer.