Changeset 00aece0 in mainline for kernel/arch/sparc64/src/drivers

Timestamp:

2012-02-18T16:47:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/sparc64/src/drivers

Files:

• kbd.c (modified) (3 diffs)
• pci.c (modified) (3 diffs)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -40 +40 @@
 #include <mm/page.h>
 #include <arch/mm/page.h>
+#include <mm/km.h>
 #include <typedefs.h>
 #include <align.h>
@@ -113 +114 @@
         size_t offset = pa - aligned_addr;
         
-        ns16550_t *ns16550 = (ns16550_t *)
-           (hw_map(aligned_addr, offset + size) + offset);
+        ns16550_t *ns16550 = (ns16550_t *) (km_map(aligned_addr, offset + size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir, cir_arg);
@@ -132 +133 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, inr);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
-            (uintptr_t) ns16550);
         sysinfo_set_item_val("kbd.address.physical", NULL, pa);
         sysinfo_set_item_val("kbd.type.ns16550", NULL, true);

kernel/arch/sparc64/src/drivers/pci.c

@@ -39 +39 @@
 #include <genarch/ofw/upa.h>
 #include <arch/trap/interrupt.h>
-#include <mm/page.h>
+#include <mm/km.h>
 #include <mm/slab.h>
 #include <typedefs.h>
@@ -109 +109 @@
         pci->model = PCI_SABRE;
         pci->op = &pci_sabre_ops;
-        pci->reg = (uint64_t *) hw_map(paddr, reg[SABRE_INTERNAL_REG].size);
+        pci->reg = (uint64_t *) km_map(paddr, reg[SABRE_INTERNAL_REG].size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         /*
@@ -156 +157 @@
         pci->model = PCI_PSYCHO;
         pci->op = &pci_psycho_ops;
-        pci->reg = (uint64_t *) hw_map(paddr, reg[PSYCHO_INTERNAL_REG].size);
+        pci->reg = (uint64_t *) km_map(paddr, reg[PSYCHO_INTERNAL_REG].size,
+            PAGE_WRITE | PAGE_NOT_CACHEABLE);
 
         /*