Changeset c1982e45 in mainline for arch

Timestamp:

2006-05-20T21:11:08Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

125e944

Parents:

1068f6a

Message:

make hardware memory mapping more generic

Location:

arch

Files:

• amd64/src/mm/page.c (modified) (4 diffs)
• ia32/src/mm/page.c (modified) (3 diffs)
• sparc64/Makefile.inc (modified) (1 diff)
• sparc64/src/console.c (modified) (1 diff)
• sparc64/src/mm/page.c (modified) (2 diffs)

arch/amd64/src/mm/page.c

@@ -72 +72 @@
         SET_FRAME_FLAGS_ARCH(ptl3, PTL3_INDEX_ARCH(page), PAGE_WRITE | PAGE_EXEC); \
     }
+
+
 void page_arch_init(void)
 {
@@ -108 +110 @@
         }
 }
+
 
 /** Identity page mapper
@@ -162 +165 @@
 }
 
+
 void page_fault(int n, istate_t *istate)
 {
@@ -173 +177 @@
         }
 }
+
+
+__address hw_map(__address physaddr, size_t size)
+{
+        if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+                panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
+        
+        __address virtaddr = PA2KA(last_frame);
+        pfn_t i;
+        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
+                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE);
+        
+        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
+        
+        return virtaddr;
+}

arch/ia32/src/mm/page.c

@@ -34 +34 @@
 #include <mm/as.h>
 #include <arch/types.h>
+#include <align.h>
 #include <config.h>
 #include <func.h>
@@ -42 +43 @@
 #include <print.h>
 #include <interrupt.h>
+
 
 void page_arch_init(void)
@@ -70 +72 @@
         paging_on();
 }
+
+
+__address hw_map(__address physaddr, size_t size)
+{
+        if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
+                panic("Unable to map physical memory %p (%d bytes)", physaddr, size)
+        
+        __address virtaddr = PA2KA(last_frame);
+        pfn_t i;
+        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
+                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE);
+        
+        last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
+        
+        return virtaddr;
+}

arch/sparc64/Makefile.inc

@@ -66 +66 @@
 
 CONFIG_FB = y
-CONFIG_FB_MAP_ARCH = y
 
 ## Compile with support for i8042 controller.

arch/sparc64/src/console.c

@@ -70 +70 @@
         mutex_initialize(&canwork);
         ofw_console_active = 1;
-}
-
-void fb_map_arch(__address virtaddr, __address physaddr, size_t size)
-{
-        dtlb_insert_mapping(virtaddr, physaddr, PAGESIZE_512K, true, false);
-        dtlb_insert_mapping(virtaddr + 512*1024, physaddr + 512*1024, PAGESIZE_512K, true, false);
 }
 

arch/sparc64/src/mm/page.c

@@ -28 +28 @@
 
 #include <arch/mm/page.h>
+#include <arch/mm/tlb.h>
 #include <genarch/mm/page_ht.h>
+#include <mm/frame.h>
+#include <bitops.h>
 
 void page_arch_init(void)
@@ -34 +37 @@
         page_mapping_operations = &ht_mapping_operations;
 }
+
+__address hw_map(__address physaddr, size_t size)
+{
+        unsigned int order;
+        
+        if (size <= FRAME_SIZE)
+                order = 0;
+        else
+                order = (fnzb32(size - 1) + 1) - FRAME_WIDTH;
+        
+        __address virtaddr = PA2KA(PFN2ADDR(frame_alloc(order, FRAME_KA)));
+        
+        dtlb_insert_mapping(virtaddr, physaddr, PAGESIZE_512K, true, false);
+        dtlb_insert_mapping(virtaddr + 512 * 1024, physaddr + 512 * 1024, PAGESIZE_512K, true, false);
+        
+        return virtaddr;
+}