summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2014-09-17 11:47:35 -0500
committerPatrick Georgi <pgeorgi@google.com>2015-03-28 07:05:14 +0100
commitdec44e9086dd03ee237eac407af6393091fe36cc (patch)
treef37e402db14c0c18bee4b16cf75d1e9b8d4d2c8f
parent5add43574dc10b9df3b8d050ce9ef14540e339a8 (diff)
downloadcoreboot-dec44e9086dd03ee237eac407af6393091fe36cc.tar.xz
tegra132: remove private spin table implementation
Support the generic spin table code instead of having the one-off implementation. BUG=chrome-os-partner:32082 BRANCH=None TEST=Built and booted to kernel w/ smp. Both w/ and w/o secure monitor. Change-Id: I8557298d1a159b70818cbd8864470ff0d8a46fb1 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 8d89af95a7919f0b8acc92d82f3abda965514ccf Original-Change-Id: I24d56a30fdabd7a35ebc28dcc355c675de823a51 Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/218655 Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: http://review.coreboot.org/9085 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/soc/nvidia/tegra132/Makefile.inc1
-rw-r--r--src/soc/nvidia/tegra132/chip.h3
-rw-r--r--src/soc/nvidia/tegra132/soc.c66
-rw-r--r--src/soc/nvidia/tegra132/spintable.S38
4 files changed, 7 insertions, 101 deletions
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 9c6809d7e3..e656b80811 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -69,7 +69,6 @@ ramstage-y += ../tegra/gpio.c
ramstage-y += ../tegra/i2c.c
ramstage-y += ../tegra/pinmux.c
ramstage-y += ramstage.c
-ramstage-y += spintable.S
ramstage-y += mmu_operations.c
ramstage-$(CONFIG_DRIVERS_UART) += uart.c
ramstage-y += ../tegra/usb.c
diff --git a/src/soc/nvidia/tegra132/chip.h b/src/soc/nvidia/tegra132/chip.h
index 394f0a4020..f2936dde6c 100644
--- a/src/soc/nvidia/tegra132/chip.h
+++ b/src/soc/nvidia/tegra132/chip.h
@@ -21,11 +21,14 @@
#define __SOC_NVIDIA_TEGRA132_CHIP_H__
#include <arch/cache.h>
#include <soc/addressmap.h>
+#include <stdint.h>
#define EFAULT 1
#define EINVAL 2
struct soc_nvidia_tegra132_config {
+ /* Address to monitor if spintable employed. */
+ uintptr_t spintable_addr;
};
#endif /* __SOC_NVIDIA_TEGRA132_CHIP_H__ */
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index b845e14322..2c03db7cb9 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -23,6 +23,7 @@
#include <device/device.h>
#include <arch/io.h>
#include <arch/cache.h>
+#include <arch/spintable.h>
#include <cpu/cpu.h>
#include <cbmem.h>
#include <timer.h>
@@ -61,62 +62,6 @@ static void soc_read_resources(device_t dev)
ram_resource(dev, index++, begin * KiB, size * KiB);
}
-static void *spintable_entry;
-static uint64_t * const spintable_magic = (void *)(uintptr_t)0x80000008;
-
-static void spintable_init(void)
-{
- extern void __wait_for_spin_table_request(void);
- const size_t spintable_entry_size = 4096;
-
- spintable_entry =
- cbmem_add(0x11111111, spintable_entry_size);
-
- memcpy(spintable_entry, __wait_for_spin_table_request,
- spintable_entry_size);
-
- /* Ensure the memory location is zero'd out. */
- *spintable_magic = 0;
-
- dcache_clean_invalidate_by_mva(spintable_magic,
- sizeof(*spintable_magic));
- dcache_clean_invalidate_by_mva(&spintable_entry,
- sizeof(spintable_entry));
- dcache_clean_invalidate_by_mva(spintable_entry, spintable_entry_size);
- dsb();
-}
-
-static void spintable_wait(void *monitor_address)
-{
- uint32_t sctlr_el2;
- uint32_t spsr_el3;
- uint32_t scr_el3;
-
- sctlr_el2 = raw_read_sctlr_el2();
- /* Make sure EL2 is in little endian without any caching enabled. */
- sctlr_el2 &= ~(1 << 25);
- sctlr_el2 &= ~(1 << 19);
- sctlr_el2 &= ~(1 << 12);
- sctlr_el2 &= ~0xf;
- raw_write_sctlr_el2(sctlr_el2);
- /* Ensure enter into EL2t with interrupts disabled. */
- spsr_el3 = (1 << 9) | (0xf << 6) | (1 << 3);
- raw_write_spsr_el3(spsr_el3);
- raw_write_elr_el3((uintptr_t)spintable_entry);
- /*
- * Lower exception level is 64 bit. HVC and SMC allowed. EL0 and EL1
- * in non-secure mode. No interrupts routed to EL3.
- */
- scr_el3 = raw_read_scr_el3();
- scr_el3 |= (1 << 10) | (1 << 8) | (0x3 << 4) | (1 << 0);
- scr_el3 &= ~((0x7 << 1) | (1 << 7) | (1 << 9) | (1 << 13) | (1 << 12));
- raw_write_scr_el3(scr_el3);
- isb();
- asm volatile(
- "mov x0, %0\n\t"
- "eret\n\t" : : "r" (monitor_address) : "x0" );
-}
-
static size_t cntrl_total_cpus(void)
{
return CONFIG_MAX_CPUS;
@@ -137,16 +82,13 @@ static struct cpu_control_ops cntrl_ops = {
static void soc_init(device_t dev)
{
- struct cpu_action action = {
- .run = spintable_wait,
- .arg = spintable_magic,
- };
+ struct soc_nvidia_tegra132_config *cfg;
clock_init_arm_generic_timer();
- spintable_init();
+ cfg = dev->chip_info;
+ spintable_init((void *)cfg->spintable_addr);
arch_initialize_cpus(dev, &cntrl_ops);
- arch_run_on_cpu_async(1, &action);
}
static void soc_noop(device_t dev)
diff --git a/src/soc/nvidia/tegra132/spintable.S b/src/soc/nvidia/tegra132/spintable.S
deleted file mode 100644
index 3066b7e679..0000000000
--- a/src/soc/nvidia/tegra132/spintable.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Google 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; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <arch/asm.h>
-
-ENTRY(__wait_for_spin_table_request)
- /* Entry here is in EL2 with the magic address in x0. */
- mov x28, x0
-1:
- ldr x27, [x28]
- cmp x27, xzr
- b.ne 2f
- wfe
- b 1b
-2:
- /* Entry into the kernel. */
- mov x0, xzr
- mov x1, xzr
- mov x2, xzr
- mov x3, xzr
- br x27
-ENDPROC(__wait_for_spin_table_request)