mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
d8ea757b25
- add new kernel memory layouts for MMUv3 cores: with 256MB and 512MB
KSEG size, starting at physical address other than 0;
- make kernel load address configurable;
- clean up kernel memory layout macros;
- drop sysmem early allocator and switch to memblock;
- enable kmemleak and memory reservation from the device tree;
- wire up new syscalls: userfaultfd, membarrier, mlock2, copy_file_range,
preadv2 and pwritev2;
- add new platform: Cadence Configurable System Platform (CSP) and new
core variant for it: xt_lnx;
- rearrange CCOUNT calibration code, make most of it generic;
- improve machine reset code (XTFPGA now reboots reliably with MMUv3
cores);
- provide default memmap command line option for configurations without
device tree support;
- ISS fixes: simdisk is now capable of using highmem pages, panic
correctly terminates simulator.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJX9RvtAAoJEFH5zJH4P6BEwmoQAJTUTrkRVd0nlTkh2vt8GfNR
s0rGUnAZa2dm3EY+J7F7RFxDfcXHP5Z73iM0fm8mUt8V/f6NR4QEF1FB9BI0lqXy
fTKHCgt+85BtPzIsNukwDi+QRyEtn3wFVCluKU4mtZ6KcEffTJwT0zMxrpDXoMdq
gcoFGViSdQ0aNo1RosHUBCF/f34+cfUnvvmF8FhcnkAmTWniM+kWk0nDmGz+qInF
ZWhvbcrPEEqR0j/wLLgL7kMhz1AYLI08+DaGR2UP80NQ9yuWraDfsRFnKbAHDqE0
JHAdcUQtPrQmBPSlc+CaE84sPXutsKVoZ/DKby70OR1TljrdytxnVC7zBvdgfVGd
bWa7+qNdhSjGKtxwOPIvjOK5VJZYsFAI3SDEVW9pg0ZD3uBec+P1yWbh1Wvo+Geb
X46EdlUfjsVp4U4G8CTG3aTQB8Dgn6QnkhtbI067l6evCebT21bx4Re1nPCfLD8C
nlt1bgstVUuWDJt+2J0cGbMBill+RBtCEHEwsU778dqq7dJmiawg1aLI2kyHL6P5
VpBaprVrUHHZ5We0obl1BPyK1Sfc7L/NiaKv0wZbuAIoEjeEloYEB+q56HFz9NWn
CJfcfugIh9q58842C0L0XY6uhce+7ZIpqTCMYFC6e8QjpJibY9qbORyineQy4Q7V
QtGm6s1HFRCyvzpx2Uen
=8HqU
-----END PGP SIGNATURE-----
Merge tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
"Updates for the xtensa architecture. It is a combined set of patches
for 4.8 that never got to the mainline and new patches for 4.9.
- add new kernel memory layouts for MMUv3 cores: with 256MB and 512MB
KSEG size, starting at physical address other than 0
- make kernel load address configurable
- clean up kernel memory layout macros
- drop sysmem early allocator and switch to memblock
- enable kmemleak and memory reservation from the device tree
- wire up new syscalls: userfaultfd, membarrier, mlock2,
copy_file_range, preadv2 and pwritev2
- add new platform: Cadence Configurable System Platform (CSP) and
new core variant for it: xt_lnx
- rearrange CCOUNT calibration code, make most of it generic
- improve machine reset code (XTFPGA now reboots reliably with MMUv3
cores)
- provide default memmap command line option for configurations
without device tree support
- ISS fixes: simdisk is now capable of using highmem pages, panic
correctly terminates simulator"
* tag 'xtensa-20161005' of git://github.com/jcmvbkbc/linux-xtensa: (24 commits)
xtensa: disable MMU initialization option on MMUv2 cores
xtensa: add default memmap and mmio32native options to defconfigs
xtensa: add default memmap option to common_defconfig
xtensa: add default memmap option to iss_defconfig
xtensa: ISS: allow simdisk to use high memory buffers
xtensa: ISS: define simc_exit and use it instead of inline asm
xtensa: xtfpga: group platform_* functions together
xtensa: rearrange CCOUNT calibration
xtensa: xtfpga: use clock provider, don't update DT
xtensa: Tweak xuartps UART driver Rx watermark for Cadence CSP config.
xtensa: initialize MMU before jumping to reset vector
xtensa: fix icountlevel setting in cpu_reset
xtensa: extract common CPU reset code into separate function
xtensa: Added Cadence CSP kernel configuration for Xtensa
xtensa: fix default kernel load address
xtensa: wire up new syscalls
xtensa: support reserved-memory DT node
xtensa: drop sysmem and switch to memblock
xtensa: minimize use of PLATFORM_DEFAULT_MEM_{ADDR,SIZE}
xtensa: cleanup MMU setup and kernel layout macros
...
156 lines
3.3 KiB
C
156 lines
3.3 KiB
C
/*
|
|
* arch/xtensa/platforms/xt2000/setup.c
|
|
*
|
|
* Platform specific functions for the XT2000 board.
|
|
*
|
|
* Authors: Chris Zankel <chris@zankel.net>
|
|
* Joe Taylor <joe@tensilica.com>
|
|
*
|
|
* Copyright 2001 - 2004 Tensilica Inc.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
*/
|
|
#include <linux/stddef.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/reboot.h>
|
|
#include <linux/kdev_t.h>
|
|
#include <linux/types.h>
|
|
#include <linux/major.h>
|
|
#include <linux/console.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/stringify.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial.h>
|
|
#include <linux/serial_8250.h>
|
|
|
|
#include <asm/processor.h>
|
|
#include <asm/platform.h>
|
|
#include <asm/bootparam.h>
|
|
#include <platform/hardware.h>
|
|
#include <platform/serial.h>
|
|
|
|
/* Assumes s points to an 8-chr string. No checking for NULL. */
|
|
|
|
static void led_print (int f, char *s)
|
|
{
|
|
unsigned long* led_addr = (unsigned long*) (XT2000_LED_ADDR + 0xE0) + f;
|
|
int i;
|
|
for (i = f; i < 8; i++)
|
|
if ((*led_addr++ = *s++) == 0)
|
|
break;
|
|
}
|
|
|
|
void platform_halt(void)
|
|
{
|
|
led_print (0, " HALT ");
|
|
local_irq_disable();
|
|
while (1);
|
|
}
|
|
|
|
void platform_power_off(void)
|
|
{
|
|
led_print (0, "POWEROFF");
|
|
local_irq_disable();
|
|
while (1);
|
|
}
|
|
|
|
void platform_restart(void)
|
|
{
|
|
/* Flush and reset the mmu, simulate a processor reset, and
|
|
* jump to the reset vector. */
|
|
cpu_reset();
|
|
/* control never gets here */
|
|
}
|
|
|
|
void __init platform_setup(char** cmdline)
|
|
{
|
|
led_print (0, "LINUX ");
|
|
}
|
|
|
|
/* early initialization */
|
|
|
|
void __init platform_init(bp_tag_t *first)
|
|
{
|
|
}
|
|
|
|
/* Heartbeat. Let the LED blink. */
|
|
|
|
void platform_heartbeat(void)
|
|
{
|
|
static int i=0, t = 0;
|
|
|
|
if (--t < 0)
|
|
{
|
|
t = 59;
|
|
led_print(7, i ? ".": " ");
|
|
i ^= 1;
|
|
}
|
|
}
|
|
|
|
//#define RS_TABLE_SIZE 2
|
|
|
|
#define _SERIAL_PORT(_base,_irq) \
|
|
{ \
|
|
.mapbase = (_base), \
|
|
.membase = (void*)(_base), \
|
|
.irq = (_irq), \
|
|
.uartclk = DUART16552_XTAL_FREQ, \
|
|
.iotype = UPIO_MEM, \
|
|
.flags = UPF_BOOT_AUTOCONF, \
|
|
.regshift = 2, \
|
|
}
|
|
|
|
static struct plat_serial8250_port xt2000_serial_data[] = {
|
|
#if XCHAL_HAVE_BE
|
|
_SERIAL_PORT(DUART16552_1_ADDR + 3, DUART16552_1_INTNUM),
|
|
_SERIAL_PORT(DUART16552_2_ADDR + 3, DUART16552_2_INTNUM),
|
|
#else
|
|
_SERIAL_PORT(DUART16552_1_ADDR, DUART16552_1_INTNUM),
|
|
_SERIAL_PORT(DUART16552_2_ADDR, DUART16552_2_INTNUM),
|
|
#endif
|
|
{ }
|
|
};
|
|
|
|
static struct platform_device xt2000_serial8250_device = {
|
|
.name = "serial8250",
|
|
.id = PLAT8250_DEV_PLATFORM,
|
|
.dev = {
|
|
.platform_data = xt2000_serial_data,
|
|
},
|
|
};
|
|
|
|
static struct resource xt2000_sonic_res[] = {
|
|
{
|
|
.start = SONIC83934_ADDR,
|
|
.end = SONIC83934_ADDR + 0xff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.start = SONIC83934_INTNUM,
|
|
.end = SONIC83934_INTNUM,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct platform_device xt2000_sonic_device = {
|
|
.name = "xtsonic",
|
|
.num_resources = ARRAY_SIZE(xt2000_sonic_res),
|
|
.resource = xt2000_sonic_res,
|
|
};
|
|
|
|
static int __init xt2000_setup_devinit(void)
|
|
{
|
|
platform_device_register(&xt2000_serial8250_device);
|
|
platform_device_register(&xt2000_sonic_device);
|
|
|
|
return 0;
|
|
}
|
|
|
|
device_initcall(xt2000_setup_devinit);
|