Changeset a60c748 in mainline

Timestamp:

2006-01-30T16:40:23Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6a3c9a7

Parents:

d4efc19

Message:

Convert ASID management of ia64 to ASID FIFO mechanism.
18-bit RIDs are supported.

Files:

• arch/ia64/Makefile.inc (modified) (2 diffs)
• arch/ia64/include/mm/asid.h (modified) (2 diffs)
• arch/ia64/src/mm/asid.c (deleted)
• arch/mips32/include/mm/asid.h (modified) (1 diff)
• arch/sparc64/include/mm/asid.h (modified) (1 diff)
• genarch/src/mm/asid.c (modified) (1 diff)

arch/ia64/Makefile.inc

@@ -52 +52 @@
 
 CONFIG_ASID = y
-
+CONFIG_ASID_FIFO = y
 
 ARCH_SOURCES = \
@@ -65 +65 @@
         arch/$(ARCH)/src/ivt.S \
         arch/$(ARCH)/src/interrupt.c \
-        arch/$(ARCH)/src/mm/asid.c \
         arch/$(ARCH)/src/mm/frame.c \
         arch/$(ARCH)/src/mm/page.c \

arch/ia64/include/mm/asid.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-typedef __u32 asid_t;
+typedef __u16 asid_t;
 
 /**
- * This macro eliminates the stealing branch of asid_get().
+ * Number of ia64 RIDs (Region Identifiers) per kernel ASID.
+ * Note that some architectures may support more bits,
+ * but those extra bits are not used by the kernel. 
  */
-#define ASID_STEALING_ENABLED   0
-
-/** Number of ia64 RIDs (Region Identifiers) per kernel ASID. */
 #define RIDS_PER_ASID           7
-#define RID_OVERFLOW            16777216        /* 2^24 */
+#define RID_MAX                 262143          /* 2^18 - 1 */
 
 #define ASID2RID(asid, vrn)     (((asid)*RIDS_PER_ASID)+(vrn))
@@ -48 +47 @@
 typedef __u32 rid_t;
 
-/**
- * This macro is needed only to compile the kernel.
- * On ia64, its value is ignored.
- */
-#define ASID_MAX_ARCH           0
-
-/**
- * Value used to recognize the situation when all ASIDs were already allocated.
- */
-#define ASID_OVERFLOW           (RID_OVERFLOW/RIDS_PER_ASID)
-
-/** On ia64, this is no-op. */
-#define asid_put_arch(x)
+#define ASID_MAX_ARCH           (RID_MAX/RIDS_PER_ASID)
 
 #endif

arch/mips32/include/mm/asid.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define ASID_STEALING_ENABLED   1
-#define ASID_MAX_ARCH           255
+#define ASID_MAX_ARCH           255     /* 2^8 - 1 */
 
 typedef __u8 asid_t;

arch/sparc64/include/mm/asid.h

@@ -37 +37 @@
 typedef __u16 asid_t;
 
-#define ASID_STEALING_ENABLED   1
 #define ASID_MAX_ARCH           8191    /* 2^13 - 1 */
 

genarch/src/mm/asid.c

@@ -95 +95 @@
         ipl = interrupts_disable();
         spinlock_lock(&asidlock);
-        if (ASID_STEALING_ENABLED && asids_allocated == ASIDS_ALLOCABLE) {
+        if (asids_allocated == ASIDS_ALLOCABLE) {
 
                 /*