Changeset 3f03199 in mainline for kernel/arch/sparc64/src/mm/sun4u/as.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (1 diff)

kernel/arch/sparc64/src/mm/sun4u/as.c

@@ -63 +63 @@
 {
 #ifdef CONFIG_TSB
-        /*
-         * The order must be calculated with respect to the emulated
-         * 16K page size.
-         *
-         */
-        uint8_t order = fnzb32(((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t)) >> FRAME_WIDTH);
-        
-        uintptr_t tsb = (uintptr_t) frame_alloc(order, flags | FRAME_KA);
-        
-        if (!tsb)
+        uintptr_t tsb_phys =
+            frame_alloc(SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t)), flags, 0);
+        if (!tsb_phys)
                 return -1;
         
-        as->arch.itsb = (tsb_entry_t *) tsb;
-        as->arch.dtsb = (tsb_entry_t *) (tsb + ITSB_ENTRY_COUNT *
+        tsb_entry_t *tsb = (tsb_entry_t *) PA2KA(tsb_phys);
+        
+        as->arch.itsb = tsb;
+        as->arch.dtsb = tsb + ITSB_ENTRY_COUNT;
+        
+        memsetb(as->arch.itsb, (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
+            sizeof(tsb_entry_t), 0);
+#endif
+        
+        return 0;
+}
+
+int as_destructor_arch(as_t *as)
+{
+#ifdef CONFIG_TSB
+        size_t frames = SIZE2FRAMES((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
             sizeof(tsb_entry_t));
-        
-        memsetb(as->arch.itsb,
-            (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
-#endif
-        
-        return 0;
-}
-
-int as_destructor_arch(as_t *as)
-{
-#ifdef CONFIG_TSB
-        /*
-         * The count must be calculated with respect to the emualted 16K page
-         * size.
-         */
-        size_t cnt = ((ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) *
-            sizeof(tsb_entry_t)) >> FRAME_WIDTH;
-        frame_free(KA2PA((uintptr_t) as->arch.itsb));
-        
-        return cnt;
+        frame_free(KA2PA((uintptr_t) as->arch.itsb), frames);
+        
+        return frames;
 #else
         return 0;