Changeset 22f0561 in mainline for kernel/arch/ia64/src

Timestamp:

2011-12-31T00:12:58Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2107e79, c520034

Parents:

efb48eb

Message:

Get rid of kernel static non-identity mappings on ia64.

• IO_OFFSET is replaced by legacyio_virt_base and LEGACYIO_USER_BASE.
• VIO_OFFSET and FW_OFFSET are removed entirely.
• Legacy I/O and IO SAPIC are mapped via hw_map().
• Remove corresponding locked translation records.
• Cleanup ia64 kernel pio_read/write_8|16|32().

Location:

kernel/arch/ia64/src

Files:

• ia64.c (modified) (7 diffs)
• mm/tlb.c (modified) (3 diffs)
• start.S (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -45 +45 @@
 #include <arch/drivers/it.h>
 #include <arch/drivers/kbd.h>
+#include <arch/legacyio.h>
 #include <genarch/drivers/ega/ega.h>
 #include <genarch/drivers/i8042/i8042.h>
@@ -51 +52 @@
 #include <genarch/kbrd/kbrd.h>
 #include <genarch/srln/srln.h>
+#include <mm/page.h>
+
+#ifdef MACHINE_ski
+#include <arch/drivers/ski.h>
+#endif
 
 /* NS16550 as a COM 1 */
@@ -58 +64 @@
 
 static uint64_t iosapic_base = 0xfec00000;
+uintptr_t legacyio_virt_base = 0;
 
 /** Performs ia64-specific initialization before main_bsp() is called. */
@@ -80 +87 @@
 static void iosapic_init(void)
 {
-        uint64_t IOSAPIC = PA2KA((sysarg_t)(iosapic_base)) | FW_OFFSET;
+        uintptr_t IOSAPIC = hw_map(iosapic_base, PAGE_SIZE);
         int i;
         
@@ -107 +114 @@
 {
         if (config.cpu_active == 1) {
+                /* Map the page with legacy I/O. */
+                legacyio_virt_base = hw_map(LEGACYIO_PHYS_BASE, LEGACYIO_SIZE);
+
                 iosapic_init();
                 irq_init(INR_COUNT, INR_COUNT);
@@ -113 +123 @@
 }
 
-void arch_post_cpu_init(void)
-{
+void arch_post_cpu_init(void){
 }
 
@@ -202 +211 @@
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);
-        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, IO_OFFSET);
+        sysinfo_set_item_val("ia64_iospace.address.virtual", NULL, LEGACYIO_USER_BASE);
 }
 

kernel/arch/ia64/src/mm/tlb.c

@@ -52 +52 @@
 #include <arch.h>
 #include <interrupt.h>
-
-#define IO_FRAME_BASE 0xFFFFC000000
+#include <arch/legacyio.h>
 
 /** Invalidate all TLB entries. */
@@ -530 +529 @@
 static int try_memmap_io_insertion(uintptr_t va, istate_t *istate)
 {
-        if ((va >= IO_OFFSET ) && (va < IO_OFFSET + (1 << IO_PAGE_WIDTH))) {
+        if ((va >= LEGACYIO_USER_BASE) && (va < LEGACYIO_USER_BASE + (1 << LEGACYIO_PAGE_WIDTH))) {
                 if (TASK) {
-                        uint64_t io_page = (va & ((1 << IO_PAGE_WIDTH) - 1)) >>
-                            USPACE_IO_PAGE_WIDTH;
+                        uint64_t io_page = (va & ((1 << LEGACYIO_PAGE_WIDTH) - 1)) >>
+                            LEGACYIO_SINGLE_PAGE_WIDTH;
                         
                         if (is_io_page_accessible(io_page)) {
                                 uint64_t page, frame;
                                 
-                                page = IO_OFFSET +
-                                    (1 << USPACE_IO_PAGE_WIDTH) * io_page;
-                                frame = IO_FRAME_BASE +
-                                    (1 << USPACE_IO_PAGE_WIDTH) * io_page;
+                                page = LEGACYIO_USER_BASE +
+                                    (1 << LEGACYIO_SINGLE_PAGE_WIDTH) * io_page;
+                                frame = LEGACYIO_PHYS_BASE +
+                                    (1 << LEGACYIO_SINGLE_PAGE_WIDTH) * io_page;
                                 
                                 tlb_entry_t entry;
@@ -555 +554 @@
                                 entry.ar = AR_READ | AR_WRITE;
                                 entry.ppn = frame >> PPN_SHIFT;
-                                entry.ps = USPACE_IO_PAGE_WIDTH;
+                                entry.ps = LEGACYIO_SINGLE_PAGE_WIDTH;
                                 
                                 dtc_mapping_insert(page, TASK->as->asid, entry);

kernel/arch/ia64/src/start.S

@@ -38 +38 @@
 #define KERNEL_TRANSLATION_I    0x0010000000000661
 #define KERNEL_TRANSLATION_D    0x0010000000000661
-#define KERNEL_TRANSLATION_VIO  0x0010000000000671      // FIXME: [non-ident]
-#define KERNEL_TRANSLATION_IO   0x00100FFFFC000671      // FIXME: [non-ident]
-#define KERNEL_TRANSLATION_FW   0x00100000F0000671      // FIXME: [non-ident]
 
 .section K_TEXT_START, "ax"
@@ -88 +85 @@
         itr.d dtr[r0] = r10
         
-        movl r7 = 1
-        movl r8 = (VRN_KERNEL << VRN_SHIFT) | VIO_OFFSET
-        mov cr.ifa = r8
-        movl r10 = (KERNEL_TRANSLATION_VIO)
-        itr.d dtr[r7] = r10
-        
-        mov r11 = cr.itir
-        movl r10 = ~0xfc
-        and r10 = r10, r11
-        movl r11 = (IO_PAGE_WIDTH << PS_SHIFT)
-        or r10 = r10, r11
-        mov cr.itir = r10
-        
-        movl r7 = 2
-        movl r8 = (VRN_KERNEL << VRN_SHIFT) | IO_OFFSET
-        mov cr.ifa = r8
-        movl r10 = (KERNEL_TRANSLATION_IO)
-        itr.d dtr[r7] = r10
-        
-        # Setup mapping for firmware area (also SAPIC)
-        
-        mov r11 = cr.itir
-        movl r10 = ~0xfc
-        and r10 = r10, r11
-        movl r11 = (FW_PAGE_WIDTH << PS_SHIFT)
-        or r10 = r10, r11
-        mov cr.itir = r10
-        
-        movl r7 = 3
-        movl r8 = (VRN_KERNEL << VRN_SHIFT) | FW_OFFSET
-        mov cr.ifa = r8
-        movl r10 = (KERNEL_TRANSLATION_FW)
-        itr.d dtr[r7] = r10
-        
-        # Initialize DSR
+        # Initialize DCR
         
         movl r10 = (DCR_DP_MASK | DCR_DK_MASK | DCR_DX_MASK | DCR_DR_MASK | DCR_DA_MASK | DCR_DD_MASK | DCR_LC_MASK)