Changeset b4ca0a9c in mainline for kernel/arch/ia32

Timestamp:

2012-07-10T11:53:50Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/arch/ia32

Files:

• Makefile.inc (modified) (2 diffs)
• include/mm/page.h (modified) (2 diffs)
• src/mm/page.c (modified) (1 diff)
• src/smp/apic.c (modified) (3 diffs)
• src/userspace.c (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -38 +38 @@
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += $(CMN1)
 CLANG_CFLAGS += $(CMN1)
 
@@ -50 +49 @@
 ifeq ($(PROCESSOR),athlon_xp)
         CMN2 = -march=athlon-xp
-        SUNCC_CFLAGS += -xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),athlon_mp)
         CMN2 = -march=athlon-mp
-        SUNCC_CFLAGS += xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),pentium3)
         CMN2 = -march=pentium3
-        SUNCC_CFLAGS += -xarch=sse
 endif
 
 ifeq ($(PROCESSOR),pentium4)
         CMN2 = -march=pentium4
-        SUNCC_CFLAGS += -xarch=sse2
 endif
 
 ifeq ($(PROCESSOR),core)
         CMN2 = -march=prescott
-        SUNCC_CFLAGS += -xarch=sse3
 endif
 

kernel/arch/ia32/include/mm/page.h

@@ -115 +115 @@
         set_pt_flags((pte_t *) (ptl3), (size_t) (i), (x))
 
+/* Set PTE present bit accessors for each level. */
+#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
+        set_pt_present((pte_t *) (ptl0), (size_t) (i))
+#define SET_PTL2_PRESENT_ARCH(ptl1, i)
+#define SET_PTL3_PRESENT_ARCH(ptl2, i)
+#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
+        set_pt_present((pte_t *) (ptl3), (size_t) (i))
+
 /* Macros for querying the last level entries. */
 #define PTE_VALID_ARCH(p) \
@@ -194 +202 @@
 }
 
+NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i)
+{
+        pte_t *p = &pt[i];
+
+        p->present = 1;
+}
+
 extern void page_arch_init(void);
 extern void page_fault(unsigned int, istate_t *);

kernel/arch/ia32/src/mm/page.c

@@ -71 +71 @@
         for (cur = 0; cur < min(config.identity_size, config.physmem_end);
             cur += FRAME_SIZE) {
-                flags = PAGE_CACHEABLE | PAGE_WRITE;
-                if ((PA2KA(cur) >= config.base) &&
-                    (PA2KA(cur) < config.base + config.kernel_size))
-                        flags |= PAGE_GLOBAL;
+                flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_WRITE | PAGE_READ;
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         }

kernel/arch/ia32/src/smp/apic.c

@@ -259 +259 @@
 }
 
+#define DELIVS_PENDING_SILENT_RETRIES   4       
+
+static void l_apic_wait_for_delivery(void)
+{
+        icr_t icr;
+        unsigned retries = 0;
+
+        do {
+                if (retries++ > DELIVS_PENDING_SILENT_RETRIES) {
+                        retries = 0;
+#ifdef CONFIG_DEBUG
+                        printf("IPI is pending.\n");
+#endif
+                        delay(20);
+                }
+                icr.lo = l_apic[ICRlo];
+        } while (icr.delivs == DELIVS_PENDING);
+        
+}
+
 /** Send all CPUs excluding CPU IPI vector.
  *
@@ -279 +299 @@
         
         l_apic[ICRlo] = icr.lo;
-        
-        icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
+
+        l_apic_wait_for_delivery();
         
         return apic_poll_errors();
@@ -327 +342 @@
                 return 0;
         
+        l_apic_wait_for_delivery();
+
         icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
-        
         icr.delmod = DELMOD_INIT;
         icr.destmod = DESTMOD_PHYS;

kernel/arch/ia32/src/userspace.c

@@ -63 +63 @@
                 
                 "pushl %[udata_des]\n"
-                "pushl %[stack_size]\n"
+                "pushl %[stack_top]\n"
                 "pushl %[ipl]\n"
                 "pushl %[utext_des]\n"
@@ -75 +75 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
+                  [stack_top] "r" ((uint8_t *) kernel_uarg->uspace_stack +
+                      kernel_uarg->uspace_stack_size),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),