[commit] r966 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc

[repository service]

Author: afaerber
Date: Sun Nov 21 22:53:54 2010
New Revision: 966
URL: http://tracker.coreboot.org/trac/openbios/changeset/966

Log:
ppc: Set up SLBs for ppc64

Set up SLBs with slbmte instead of mtsrin, suggested by Alex.

v3:
* Continue to use mtmsrin on ppc for simplicity.
* Add comment on slbia, suggested by Segher.
* Add inline functions {slbia,slbmte}, requested by Alex.
* Add inline function mfpvr before Alex asks for it. :)

v2:
* Don't initialize 64 SLBs, then invalidate them, as in IBM's application note
  for the 970. Use slbia instead, recommended by Alex.
* Conditionalize when to use SLB or SR.

Cc: Segher Boessenkool 
Signed-off-by: Andreas Färber 
Signed-off-by: Alexander Graf

Modified:
   trunk/openbios-devel/arch/ppc/qemu/ofmem.c
   trunk/openbios-devel/include/arch/ppc/processor.h

Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/ofmem.c	Sun Nov 21 20:20:54 2010	(r965)
+++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c	Sun Nov 21 22:53:54 2010	(r966)
@@ -336,9 +336,7 @@

static int is_ppc64(void)
 {
-	unsigned int pvr;
-	asm volatile("mfspr %0, 0x11f" : "=r" (pvr) );
-
+	unsigned int pvr = mfpvr();
    return ((pvr >= 0x330000) && (pvr < 0x70330000));
 }

@@ -387,7 +385,10 @@
 setup_mmu( unsigned long ramsize )
 {
    ofmem_t *ofmem;
-	unsigned long sdr1, sr_base;
+	unsigned long sdr1;
+#ifndef __powerpc64__
+	unsigned long sr_base;
+#endif
    unsigned long hash_base;
    unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */
    int i;
@@ -399,6 +400,19 @@
    sdr1 = hash_base | ((HASH_SIZE-1) >> 16);
    asm volatile("mtsdr1 %0" :: "r" (sdr1) );

+#ifdef __powerpc64__
+
+	/* Segment Lookaside Buffer */
+
+	slbia(); /* Invalidate all SLBs except SLB 0 */
+	for (i = 0; i < 16; i++) {
+		unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7);
+		unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i;
+		slbmte(rs, rb);
+	}
+
+#else
+
    /* Segment Register */

sr_base = SEGR_USER | SEGR_BASE ;
@@ -407,6 +421,8 @@
    	asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) );
    }

+#endif
+
    ofmem = ofmem_arch_get_private();
    memset(ofmem, 0, sizeof(ofmem_t));
    ofmem->ramsize = ramsize;

Modified: trunk/openbios-devel/include/arch/ppc/processor.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/processor.h	Sun Nov 21 20:20:54 2010	(r965)
+++ trunk/openbios-devel/include/arch/ppc/processor.h	Sun Nov 21 22:53:54 2010	(r966)
@@ -425,6 +425,23 @@
 #endif
 }

+static inline unsigned int mfpvr(void)
+{
+    unsigned int pvr;
+    asm volatile("mfspr %0, 0x11f" : "=r" (pvr) );
+    return pvr;
+}
+
+static inline void slbia(void)
+{
+    asm volatile("slbia" ::: "memory");
+}
+
+static inline void slbmte(unsigned long rs, unsigned long rb)
+{
+    asm volatile("slbmte %0,%1 ; isync" :: "r" (rs), "r" (rb) : "memory");
+}
+
 #endif /* !__ASSEMBLER__ */

#endif   /* _H_PROCESSOR */