Changeset 3772af6 in mainline

Timestamp:

2013-09-09T20:25:27Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ee7f78a

Parents:

c501bc4

Message:

remove the special-purpose DMA zone (including the ZONE_DMA and FRAME_DMA flags)
this most probably breaks Sound Blaster 16, but it is reported to be broken anyhow
a proper platform-independent DMA memory allocation is in the works

Location:

kernel

Files:

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

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;
@@ -92 +91 @@
                                 else
                                         conf = minconf;
-
-                                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);
-                                }
+                                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;
@@ -79 +77 @@
 /** 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. */
 #define ZONE_EF_MASK    0x7
 
-#define FRAME_TO_ZONE_FLAGS(ff) \
-        ((((ff) & FRAME_DMA) ? ZONE_DMA : \
-            (((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
+#define FRAME_TO_ZONE_FLAGS(ff) \
+        ((((ff) & FRAME_LOWMEM) ? ZONE_LOWMEM : \
             (((ff) & FRAME_HIGHMEM) ? ZONE_HIGHMEM : \
-            ZONE_LOWMEM /* | ZONE_HIGHMEM */))) | \
+            ZONE_LOWMEM /* | ZONE_HIGHMEM */)) | \
             ZONE_AVAILABLE)
 

kernel/generic/src/ddi/ddi.c

@@ -336 +336 @@
                 order = fnzb(pages - 1) + 1;
         
-        *phys = frame_alloc_noreserve(order, FRAME_DMA);
+        *phys = frame_alloc_noreserve(order, 0);
         if (*phys == NULL)
                 return ENOMEM;