Changeset 22f0561 in mainline for kernel/arch/ia64/src/mm/tlb.c

Timestamp:

2011-12-31T00:12:58Z (12 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().

File:

• kernel/arch/ia64/src/mm/tlb.c (modified) (3 diffs)

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);