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

Timestamp:

2018-03-27T16:49:29Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

f303afc6 (diff), 94d211e (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-27 16:49:29)

git-committer:

GitHub <noreply@…> (2018-03-27 16:49:29)

Message:

Merge 94d211e1f212626c420cf42c22b056ac1db9c0f1 into f303afc69bfdfc798071487501f775a7c4d8c475

File:

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

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

@@ -110 +110 @@
         pci->op = &pci_sabre_ops;
         pci->reg = (uint64_t *) km_map(paddr, reg[SABRE_INTERNAL_REG].size,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         return pci;
@@ -152 +152 @@
         pci->op = &pci_psycho_ops;
         pci->reg = (uint64_t *) km_map(paddr, reg[PSYCHO_INTERNAL_REG].size,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE);
+            PAGE_READ_WRITE | PAGE_KERNEL | PAGE_NOT_CACHEABLE);
 
         return pci;