Changeset aaceebc4 in mainline

Timestamp:

2013-03-12T23:10:57Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

cf39b2e

Parents:

428bd07

Message:

Create DMA zone.

use dma zone for dma_map_anonymous calls.
create non-available zone if all pages in that zone are used.
make occupying pages in non-available zones a no-op

This enables ISA DMA on configurations with more than 16 MB of ram

Location:

kernel

Files:

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

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

@@ -47 +47 @@
 
 #define PHYSMEM_LIMIT32  UINT64_C(0x100000000)
+#define PHYSMEM_LIMIT_DMA   UINT64_C(0x1000000)
 
 size_t hardcoded_unmapped_ktext_size = 0;
@@ -91 +92 @@
                                 else
                                         conf = minconf;
-                                zone_create(pfn, count, conf,
-                                    ZONE_AVAILABLE | ZONE_LOWMEM);
+
+                                if ((pfn * PAGE_SIZE) < PHYSMEM_LIMIT_DMA) {
+                                        size_t dma_count = min(
+                                            PHYSMEM_LIMIT_DMA / PAGE_SIZE - pfn,
+                                            count);
+                                        zone_create(pfn, dma_count, conf,
+                                            ZONE_AVAILABLE | ZONE_DMA);
+                                        count -= dma_count;
+                                        pfn += dma_count;
+                                }
+
+                                conf = pfn;
+                                if (count) {
+                                        zone_create(pfn, count, conf,
+                                            ZONE_AVAILABLE | ZONE_LOWMEM);
+                                }
                         } else {
                                 conf = zone_external_conf_alloc(count);
-                                if (conf != 0)
+                                if (conf != 0) {
                                         zone_create(pfn, count, conf,
                                             ZONE_AVAILABLE | ZONE_HIGHMEM);
+                                }
                         }
                 } else if ((e820table[i].type == MEMMAP_MEMORY_ACPI) ||

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;

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);