Changeset b5e0bb8 in mainline

Timestamp:

2006-02-01T23:06:10Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4e147a6

Parents:

071a8ae6

Message:

sparc64 bugfix.
When disabling IMMU and DMMU the kernel has to perform synchronization operation
(e.g flush %r or membar #Sync instruction). There is no guarantee that the address
contained in %r is in DTLB and therefore the flush instruction can fault. Normally
this would be recognized and fixed by the OpenFirmware Fast Data MMU fault handler.
However, this handler lives in virtually mapped memory and an attempt to execute
there while the MMUs are disabled would result in a nested trap leading to error state.
Replacing flush %r instruction with membar #Sync, wich is sufficient in this case,
fixes this problem.

Location:

arch

Files:

• ia64/src/mm/frame.c (modified) (1 diff)
• sparc64/include/barrier.h (modified) (1 diff)
• sparc64/include/mm/mmu.h (modified) (2 diffs)
• sparc64/include/mm/page.h (modified) (1 diff)

arch/ia64/src/mm/frame.c

@@ -45 +45 @@
          */
         frame_region_not_free(ROM_BASE, ROM_SIZE);
-        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE-1));
+        
+        zone_create_in_region(0, config.memory_size & ~(FRAME_SIZE-1));
 }

arch/sparc64/include/barrier.h

@@ -52 +52 @@
 }
 
+static inline void membar(void)
+{
+        __asm__ volatile ("membar #Sync\n");
+}
+
 #endif

arch/sparc64/include/mm/mmu.h

@@ -111 +111 @@
         cr.im = enable;
         asi_u64_write(ASI_LSU_CONTROL_REG, 0, cr.value);
-        flush();
+        membar();
 }
 
@@ -122 +122 @@
         cr.dm = enable;
         asi_u64_write(ASI_LSU_CONTROL_REG, 0, cr.value);
-        flush();
+        membar();
 }
 

arch/sparc64/include/mm/page.h

@@ -42 +42 @@
 
 /** Implementation of page hash table interface. */
-#define HT_WIDTH_ARCH                   FRAME_WIDTH
+#define HT_WIDTH_ARCH                   20      /* 1M */
 #define HT_HASH_ARCH(page, asid)        0
 #define HT_COMPARE_ARCH(page, asid, t)  0