mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 18:30:06 +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>
126 lines
2.8 KiB
C
126 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* PROM interface routines.
|
|
*/
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/string.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/ioport.h>
|
|
#include <asm/bootinfo.h>
|
|
#include <asm/lasat/lasat.h>
|
|
#include <asm/cpu.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include "at93c.h"
|
|
#include <asm/lasat/eeprom.h>
|
|
#include "prom.h"
|
|
|
|
#define RESET_VECTOR 0xbfc00000
|
|
#define PROM_JUMP_TABLE_ENTRY(n) (*((u32 *)(RESET_VECTOR + 0x20) + n))
|
|
#define PROM_DISPLAY_ADDR PROM_JUMP_TABLE_ENTRY(0)
|
|
#define PROM_PUTC_ADDR PROM_JUMP_TABLE_ENTRY(1)
|
|
#define PROM_MONITOR_ADDR PROM_JUMP_TABLE_ENTRY(2)
|
|
|
|
static void null_prom_display(const char *string, int pos, int clear)
|
|
{
|
|
}
|
|
|
|
static void null_prom_monitor(void)
|
|
{
|
|
}
|
|
|
|
static void null_prom_putc(char c)
|
|
{
|
|
}
|
|
|
|
/* these are functions provided by the bootloader */
|
|
static void (*__prom_putc)(char c) = null_prom_putc;
|
|
|
|
void prom_putchar(char c)
|
|
{
|
|
__prom_putc(c);
|
|
}
|
|
|
|
void (*prom_display)(const char *string, int pos, int clear) =
|
|
null_prom_display;
|
|
void (*prom_monitor)(void) = null_prom_monitor;
|
|
|
|
unsigned int lasat_ndelay_divider;
|
|
|
|
static void setup_prom_vectors(void)
|
|
{
|
|
u32 version = *(u32 *)(RESET_VECTOR + 0x90);
|
|
|
|
if (version >= 307) {
|
|
prom_display = (void *)PROM_DISPLAY_ADDR;
|
|
__prom_putc = (void *)PROM_PUTC_ADDR;
|
|
prom_monitor = (void *)PROM_MONITOR_ADDR;
|
|
}
|
|
printk(KERN_DEBUG "prom vectors set up\n");
|
|
}
|
|
|
|
static struct at93c_defs at93c_defs[N_MACHTYPES] = {
|
|
{
|
|
.reg = (void *)AT93C_REG_100,
|
|
.rdata_reg = (void *)AT93C_RDATA_REG_100,
|
|
.rdata_shift = AT93C_RDATA_SHIFT_100,
|
|
.wdata_shift = AT93C_WDATA_SHIFT_100,
|
|
.cs = AT93C_CS_M_100,
|
|
.clk = AT93C_CLK_M_100
|
|
}, {
|
|
.reg = (void *)AT93C_REG_200,
|
|
.rdata_reg = (void *)AT93C_RDATA_REG_200,
|
|
.rdata_shift = AT93C_RDATA_SHIFT_200,
|
|
.wdata_shift = AT93C_WDATA_SHIFT_200,
|
|
.cs = AT93C_CS_M_200,
|
|
.clk = AT93C_CLK_M_200
|
|
},
|
|
};
|
|
|
|
void __init prom_init(void)
|
|
{
|
|
int argc = fw_arg0;
|
|
char **argv = (char **) fw_arg1;
|
|
|
|
setup_prom_vectors();
|
|
|
|
if (IS_LASAT_200()) {
|
|
printk(KERN_INFO "LASAT 200 board\n");
|
|
lasat_ndelay_divider = LASAT_200_DIVIDER;
|
|
at93c = &at93c_defs[1];
|
|
} else {
|
|
printk(KERN_INFO "LASAT 100 board\n");
|
|
lasat_ndelay_divider = LASAT_100_DIVIDER;
|
|
at93c = &at93c_defs[0];
|
|
}
|
|
|
|
lasat_init_board_info(); /* Read info from EEPROM */
|
|
|
|
/* Get the command line */
|
|
if (argc > 0) {
|
|
strncpy(arcs_cmdline, argv[0], COMMAND_LINE_SIZE-1);
|
|
arcs_cmdline[COMMAND_LINE_SIZE-1] = '\0';
|
|
}
|
|
|
|
/* Set the I/O base address */
|
|
set_io_port_base(KSEG1);
|
|
|
|
/* Set memory regions */
|
|
ioport_resource.start = 0;
|
|
ioport_resource.end = 0xffffffff; /* Wrong, fixme. */
|
|
|
|
add_memory_region(0, lasat_board_info.li_memsize, BOOT_MEM_RAM);
|
|
}
|
|
|
|
void __init prom_free_prom_memory(void)
|
|
{
|
|
}
|
|
|
|
const char *get_system_type(void)
|
|
{
|
|
return lasat_board_info.li_bmstr;
|
|
}
|