Page MenuHomeFreeBSD
Files F115698093

D42053.diff
No OneTemporary
Actions

D42053.diff
View Options

diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h
--- a/sys/compat/linuxkpi/common/include/asm/set_memory.h
+++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h
@@ -34,14 +34,26 @@
static inline int
set_memory_uc(unsigned long addr, int numpages)
{
- return (pmap_change_attr(addr, numpages, VM_MEMATTR_UNCACHEABLE));
+ vm_offset_t va;
+ vm_size_t len;
+
+ va = PHYS_TO_DMAP(addr);
+ len = numpages << PAGE_SHIFT;
+
+ return (-pmap_change_attr(va, len, VM_MEMATTR_UNCACHEABLE));
}
static inline int
set_memory_wc(unsigned long addr, int numpages)
{
#ifdef VM_MEMATTR_WRITE_COMBINING
- return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_COMBINING));
+ vm_offset_t va;
+ vm_size_t len;
+
+ va = PHYS_TO_DMAP(addr);
+ len = numpages << PAGE_SHIFT;
+
+ return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_COMBINING));
#else
return (set_memory_uc(addr, numpages));
#endif
@@ -50,7 +62,13 @@
static inline int
set_memory_wb(unsigned long addr, int numpages)
{
- return (pmap_change_attr(addr, numpages, VM_MEMATTR_WRITE_BACK));
+ vm_offset_t va;
+ vm_size_t len;
+
+ va = PHYS_TO_DMAP(addr);
+ len = numpages << PAGE_SHIFT;
+
+ return (-pmap_change_attr(va, len, VM_MEMATTR_WRITE_BACK));
}
static inline int
diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h
--- a/sys/compat/linuxkpi/common/include/linux/io.h
+++ b/sys/compat/linuxkpi/common/include/linux/io.h
@@ -532,14 +532,25 @@
static inline int
arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size)
{
+ vm_offset_t va;
- return (set_memory_wc(start, size >> PAGE_SHIFT));
+ va = PHYS_TO_DMAP(start);
+
+#ifdef VM_MEMATTR_WRITE_COMBINING
+ return (-pmap_change_attr(va, size, VM_MEMATTR_WRITE_COMBINING));
+#else
+ return (-pmap_change_attr(va, size, VM_MEMATTR_UNCACHEABLE));
+#endif
}
static inline void
arch_io_free_memtype_wc(resource_size_t start, resource_size_t size)
{
- set_memory_wb(start, size >> PAGE_SHIFT);
+ vm_offset_t va;
+
+ va = PHYS_TO_DMAP(start);
+
+ pmap_change_attr(va, size, VM_MEMATTR_WRITE_BACK);
}
#endif

File Metadata

Mime Type
text/plain
Expires
Mon, Apr 28, 7:52 AM (9 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17827302
Default Alt Text
D42053.diff (2 KB)

Event Timeline