![Linus Torvalds](/assets/img/avatar_default.png)
Pull ARM updates from Russell King: - Major clean-up of the L2 cache support code. The existing mess was becoming rather unmaintainable through all the additions that others have done over time. This turns it into a much nicer structure, and implements a few performance improvements as well. - Clean up some of the CP15 control register tweaks for alignment support, moving some code and data into alignment.c - DMA properties for ARM, from Santosh and reviewed by DT people. This adds DT properties to specify bus translations we can't discover automatically, and to indicate whether devices are coherent. - Hibernation support for ARM - Make ftrace work with read-only text in modules - add suspend support for PJ4B CPUs - rework interrupt masking for undefined instruction handling, which allows us to enable interrupts earlier in the handling of these exceptions. - support for big endian page tables - fix stacktrace support to exclude stacktrace functions from the trace, and add save_stack_trace_regs() implementation so that kprobes can record stack traces. - Add support for the Cortex-A17 CPU. - Remove last vestiges of ARM710 support. - Removal of ARM "meminfo" structure, finally converting us solely to memblock to handle the early memory initialisation. * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits) ARM: ensure C page table setup code follows assembly code (part II) ARM: ensure C page table setup code follows assembly code ARM: consolidate last remaining open-coded alignment trap enable ARM: remove global cr_no_alignment ARM: remove CPU_CP15 conditional from alignment.c ARM: remove unused adjust_cr() function ARM: move "noalign" command line option to alignment.c ARM: provide common method to clear bits in CPU control register ARM: 8025/1: Get rid of meminfo ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type ARM: 8066/1: correction for ARM patch 8031/2 ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation ARM: 8065/1: remove last use of CONFIG_CPU_ARM710 ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction ARM: 8047/1: rwsem: use asm-generic rwsem implementation ARM: l2c: trial at enabling some Cortex-A9 optimisations ARM: l2c: add warnings for stuff modifying aux_ctrl register values ARM: l2c: print a warning with L2C-310 caches if the cache size is modified ARM: l2c: remove old .set_debug method ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this ...
212 lines
5.2 KiB
C
212 lines
5.2 KiB
C
/*
|
|
* This file contains common code that is intended to be used across
|
|
* boards so that it's not replicated.
|
|
*
|
|
* Copyright (C) 2011 Xilinx
|
|
*
|
|
* This software is licensed under the terms of the GNU General Public
|
|
* License version 2, as published by the Free Software Foundation, and
|
|
* may be copied, distributed, and modified under those terms.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clk/zynq.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/of.h>
|
|
#include <linux/memblock.h>
|
|
#include <linux/irqchip.h>
|
|
#include <linux/irqchip/arm-gic.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sys_soc.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/smp_scu.h>
|
|
#include <asm/system_info.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
|
|
#include "common.h"
|
|
|
|
#define ZYNQ_DEVCFG_MCTRL 0x80
|
|
#define ZYNQ_DEVCFG_PS_VERSION_SHIFT 28
|
|
#define ZYNQ_DEVCFG_PS_VERSION_MASK 0xF
|
|
|
|
void __iomem *zynq_scu_base;
|
|
|
|
/**
|
|
* zynq_memory_init - Initialize special memory
|
|
*
|
|
* We need to stop things allocating the low memory as DMA can't work in
|
|
* the 1st 512K of memory.
|
|
*/
|
|
static void __init zynq_memory_init(void)
|
|
{
|
|
if (!__pa(PAGE_OFFSET))
|
|
memblock_reserve(__pa(PAGE_OFFSET), __pa(swapper_pg_dir));
|
|
}
|
|
|
|
static struct platform_device zynq_cpuidle_device = {
|
|
.name = "cpuidle-zynq",
|
|
};
|
|
|
|
/**
|
|
* zynq_get_revision - Get Zynq silicon revision
|
|
*
|
|
* Return: Silicon version or -1 otherwise
|
|
*/
|
|
static int __init zynq_get_revision(void)
|
|
{
|
|
struct device_node *np;
|
|
void __iomem *zynq_devcfg_base;
|
|
u32 revision;
|
|
|
|
np = of_find_compatible_node(NULL, NULL, "xlnx,zynq-devcfg-1.0");
|
|
if (!np) {
|
|
pr_err("%s: no devcfg node found\n", __func__);
|
|
return -1;
|
|
}
|
|
|
|
zynq_devcfg_base = of_iomap(np, 0);
|
|
if (!zynq_devcfg_base) {
|
|
pr_err("%s: Unable to map I/O memory\n", __func__);
|
|
return -1;
|
|
}
|
|
|
|
revision = readl(zynq_devcfg_base + ZYNQ_DEVCFG_MCTRL);
|
|
revision >>= ZYNQ_DEVCFG_PS_VERSION_SHIFT;
|
|
revision &= ZYNQ_DEVCFG_PS_VERSION_MASK;
|
|
|
|
iounmap(zynq_devcfg_base);
|
|
|
|
return revision;
|
|
}
|
|
|
|
/**
|
|
* zynq_init_machine - System specific initialization, intended to be
|
|
* called from board specific initialization.
|
|
*/
|
|
static void __init zynq_init_machine(void)
|
|
{
|
|
struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
|
|
struct soc_device_attribute *soc_dev_attr;
|
|
struct soc_device *soc_dev;
|
|
struct device *parent = NULL;
|
|
|
|
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
|
|
if (!soc_dev_attr)
|
|
goto out;
|
|
|
|
system_rev = zynq_get_revision();
|
|
|
|
soc_dev_attr->family = kasprintf(GFP_KERNEL, "Xilinx Zynq");
|
|
soc_dev_attr->revision = kasprintf(GFP_KERNEL, "0x%x", system_rev);
|
|
soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "0x%x",
|
|
zynq_slcr_get_device_id());
|
|
|
|
soc_dev = soc_device_register(soc_dev_attr);
|
|
if (IS_ERR(soc_dev)) {
|
|
kfree(soc_dev_attr->family);
|
|
kfree(soc_dev_attr->revision);
|
|
kfree(soc_dev_attr->soc_id);
|
|
kfree(soc_dev_attr);
|
|
goto out;
|
|
}
|
|
|
|
parent = soc_device_to_device(soc_dev);
|
|
|
|
out:
|
|
/*
|
|
* Finished with the static registrations now; fill in the missing
|
|
* devices
|
|
*/
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
|
|
|
|
platform_device_register(&zynq_cpuidle_device);
|
|
platform_device_register_full(&devinfo);
|
|
|
|
zynq_slcr_init();
|
|
}
|
|
|
|
static void __init zynq_timer_init(void)
|
|
{
|
|
zynq_early_slcr_init();
|
|
|
|
zynq_clock_init();
|
|
of_clk_init(NULL);
|
|
clocksource_of_init();
|
|
}
|
|
|
|
static struct map_desc zynq_cortex_a9_scu_map __initdata = {
|
|
.length = SZ_256,
|
|
.type = MT_DEVICE,
|
|
};
|
|
|
|
static void __init zynq_scu_map_io(void)
|
|
{
|
|
unsigned long base;
|
|
|
|
base = scu_a9_get_base();
|
|
zynq_cortex_a9_scu_map.pfn = __phys_to_pfn(base);
|
|
/* Expected address is in vmalloc area that's why simple assign here */
|
|
zynq_cortex_a9_scu_map.virtual = base;
|
|
iotable_init(&zynq_cortex_a9_scu_map, 1);
|
|
zynq_scu_base = (void __iomem *)base;
|
|
BUG_ON(!zynq_scu_base);
|
|
}
|
|
|
|
/**
|
|
* zynq_map_io - Create memory mappings needed for early I/O.
|
|
*/
|
|
static void __init zynq_map_io(void)
|
|
{
|
|
debug_ll_io_init();
|
|
zynq_scu_map_io();
|
|
}
|
|
|
|
static void __init zynq_irq_init(void)
|
|
{
|
|
gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND;
|
|
irqchip_init();
|
|
}
|
|
|
|
static void zynq_system_reset(enum reboot_mode mode, const char *cmd)
|
|
{
|
|
zynq_slcr_system_reset();
|
|
}
|
|
|
|
static const char * const zynq_dt_match[] = {
|
|
"xlnx,zynq-7000",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
|
|
/* 64KB way size, 8-way associativity, parity disabled */
|
|
.l2c_aux_val = 0x02000000,
|
|
.l2c_aux_mask = 0xf0ffffff,
|
|
.smp = smp_ops(zynq_smp_ops),
|
|
.map_io = zynq_map_io,
|
|
.init_irq = zynq_irq_init,
|
|
.init_machine = zynq_init_machine,
|
|
.init_time = zynq_timer_init,
|
|
.dt_compat = zynq_dt_match,
|
|
.reserve = zynq_memory_init,
|
|
.restart = zynq_system_reset,
|
|
MACHINE_END
|