Changeset 82da5f5 in mainline

Timestamp:

2006-05-24T13:38:39Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

567807b1

Parents:

8182031

Message:

Modify sparc64 to choose optimal page size in each invocation of hw_map().
Use hw_map() to map keyboard device memory.

Location:

arch/sparc64

Files:

• Makefile.inc (modified) (2 diffs)
• include/drivers/i8042.h (modified) (2 diffs)
• src/console.c (modified) (1 diff)
• src/drivers/i8042.c (added)
• src/mm/page.c (modified) (3 diffs)

arch/sparc64/Makefile.inc

@@ -62 +62 @@
 
 ## Compile with support for framebuffer.
-## Mapping of the framebuffer is implemented by a sparc64-specific function.
 #
 
@@ -92 +91 @@
         arch/$(ARCH)/src/trap/interrupt.c \
         arch/$(ARCH)/src/ddi/ddi.c \
-        arch/$(ARCH)/src/drivers/tick.c
+        arch/$(ARCH)/src/drivers/tick.c \
+        arch/$(ARCH)/src/drivers/i8042.c

arch/sparc64/include/drivers/i8042.h

@@ -33 +33 @@
 
 #define KBD_PHYS_ADDRESS        0x1fff8904000ULL
-#define KBD_VIRT_ADDRESS        0x000d0000000ULL
 
 #define STATUS_REG      4
@@ -39 +38 @@
 #define DATA_REG        6
 
+#define LAST_REG        DATA_REG
+
+extern volatile __u8 *kbd_virt_address;
+
 static inline void i8042_data_write(__u8 data)
 {
-        ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG] = data;
+        kbd_virt_address[DATA_REG] = data;
 }
 
 static inline __u8 i8042_data_read(void)
 {
-        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG];
+        return kbd_virt_address[DATA_REG];
 }
 
 static inline __u8 i8042_status_read(void)
 {
-        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[STATUS_REG];
+        return kbd_virt_address[STATUS_REG];
 }
 
 static inline void i8042_command_write(__u8 command)
 {
-        ((volatile __u8 *)(KBD_VIRT_ADDRESS))[COMMAND_REG] = command;
+        kbd_virt_address[COMMAND_REG] = command;
 }
 
+extern void kbd_init(void);
+
 #endif

arch/sparc64/src/console.c

@@ -78 +78 @@
         stdin = NULL;
 
-        dtlb_insert_mapping(KBD_VIRT_ADDRESS, KBD_PHYS_ADDRESS, PAGESIZE_8K, true, false);
-
+        kbd_init();
         fb_init(FB_PHYS_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH, FB_X_RES * FB_COLOR_DEPTH / 8);
-        i8042_init();
 }
 

arch/sparc64/src/mm/page.c

@@ -32 +32 @@
 #include <mm/frame.h>
 #include <bitops.h>
+#include <debug.h>
 
 void page_arch_init(void)
@@ -41 +42 @@
 {
         unsigned int order;
+        int i;
+
+        struct {
+                int pagesize;
+                size_t increment;
+                count_t count;
+        } sizemap[] = {
+                { PAGESIZE_8K, 0, 1 },                  /* 8K */
+                { PAGESIZE_8K, PAGE_SIZE, 2 },          /* 16K */
+                { PAGESIZE_8K, PAGE_SIZE, 4 },          /* 32K */
+                { PAGESIZE_64K, 0, 1},                  /* 64K */
+                { PAGESIZE_64K, 8*PAGE_SIZE, 2 },       /* 128K */
+                { PAGESIZE_64K, 8*PAGE_SIZE, 4 },       /* 256K */
+                { PAGESIZE_512K, 0, 1 },                /* 512K */
+                { PAGESIZE_512K, 64*PAGE_SIZE, 2 },     /* 1M */
+                { PAGESIZE_512K, 64*PAGE_SIZE, 4 },     /* 2M */
+                { PAGESIZE_4M, 0, 1 }                   /* 4M */
+        };
+        
+        ASSERT(size <= 4*1024*1024);
         
         if (size <= FRAME_SIZE)
@@ -48 +69 @@
         
         __address virtaddr = PA2KA(PFN2ADDR(frame_alloc(order, FRAME_KA)));
-        
-        dtlb_insert_mapping(virtaddr, physaddr, PAGESIZE_512K, true, false);
-        dtlb_insert_mapping(virtaddr + 512 * 1024, physaddr + 512 * 1024, PAGESIZE_512K, true, false);
+
+        for (i = 0; i < sizemap[order].count; i++)
+                dtlb_insert_mapping(virtaddr + i*sizemap[order].increment,
+                                    physaddr + i*sizemap[order].increment,
+                                    sizemap[order].pagesize, true, false);
         
         return virtaddr;