shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'for-linus' of https://github.com/openrisc/linux

Browse Source 
Pull OpenRISC updates from Stafford Horne:
 "I have relocated to London so not much work from me while I get
  settled.

  Still, OpenRISC picked up two patches in this window:

   - Fix for kernel page table walking from Jann Horn

   - MAINTAINER entry cleanup from Palmer Dabbelt"

* tag 'for-linus' of https://github.com/openrisc/linux:
  MAINTAINERS: git://github -> https://github.com for openrisc
  openrisc: Fix pagewalk usage in arch_dma_{clear, set}_uncached
This commit is contained in:
Linus Torvalds
2022-10-15 16:47:33 -07:00
parent 41410965c3 34a0bac084
commit 36d8a3edf8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@@ -15411,7 +15411,7 @@ M: Stafford Horne <shorne@gmail.com>
L: openrisc@lists.librecores.org L: openrisc@lists.librecores.org
S: Maintained S: Maintained
W: http://openrisc.io W: http://openrisc.io
T: git git://github.com/openrisc/linux.git T: git https://github.com/openrisc/linux.git
F: Documentation/devicetree/bindings/openrisc/ F: Documentation/devicetree/bindings/openrisc/
F: Documentation/openrisc/ F: Documentation/openrisc/
F: arch/openrisc/ F: arch/openrisc/

16
arch/openrisc/kernel/dma.c
View File

@@ -74,10 +74,10 @@ void *arch_dma_set_uncached(void *cpu_addr, size_t size)
* We need to iterate through the pages, clearing the dcache for * We need to iterate through the pages, clearing the dcache for
* them and setting the cache-inhibit bit. * them and setting the cache-inhibit bit.
*/ */
mmap_read_lock(&init_mm); mmap_write_lock(&init_mm);
error = walk_page_range(&init_mm, va, va + size, &set_nocache_walk_ops, error = walk_page_range_novma(&init_mm, va, va + size,
NULL); &set_nocache_walk_ops, NULL, NULL);
mmap_read_unlock(&init_mm); mmap_write_unlock(&init_mm);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
@@ -88,11 +88,11 @@ void arch_dma_clear_uncached(void *cpu_addr, size_t size)
{ {
unsigned long va = (unsigned long)cpu_addr; unsigned long va = (unsigned long)cpu_addr;
mmap_read_lock(&init_mm); mmap_write_lock(&init_mm);
/* walk_page_range shouldn't be able to fail here */ /* walk_page_range shouldn't be able to fail here */
WARN_ON(walk_page_range(&init_mm, va, va + size, WARN_ON(walk_page_range_novma(&init_mm, va, va + size,
&clear_nocache_walk_ops, NULL)); &clear_nocache_walk_ops, NULL, NULL));
mmap_read_unlock(&init_mm); mmap_write_unlock(&init_mm);
} }
void arch_sync_dma_for_device(phys_addr_t addr, size_t size, void arch_sync_dma_for_device(phys_addr_t addr, size_t size,