Changeset cb569e6 in mainline for kernel/arch

Timestamp:

2010-11-18T21:58:27Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e5c7ba

Parents:

69e0d6d (diff), 45f04f8 (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 mainline changes.

Location:

kernel/arch

Files:

• amd64/include/mm/as.h (modified) (1 diff)
• amd64/include/pm.h (modified) (1 diff)
• amd64/src/ddi/ddi.c (modified) (1 diff)
• ia32/include/pm.h (modified) (1 diff)
• ia32/src/ddi/ddi.c (modified) (1 diff)

kernel/arch/amd64/include/mm/as.h

@@ -36 +36 @@
 #define KERN_amd64_AS_H_
 
+#define ADDRESS_SPACE_HOLE_START        0x0000800000000000ULL
+#define ADDRESS_SPACE_HOLE_END          0xffff7fffffffffffULL
+
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH  (unsigned long) 0xffff800000000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH    (unsigned long) 0xffffffffffffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH 0xffff800000000000ULL
+#define KERNEL_ADDRESS_SPACE_END_ARCH   0xffffffffffffffffULL
 
-#define USER_ADDRESS_SPACE_START_ARCH    (unsigned long) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH      (unsigned long) 0x00007fffffffffff
+#define USER_ADDRESS_SPACE_START_ARCH   0x0000000000000000ULL
+#define USER_ADDRESS_SPACE_END_ARCH     0x00007fffffffffffULL
 
 #define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))

kernel/arch/amd64/include/pm.h

@@ -83 +83 @@
 
 #define TSS_BASIC_SIZE  104
-#define TSS_IOMAP_SIZE  (16 * 1024 + 1)  /* 16K for bitmap + 1 terminating byte for convenience */
+#define TSS_IOMAP_SIZE  (8 * 1024 + 1)  /* 8K for bitmap + 1 terminating byte for convenience */
 
 #define IO_PORTS  (64 * 1024)

kernel/arch/amd64/src/ddi/ddi.c

@@ -126 +126 @@
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
                 
+                /*
+                 * Set the trailing bits in the last byte of the map to disable
+                 * I/O access.
+                 */
+                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
         }
         irq_spinlock_unlock(&TASK->lock, false);

kernel/arch/ia32/include/pm.h

@@ -75 +75 @@
 
 #define TSS_BASIC_SIZE  104
-#define TSS_IOMAP_SIZE  (16 * 1024 + 1)  /* 16K for bitmap + 1 terminating byte for convenience */
+#define TSS_IOMAP_SIZE  (8 * 1024 + 1)  /* 8K for bitmap + 1 terminating byte for convenience */
 
 #define IO_PORTS  (64 * 1024)

kernel/arch/ia32/src/ddi/ddi.c

@@ -127 +127 @@
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap,
                     TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &TASK->arch.iomap, bits);
                 
+                /*
+                 * Set the trailing bits in the last byte of the map to disable
+                 * I/O access.
+                 */
+                bitmap_set_range(&iomap, bits, ALIGN_UP(bits, 8) - bits);
                 /*
                  * It is safe to set the trailing eight bits because of the
                  * extra convenience byte in TSS_IOMAP_SIZE.
                  */
-                bitmap_set_range(&iomap, ALIGN_UP(TASK->arch.iomap.bits, 8), 8);
+                bitmap_set_range(&iomap, ALIGN_UP(bits, 8), 8);
         }
         irq_spinlock_unlock(&TASK->lock, false);