git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5644 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 61 insertions, 46 deletions

diff --git a/docs/reports/SPC56EL60-120.txt b/docs/reports/SPC56EL60-120.txt
index 6690a5899..50a7ad9fe 100644
--- a/docs/reports/SPC56EL60-120.txt
+++ b/docs/reports/SPC56EL60-120.txt
@@ -6,7 +6,7 @@ Settings: SYSCLK=120
 *** ChibiOS/RT test suite

 ***

 *** Kernel:       2.5.2unstable

-*** Compiled:     Apr 29 2013 - 09:53:43

+*** Compiled:     Apr 29 2013 - 11:20:37

 *** Compiler:     GCC 4.6.3 build on 2013-01-07

 *** Architecture: Power Architecture

 *** Core Variant: e200z4

@@ -100,7 +100,7 @@ Settings: SYSCLK=120
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.1 (Benchmark, messages #1)

---- Score : 379276 msgs/S, 758552 ctxswc/S

+--- Score : 379277 msgs/S, 758554 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.2 (Benchmark, messages #2)

@@ -108,7 +108,7 @@ Settings: SYSCLK=120
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.3 (Benchmark, messages #3)

---- Score : 312930 msgs/S, 625860 ctxswc/S

+--- Score : 312931 msgs/S, 625862 ctxswc/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.4 (Benchmark, context switch)

@@ -120,7 +120,7 @@ Settings: SYSCLK=120
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.6 (Benchmark, threads, create only)

---- Score : 369919 threads/S

+--- Score : 369918 threads/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.7 (Benchmark, mass reschedule, 5 threads)

@@ -136,11 +136,11 @@ Settings: SYSCLK=120
 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.10 (Benchmark, virtual timers set/reset)

---- Score : 1309916 timers/S

+--- Score : 1309908 timers/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.11 (Benchmark, semaphores wait/signal)

---- Score : 1762552 wait+signal/S

+--- Score : 1762548 wait+signal/S

 --- Result: SUCCESS

 ----------------------------------------------------------------------------

 --- Test Case 11.12 (Benchmark, mutexes lock/unlock)

diff --git a/os/ports/GCC/PPC/SPC564Axx/core.s b/os/ports/GCC/PPC/SPC564Axx/core.s
index da14e7236..bd6ad0fed 100644
--- a/os/ports/GCC/PPC/SPC564Axx/core.s
+++ b/os/ports/GCC/PPC/SPC564Axx/core.s
@@ -208,7 +208,7 @@ _ramcode:
         .type       _coreinit, @function

 _coreinit:

         /*

-         * Invalidating all TLBs except one.

+         * Invalidating all TLBs except TLB1.

          */

         lis         %r3, 0

         mtspr       625, %r3        /* MAS1 */

diff --git a/os/ports/GCC/PPC/SPC56ELxx/core.s b/os/ports/GCC/PPC/SPC56ELxx/core.s
index 24d36e107..4d381bd29 100644
--- a/os/ports/GCC/PPC/SPC56ELxx/core.s
+++ b/os/ports/GCC/PPC/SPC56ELxx/core.s
@@ -127,7 +127,7 @@
 

 #define TLB1_MAS0               (MAS0_TBLMAS_TBL | MAS0_ESEL(1))

 #define TLB1_MAS1               (MAS1_VALID | MAS1_IPROT | MAS1_TSISE_128K)

-#define TLB1_MAS2               (MAS2_EPN(0x40000000) | MAS2_VLE | MAS2_I)

+#define TLB1_MAS2               (MAS2_EPN(0x40000000) | MAS2_VLE)

 #define TLB1_MAS3               (MAS3_RPN(0x40000000) |                     \

                                  MAS3_UX | MAS3_SX | MAS3_UW | MAS3_SW |    \

                                  MAS3_UR | MAS3_SR)

@@ -214,6 +214,59 @@ _ramcode:
         .type       _coreinit, @function

 _coreinit:

         /*

+         * Invalidating all TLBs except TLB0.

+         */

+        lis         %r3, 0

+        mtspr       625, %r3        /* MAS1 */

+        mtspr       626, %r3        /* MAS2 */

+        mtspr       627, %r3        /* MAS3 */

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(1))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(2))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(3))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(4))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(5))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(6))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(7))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(8))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(9))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(10))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(11))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(12))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(13))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(14))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(15))@h

+        mtspr       624, %r3        /* MAS0 */

+        tlbwe

+

+        /*

          * TLB1 allocated to internal RAM.

          */

         lis         %r3, TLB1_MAS0@h

@@ -294,44 +347,6 @@ _coreinit:
         tlbwe

 

         /*

-         * Invalidating the remaining TLBs (because debuggers).

-         */

-        lis         %r3, 0

-        mtspr       625, %r3        /* MAS1 */

-        mtspr       626, %r3        /* MAS2 */

-        mtspr       627, %r3        /* MAS3 */

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(6))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(7))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(8))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(9))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(10))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(11))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(12))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(13))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(14))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-        lis         %r3, (MAS0_TBLMAS_TBL | MAS0_ESEL(15))@h

-        mtspr       624, %r3        /* MAS0 */

-        tlbwe

-

-        /*

          * RAM clearing, this device requires a write to all RAM location in

          * order to initialize the ECC detection hardware, this is going to

          * slow down the startup but there is no way around.