mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
![Mike Rapoport](/assets/img/avatar_default.png)
Move remaining definitions and declarations from include/linux/bootmem.h into include/linux/memblock.h and remove the redundant header. The includes were replaced with the semantic patch below and then semi-automated removal of duplicated '#include <linux/memblock.h> @@ @@ - #include <linux/bootmem.h> + #include <linux/memblock.h> [sfr@canb.auug.org.au: dma-direct: fix up for the removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181002185342.133d1680@canb.auug.org.au [sfr@canb.auug.org.au: powerpc: fix up for removal of linux/bootmem.h] Link: http://lkml.kernel.org/r/20181005161406.73ef8727@canb.auug.org.au [sfr@canb.auug.org.au: x86/kaslr, ACPI/NUMA: fix for linux/bootmem.h removal] Link: http://lkml.kernel.org/r/20181008190341.5e396491@canb.auug.org.au Link: http://lkml.kernel.org/r/1536927045-23536-30-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
69 lines
1.3 KiB
C
69 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* linux/arch/m68k/sun3/dvma.c
|
|
*
|
|
* Written by Sam Creasey
|
|
*
|
|
* Sun3 IOMMU routines used for dvma accesses.
|
|
*
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/list.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/sun3mmu.h>
|
|
#include <asm/dvma.h>
|
|
|
|
|
|
static unsigned long ptelist[120];
|
|
|
|
static unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr)
|
|
{
|
|
unsigned long pte;
|
|
unsigned long j;
|
|
pte_t ptep;
|
|
|
|
j = *(volatile unsigned long *)kaddr;
|
|
*(volatile unsigned long *)kaddr = j;
|
|
|
|
ptep = pfn_pte(virt_to_pfn(kaddr), PAGE_KERNEL);
|
|
pte = pte_val(ptep);
|
|
// pr_info("dvma_remap: addr %lx -> %lx pte %08lx\n", kaddr, vaddr, pte);
|
|
if(ptelist[(vaddr & 0xff000) >> PAGE_SHIFT] != pte) {
|
|
sun3_put_pte(vaddr, pte);
|
|
ptelist[(vaddr & 0xff000) >> PAGE_SHIFT] = pte;
|
|
}
|
|
|
|
return (vaddr + (kaddr & ~PAGE_MASK));
|
|
|
|
}
|
|
|
|
int dvma_map_iommu(unsigned long kaddr, unsigned long baddr,
|
|
int len)
|
|
{
|
|
|
|
unsigned long end;
|
|
unsigned long vaddr;
|
|
|
|
vaddr = dvma_btov(baddr);
|
|
|
|
end = vaddr + len;
|
|
|
|
while(vaddr < end) {
|
|
dvma_page(kaddr, vaddr);
|
|
kaddr += PAGE_SIZE;
|
|
vaddr += PAGE_SIZE;
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
void __init sun3_dvma_init(void)
|
|
{
|
|
memset(ptelist, 0, sizeof(ptelist));
|
|
}
|