Changeset ab92305 in mainline for kernel/generic

Timestamp:

2013-08-19T17:23:31Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4da8fdb

Parents:

2921602 (diff), 4a9728ec (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 audio support.

Includes audio server and sb16 driver.

Tested on ia32 and amd64 (qemu).

Location:

kernel/generic

Files:

• include/mm/as.h (modified) (1 diff)
• include/mm/frame.h (modified) (3 diffs)
• src/ddi/ddi.c (modified) (2 diffs)
• src/mm/as.c (modified) (1 diff)
• src/mm/frame.c (modified) (3 diffs)

kernel/generic/include/mm/as.h

@@ -250 +250 @@
 extern int as_area_change_flags(as_t *, unsigned int, uintptr_t);
 
+//TODO REMOVE!
+extern as_area_t * find_locked_area(as_t *as, uintptr_t va);
+
 extern unsigned int as_area_get_flags(as_area_t *);
 extern bool as_area_check_access(as_area_t *, pf_access_t);

kernel/generic/include/mm/frame.h

@@ -63 +63 @@
 /** Allocate a frame which cannot be identity-mapped. */
 #define FRAME_HIGHMEM     0x20
+/** Allocate a frame which needs to be from DMA zone. */
+#define FRAME_DMA         0x40
 
 typedef uint8_t zone_flags_t;
@@ -77 +79 @@
 /** Zone contains memory that cannot be identity-mapped */
 #define ZONE_HIGHMEM    0x10
+/** Zone contains memory suitable for old ISA DMA */
+#define ZONE_DMA        0x20
 
 /** Mask of zone bits that must be matched exactly. */
@@ -82 +86 @@
 
 #define FRAME_TO_ZONE_FLAGS(ff) \
-        ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
+        ((((ff) & FRAME_DMA) ? ZONE_DMA : \
+            (((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
             (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
-            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
-            ZONE_AVAILABLE) 
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */))) | \
+            ZONE_AVAILABLE)
 
 #define ZONE_FLAGS_MATCH(zf, f) \

kernel/generic/src/ddi/ddi.c

@@ -336 +336 @@
                 order = fnzb(pages - 1) + 1;
         
-        *phys = frame_alloc_noreserve(order, 0);
+        *phys = frame_alloc_noreserve(order, FRAME_DMA);
         if (*phys == NULL)
                 return ENOMEM;
@@ -361 +361 @@
 NO_TRACE static int dmamem_unmap_anonymous(uintptr_t virt)
 {
-        // TODO: implement unlocking & unmap
-        return EOK;
+        // TODO: This is an ugly hack
+        as_t *as = TASK->as;
+
+        mutex_lock(&as->lock);
+        as_area_t *area = find_locked_area(as, virt);
+        if (!area) {
+                mutex_unlock(&as->lock);
+                return ENOENT;
+        }
+        frame_free_noreserve(area->backend_data.base);
+        area->backend_data.base = 0;
+        area->backend_data.frames = 0;
+        mutex_unlock(&area->lock);
+        mutex_unlock(&as->lock);
+
+        return as_area_destroy(as, virt);
 }
 

kernel/generic/src/mm/as.c

@@ -672 +672 @@
         
         return NULL;
+}
+
+/** UGLY! UGLY! UGLY! */
+// TODO: REMOVE ASAP!
+as_area_t * find_locked_area(as_t *as, uintptr_t va)
+{
+        return find_area_and_lock(as, va);
 }
 

kernel/generic/src/mm/frame.c

@@ -518 +518 @@
 NO_TRACE static void zone_mark_unavailable(zone_t *zone, size_t frame_idx)
 {
-        ASSERT(zone->flags & ZONE_AVAILABLE);
+        if (!(zone->flags & ZONE_AVAILABLE))
+                return;
+//      ASSERT(zone->flags & ZONE_AVAILABLE);
         
         frame_t *frame = zone_get_frame(zone, frame_idx);
@@ -935 +937 @@
                         }
                         
-                        if (confframe >= start + count)
-                                panic("Cannot find configuration data for zone.");
+                        if (confframe >= start + count) {
+                                flags &= ~ZONE_AVAILABLE;
+                                goto nonavail;
+//                              panic("Cannot find configuration data for zone.");
+                        }
                 }
                 
@@ -960 +965 @@
                 return znum;
         }
-        
+nonavail:
+        (void)0; // label trick
         /* Non-available zone */
         size_t znum = zones_insert_zone(start, count, flags);