Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

* mpc6xx/mmu/bat.c, mpc6xx/mmu/pte121.c, shared/src/cache.c:

Browse Source 
Checked inline assembly code; added 'm' operands and
	paranoia 'memory' clobbers. Also, made sure that no
	pure input operands are modified by the asm.
This commit is contained in:
Till Straumann
2006-07-13 00:29:06 +00:00
parent c8f74b474a
commit 05e2e4ca29
4 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,10 @@
2006-07-12 Till Straumann <strauman@slac.stanford.edu>
* mpc6xx/mmu/bat.c, mpc6xx/mmu/pte121.c, shared/src/cache.c:
Checked inline assembly code; added 'm' operands and
paranoia 'memory' clobbers. Also, made sure that no
pure input operands are modified by the asm.
2006-06-19 Till Straumann <strauman@slac.stanford.edu> 2006-06-19 Till Straumann <strauman@slac.stanford.edu>
* mpc6xx/mmu/mmuAsm.S: re-checked synchronization * mpc6xx/mmu/mmuAsm.S: re-checked synchronization

1
c/src/lib/libcpu/powerpc/mpc6xx/mmu/bat.c
View File

@@ -119,6 +119,7 @@ set_hid0_sync (unsigned long val)
" isync \n" " isync \n"
: :
:"i" (HID0), "r" (val) :"i" (HID0), "r" (val)
:"memory" /* paranoia */
); );
} }

57
c/src/lib/libcpu/powerpc/mpc6xx/mmu/pte121.c
View File

@@ -180,8 +180,11 @@ static void myhdl (BSP_Exception_frame * excPtr);
static void dumpPte (APte pte); static void dumpPte (APte pte);
#ifdef DEBUG
static void static void
dumpPteg (unsigned long vsid, unsigned long pi, unsigned long hash); dumpPteg (unsigned long vsid, unsigned long pi, unsigned long hash);
#endif
unsigned long unsigned long
triv121IsRangeMapped (long vsid, unsigned long start, unsigned long end); triv121IsRangeMapped (long vsid, unsigned long start, unsigned long end);
@@ -501,9 +504,9 @@ triv121PgTblMap (Triv121PgTbl pt,
uint32_t flags; uint32_t flags;
rtems_interrupt_disable (flags); rtems_interrupt_disable (flags);
/* order setting 'v' after writing everything else */ /* order setting 'v' after writing everything else */
asm volatile ("eieio"); asm volatile ("eieio"::"m"(*pte));
pte->v = 1; pte->v = 1;
asm volatile ("sync"); asm volatile ("sync"::"m"(*pte));
rtems_interrupt_enable (flags); rtems_interrupt_enable (flags);
} else { } else {
pte->v = 1; pte->v = 1;
@@ -550,6 +553,9 @@ triv121PgTblActivate (Triv121PgTbl pt)
{ {
#ifndef DEBUG_MAIN #ifndef DEBUG_MAIN
unsigned long sdr1 = triv121PgTblSDR1 (pt); unsigned long sdr1 = triv121PgTblSDR1 (pt);
register unsigned long tmp0 = 16; /* initial counter value (#segment regs) */
register unsigned long tmp1 = (KEY_USR | KEY_SUP);
register unsigned long tmp2 = (MSR_EE | MSR_IR | MSR_DR);
#endif #endif
pt->active = 1; pt->active = 1;
@@ -558,7 +564,7 @@ triv121PgTblActivate (Triv121PgTbl pt)
/* install our exception handler */ /* install our exception handler */
ohdl = globalExceptHdl; ohdl = globalExceptHdl;
globalExceptHdl = myhdl; globalExceptHdl = myhdl;
__asm__ __volatile__ ("sync"); __asm__ __volatile__ ("sync"::"memory");
#endif #endif
/* This section of assembly code takes care of the /* This section of assembly code takes care of the
@@ -578,7 +584,7 @@ triv121PgTblActivate (Triv121PgTbl pt)
* - restore original MSR * - restore original MSR
*/ */
__asm__ __volatile ( __asm__ __volatile (
" mtctr %0\n" " mtctr %[tmp0]\n"
/* Get MSR and switch interrupts off - just in case. /* Get MSR and switch interrupts off - just in case.
* Also switch the MMU off; the book * Also switch the MMU off; the book
* says that SDR1 must not be changed with either * says that SDR1 must not be changed with either
@@ -586,34 +592,33 @@ triv121PgTblActivate (Triv121PgTbl pt)
* be safe as long as the IBAT & DBAT mappings override * be safe as long as the IBAT & DBAT mappings override
* the page table... * the page table...
*/ */
" mfmsr %0\n" " mfmsr %[tmp0]\n"
" andc %6, %0, %6\n" " andc %[tmp2], %[tmp0], %[tmp2]\n"
" mtmsr %6\n" " mtmsr %[tmp2]\n"
" isync \n" " isync \n"
/* set up the segment registers */ /* set up the segment registers */
" li %6, 0\n" " li %[tmp2], 0\n"
"1: mtsrin %1, %6\n" "1: mtsrin %[tmp1], %[tmp2]\n"
" addis %6, %6, 0x1000\n" /* address next SR */ " addis %[tmp2], %[tmp2], 0x1000\n" /* address next SR */
" addi %1, %1, 1\n" /* increment VSID */ " addi %[tmp1], %[tmp1], 1\n" /* increment VSID */
" bdnz 1b\n" " bdnz 1b\n"
/* Now flush all TLBs, starting with the topmost index */ /* Now flush all TLBs, starting with the topmost index */
" lis %6, %2@h\n" " lis %[tmp2], %[ea_range]@h\n"
"2: addic. %6, %6, -%3\n" /* address the next one (decrementing) */ "2: addic. %[tmp2], %[tmp2], -%[pg_sz]\n" /* address the next one (decrementing) */
" tlbie %6\n" /* invalidate & repeat */ " tlbie %[tmp2]\n" /* invalidate & repeat */
" bgt 2b\n" " bgt 2b\n"
" eieio \n" " eieio \n"
" tlbsync \n" " tlbsync \n"
" sync \n" " sync \n"
/* set up SDR1 */ /* set up SDR1 */
" mtspr %4, %5\n" " mtspr %[sdr1], %[sdr1val]\n"
/* restore original MSR */ /* restore original MSR */
" mtmsr %0\n" " mtmsr %[tmp0]\n"
" isync \n" " isync \n"
: :[tmp0]"+r&"(tmp0), [tmp1]"+b&"(tmp1), [tmp2]"+b&"(tmp2)
:"r" (16), "b" (KEY_USR | KEY_SUP), :[ea_range]"i"(FLUSH_EA_RANGE), [pg_sz]"i" (1 << LD_PG_SIZE),
"i" (FLUSH_EA_RANGE), "i" (1 << LD_PG_SIZE), [sdr1]"i"(SDR1), [sdr1val]"r" (sdr1)
"i" (SDR1), "r" (sdr1), "b" (MSR_EE | MSR_IR | MSR_DR) :"ctr", "cc", "memory"
:"ctr", "cc"
); );
/* At this point, BAT0 is probably still active; it's the /* At this point, BAT0 is probably still active; it's the
@@ -833,7 +838,7 @@ triv121UnmapEa (unsigned long ea)
" tlbie %0 \n\t" " tlbie %0 \n\t"
" eieio \n\t" " eieio \n\t"
" tlbsync \n\t" " tlbsync \n\t"
" sync \n\t"::"r" (ea)); " sync \n\t"::"r" (ea):"memory");
rtems_interrupt_enable (flags); rtems_interrupt_enable (flags);
return pte; return pte;
} }
@@ -850,7 +855,7 @@ triv121UnmapEa (unsigned long ea)
"1: \n\t" \ "1: \n\t" \
: \ : \
:"r"(msr) \ :"r"(msr) \
:"3","lr") :"3","lr","memory")
/* The book doesn't mention dssall when changing PTEs /* The book doesn't mention dssall when changing PTEs
* but they require it for BAT changes and I guess * but they require it for BAT changes and I guess
@@ -911,14 +916,14 @@ triv121ChangeEaAttributes (unsigned long ea, int wimg, int pp)
pte->v = 0; pte->v = 0;
do_dssall (); do_dssall ();
asm volatile ("sync"); asm volatile ("sync":::"memory");
if (wimg >= 0) if (wimg >= 0)
pte->wimg = wimg; pte->wimg = wimg;
if (pp >= 0) if (pp >= 0)
pte->pp = pp; pte->pp = pp;
asm volatile ("tlbie %0; eieio"::"r" (ea)); asm volatile ("tlbie %0; eieio"::"r" (ea):"memory");
pte->v = 1; pte->v = 1;
asm volatile ("tlbsync; sync"); asm volatile ("tlbsync; sync":::"memory");
/* restore, i.e., switch MMU and IRQs back on */ /* restore, i.e., switch MMU and IRQs back on */
SYNC_LONGJMP (msr); SYNC_LONGJMP (msr);

6
c/src/lib/libcpu/powerpc/shared/src/cache.c
View File

@@ -91,14 +91,14 @@ void _CPU_cache_flush_1_data_line(
const void * _address ) const void * _address )
{ {
register const void *__address = _address; register const void *__address = _address;
asm volatile ( "dcbf 0,%0" :: "r" (__address) ); asm volatile ( "dcbf 0,%0" :: "r" (__address) : "memory" );
} }
void _CPU_cache_invalidate_1_data_line( void _CPU_cache_invalidate_1_data_line(
const void * _address ) const void * _address )
{ {
register const void *__address = _address; register const void *__address = _address;
asm volatile ( "dcbi 0,%0" :: "r" (__address) ); asm volatile ( "dcbi 0,%0" :: "r"(__address) : "memory" );
} }
void _CPU_cache_flush_entire_data ( void ) {} void _CPU_cache_flush_entire_data ( void ) {}
@@ -126,7 +126,7 @@ void _CPU_cache_invalidate_1_instruction_line(
const void * _address ) const void * _address )
{ {
register const void *__address = _address; register const void *__address = _address;
asm volatile ( "icbi 0,%0" :: "r" (__address) ); asm volatile ( "icbi 0,%0" :: "r" (__address) : "memory");
} }
void _CPU_cache_invalidate_entire_instruction ( void ) {} void _CPU_cache_invalidate_entire_instruction ( void ) {}