WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/ Rev 3907 and /trunk/kernel/ Rev 3908

Ignore whitespace Rev 3907 → Rev 3908

 /trunk/kernel/genarch/src/fb/fb.c
 ,9 → 52,6
 SPINLOCK_INITIALIZE(fb_lock);
-/**< Physical memory area for fb. */
-static parea_t fb_parea;
 static uint8_t *fb_addr;
 static uint8_t *backbuf;
 static uint8_t *glyphs;
 ,12 → 516,6
     fb_addr = (uint8_t *) hw_map((uintptr_t) props->addr, fbsize);
-    fb_parea.pbase = (uintptr_t) props->addr + props->offset;
-    fb_parea.vbase = (uintptr_t) fb_addr;
-    fb_parea.frames = SIZE2FRAMES(fbsize);
-    fb_parea.cacheable = false;
-    ddi_parea_register(&fb_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 1);
     sysinfo_set_item_val("fb.width", NULL, xres);

 /trunk/kernel/genarch/src/drivers/ega/ega.c
 ,8 → 54,6
  * Simple and short. Function for displaying characters and "scrolling".
  */
-static parea_t ega_parea;   /**< Physical memory area for EGA video RAM. */
 SPINLOCK_INITIALIZE(egalock);
 static uint32_t ega_cursor;
 static uint8_t *videoram;
 ,12 → 150,6
     chardev_initialize("ega_out", &ega_console, &ega_ops);
     stdout = &ega_console;
-    ega_parea.pbase = videoram_phys;
-    ega_parea.vbase = (uintptr_t) videoram;
-    ega_parea.frames = 1;
-    ega_parea.cacheable = false;
-    ddi_parea_register(&ega_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 2);
     sysinfo_set_item_val("fb.width", NULL, ROW);

 /trunk/kernel/generic/include/ddi/ddi.h
 ,13 → 38,14
 #include <ddi/ddi_arg.h>
 #include <arch/types.h>
 #include <proc/task.h>
+#include <adt/list.h>
 /** Structure representing contiguous physical memory area. */
 typedef struct {
-    uintptr_t pbase;    /**< Physical base of the area. */
-    uintptr_t vbase;    /**< Virtual base of the area. */
-    count_t frames;     /**< Number of frames in the area. */
-    bool cacheable;     /**< Cacheability. */
+    uintptr_t pbase;    /**< Physical base of the area. */
+    pfn_t frames;       /**< Number of frames in the area. */
+    link_t link;        /**< Linked list link */
 } parea_t;
 extern void ddi_init(void);

 /trunk/kernel/generic/include/mm/page.h
 ,7 → 42,7
 /** Operations to manipulate page mappings. */
 typedef struct {
     void (* mapping_insert)(as_t *as, uintptr_t page, uintptr_t frame,
-        int flags);
+        int flags);
     void (* mapping_remove)(as_t *as, uintptr_t page);
     pte_t *(* mapping_find)(as_t *as, uintptr_t page);
 } page_mapping_operations_t;
 ,7 → 59,9
 extern pte_t *page_table_create(int flags);
 extern void page_table_destroy(pte_t *page_table);
 extern void map_structure(uintptr_t s, size_t size);
 extern uintptr_t hw_map(uintptr_t physaddr, size_t size);
+extern void hw_area(uintptr_t *physaddr, pfn_t *frames);
 #endif

 /trunk/kernel/generic/src/time/clock.c
 ,9 → 88,7
     uptime->useconds = 0;
     clock_parea.pbase = (uintptr_t) faddr;
-    clock_parea.vbase = (uintptr_t) uptime;
     clock_parea.frames = 1;
-    clock_parea.cacheable = true;
     ddi_parea_register(&clock_parea);
     /*

 /trunk/kernel/generic/src/ddi/ddi.c
 ,7 → 47,7
 #include <mm/as.h>
 #include <synch/spinlock.h>
 #include <syscall/copy.h>
-#include <adt/btree.h>
+#include <adt/list.h>
 #include <arch.h>
 #include <align.h>
 #include <errno.h>
 ,13 → 55,17
 /** This lock protects the parea_btree. */
 SPINLOCK_INITIALIZE(parea_lock);
-/** B+tree with enabled physical memory areas. */
-static btree_t parea_btree;
+/** List with enabled physical memory areas. */
+static LIST_INITIALIZE(parea_head);
+/** Physical memory area for devices. */
+static parea_t dev_area;
 /** Initialize DDI. */
 void ddi_init(void)
 {
-    btree_create(&parea_btree);
+    hw_area(&dev_area.pbase, &dev_area.frames);
+    ddi_parea_register(&dev_area);
 }
 /** Enable piece of physical memory for mapping by physmem_map().
 ,19 → 78,19
 void ddi_parea_register(parea_t *parea)
 {
     ipl_t ipl;
     ipl = interrupts_disable();
     spinlock_lock(&parea_lock);
     /*
      * TODO: we should really check for overlaps here.
-     * However, we should be safe because the kernel is pretty sane and
-     * memory of different devices doesn't overlap.
+     * However, we should be safe because the kernel is pretty sane.
      */
-    btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
+    link_initialize(&parea->link);
+    list_append(&parea->link, &parea_head);
     spinlock_unlock(&parea_lock);
-    interrupts_restore(ipl);
+    interrupts_restore(ipl);
 }
 /** Map piece of physical memory into virtual address space of current task.
 ,16 → 101,16
  * @param flags Address space area flags for the mapping.
  *
  * @return 0 on success, EPERM if the caller lacks capabilities to use this
- *  syscall, ENOENT if there is no task matching the specified ID or the
- *  physical address space is not enabled for mapping and ENOMEM if there
- *  was a problem in creating address space area.
+ *  syscall, ENOENT if there is no task matching the specified ID or the
+ *  physical address space is not enabled for mapping and ENOMEM if there
+ *  was a problem in creating address space area.
  */
-static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, count_t pages, int flags)
+static int ddi_physmem_map(uintptr_t pf, uintptr_t vp, pfn_t pages, int flags)
 {
     ipl_t ipl;
     cap_t caps;
     mem_backend_data_t backend_data;
     backend_data.base = pf;
     backend_data.frames = pages;
 ,30 → 120,35
     caps = cap_get(TASK);
     if (!(caps & CAP_MEM_MANAGER))
         return EPERM;
     ipl = interrupts_disable();
     /*
      * Check if the physical memory area is enabled for mapping.
-     * If the architecture supports virtually indexed caches, intercept
-     * attempts to create an illegal address alias.
      */
     spinlock_lock(&parea_lock);
-    parea_t *parea;
-    btree_node_t *nodep;
-    parea = (parea_t *) btree_search(&parea_btree, (btree_key_t) pf, &nodep);
-    if (!parea || parea->frames < pages || ((flags & AS_AREA_CACHEABLE) &&
-        !parea->cacheable) || (!(flags & AS_AREA_CACHEABLE) &&
-        parea->cacheable)) {
+    bool fnd = false;
+    link_t *cur;
+    for (cur = parea_head.next; cur != &parea_head; cur = cur->next) {
+        parea_t *parea = list_get_instance(cur, parea_t, link);
+        if ((parea->pbase <= pf) && (ADDR2PFN(pf - parea->pbase) + pages <= parea->frames)) {
+            fnd = true;
+            break;
+        }
+    }
+    spinlock_unlock(&parea_lock);
+    if (!fnd) {
         /*
-         * This physical memory area cannot be mapped.
+         * Physical memory area cannot be mapped.
          */
-        spinlock_unlock(&parea_lock);
         interrupts_restore(ipl);
         return ENOENT;
     }
-    spinlock_unlock(&parea_lock);
     spinlock_lock(&TASK->lock);
     if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp, AS_AREA_ATTR_NONE,
 ,7 → 235,7
 {
     return (unative_t) ddi_physmem_map(ALIGN_DOWN((uintptr_t) phys_base,
         FRAME_SIZE), ALIGN_DOWN((uintptr_t) virt_base, PAGE_SIZE),
-        (count_t) pages, (int) flags);
+        (pfn_t) pages, (int) flags);
 }
 /** Wrapper for SYS_ENABLE_IOSPACE syscall.
 ,13 → 267,13
  */
 unative_t sys_preempt_control(int enable)
 {
-        if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
-                return EPERM;
-        if (enable)
-                preemption_enable();
-        else
-                preemption_disable();
-        return 0;
+    if (!cap_get(TASK) & CAP_PREEMPT_CONTROL)
+        return EPERM;
+    if (enable)
+        preemption_enable();
+    else
+        preemption_disable();
+    return 0;
 }
 /** @}

 /trunk/kernel/generic/src/console/console.c
 ,9 → 126,7
     devno_t devno = device_assign_devno();
     klog_parea.pbase = (uintptr_t) faddr;
-    klog_parea.vbase = (uintptr_t) klog;
     klog_parea.frames = SIZE2FRAMES(KLOG_SIZE);
-    klog_parea.cacheable = true;
     ddi_parea_register(&klog_parea);
     sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);

 /trunk/kernel/generic/src/console/cmd.c
 ,7 → 529,7
         spinlock_unlock(&hlp->lock);
     }
-    spinlock_unlock(&cmd_lock);
+    spinlock_unlock(&cmd_lock);
     return 1;
 }

 /trunk/kernel/generic/src/proc/task.c
 ,7 → 339,7
         bool sleeping = false;
         thr = list_get_instance(cur, thread_t, th_link);
         spinlock_lock(&thr->lock);
         thr->interrupted = true;
         if (thr->state == Sleeping)

 /trunk/kernel/generic/src/lib/rd.c
 ,9 → 88,7
     rd_parea.pbase = ALIGN_DOWN((uintptr_t) KA2PA((void *) header + hsize),
         FRAME_SIZE);
-    rd_parea.vbase = (uintptr_t) ((void *) header + hsize);
     rd_parea.frames = SIZE2FRAMES(dsize);
-    rd_parea.cacheable = true;
     ddi_parea_register(&rd_parea);
     sysinfo_set_item_val("rd", NULL, true);

 /trunk/kernel/generic/src/adt/avl.c
 ,7 → 43,7
  *
  * Every node has a pointer to its parent which allows insertion of multiple
  * identical keys into the tree.
- *
+ *
  * Be careful when using this tree because of the base atribute which is added
  * to every inserted node key. There is no rule in which order nodes with the
  * same key are visited.

/trunk/kernel/arch/sparc64/include/mm/frame.h
73,6 → 73,7
typedef union frame_address frame_address_t;

extern uintptr_t last_frame;
extern uintptr_t end_frame;
extern void frame_arch_init(void);
#define physmem_print()

/trunk/kernel/arch/sparc64/src/mm/frame.c
41,6 → 41,7
#include <macros.h>

uintptr_t last_frame = NULL;
uintptr_t end_frame = NULL;

/** Create memory zones according to information stored in bootinfo.
*
80,6 → 81,7
frame_mark_unavailable(ADDR2PFN(KA2PA(PFN2ADDR(0))), 1);
}

end_frame = last_frame;
}

/** @}

 /trunk/kernel/arch/sparc64/src/mm/page.c
 ,7 → 147,7
             physaddr + i * sizemap[order].increment,
             sizemap[order].pagesize_code, true, false);
-#ifdef CONFIG_SMP
+#ifdef CONFIG_SMP
         /*
          * Second, save the information about the mapping for APs.
          */
 ,6 → 164,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0x7ffffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/sparc64/src/drivers/sgcn.c
 ,19 → 161,10
 chardev_t sgcn_io;
 /**
- * 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).
+ * Set some sysinfo values (SRAM address and SRAM size).
  */
-static void register_sram_parea(uintptr_t sram_begin_physical)
+static void register_sram(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);
     sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE);
     sysinfo_set_item_val("sram.address.physical", NULL,
         sram_begin_physical);
 ,7 → 202,7
         + *((uint32_t *) iosram_toc->value);
     sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE);
-    register_sram_parea(sram_begin_physical);
+    register_sram(sram_begin_physical);
 }
 /**

/trunk/kernel/arch/ia64/include/mm/frame.h
44,6 → 44,7
#include <arch/types.h>

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
#define physmem_print()

/trunk/kernel/arch/ia64/src/mm/frame.c
51,6 → 51,7
#define MINCONF 1

uintptr_t last_frame = 0;
uintptr_t end_frame = 0;

void frame_arch_init(void)
{

 /trunk/kernel/arch/ia64/src/mm/page.c
 ,5 → 274,11
     return PA2KA(physaddr);
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0x7fffffffffffffffUL - end_frame);
+}
 /** @}
  */

/trunk/kernel/arch/arm32/include/mm/frame.h
51,6 → 51,7
#define BOOT_PAGE_TABLE_SIZE_IN_FRAMES (BOOT_PAGE_TABLE_SIZE >> FRAME_WIDTH)

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
extern void boot_page_table_free(void);

 /trunk/kernel/arch/arm32/src/mm/frame.c
 ,6 → 41,7
 /** Address of the last frame in the memory. */
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 /** Creates memory zones. */
 void frame_arch_init(void)
 ,7 → 50,8
     zone_create(0, ADDR2PFN(machine_get_memory_size()),
         BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
     last_frame = machine_get_memory_size();
+    end_frame = last_frame;
     /* blacklist boot page table */
     frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,
         BOOT_PAGE_TABLE_SIZE_IN_FRAMES);

 /trunk/kernel/arch/arm32/src/mm/page.c
 ,5 → 106,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/ppc32/include/mm/frame.h
 ,9 → 41,10
 #ifdef KERNEL
 #ifndef __ASM__
-#include <arch/types.h>
+#include <arch/types.h>
 extern uintptr_t last_frame;
+extern uintptr_t end_frame;
 extern void frame_arch_init(void);
 extern void physmem_print(void);

 /trunk/kernel/arch/ppc32/src/mm/frame.c
 ,6 → 40,7
 #include <print.h>
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 void physmem_print(void)
 {
 ,7 → 75,9
         if (last_frame < ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE))
             last_frame = ALIGN_UP(bootinfo.memmap.zones[i].start + bootinfo.memmap.zones[i].size, FRAME_SIZE);
     }
+    end_frame = last_frame;
     /* First is exception vector, second is 'implementation specific',
        third and fourth is reserved, other contain real mode code */
     frame_mark_unavailable(0, 8);

 /trunk/kernel/arch/ppc32/src/mm/page.c
 ,5 → 63,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

/trunk/kernel/arch/amd64/include/mm/frame.h
44,6 → 44,7

#ifndef __ASM__
extern uintptr_t last_frame;
extern uintptr_t end_frame;
extern void frame_arch_init(void);
extern void physmem_print(void);
#endif /* __ASM__ */

 /trunk/kernel/arch/amd64/src/mm/page.c
 ,5 → 214,11
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xfffffffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/mips32/include/mm/frame.h
 ,15 → 35,19
 #ifndef KERN_mips32_FRAME_H_
 #define KERN_mips32_FRAME_H_
-#define FRAME_WIDTH     14  /* 16K */
-#define FRAME_SIZE      (1 << FRAME_WIDTH)
+#define FRAME_WIDTH  14  /* 16K */
+#define FRAME_SIZE   (1 << FRAME_WIDTH)
 #ifdef KERNEL
 #ifndef __ASM__
+#include <typedefs.h>
 extern void frame_arch_init(void);
 extern void physmem_print(void);
+extern uintptr_t end_frame;
 #endif /* __ASM__ */
 #endif /* KERNEL */

 /trunk/kernel/arch/mips32/src/mm/frame.c
 ,7 → 65,9
 static count_t phys_regions_count = 0;
 static phys_region_t phys_regions[MAX_REGIONS];
+uintptr_t end_frame = 0;
 /** Check whether frame is available
  *
  * Returns true if given frame is generally available for use.
 ,8 → 238,10
         }
     }
-    frame_add_region(start_frame, frame);
+    end_frame = frame;
+    frame_add_region(start_frame, end_frame);
     /* Blacklist interrupt vector frame */
     frame_mark_unavailable(0, 1);

 /trunk/kernel/arch/mips32/src/mm/page.c
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup mips32mm
+/** @addtogroup mips32mm
  * @{
  */
 /** @file
 ,6 → 35,7
 #include <arch/mm/page.h>
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
+#include <mm/frame.h>
 void page_arch_init(void)
 {
 ,5 → 51,11
     return physaddr + 0xa0000000;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 /** @}
  */

 /trunk/kernel/arch/mips32/src/drivers/msim.c
 ,7 → 41,6
 #include <sysinfo/sysinfo.h>
 #include <ddi/ddi.h>
-static parea_t msim_parea;
 static chardev_t console;
 static irq_t msim_irq;
 ,12 → 155,6
     sysinfo_set_item_val("kbd.inr", NULL, MSIM_KBD_IRQ);
     sysinfo_set_item_val("kbd.address.virtual", NULL, MSIM_KBD_ADDRESS);
-    msim_parea.pbase = KA2PA(MSIM_VIDEORAM);
-    msim_parea.vbase = MSIM_VIDEORAM;
-    msim_parea.frames = 1;
-    msim_parea.cacheable = false;
-    ddi_parea_register(&msim_parea);
     sysinfo_set_item_val("fb", NULL, true);
     sysinfo_set_item_val("fb.kind", NULL, 3);
     sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(MSIM_VIDEORAM));

/trunk/kernel/arch/ia32/include/mm/frame.h
44,6 → 44,7
#include <arch/types.h>

extern uintptr_t last_frame;
extern uintptr_t end_frame;

extern void frame_arch_init(void);
extern void physmem_print(void);

 /trunk/kernel/arch/ia32/src/mm/frame.c
 ,6 → 50,7
 size_t hardcoded_unmapped_kdata_size = 0;
 uintptr_t last_frame = 0;
+uintptr_t end_frame = 0;
 static void init_e820_memory(pfn_t minconf)
 {
 ,8 → 74,10
                 e820table[i].size, FRAME_SIZE))
                 last_frame =
                     ALIGN_UP(e820table[i].base_address + e820table[i].size, FRAME_SIZE);
-        }
+        }
     }
+    end_frame = last_frame;
 }
 static char *e820names[] = {
 ,6 → 116,7
     if (config.cpu_active == 1) {
         minconf = 1;
 #ifdef CONFIG_SMP
         minconf = max(minconf,
             ADDR2PFN(AP_BOOT_OFFSET + hardcoded_unmapped_ktext_size +
 ,7 → 123,7
             hardcoded_unmapped_kdata_size));
 #endif
         init_e820_memory(minconf);
         /* Reserve frame 0 (BIOS data) */
         frame_mark_unavailable(0, 1);

 /trunk/kernel/arch/ia32/src/mm/page.c
 ,6 → 93,12
     return virtaddr;
 }
+void hw_area(uintptr_t *physaddr, pfn_t *frames)
+{
+    *physaddr = end_frame;
+    *frames = ADDR2PFN(0xffffffff - end_frame);
+}
 void page_fault(int n __attribute__((unused)), istate_t *istate)
 {
     uintptr_t page;
 ,7 → 108,7
     if (istate->error_word & PFERR_CODE_RSVD)
         panic("Reserved bit set in page directory.");
     if (istate->error_word & PFERR_CODE_RW)
         access = PF_ACCESS_WRITE;
     else

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3907 → Rev 3908