![Alexandre Courbot](/assets/img/avatar_default.png)
CPU reset handler was set before fuse is initialized, but tegra_cpu_reset_handler_enable() uses tegra_chip_id, which is set by tegra_init_fuse(). This patch reorders the calls so the CPU reset handler code does not read an uninitialized variable. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Olof Johansson <olof@lixom.net>
193 lines
4.5 KiB
C
193 lines
4.5 KiB
C
/*
|
|
* NVIDIA Tegra SoC device tree board support
|
|
*
|
|
* Copyright (C) 2011, 2013, NVIDIA Corporation
|
|
* Copyright (C) 2010 Secret Lab Technologies, Ltd.
|
|
* Copyright (C) 2010 Google, Inc.
|
|
*
|
|
* 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/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_8250.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/irqdomain.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/pda_power.h>
|
|
#include <linux/io.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/sys_soc.h>
|
|
#include <linux/usb/tegra_usb_phy.h>
|
|
#include <linux/clk/tegra.h>
|
|
#include <linux/irqchip.h>
|
|
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/setup.h>
|
|
|
|
#include "apbio.h"
|
|
#include "board.h"
|
|
#include "common.h"
|
|
#include "cpuidle.h"
|
|
#include "fuse.h"
|
|
#include "iomap.h"
|
|
#include "irq.h"
|
|
#include "pmc.h"
|
|
#include "pm.h"
|
|
#include "reset.h"
|
|
#include "sleep.h"
|
|
|
|
/*
|
|
* Storage for debug-macro.S's state.
|
|
*
|
|
* This must be in .data not .bss so that it gets initialized each time the
|
|
* kernel is loaded. The data is declared here rather than debug-macro.S so
|
|
* that multiple inclusions of debug-macro.S point at the same data.
|
|
*/
|
|
u32 tegra_uart_config[4] = {
|
|
/* Debug UART initialization required */
|
|
1,
|
|
/* Debug UART physical address */
|
|
0,
|
|
/* Debug UART virtual address */
|
|
0,
|
|
/* Scratch space for debug macro */
|
|
0,
|
|
};
|
|
|
|
static void __init tegra_init_cache(void)
|
|
{
|
|
#ifdef CONFIG_CACHE_L2X0
|
|
int ret;
|
|
void __iomem *p = IO_ADDRESS(TEGRA_ARM_PERIF_BASE) + 0x3000;
|
|
u32 aux_ctrl, cache_type;
|
|
|
|
cache_type = readl(p + L2X0_CACHE_TYPE);
|
|
aux_ctrl = (cache_type & 0x700) << (17-8);
|
|
aux_ctrl |= 0x7C400001;
|
|
|
|
ret = l2x0_of_init(aux_ctrl, 0x8200c3fe);
|
|
if (!ret)
|
|
l2x0_saved_regs_addr = virt_to_phys(&l2x0_saved_regs);
|
|
#endif
|
|
}
|
|
|
|
static void __init tegra_init_early(void)
|
|
{
|
|
tegra_apb_io_init();
|
|
tegra_init_fuse();
|
|
tegra_cpu_reset_handler_init();
|
|
tegra_init_cache();
|
|
tegra_powergate_init();
|
|
tegra_hotplug_init();
|
|
}
|
|
|
|
static void __init tegra_dt_init_irq(void)
|
|
{
|
|
tegra_pmc_init_irq();
|
|
tegra_init_irq();
|
|
irqchip_init();
|
|
tegra_legacy_irq_syscore_init();
|
|
}
|
|
|
|
static void __init tegra_dt_init(void)
|
|
{
|
|
struct soc_device_attribute *soc_dev_attr;
|
|
struct soc_device *soc_dev;
|
|
struct device *parent = NULL;
|
|
|
|
tegra_pmc_init();
|
|
|
|
tegra_clocks_apply_init_table();
|
|
|
|
soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
|
|
if (!soc_dev_attr)
|
|
goto out;
|
|
|
|
soc_dev_attr->family = kasprintf(GFP_KERNEL, "Tegra");
|
|
soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%d", tegra_revision);
|
|
soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%d", tegra_chip_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);
|
|
|
|
/*
|
|
* Finished with the static registrations now; fill in the missing
|
|
* devices
|
|
*/
|
|
out:
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
|
|
}
|
|
|
|
static void __init paz00_init(void)
|
|
{
|
|
if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
|
|
tegra_paz00_wifikill_init();
|
|
}
|
|
|
|
static struct {
|
|
char *machine;
|
|
void (*init)(void);
|
|
} board_init_funcs[] = {
|
|
{ "compal,paz00", paz00_init },
|
|
};
|
|
|
|
static void __init tegra_dt_init_late(void)
|
|
{
|
|
int i;
|
|
|
|
tegra_init_suspend();
|
|
tegra_cpuidle_init();
|
|
tegra_powergate_debugfs_init();
|
|
|
|
for (i = 0; i < ARRAY_SIZE(board_init_funcs); i++) {
|
|
if (of_machine_is_compatible(board_init_funcs[i].machine)) {
|
|
board_init_funcs[i].init();
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
static const char * const tegra_dt_board_compat[] = {
|
|
"nvidia,tegra124",
|
|
"nvidia,tegra114",
|
|
"nvidia,tegra30",
|
|
"nvidia,tegra20",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)")
|
|
.map_io = tegra_map_common_io,
|
|
.smp = smp_ops(tegra_smp_ops),
|
|
.init_early = tegra_init_early,
|
|
.init_irq = tegra_dt_init_irq,
|
|
.init_machine = tegra_dt_init,
|
|
.init_late = tegra_dt_init_late,
|
|
.restart = tegra_pmc_restart,
|
|
.dt_compat = tegra_dt_board_compat,
|
|
MACHINE_END
|