Changeset ae318d3 in mainline for kernel/arch/sparc64

Timestamp:

2009-02-16T18:50:48Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

06da55b

Parents:

17f168e

Message:

overhaul pareas: use one single physical area for the physical address space not belonging to physical memory

Location:

kernel/arch/sparc64

Files:

• include/mm/frame.h (modified) (1 diff)
• src/drivers/sgcn.c (modified) (2 diffs)
• src/mm/frame.c (modified) (2 diffs)
• src/mm/page.c (modified) (2 diffs)

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

@@ -74 +74 @@
 
 extern uintptr_t last_frame;
+extern uintptr_t end_frame;
 extern void frame_arch_init(void);
 #define physmem_print()

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

@@ -162 +162 @@
 
 /**
- * Registers the physical area of the SRAM so that the userspace SGCN
- * driver can map it. Moreover, it sets some sysinfo values (SRAM address
- * and SRAM size).
- */
-static void register_sram_parea(uintptr_t sram_begin_physical)
-{
-        static parea_t sram_parea;
-        sram_parea.pbase = sram_begin_physical;
-        sram_parea.vbase = (uintptr_t) sram_begin;
-        sram_parea.frames = MAPPED_AREA_SIZE / FRAME_SIZE;
-        sram_parea.cacheable = false;
-        ddi_parea_register(&sram_parea);
-        
+ * Set some sysinfo values (SRAM address and SRAM size).
+ */
+static void register_sram(uintptr_t sram_begin_physical)
+{
         sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE);
         sysinfo_set_item_val("sram.address.physical", NULL,
@@ -212 +203 @@
         sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE);
         
-        register_sram_parea(sram_begin_physical);
+        register_sram(sram_begin_physical);
 }
 

kernel/arch/sparc64/src/mm/frame.c

@@ -42 +42 @@
 
 uintptr_t last_frame = NULL;
+uintptr_t end_frame = NULL;
 
 /** Create memory zones according to information stored in bootinfo.
@@ -81 +82 @@
         }
         
+        end_frame = last_frame;
 }
 

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

@@ -148 +148 @@
                     sizemap[order].pagesize_code, true, false);
         
-#ifdef CONFIG_SMP       
+#ifdef CONFIG_SMP
                 /*
                  * Second, save the information about the mapping for APs.
@@ -165 +165 @@
 }
 
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+        *physaddr = end_frame;
+        *frames = ADDR2PFN(0x7ffffffffff - end_frame);
+}
+
 /** @}
  */
-