Changeset b4655da in mainline

Timestamp:

2009-11-06T16:59:40Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

74cbac7d

Parents:

66e08d02

Message:

TLB & CPU init implemented, now the code reaches creation of the first thread.

Location:

kernel/arch/sparc64

Files:

• Makefile.inc (modified) (3 diffs)
• include/drivers/tick.h (modified) (1 diff)
• include/mm/tte.h (modified) (1 diff)
• src/cpu/cpu.c (deleted)
• src/drivers/tick.c (modified) (2 diffs)
• src/mm/sun4v/tlb.c (modified) (11 diffs)
• src/mm/tsb.c (deleted)
• src/sun4v/sparc64.c (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -64 +64 @@
 
 ARCH_SOURCES = \
-        arch/$(KARCH)/src/cpu/cpu.c \
+        arch/$(KARCH)/src/cpu/$(USARCH)/cpu.c \
         arch/$(KARCH)/src/asm.S \
         arch/$(KARCH)/src/panic.S \
@@ -94 +94 @@
 ifeq ($(USARCH),sun4v)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/drivers/niagara.c
+                arch/$(KARCH)/src/drivers/niagara.c \
+                arch/$(KARCH)/src/sun4v/md.c
 endif
 
@@ -110 +111 @@
 ifeq ($(CONFIG_TSB),y)
         ARCH_SOURCES += \
-                arch/$(KARCH)/src/mm/tsb.c
+                arch/$(KARCH)/src/mm/$(USARCH)/tsb.c
 endif

kernel/arch/sparc64/include/drivers/tick.h

@@ -36 +36 @@
 #define KERN_sparc64_TICK_H_
 
+#include <arch/asm.h>
 #include <arch/interrupt.h>
+
+/* mask of the "counter" field of the Tick register */
+#define TICK_COUNTER_MASK       (~(1l << 63))
 
 extern void tick_init(void);
 extern void tick_interrupt(int n, istate_t *istate);
+
+/**
+ * Reads the Tick register counter.
+ */
+static inline uint64_t tick_counter_read(void)
+{
+        return TICK_COUNTER_MASK & tick_read();
+}
 
 #endif

kernel/arch/sparc64/include/mm/tte.h

@@ -36 +36 @@
 #define KERN_sparc64_TTE_H_
 
-#define TTE_G           (1 << 0)
-#define TTE_W           (1 << 1)
-#define TTE_P           (1 << 2)
-#define TTE_E           (1 << 3)
-#define TTE_CV          (1 << 4)
-#define TTE_CP          (1 << 5)
-#define TTE_L           (1 << 6)
-
-#define TTE_V_SHIFT     63
-#define TTE_SIZE_SHIFT  61
-
-#ifndef __ASM__
-
-#include <arch/types.h>
-
-/* TTE tag's VA_tag field contains bits <63:VA_TAG_PAGE_SHIFT> of the VA */
-#define VA_TAG_PAGE_SHIFT       22
-
-/** Translation Table Entry - Tag. */
-union tte_tag {
-        uint64_t value;
-        struct {
-                unsigned g : 1;         /**< Global. */
-                unsigned : 2;           /**< Reserved. */
-                unsigned context : 13;  /**< Context identifier. */
-                unsigned : 6;           /**< Reserved. */
-                uint64_t va_tag : 42;   /**< Virtual Address Tag, bits 63:22. */
-        } __attribute__ ((packed));
-};
-
-typedef union tte_tag tte_tag_t;
-
-/** Translation Table Entry - Data. */
-union tte_data {
-        uint64_t value;
-        struct {
-                unsigned v : 1;         /**< Valid. */
-                unsigned size : 2;      /**< Page size of this entry. */
-                unsigned nfo : 1;       /**< No-Fault-Only. */
-                unsigned ie : 1;        /**< Invert Endianness. */
-                unsigned soft2 : 9;     /**< Software defined field. */
-#if defined (US)
-                unsigned diag : 9;      /**< Diagnostic data. */
-                unsigned pfn : 28;      /**< Physical Address bits, bits 40:13. */
-#elif defined (US3)
-                unsigned : 7;           /**< Reserved. */
-                unsigned pfn : 30;      /**< Physical Address bits, bits 42:13 */
+#if defined (SUN4U)
+#include <arch/mm/sun4u/tte.h>
+#elif defined (SUN4V)
+#include <arch/mm/sun4v/tte.h>
 #endif
-                unsigned soft : 6;      /**< Software defined field. */
-                unsigned l : 1;         /**< Lock. */
-                unsigned cp : 1;        /**< Cacheable in physically indexed cache. */
-                unsigned cv : 1;        /**< Cacheable in virtually indexed cache. */
-                unsigned e : 1;         /**< Side-effect. */
-                unsigned p : 1;         /**< Privileged. */
-                unsigned w : 1;         /**< Writable. */
-                unsigned g : 1;         /**< Global. */
-        } __attribute__ ((packed));
-};
-
-typedef union tte_data tte_data_t;
-
-#endif /* !def __ASM__ */
 
 #endif

kernel/arch/sparc64/src/drivers/tick.c

@@ -54 +54 @@
         interrupt_register(14, "tick_int", tick_interrupt);
         compare.int_dis = false;
-        compare.tick_cmpr = CPU->arch.clock_frequency / HZ;
+        compare.tick_cmpr = tick_counter_read() +
+                CPU->arch.clock_frequency / HZ;
         CPU->arch.next_tick_cmpr = compare.tick_cmpr;
         tick_compare_write(compare.value);
-        tick_write(0);
 
-#if defined (US3)
+#if defined (US3) || defined (SUN4V)
         /* disable STICK interrupts and clear any pending ones */
         tick_compare_reg_t stick_compare;
@@ -111 +111 @@
          * overflow only in 146 years.
          */
-        drift = tick_read() - CPU->arch.next_tick_cmpr;
+        drift = tick_counter_read() - CPU->arch.next_tick_cmpr;
         while (drift > CPU->arch.clock_frequency / HZ) {
                 drift -= CPU->arch.clock_frequency / HZ;
                 CPU->missed_clock_ticks++;
         }
-        CPU->arch.next_tick_cmpr = tick_read() +
+        CPU->arch.next_tick_cmpr = tick_counter_read() +
             (CPU->arch.clock_frequency / HZ) - drift;
         tick_compare_write(CPU->arch.next_tick_cmpr);

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -37 +37 @@
 #include <mm/as.h>
 #include <mm/asid.h>
+#include <arch/sun4v/hypercall.h>
 #include <arch/mm/frame.h>
 #include <arch/mm/page.h>
-#include <arch/mm/mmu.h>
+#include <arch/mm/tte.h>
+#include <arch/mm/tlb.h>
 #include <arch/interrupt.h>
 #include <interrupt.h>
@@ -70 +72 @@
 };
 
+/** Invalidate all unlocked ITLB and DTLB entries. */
+void tlb_invalidate_all(void)
+{
+        uint64_t errno =  __hypercall_fast3(MMU_DEMAP_ALL, 0, 0,
+                MMU_FLAG_DTLB | MMU_FLAG_ITLB);
+        if (errno != EOK) {
+                panic("Error code = %d.\n", errno);
+        }
+}
+
 void tlb_arch_init(void)
 {
-        /*
-         * Invalidate all non-locked DTLB and ITLB entries.
-         */
-        //MH
-        //tlb_invalidate_all();
-
-        /*
-         * Clear both SFSRs.
-         */
-        //MH
-        //dtlb_sfsr_write(0);
-        //itlb_sfsr_write(0);
+        tlb_invalidate_all();
 }
 
@@ -97 +98 @@
     bool locked, bool cacheable)
 {
+#if 0
         tlb_tag_access_reg_t tag;
         tlb_data_t data;
@@ -124 +126 @@
 
         dtlb_data_in_write(data.value);
+#endif
 }
 
@@ -135 +138 @@
 void dtlb_pte_copy(pte_t *t, size_t index, bool ro)
 {
+#if 0
         tlb_tag_access_reg_t tag;
         tlb_data_t data;
@@ -163 +167 @@
 
         dtlb_data_in_write(data.value);
+#endif
 }
 
@@ -172 +177 @@
 void itlb_pte_copy(pte_t *t, size_t index)
 {
+#if 0
         tlb_tag_access_reg_t tag;
         tlb_data_t data;
@@ -197 +203 @@
         
         itlb_data_in_write(data.value);
+#endif
 }
 
@@ -362 +369 @@
 static void print_tlb_entry(int i, tlb_tag_read_reg_t t, tlb_data_t d)
 {
+#if 0
         printf("%d: vpn=%#llx, context=%d, v=%d, size=%d, nfo=%d, "
             "ie=%d, soft2=%#x, pfn=%#x, soft=%#x, l=%d, "
@@ -367 +375 @@
             t.context, d.v, d.size, d.nfo, d.ie, d.soft2,
             d.pfn, d.soft, d.l, d.cp, d.cv, d.e, d.p, d.w, d.g);
+#endif
 }
 
@@ -502 +511 @@
 }
 
-#if defined (US)
-/** Invalidate all unlocked ITLB and DTLB entries. */
-void tlb_invalidate_all(void)
-{
-        int i;
-        
-        /*
-         * Walk all ITLB and DTLB entries and remove all unlocked mappings.
-         *
-         * The kernel doesn't use global mappings so any locked global mappings
-         * found must have been created by someone else. Their only purpose now
-         * is to collide with proper mappings. Invalidate immediately. It should
-         * be safe to invalidate them as late as now.
-         */
-
-        tlb_data_t d;
-        tlb_tag_read_reg_t t;
-
-        for (i = 0; i < ITLB_ENTRY_COUNT; i++) {
-                d.value = itlb_data_access_read(i);
-                if (!d.l || d.g) {
-                        t.value = itlb_tag_read_read(i);
-                        d.v = false;
-                        itlb_tag_access_write(t.value);
-                        itlb_data_access_write(i, d.value);
-                }
-        }
-
-        for (i = 0; i < DTLB_ENTRY_COUNT; i++) {
-                d.value = dtlb_data_access_read(i);
-                if (!d.l || d.g) {
-                        t.value = dtlb_tag_read_read(i);
-                        d.v = false;
-                        dtlb_tag_access_write(t.value);
-                        dtlb_data_access_write(i, d.value);
-                }
-        }
-
-}
-
-#elif defined (US3)
-
-/** Invalidate all unlocked ITLB and DTLB entries. */
-void tlb_invalidate_all(void)
-{
-        itlb_demap(TLB_DEMAP_ALL, 0, 0);
-        dtlb_demap(TLB_DEMAP_ALL, 0, 0);
-}
-
-#endif
-
 /** Invalidate all ITLB and DTLB entries that belong to specified ASID
  * (Context).

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -38 +38 @@
 #include <arch/trap/trap.h>
 #include <arch/console.h>
+#include <arch/sun4v/md.h>
 #include <console/console.h>
 #include <arch/boot/boot.h>
@@ -68 +69 @@
                     bootinfo.taskmap.tasks[i].name);
         }
+
+        md_init();
 }