65fddcfca8
The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include
of the latter in the middle of asm includes. Fix this up with the aid of
the below script and manual adjustments here and there.
import sys
import re
if len(sys.argv) is not 3:
print "USAGE: %s <file> <header>" % (sys.argv[0])
sys.exit(1)
hdr_to_move="#include <linux/%s>" % sys.argv[2]
moved = False
in_hdrs = False
with open(sys.argv[1], "r") as f:
lines = f.readlines()
for _line in lines:
line = _line.rstrip('
')
if line == hdr_to_move:
continue
if line.startswith("#include <linux/"):
in_hdrs = True
elif not moved and in_hdrs:
moved = True
print hdr_to_move
print line
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Cain <bcain@codeaurora.org>
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 Ungerer <gerg@linux-m68k.org>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Guo Ren <guoren@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Rich Felker <dalias@libc.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vincent Chen <deanbo422@gmail.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Link: http://lkml.kernel.org/r/20200514170327.31389-4-rppt@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
122 lines
2.8 KiB
C
122 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
#include <linux/kernel.h>
|
|
#include <linux/export.h>
|
|
#include <linux/spinlock_types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/pgtable.h>
|
|
#include <asm/page.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/io.h>
|
|
#include <asm/cpufeature.h>
|
|
#include <asm/special_insns.h>
|
|
#include <asm/olpc_ofw.h>
|
|
|
|
/* address of OFW callback interface; will be NULL if OFW isn't found */
|
|
static int (*olpc_ofw_cif)(int *);
|
|
|
|
/* page dir entry containing OFW's pgdir table; filled in by head_32.S */
|
|
u32 olpc_ofw_pgd __initdata;
|
|
|
|
static DEFINE_SPINLOCK(ofw_lock);
|
|
|
|
#define MAXARGS 10
|
|
|
|
void __init setup_olpc_ofw_pgd(void)
|
|
{
|
|
pgd_t *base, *ofw_pde;
|
|
|
|
if (!olpc_ofw_cif)
|
|
return;
|
|
|
|
/* fetch OFW's PDE */
|
|
base = early_ioremap(olpc_ofw_pgd, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD);
|
|
if (!base) {
|
|
printk(KERN_ERR "failed to remap OFW's pgd - disabling OFW!\n");
|
|
olpc_ofw_cif = NULL;
|
|
return;
|
|
}
|
|
ofw_pde = &base[OLPC_OFW_PDE_NR];
|
|
|
|
/* install OFW's PDE permanently into the kernel's pgtable */
|
|
set_pgd(&swapper_pg_dir[OLPC_OFW_PDE_NR], *ofw_pde);
|
|
/* implicit optimization barrier here due to uninline function return */
|
|
|
|
early_iounmap(base, sizeof(olpc_ofw_pgd) * PTRS_PER_PGD);
|
|
}
|
|
|
|
int __olpc_ofw(const char *name, int nr_args, const void **args, int nr_res,
|
|
void **res)
|
|
{
|
|
int ofw_args[MAXARGS + 3];
|
|
unsigned long flags;
|
|
int ret, i, *p;
|
|
|
|
BUG_ON(nr_args + nr_res > MAXARGS);
|
|
|
|
if (!olpc_ofw_cif)
|
|
return -EIO;
|
|
|
|
ofw_args[0] = (int)name;
|
|
ofw_args[1] = nr_args;
|
|
ofw_args[2] = nr_res;
|
|
|
|
p = &ofw_args[3];
|
|
for (i = 0; i < nr_args; i++, p++)
|
|
*p = (int)args[i];
|
|
|
|
/* call into ofw */
|
|
spin_lock_irqsave(&ofw_lock, flags);
|
|
ret = olpc_ofw_cif(ofw_args);
|
|
spin_unlock_irqrestore(&ofw_lock, flags);
|
|
|
|
if (!ret) {
|
|
for (i = 0; i < nr_res; i++, p++)
|
|
*((int *)res[i]) = *p;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL_GPL(__olpc_ofw);
|
|
|
|
bool olpc_ofw_present(void)
|
|
{
|
|
return olpc_ofw_cif != NULL;
|
|
}
|
|
EXPORT_SYMBOL_GPL(olpc_ofw_present);
|
|
|
|
/* OFW cif _should_ be above this address */
|
|
#define OFW_MIN 0xff000000
|
|
|
|
/* OFW starts on a 1MB boundary */
|
|
#define OFW_BOUND (1<<20)
|
|
|
|
void __init olpc_ofw_detect(void)
|
|
{
|
|
struct olpc_ofw_header *hdr = &boot_params.olpc_ofw_header;
|
|
unsigned long start;
|
|
|
|
/* ensure OFW booted us by checking for "OFW " string */
|
|
if (hdr->ofw_magic != OLPC_OFW_SIG)
|
|
return;
|
|
|
|
olpc_ofw_cif = (int (*)(int *))hdr->cif_handler;
|
|
|
|
if ((unsigned long)olpc_ofw_cif < OFW_MIN) {
|
|
printk(KERN_ERR "OFW detected, but cif has invalid address 0x%lx - disabling.\n",
|
|
(unsigned long)olpc_ofw_cif);
|
|
olpc_ofw_cif = NULL;
|
|
return;
|
|
}
|
|
|
|
/* determine where OFW starts in memory */
|
|
start = round_down((unsigned long)olpc_ofw_cif, OFW_BOUND);
|
|
printk(KERN_INFO "OFW detected in memory, cif @ 0x%lx (reserving top %ldMB)\n",
|
|
(unsigned long)olpc_ofw_cif, (-start) >> 20);
|
|
reserve_top_address(-start);
|
|
}
|
|
|
|
bool __init olpc_ofw_is_installed(void)
|
|
{
|
|
return olpc_ofw_cif != NULL;
|
|
}
|