Changeset db96017 in mainline for kernel/arch/sparc64/src/drivers/pci.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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.

File:

• kernel/arch/sparc64/src/drivers/pci.c (modified) (3 diffs)

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