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

2003-02-20 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
PR 349/bsps
	* mpc6xx/exceptions/raw_exception.c, mpc6xx/mmu/bat.c,
	mpc6xx/mmu/pte121.c, shared/include/cpuIdent.c,
	shared/include/cpuIdent.h, shared/src/Makefile.am, shared/src/stack.c,
	shared/src/stackTrace.h, powerpc/registers.h:
	  - undo improper 'fix' who broke mpc604r identification
	  - fix: 7400 identification PVR value was wrong
	  - enhance 'setdbat()' to switch OFF a given BAT if called with 0 size
	  - fix: page table support bugfix
	  - enhancement: provide routines to take and print stack trace
	    snapshots
	  - add definitions for HID1 and DABR SPRs
This commit is contained in:
Joel Sherrill
2003-02-20 22:07:54 +00:00
parent da1100e035
commit c074ea2eae
7 changed files with 57 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,18 @@
2003-02-20 Till Straumann <strauman@slac.stanford.edu>
PR 349/bsps
* mpc6xx/exceptions/raw_exception.c, mpc6xx/mmu/bat.c,
mpc6xx/mmu/pte121.c, shared/include/cpuIdent.c,
shared/include/cpuIdent.h, shared/src/Makefile.am, shared/src/stack.c,
shared/src/stackTrace.h, powerpc/registers.h:
- undo improper 'fix' who broke mpc604r identification
- fix: 7400 identification PVR value was wrong
- enhance 'setdbat()' to switch OFF a given BAT if called with 0 size
- fix: page table support bugfix
- enhancement: provide routines to take and print stack trace
snapshots
- add definitions for HID1 and DABR SPRs
2003-02-14 Greg Menke <gregory.menke@gsfc.nasa.gov>
PR 348/bsps

4
c/src/lib/libcpu/powerpc/mpc6xx/exceptions/raw_exception.c
View File

@@ -125,7 +125,7 @@ int mpc60x_vector_is_valid(rtems_vector vector)
break;
case PPC_604:
case PPC_604e:
/* case PPC_604r: -- same value as PPC_750 */
case PPC_604r:
if (!mpc604_vector_is_valid(vector)) {
return 0;
}
@@ -138,7 +138,7 @@ int mpc60x_vector_is_valid(rtems_vector vector)
}
break;
default:
printk("Please complete libcpu/powerpc/mpc6xx/raw_exception.c\n");
printk("Please complete libcpu/powerpc/mpc6xx/exceptions/raw_exception.c\n");
printk("current_ppc_cpu = %x\n", current_ppc_cpu);
return 0;
}

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

@@ -43,7 +43,7 @@ void setdbat(int bat_index, unsigned long virt, unsigned long phys,
int wimgxpp;
ubat bat;
bl = (size >> 17) - 1;
bl = (size >= (1<<17)) ? (size >> 17) - 1 : 0;
/* 603, 604, etc. */
wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE
| _PAGE_COHERENT | _PAGE_GUARDED);
@@ -53,8 +53,13 @@ void setdbat(int bat_index, unsigned long virt, unsigned long phys,
if (flags & _PAGE_USER)
bat.bat.batu.vp = 1;
bat_addrs[bat_index].start = virt;
bat_addrs[bat_index].limit = virt + ((bl + 1) << 17) - 1;
bat_addrs[bat_index].limit = virt + (bl ? ((bl + 1) << 17) - 1 : 0);
bat_addrs[bat_index].phys = phys;
if ( 0 == bl ) {
/* size of 0 tells us to switch it off */
bat.bat.batu.vp = 0;
bat.bat.batu.vs = 0;
}
switch (bat_index) {
case 0 : asm_setdbat0(bat.word[0], bat.word[1]); break;
case 1 : asm_setdbat1(bat.word[0], bat.word[1]); break;

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

@@ -22,8 +22,8 @@
#include <rtems.h>
#include <rtems/bspIo.h>
#include <libcpu/cpuIdent.h>
#include <bsp.h>
#ifdef DEBUG_EXC
#include <bsp.h>
#include <bsp/vectors.h>
#include <libcpu/raw_exception.h>
#endif
@@ -125,7 +125,7 @@
/* Horrible Macros */
#ifdef __rtems
#ifdef __rtems__
/* must not use printf until multitasking is up */
typedef void (*PrintF)(char *,...);
static PrintF whatPrintf(void)
@@ -363,8 +363,8 @@ triv121PgTblInit(unsigned long base, unsigned ldSize)
if (base & ((1<<ldSize)-1))
return 0; /* misaligned */
/* This should work on a 604, but I couldn't test (I did
* on 750 and 7400). Verify that the TLB invalidation works
/* This was tested on 604r, 750 and 7400.
* On other CPUs, verify that the TLB invalidation works
* for a new CPU variant and that it has hardware PTE lookup/
* TLB replacement before adding it to this list.
*
@@ -678,10 +678,34 @@ static int maxw=20; /* mute after detecting this many errors */
}
v=m=0;
for (i=0, pte=pt->base; i<pt->size/sizeof(PTERec); i++,pte++) {
#if 1
/* 10/9/2002: I had machine checks crashing after this loop
* terminated. Maybe caused by speculative loads
* from beyond the valid memory area (since the
* page hash table sits at the top of physical
* memory).
* Very bizarre - the other loops in this file
* seem to be fine. Maybe there is a compiler bug??
* For the moment, I let the loop run backwards...
*
* Also see the comment a couple of lines down.
*/
for (i=pt->size/sizeof(PTERec)-1, pte=pt->base + i; i>=0; i--,pte--)
#else
for (i=0, pte=pt->base; i<pt->size/sizeof(PTERec); i++,pte++)
#endif
{
int err=0;
char buf[500];
unsigned long *lp=(unsigned long*)pte;
#if 0
/* If I put this bogus while statement here (the body is
* never reached), the original loop works OK
*/
while (pte >= pt->base + pt->size/sizeof(PTERec))
/* never reached */;
#endif
if ( (*lp & (0xfffff0<<7)) || *(lp+1) & 0xe00 || (pte->v && pte->marked)) {
/* check for vsid (without segment bits) == 0, unused bits == 0, valid && marked */
sprintf(buf,"invalid VSID , unused bits or v && m");

2
c/src/lib/libcpu/powerpc/shared/include/cpuIdent.c
View File

@@ -33,10 +33,10 @@ char *get_ppc_cpu_type_name(ppc_cpu_id_t cpu)
case PPC_603: return "MPC603";
case PPC_603ev: return "MPC603ev";
case PPC_604: return "MPC604";
/* case PPC_604r: return "MPC604r"; same value as 750 */
case PPC_750: return "MPC750";
case PPC_7400: return "MPC7400";
case PPC_604e: return "MPC604e";
case PPC_604r: return "MPC604r";
case PPC_620: return "MPC620";
case PPC_860: return "MPC860";
case PPC_8260: return "MPC8260";

2
c/src/lib/libcpu/powerpc/shared/include/cpuIdent.h
View File

@@ -27,7 +27,7 @@ typedef enum
PPC_750 = 0x8,
PPC_604e = 0x9,
PPC_604r = 0xA,
PPC_7400 = 0xA,
PPC_7400 = 0xC,
PPC_620 = 0x16,
PPC_860 = 0x50,
PPC_821 = PPC_860,

4
c/src/lib/libcpu/powerpc/shared/src/Makefile.am
View File

@@ -5,12 +5,12 @@
VPATH = @srcdir@:@srcdir@/../../../shared/src
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
C_FILES = cache.c cache_aligned_malloc.c cache_manager.c stack.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
include_libcpudir = $(includedir)/libcpu
include_libcpu_HEADERS = cache_.h cache.h
include_libcpu_HEADERS = cache_.h cache.h stackTrace.h
OBJS = $(C_O_FILES)